]> SALOME platform Git repositories - tools/solverlab.git/commitdiff
Salome HOME
Added tetrahedron 3D test
authormichael <michael@localhost.localdomain>
Wed, 20 Jan 2021 11:42:20 +0000 (12:42 +0100)
committermichael <michael@localhost.localdomain>
Wed, 20 Jan 2021 11:42:20 +0000 (12:42 +0100)
CoreFlows/examples/C/CMakeLists.txt
CoreFlows/examples/C/WaveSystem_FV_SphericalExplosion_CDMATH.cxx
CoreFlows/examples/C/WaveSystem_FV_SphericalExplosion_MPI.cxx

index a3ad587886a94ee8ff0c87545b0c77fc27fd4471..339b28f1400d5136ec59ab45b8a6c5b58513e525 100755 (executable)
@@ -101,18 +101,22 @@ CreateTestExecAndInstall(testEOS.cxx  "${libs_for_tests}" )
   add_executable(WaveSystem_FV_SphericalExplosion_CDMATH.exe WaveSystem_FV_SphericalExplosion_CDMATH.cxx)
   target_link_libraries(WaveSystem_FV_SphericalExplosion_CDMATH.exe CoreFlowsLibs )
   install(TARGETS WaveSystem_FV_SphericalExplosion_CDMATH.exe DESTINATION share/examples)
-  add_test(NAME WaveSystem_2DFV_SphericalExplosion_CDMATH_SQUARE  COMMAND "./WaveSystem_FV_SphericalExplosion_CDMATH.exe")     
-  add_test(NAME WaveSystem_3DFV_SphericalExplosion_CDMATH_CUBE    COMMAND "./WaveSystem_FV_SphericalExplosion_CDMATH.exe" resources/meshCube.med)     
+  add_test(NAME WaveSystem_2DFV_SphericalExplosion_CDMATH_SQUARE         COMMAND "./WaveSystem_FV_SphericalExplosion_CDMATH.exe")     
+  add_test(NAME WaveSystem_2DFV_SphericalExplosion_CDMATH_HEXAGON        COMMAND "./WaveSystem_FV_SphericalExplosion_CDMATH.exe" resources/meshHexagonWithTriangles10.med)
+  add_test(NAME WaveSystem_3DFV_SphericalExplosion_CDMATH_CUBE           COMMAND "./WaveSystem_FV_SphericalExplosion_CDMATH.exe" resources/meshCube.med)     
+  add_test(NAME WaveSystem_3DFV_SphericalExplosion_CDMATH_TETRAHEDRON    COMMAND "./WaveSystem_FV_SphericalExplosion_CDMATH.exe" resources/meshTetrahedron10.med)     
 
 if( SOLVERLAB_WITH_MPI )
   add_executable(WaveSystem_FV_SphericalExplosion_MPI.exe WaveSystem_FV_SphericalExplosion_MPI.cxx)                    # compilation of the testxxx.exe 
   target_link_libraries(WaveSystem_FV_SphericalExplosion_MPI.exe CoreFlowsLibs  ${MPI_LIBRARY})              # provide required lib for testxxx.exe 
   install(TARGETS WaveSystem_FV_SphericalExplosion_MPI.exe DESTINATION share/examples)
