Skip to content

Commit 89e3124

Browse files
epsi1onepsi1on
committed
update
1 parent c320d4f commit 89e3124

27 files changed

Lines changed: 432 additions & 97 deletions

‎Sources/BriefFiniteElementNet.dev.sln‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.32126.317
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BriefFiniteElementNet", "BriefFiniteElementNet\BriefFiniteElementNet.csproj", "{7CDA20D4-9BC8-4BC3-9F22-CB86CD4DC3E1}"
7+
EndProject
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common", "Common\Common.csproj", "{A4296E2E-FF35-4416-A57F-C162A31B3608}"
9+
EndProject
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls", "Controls\Controls.csproj", "{8DABDE62-8A8E-4153-B753-3A62015A9C16}"
11+
EndProject
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomElements", "CustomElements\CustomElements.csproj", "{2AC3B54E-4581-4F39-BE3F-3E1B8C16D4F7}"
13+
EndProject
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Legacy", "Legacy\Legacy.csproj", "{D272A774-6864-4504-B480-02BA57955B53}"
15+
EndProject
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SolversX64", "Solvers\SolversX64.csproj", "{6B3E0DE1-C1F6-4CEC-84F6-FDAE230A410D}"
17+
EndProject
18+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSparse.Interop", "csparse-interrupt\CSparse.Interop\CSparse.Interop.csproj", "{1D9A0397-F17A-4844-A333-A6F3C31E4998}"
19+
EndProject
20+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BriefFiniteElementNet.Validation", "..\Validation\Validation\BriefFiniteElementNet.Validation.csproj", "{7A20CE01-552E-457A-A9C3-18BED244D897}"
21+
EndProject
22+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestingConsole", "TestingConsole\TestingConsole.csproj", "{3BA871B0-C85B-45FA-9CA4-2F7D7CCF25BB}"
23+
EndProject
24+
Global
25+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
26+
Debug|Any CPU = Debug|Any CPU
27+
Release|Any CPU = Release|Any CPU
28+
EndGlobalSection
29+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
30+
{7CDA20D4-9BC8-4BC3-9F22-CB86CD4DC3E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31+
{7CDA20D4-9BC8-4BC3-9F22-CB86CD4DC3E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
32+
{7CDA20D4-9BC8-4BC3-9F22-CB86CD4DC3E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
33+
{7CDA20D4-9BC8-4BC3-9F22-CB86CD4DC3E1}.Release|Any CPU.Build.0 = Release|Any CPU
34+
{A4296E2E-FF35-4416-A57F-C162A31B3608}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35+
{A4296E2E-FF35-4416-A57F-C162A31B3608}.Debug|Any CPU.Build.0 = Debug|Any CPU
36+
{A4296E2E-FF35-4416-A57F-C162A31B3608}.Release|Any CPU.ActiveCfg = Release|Any CPU
37+
{A4296E2E-FF35-4416-A57F-C162A31B3608}.Release|Any CPU.Build.0 = Release|Any CPU
38+
{8DABDE62-8A8E-4153-B753-3A62015A9C16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39+
{8DABDE62-8A8E-4153-B753-3A62015A9C16}.Debug|Any CPU.Build.0 = Debug|Any CPU
40+
{8DABDE62-8A8E-4153-B753-3A62015A9C16}.Release|Any CPU.ActiveCfg = Release|Any CPU
41+
{8DABDE62-8A8E-4153-B753-3A62015A9C16}.Release|Any CPU.Build.0 = Release|Any CPU
42+
{2AC3B54E-4581-4F39-BE3F-3E1B8C16D4F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43+
{2AC3B54E-4581-4F39-BE3F-3E1B8C16D4F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
44+
{2AC3B54E-4581-4F39-BE3F-3E1B8C16D4F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
45+
{2AC3B54E-4581-4F39-BE3F-3E1B8C16D4F7}.Release|Any CPU.Build.0 = Release|Any CPU
46+
{D272A774-6864-4504-B480-02BA57955B53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
47+
{D272A774-6864-4504-B480-02BA57955B53}.Debug|Any CPU.Build.0 = Debug|Any CPU
48+
{D272A774-6864-4504-B480-02BA57955B53}.Release|Any CPU.ActiveCfg = Release|Any CPU
49+
{D272A774-6864-4504-B480-02BA57955B53}.Release|Any CPU.Build.0 = Release|Any CPU
50+
{6B3E0DE1-C1F6-4CEC-84F6-FDAE230A410D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
51+
{6B3E0DE1-C1F6-4CEC-84F6-FDAE230A410D}.Debug|Any CPU.Build.0 = Debug|Any CPU
52+
{6B3E0DE1-C1F6-4CEC-84F6-FDAE230A410D}.Release|Any CPU.ActiveCfg = Release|Any CPU
53+
{6B3E0DE1-C1F6-4CEC-84F6-FDAE230A410D}.Release|Any CPU.Build.0 = Release|Any CPU
54+
{1D9A0397-F17A-4844-A333-A6F3C31E4998}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
55+
{1D9A0397-F17A-4844-A333-A6F3C31E4998}.Debug|Any CPU.Build.0 = Debug|Any CPU
56+
{1D9A0397-F17A-4844-A333-A6F3C31E4998}.Release|Any CPU.ActiveCfg = Release|Any CPU
57+
{1D9A0397-F17A-4844-A333-A6F3C31E4998}.Release|Any CPU.Build.0 = Release|Any CPU
58+
{7A20CE01-552E-457A-A9C3-18BED244D897}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
59+
{7A20CE01-552E-457A-A9C3-18BED244D897}.Debug|Any CPU.Build.0 = Debug|Any CPU
60+
{7A20CE01-552E-457A-A9C3-18BED244D897}.Release|Any CPU.ActiveCfg = Release|Any CPU
61+
{7A20CE01-552E-457A-A9C3-18BED244D897}.Release|Any CPU.Build.0 = Release|Any CPU
62+
{3BA871B0-C85B-45FA-9CA4-2F7D7CCF25BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
63+
{3BA871B0-C85B-45FA-9CA4-2F7D7CCF25BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
64+
{3BA871B0-C85B-45FA-9CA4-2F7D7CCF25BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
65+
{3BA871B0-C85B-45FA-9CA4-2F7D7CCF25BB}.Release|Any CPU.Build.0 = Release|Any CPU
66+
EndGlobalSection
67+
GlobalSection(SolutionProperties) = preSolution
68+
HideSolutionNode = FALSE
69+
EndGlobalSection
70+
GlobalSection(ExtensibilityGlobals) = postSolution
71+
SolutionGuid = {A2423FE1-F612-4C6D-B808-65E81B874574}
72+
EndGlobalSection
73+
EndGlobal

‎Sources/BriefFiniteElementNet/BriefFiniteElementNet.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
<GenerateDocumentationFile>false</GenerateDocumentationFile>
1010
<PackageId>BriefFiniteElement.Net</PackageId>
1111
<Description>A Finite Element library for static and linear analysis of solids and structures.</Description>
12-
<Version>2.0.6</Version>
12+
<Version>2.0.7</Version>
1313
<PackageTags>finite elements static linear analysis</PackageTags>
1414
<Product>BriefFiniteElement.Net</Product>
1515
<Company>N.A.</Company>
16-
<Copyright>Copyleft © 2022</Copyright>
16+
<Copyright>Copyleft © 2023</Copyright>
1717
<Authors>epsi1on</Authors>
1818

1919
<AssemblyName>BriefFiniteElementNet</AssemblyName>

‎Sources/BriefFiniteElementNet/ElementHelpers/TetrahedronHelper.cs‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -436,19 +436,17 @@ public GeneralStressTensor GetLocalInternalStressAt(Element targetElement, Displ
436436

437437
var res = d * b * u;
438438

439+
//res = (Matrix) res.Transpose();
440+
439441
var cauchy = new CauchyStressTensor();
440442

441443
cauchy.S11 = res[0, 0];
442-
cauchy.S12 = res[0, 1];
443-
cauchy.S13 = res[0, 2];
444-
445-
cauchy.S21 = res[1, 0];
446-
cauchy.S22 = res[1, 1];
447-
cauchy.S23 = res[1, 2];
444+
cauchy.S22 = res[1, 0];
445+
cauchy.S33 = res[2, 0];
448446

449-
cauchy.S31 = res[2, 0];
450-
cauchy.S32 = res[2, 1];
451-
cauchy.S33 = res[2, 2];
447+
cauchy.S23 = cauchy.S32 = res[3, 0];
448+
cauchy.S13 = cauchy.S31 = res[4, 0];
449+
cauchy.S12 = cauchy.S21 = res[5, 0];
452450

453451
return new GeneralStressTensor(cauchy);
454452
}

‎Sources/BriefFiniteElementNet/Integration/GaussianIntegrator.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,27 @@ public static GaussianIntegrator CreateFor1DProblem(Func<double, double> functio
305305
return buf;
306306
}
307307

308+
public static GaussianIntegrator CreateFor1DProblem(IMatrixFunction function, double x0, double x1,
309+
int sampling)
310+
{
311+
var buf = new GaussianIntegrator();
312+
313+
buf.A1 = 0;
314+
buf.A2 = 1;
315+
316+
buf.F1 = gama => 0;
317+
buf.F2 = gama => 1;
318+
319+
buf.G1 = (eta, gama) => x0;
320+
buf.G2 = (eta, gama) => x1;
321+
322+
buf.XiPointCount = sampling;
323+
buf.GammaPointCount = buf.EtaPointCount = 1;
324+
325+
buf.H = function;
326+
327+
return buf;
328+
}
308329

309330
public static GaussianIntegrator CreateFor1DProblem(Func<double, Matrix> function, double x0, double x1,
310331
int sampling)

‎Sources/Common/Common.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<GenerateDocumentationFile>false</GenerateDocumentationFile>
88
<PackageId>BriefFiniteElementNet.Common</PackageId>
99
<Description>Common object for Brief Finite Element</Description>
10-
<Version>2.0.5</Version>
10+
<Version>2.0.7</Version>
1111
<PackageTags>finite elements static linear analysis</PackageTags>
1212
<Product>BriefFiniteElementNet.Common</Product>
1313
<Company />

‎Sources/Controls/Controls.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<ProjectGuid>{8DABDE62-8A8E-4153-B753-3A62015A9C16}</ProjectGuid>
4-
<TargetFrameworks>net48</TargetFrameworks>
4+
<TargetFrameworks>net45;</TargetFrameworks>
55
<AssemblyVersion>2.0.5</AssemblyVersion>
66
<AssemblyTitle>BriefFiniteElement.Controls</AssemblyTitle>
77
<Product>BriefFiniteElement.Controls</Product>

‎Sources/TempConsole/Program.cs‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,11 @@
1-
// See https://aka.ms/new-console-template for more information
2-
Console.WriteLine("Hello, World!");
1+

2+
public static class Program
3+
{
4+
public static void Main(string[] args)
5+
{
6+
//Console.WriteLine("Hello, World!");
7+
}
8+
9+
}
10+
// See https://aka.ms/new-console-template for more information
11+

‎Sources/TempConsole/TempConsole.csproj‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,13 @@
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
99

10+
<ItemGroup>
11+
<ProjectReference Include="..\..\Validation\Validation\BriefFiniteElementNet.Validation.csproj" />
12+
<ProjectReference Include="..\BriefFiniteElementNet\BriefFiniteElementNet.csproj" />
13+
<ProjectReference Include="..\Common\Common.csproj" />
14+
<ProjectReference Include="..\CustomElements\CustomElements.csproj" />
15+
<ProjectReference Include="..\Legacy\Legacy.csproj" />
16+
17+
</ItemGroup>
18+
1019
</Project>

‎Sources/TestingConsole/App.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
5+
</startup>
6+
</configuration>

‎Sources/TestingConsole/Program.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
7+
namespace TestingConsole
8+
{
9+
internal class Program
10+
{
11+
static void Main(string[] args)
12+
{
13+
BriefFiniteElementNet.Validation.GithubIssues.Issue152.Run();
14+
}
15+
}
16+
}

0 commit comments

Comments
 (0)