Skip to content

Tmesh #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
heitor31415 wants to merge 14 commits into
base: RMOD
Choose a base branch
from
Open

Tmesh #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7262c8c
Eval_GM lines reduction
heitor31415 Feb 8, 2018
c2141df
Thermal Mesh object
heitor31415 Feb 8, 2018
ca329f5
Mesh object
heitor31415 Feb 8, 2018
1981fc8
expand cMatrix function
heitor31415 Feb 8, 2018
decf403
Layer element position
heitor31415 Feb 12, 2018
94b268e
addLayer function and debug
heitor31415 Feb 12, 2018
36d7c83
realloc problem
heitor31415 Feb 12, 2018
125962c
Layer orientation
heitor31415 Feb 16, 2018
184d565
Release config and CMat Realloc fix
heitor31415 Feb 19, 2018
5a320bc
Mesh Refinement fixed
heitor31415 Feb 21, 2018
d7a29ca
Export mesh files added
heitor31415 Feb 21, 2018
32c290a
addLayer functional
heitor31415 Mar 16, 2018
92af82e
addLayer functional 2
heitor31415 Mar 16, 2018
31100c0
final
heitor31415 Mar 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions TRMOD.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,19 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{CC9A36FE-892B-4D18-AE7A-428E7D0A7DFE}.Debug|Win32.ActiveCfg = Debug|Win32
{CC9A36FE-892B-4D18-AE7A-428E7D0A7DFE}.Debug|Win32.Build.0 = Debug|Win32
{CC9A36FE-892B-4D18-AE7A-428E7D0A7DFE}.Debug|x64.ActiveCfg = Debug|x64
{CC9A36FE-892B-4D18-AE7A-428E7D0A7DFE}.Debug|x64.Build.0 = Debug|x64
{CC9A36FE-892B-4D18-AE7A-428E7D0A7DFE}.Release|Win32.ActiveCfg = Release|Win32
{CC9A36FE-892B-4D18-AE7A-428E7D0A7DFE}.Release|Win32.Build.0 = Release|Win32
{CC9A36FE-892B-4D18-AE7A-428E7D0A7DFE}.Release|x64.ActiveCfg = Release|x64
{CC9A36FE-892B-4D18-AE7A-428E7D0A7DFE}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
85 changes: 2 additions & 83 deletions TRMOD/Element.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,87 +458,6 @@ void CElement::Eval_GM(double *G,const int i,const int j)
case 3: a11 = Ji[6]; a12 = Ji[7]; a13 = Ji[8]; break;
}

switch(j)
{
case 0:
G[0] = a11*g1md[0] + a12*g2md[0] + a13*g3md[0];
G[1] = a11*g1md[1] + a12*g2md[1] + a13*g3md[1];
G[2] = a11*g1md[2] + a12*g2md[2] + a13*g3md[2];
G[3] = a11*g1md[3] + a12*g2md[3] + a13*g3md[3];
G[4] = a11*g1md[4] + a12*g2md[4] + a13*g3md[4];
G[5] = a11*g1md[5] + a12*g2md[5] + a13*g3md[5];
G[6] = a11*g1md[6] + a12*g2md[6] + a13*g3md[6];
G[7] = a11*g1md[7] + a12*g2md[7] + a13*g3md[7];
break;
case 1:
G[0] = a11*g1md[8] + a12*g2md[8] + a13*g3md[8];
G[1] = a11*g1md[9] + a12*g2md[9] + a13*g3md[9];
G[2] = a11*g1md[10] + a12*g2md[10] + a13*g3md[10];
G[3] = a11*g1md[11] + a12*g2md[11] + a13*g3md[11];
G[4] = a11*g1md[12] + a12*g2md[12] + a13*g3md[12];
G[5] = a11*g1md[13] + a12*g2md[13] + a13*g3md[13];
G[6] = a11*g1md[14] + a12*g2md[14] + a13*g3md[14];
G[7] = a11*g1md[15] + a12*g2md[15] + a13*g3md[15];
break;
case 2:
G[0] = a11*g1md[16] + a12*g2md[16] + a13*g3md[16];
G[1] = a11*g1md[17] + a12*g2md[17] + a13*g3md[17];
G[2] = a11*g1md[18] + a12*g2md[18] + a13*g3md[18];
G[3] = a11*g1md[19] + a12*g2md[19] + a13*g3md[19];
G[4] = a11*g1md[20] + a12*g2md[20] + a13*g3md[20];
G[5] = a11*g1md[21] + a12*g2md[21] + a13*g3md[21];
G[6] = a11*g1md[22] + a12*g2md[22] + a13*g3md[22];
G[7] = a11*g1md[23] + a12*g2md[23] + a13*g3md[23];
break;
case 3:
G[0] = a11*g1md[24] + a12*g2md[24] + a13*g3md[24];
G[1] = a11*g1md[25] + a12*g2md[25] + a13*g3md[25];
G[2] = a11*g1md[26] + a12*g2md[26] + a13*g3md[26];
G[3] = a11*g1md[27] + a12*g2md[27] + a13*g3md[27];
G[4] = a11*g1md[28] + a12*g2md[28] + a13*g3md[28];
G[5] = a11*g1md[29] + a12*g2md[29] + a13*g3md[29];
G[6] = a11*g1md[30] + a12*g2md[30] + a13*g3md[30];
G[7] = a11*g1md[31] + a12*g2md[31] + a13*g3md[31];
break;
case 4:
G[0] = a11*g1md[32] + a12*g2md[32] + a13*g3md[32];
G[1] = a11*g1md[33] + a12*g2md[33] + a13*g3md[33];
G[2] = a11*g1md[34] + a12*g2md[34] + a13*g3md[34];
G[3] = a11*g1md[35] + a12*g2md[35] + a13*g3md[35];
G[4] = a11*g1md[36] + a12*g2md[36] + a13*g3md[36];
G[5] = a11*g1md[37] + a12*g2md[37] + a13*g3md[37];
G[6] = a11*g1md[38] + a12*g2md[38] + a13*g3md[38];
G[7] = a11*g1md[39] + a12*g2md[39] + a13*g3md[39];
break;
case 5:
G[0] = a11*g1md[40] + a12*g2md[40] + a13*g3md[40];
G[1] = a11*g1md[41] + a12*g2md[41] + a13*g3md[41];
G[2] = a11*g1md[42] + a12*g2md[42] + a13*g3md[42];
G[3] = a11*g1md[43] + a12*g2md[43] + a13*g3md[43];
G[4] = a11*g1md[44] + a12*g2md[44] + a13*g3md[44];
G[5] = a11*g1md[45] + a12*g2md[45] + a13*g3md[45];
G[6] = a11*g1md[46] + a12*g2md[46] + a13*g3md[46];
G[7] = a11*g1md[47] + a12*g2md[47] + a13*g3md[47];
break;
case 6:
G[0] = a11*g1md[48] + a12*g2md[48] + a13*g3md[48];
G[1] = a11*g1md[49] + a12*g2md[49] + a13*g3md[49];
G[2] = a11*g1md[50] + a12*g2md[50] + a13*g3md[50];
G[3] = a11*g1md[51] + a12*g2md[51] + a13*g3md[51];
G[4] = a11*g1md[52] + a12*g2md[52] + a13*g3md[52];
G[5] = a11*g1md[53] + a12*g2md[53] + a13*g3md[53];
G[6] = a11*g1md[54] + a12*g2md[54] + a13*g3md[54];
G[7] = a11*g1md[55] + a12*g2md[55] + a13*g3md[55];
break;
case 7:
G[0] = a11*g1md[56] + a12*g2md[56] + a13*g3md[56];
G[1] = a11*g1md[57] + a12*g2md[57] + a13*g3md[57];
G[2] = a11*g1md[58] + a12*g2md[58] + a13*g3md[58];
G[3] = a11*g1md[59] + a12*g2md[59] + a13*g3md[59];
G[4] = a11*g1md[60] + a12*g2md[60] + a13*g3md[60];
G[5] = a11*g1md[61] + a12*g2md[61] + a13*g3md[61];
G[6] = a11*g1md[62] + a12*g2md[62] + a13*g3md[62];
G[7] = a11*g1md[63] + a12*g2md[63] + a13*g3md[63];
break;
}
for (int k = 0; k < 8; k++)
G[k] = a11*g1md[k + 8 * j] + a12*g2md[k + 8 * j] + a13*g3md[k + 8 * j];
}
Binary file modified TRMOD/FEM-Tyre_Job1.tbi
View file
Open in desktop
Binary file not shown.
14 changes: 7 additions & 7 deletions TRMOD/MatrixStuff_Modal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ class CMatrixStuff_Modal
void Matrix_SetValues_T (int ir, int ic, double** matrix, double* lineararray);