-  add_test(NAME WaveSystem_2DFV_SphericalExplosion_MPI_SEQ_SQUARE  COMMAND "${MPIEXEC}" "-n" "1" "./WaveSystem_FV_SphericalExplosion_MPI.exe")     
-  add_test(NAME WaveSystem_2DFV_SphericalExplosion_MPI_SEQ_HEXAGON COMMAND "${MPIEXEC}" "-n" "1" "./WaveSystem_FV_SphericalExplosion_MPI.exe" resources/meshHexagonWithTriangles10.med) 
-  add_test(NAME WaveSystem_3DFV_SphericalExplosion_MPI_SEQ_CUBE    COMMAND "${MPIEXEC}" "-n" "1" "./WaveSystem_FV_SphericalExplosion_MPI.exe" resources/meshCube.med) 
-  add_test(NAME WaveSystem_2DFV_SphericalExplosion_MPI_PAR_SQUARE  COMMAND "${MPIEXEC}" "-n" "2" "./WaveSystem_FV_SphericalExplosion_MPI.exe")
-  add_test(NAME WaveSystem_2DFV_SphericalExplosion_MPI_PAR_HEXAGON COMMAND "${MPIEXEC}" "-n" "2" "./WaveSystem_FV_SphericalExplosion_MPI.exe" resources/meshHexagonWithTriangles10.med)
-  add_test(NAME WaveSystem_3DFV_SphericalExplosion_MPI_PAR_CUBE    COMMAND "${MPIEXEC}" "-n" "2" "./WaveSystem_FV_SphericalExplosion_MPI.exe" resources/meshCube.med) 
+  add_test(NAME WaveSystem_2DFV_SphericalExplosion_MPI_SEQ_SQUARE         COMMAND "${MPIEXEC}" "-n" "1" "./WaveSystem_FV_SphericalExplosion_MPI.exe")     
+  add_test(NAME WaveSystem_2DFV_SphericalExplosion_MPI_SEQ_HEXAGON        COMMAND "${MPIEXEC}" "-n" "1" "./WaveSystem_FV_SphericalExplosion_MPI.exe" resources/meshHexagonWithTriangles10.med) 
+  add_test(NAME WaveSystem_3DFV_SphericalExplosion_MPI_SEQ_CUBE           COMMAND "${MPIEXEC}" "-n" "1" "./WaveSystem_FV_SphericalExplosion_MPI.exe" resources/meshCube.med) 
+  add_test(NAME WaveSystem_3DFV_SphericalExplosion_MPI_SEQ_TETRAHEDRON    COMMAND "${MPIEXEC}" "-n" "1" "./WaveSystem_FV_SphericalExplosion_MPI.exe" resources/meshTetrahedron10.med) 
+  add_test(NAME WaveSystem_2DFV_SphericalExplosion_MPI_PAR_SQUARE         COMMAND "${MPIEXEC}" "-n" "2" "./WaveSystem_FV_SphericalExplosion_MPI.exe")
+  add_test(NAME WaveSystem_2DFV_SphericalExplosion_MPI_PAR_HEXAGON        COMMAND "${MPIEXEC}" "-n" "2" "./WaveSystem_FV_SphericalExplosion_MPI.exe" resources/meshHexagonWithTriangles10.med)
+  add_test(NAME WaveSystem_3DFV_SphericalExplosion_MPI_PAR_CUBE           COMMAND "${MPIEXEC}" "-n" "2" "./WaveSystem_FV_SphericalExplosion_MPI.exe" resources/meshCube.med) 
+  add_test(NAME WaveSystem_3DFV_SphericalExplosion_MPI_PAR_TETRAHEDRON    COMMAND "${MPIEXEC}" "-n" "2" "./WaveSystem_FV_SphericalExplosion_MPI.exe" resources/meshTetrahedron10.med) 
 endif( SOLVERLAB_WITH_MPI )
 
index 0299ef2d7c8068d28db2dbb7785e502dccc843bb..5b9f662a7e7a09927989d4f87f82f2e85e103616 100755 (executable)
@@ -24,7 +24,7 @@ double precision=1e-5;
 
 void initial_conditions_shock(Mesh my_mesh,Field& pressure_field,Field& velocity_field)
 {
-    double rayon=0.35;
+    double rayon=0.15;
     double xcentre=0.;
     double ycentre=0;
     double zcentre=0;
@@ -256,7 +256,6 @@ int main(int argc, char *argv[])
        cout << "- Boundary conditions : WALL" << endl;
 
     // Problem data
-    double cfl=0.49;
     double tmax=1.;
     double ntmax=3;//20000;
     int freqSortie=100;
@@ -290,6 +289,7 @@ int main(int argc, char *argv[])
            myMesh=Mesh(filename);
        }
 
+    double cfl=1./myMesh.getSpaceDimension();
        WaveSystem(tmax,ntmax,cfl,freqSortie,myMesh,fileOutPut);
        
     cout << "Simulation complete." << endl;
index 0356da9a001a960d32e2adb78240b4183fb5f184..814513a1f755be80fe2914f19352cc91d5f29123 100755 (executable)
@@ -26,7 +26,7 @@ double precision=1e-5;
 
 void initial_conditions_shock(Mesh my_mesh,Field& pressure_field,Field& velocity_field)
 {
-    double rayon=0.35;
+    double rayon=0.15;
     double xcentre=0.;
     double ycentre=0;
     double zcentre=0;
@@ -341,7 +341,6 @@ int main(int argc, char *argv[])
        MPI_Comm_size(PETSC_COMM_WORLD,&size);
        
     // Problem data
-    double cfl=0.49;
     double tmax=1.;
     int ntmax=2000;
     int freqSortie=10;
@@ -394,6 +393,7 @@ int main(int argc, char *argv[])
                    resultDirectory = argv[2];
        }
        
+    double cfl=1./myMesh.getSpaceDimension();
        WaveSystem(tmax,ntmax,cfl,freqSortie,myMesh,fileOutPut, rank, size, resultDirectory);
 
        if(rank == 0)