public:
void Matrix_Times_Vector(int ir, int ic, double* result, double** matrix, double* vector);
void M_Times_M_Times_M (int ir1,int ir2,int ir3, double** result, double **mat1, double** mat2, double **mat3);
void Matrix_Deallocate (int ir, double **p);
double** Matrix_Allocate (int ir, int ic, double initfactor, bool *status);
double* Vector_Allocate (int ir, double initfacetor, bool *status);
int** Matrix_Allocate_Int(int ir, int ic, int initfactor, bool *status);
int* Vector_Allocate_Int(int ir, int initfactor, bool *status);
void Matrix_Times_Vector (int ir, int ic, double* result, double** matrix, double* vector);
void M_Times_M_Times_M (int ir1,int ir2,int ir3, double** result, double **mat1, double** mat2, double **mat3);
void Matrix_Deallocate (int ir, double **p);
double** Matrix_Allocate (int ir, int ic, double initfactor, bool *status);
double* Vector_Allocate (int ir, double initfacetor, bool *status);
int** Matrix_Allocate_Int (int ir, int ic, int initfactor, bool *status);
int* Vector_Allocate_Int (int ir, int initfactor, bool *status);
};
81 changes: 80 additions & 1 deletion TRMOD/TRMOD.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,18 @@
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{CC9A36FE-892B-4D18-AE7A-428E7D0A7DFE}</ProjectGuid>
Expand All @@ -22,30 +30,61 @@
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir)\inc;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir)\inc;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir)\inc;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir)\inc;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
Expand All @@ -63,6 +102,22 @@
<AdditionalDependencies>gsl.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(ProjectDir)\inc;$(SolutionDir)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>gsl.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Expand All @@ -71,27 +126,51 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(SolutionDir)\inc;$(ProjectDir)\inc</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>gsl.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(SolutionDir)\inc;$(ProjectDir)\inc</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>gsl.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="Element.cpp" />
<ClCompile Include="main1.cpp" />
<ClCompile Include="Math8.cpp" />
<ClCompile Include="MatrixStuff_Modal.cpp" />
<ClCompile Include="Tmesh.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Element.h" />
<ClInclude Include="Math8.h" />
<ClInclude Include="MatrixStuff_Modal.h" />
<ClInclude Include="misc.h" />
<ClInclude Include="Tmesh.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
6 changes: 6 additions & 0 deletions TRMOD/TRMOD.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
<ClCompile Include="MatrixStuff_Modal.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Tmesh.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="misc.h">
Expand All @@ -41,5 +44,8 @@
<ClInclude Include="MatrixStuff_Modal.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Tmesh.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
Loading