Merge pull request #42 from gismo/hotfix_datadir

mmoelle1 · web-flow · commit d2365f5c8780 · 2025-04-09T18:12:21.000+02:00
Fix data directory
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -52,6 +52,9 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}"
   DESTINATION include/gismo
   FILES_MATCHING PATTERN "*.h" )
 
+# add filedata folder
+add_definitions(-D${PROJECT_NAME}_DATA="${CMAKE_CURRENT_SOURCE_DIR}/filedata/")
+
 # add example files
 if(GISMO_BUILD_EXAMPLES)
   add_custom_target(${PROJECT_NAME}-examples)
diff --git a/examples/aroundCylinder_NS_2D.cpp b/examples/aroundCylinder_NS_2D.cpp
@@ -27,7 +27,7 @@ int main(int argc, char* argv[]){
                     // Input //
     //=====================================//
 
-    std::string filename = ELAST_DATA_DIR"/flow_around_cylinder.xml";
+    std::string filename = gsElasticity_DATA"/flow_around_cylinder.xml";
     real_t viscosity = 0.001; // kinematic viscosity
     real_t meanVelocity = 0.2; // inflow velocity
     real_t density = 1.;
diff --git a/examples/aroundCylinder_NS_2Dt.cpp b/examples/aroundCylinder_NS_2Dt.cpp
@@ -61,7 +61,7 @@ int main(int argc, char* argv[]){
                     // Input //
     //=====================================//
 
-    std::string filename = ELAST_DATA_DIR"/flow_around_cylinder.xml";
+    std::string filename = gsElasticity_DATA"/flow_around_cylinder.xml";
     real_t viscosity = 0.001; // kinematic viscosity
     real_t meanVelocity = 1; // inflow velocity
     real_t density = 1.0;
diff --git a/examples/aroundCylinder_stokes_2D.cpp b/examples/aroundCylinder_stokes_2D.cpp
@@ -26,7 +26,7 @@ int main(int argc, char* argv[]){
                     // Input //
     //=====================================//
 
-    std::string filename = ELAST_DATA_DIR"/flow_around_cylinder.xml";
+    std::string filename = gsElasticity_DATA"/flow_around_cylinder.xml";
     real_t viscosity = 0.001; // kinematic viscosity
     real_t meanVelocity = 0.2; // inflow velocity
     real_t density = 1.;
diff --git a/examples/biceps_activeMuscle_3D.cpp b/examples/biceps_activeMuscle_3D.cpp
@@ -64,8 +64,8 @@ int main(int argc, char* argv[]){
 
     // scanning geometry
     gsMultiPatch<> geometry;
-    gsReadFile<>(rightOrLeft ? ELAST_DATA_DIR"/bicepsRightMP.xml" :
-                               ELAST_DATA_DIR"/bicepsLeftMP.xml", geometry);
+    gsReadFile<>(rightOrLeft ? gsElasticity_DATA"/bicepsRightMP.xml" :
+                               gsElasticity_DATA"/bicepsLeftMP.xml", geometry);
     geometry.computeTopology();
 
     // creating bases
diff --git a/examples/biceps_activeMuscle_3Dt.cpp b/examples/biceps_activeMuscle_3Dt.cpp
@@ -69,8 +69,8 @@ int main(int argc, char* argv[]){
 
     // scanning geometry
     gsMultiPatch<> geometry;
-    gsReadFile<>(rightOrLeft ? ELAST_DATA_DIR"/bicepsRightMP.xml" :
-                               ELAST_DATA_DIR"/bicepsLeftMP.xml", geometry);
+    gsReadFile<>(rightOrLeft ? gsElasticity_DATA"/bicepsRightMP.xml" :
+                               gsElasticity_DATA"/bicepsLeftMP.xml", geometry);
     geometry.computeTopology();
 
     // creating bases
diff --git a/examples/cooks_mixedLinElast_2D.cpp b/examples/cooks_mixedLinElast_2D.cpp
@@ -17,7 +17,7 @@ int main(int argc, char* argv[]){
                 // Input //
     //=====================================//
 
-    std::string filename = ELAST_DATA_DIR"/cooks.xml";
+    std::string filename = gsElasticity_DATA"/cooks.xml";
     real_t youngsModulus = 240.565e6;
     real_t poissonsRatio = 0.4;
     index_t numUniRef = 3;
diff --git a/examples/cooks_mixedNonLinElast_2D.cpp b/examples/cooks_mixedNonLinElast_2D.cpp
@@ -19,7 +19,7 @@ int main(int argc, char* argv[]){
                 // Input //
     //=====================================//
 
-    std::string filename = ELAST_DATA_DIR"/cooks.xml";
+    std::string filename = gsElasticity_DATA"/cooks.xml";
     real_t youngsModulus = 240.565e6;
     real_t poissonsRatio = 0.4;
     index_t materialLaw = material_law::mixed_neo_hooke_ln;
diff --git a/examples/cooks_nonLinElast_2D.cpp b/examples/cooks_nonLinElast_2D.cpp
@@ -21,7 +21,7 @@ int main(int argc, char* argv[]){
                 // Input //
     //=====================================//
 
-    std::string filename = ELAST_DATA_DIR"/cooks.xml";
+    std::string filename = gsElasticity_DATA"/cooks.xml";
     real_t youngsModulus = 240.565e6;
     real_t poissonsRatio = 0.4;
     index_t numUniRef = 4;
diff --git a/examples/flappingBeam_CFD1_NS_2D.cpp b/examples/flappingBeam_CFD1_NS_2D.cpp
@@ -46,7 +46,7 @@ int main(int argc, char* argv[]){
                 // Input //
     //=====================================//
 
-    std::string filename = ELAST_DATA_DIR"/flappingBeam_flow.xml";
+    std::string filename = gsElasticity_DATA"/flappingBeam_flow.xml";
     real_t viscosity = 0.001; // kinematic viscosity
     real_t meanVelocity = 0.2; // inflow velocity
     real_t density = 1.0e3;
diff --git a/examples/flappingBeam_CFD3_NS_2Dt.cpp b/examples/flappingBeam_CFD3_NS_2Dt.cpp
@@ -76,7 +76,7 @@ int main(int argc, char* argv[]){
                 // Input //
     //=====================================//
 
-    std::string filename = ELAST_DATA_DIR"/flappingBeam_flow.xml";
+    std::string filename = gsElasticity_DATA"/flappingBeam_flow.xml";
     real_t viscosity = 0.001; // kinematic viscosity
     real_t meanVelocity = 2; // inflow velocity
     real_t density = 1.0e3;
diff --git a/examples/flappingBeam_CSM1_nonLinElast_2D.cpp b/examples/flappingBeam_CSM1_nonLinElast_2D.cpp
@@ -18,7 +18,7 @@ int main(int argc, char* argv[]){
                 // Input //
     //=====================================//
 
-    std::string filename = ELAST_DATA_DIR"/flappingBeam_beam.xml";
+    std::string filename = gsElasticity_DATA"/flappingBeam_beam.xml";
     real_t poissonsRatio = 0.4;
     real_t youngsModulus = 1.4e6;
     real_t density = 1.0e3;
@@ -84,7 +84,7 @@ int main(int argc, char* argv[]){
     gsStopwatch clock;
     clock.restart();
     solver.solve();
-    gsInfo << "Solved the system in " << clock.stop() <<"s.\n";  
+    gsInfo << "Solved the system in " << clock.stop() <<"s.\n";
 
     //=============================================//
                       // Output //
diff --git a/examples/flappingBeam_CSM3_nonLinElast_2Dt.cpp b/examples/flappingBeam_CSM3_nonLinElast_2Dt.cpp
@@ -31,7 +31,7 @@ int main(int argc, char* argv[]){
                 // Input //
     //=====================================//
 
-    std::string filename = ELAST_DATA_DIR"/flappingBeam_beam.xml";
+    std::string filename = gsElasticity_DATA"/flappingBeam_beam.xml";
     real_t poissonsRatio = 0.4;
     real_t youngsModulus = 1.4e6;
     real_t density = 1.0e3;
diff --git a/examples/flappingBeam_FSI2_coupledFSI_2Dt.cpp b/examples/flappingBeam_FSI2_coupledFSI_2Dt.cpp
@@ -65,13 +65,13 @@ int main(int argc, char* argv[])
     //=====================================//
 
     // beam parameters
-    std::string filenameBeam = ELAST_DATA_DIR"/flappingBeam_beam.xml";
+    std::string filenameBeam = gsElasticity_DATA"/flappingBeam_beam.xml";
     real_t youngsModulus = 1.4e6;
     real_t poissonsRatio = 0.4;
     real_t densitySolid = 1.0e4;
     real_t beamLoad = 0.0;
     // flow parameters
-    std::string filenameFlow = ELAST_DATA_DIR"/flappingBeam_flow.xml";
+    std::string filenameFlow = gsElasticity_DATA"/flappingBeam_flow.xml";
     real_t viscosity = 0.001;
     real_t meanVelocity = 1.;
     real_t densityFluid = 1.0e3;
diff --git a/examples/flappingBeam_meshDeform_2D.cpp b/examples/flappingBeam_meshDeform_2D.cpp
@@ -34,8 +34,8 @@ int main(int argc, char* argv[])
 {
     gsInfo << "Testing the ALE mapping construction in 2D.\n";
 
-    std::string filenameALE = ELAST_DATA_DIR"/flappingBeam_flow.xml";
-    std::string filenameBeam = ELAST_DATA_DIR"/flappingBeam_beam.xml";
+    std::string filenameALE = gsElasticity_DATA"/flappingBeam_flow.xml";
+    std::string filenameBeam = gsElasticity_DATA"/flappingBeam_beam.xml";
     index_t numUniRef = 3; // number of h-refinements
     index_t numPlotPoints = 1000;
     real_t youngsModulus = 1.4e6;
diff --git a/examples/muscleBeam_activeMuscle_3Dt.cpp b/examples/muscleBeam_activeMuscle_3Dt.cpp
@@ -21,7 +21,7 @@ int main(int argc, char* argv[]){
                 // Input //
     //=====================================//
 
-    std::string filename = ELAST_DATA_DIR"/muscleBeamMP.xml";
+    std::string filename = gsElasticity_DATA"/muscleBeamMP.xml";
     real_t youngsModulusMuscle = 3.0e5; // shear modulus 1e5;
     real_t youngsModulusTendon = 3.0e6; // shear modulus 1e6;
     real_t poissonsRatioMuscle = 0.5;
diff --git a/examples/muscleBeam_mixedNonLinElast_3D.cpp b/examples/muscleBeam_mixedNonLinElast_3D.cpp
@@ -18,7 +18,7 @@ int main(int argc, char* argv[]){
                 // Input //
     //=====================================//
 
-    std::string filename = ELAST_DATA_DIR"/muscleBeamMP.xml";
+    std::string filename = gsElasticity_DATA"/muscleBeamMP.xml";
     real_t youngsModulus = 3.0e5; // shear modulus 1e5;
     real_t poissonsRatio = 0.5;
     real_t density = 9e2;
diff --git a/examples/muscleBeam_mixedNonLinElast_3Dt.cpp b/examples/muscleBeam_mixedNonLinElast_3Dt.cpp
@@ -20,7 +20,7 @@ int main(int argc, char* argv[]){
                 // Input //
     //=====================================//
 
-    std::string filename = ELAST_DATA_DIR"/muscleBeamMP.xml";
+    std::string filename = gsElasticity_DATA"/muscleBeamMP.xml";
     real_t youngsModulus = 3.0e5; // shear modulus 1e5;
     real_t poissonsRatio = 0.5;
     real_t density = 9e2;
diff --git a/examples/plateWithHoleMP_linElast_2D.cpp b/examples/plateWithHoleMP_linElast_2D.cpp
@@ -20,7 +20,7 @@ int main(int argc, char* argv[]){
                 // Input //
     //=====================================//
 
-    std::string filename = ELAST_DATA_DIR"/plateWithHoleMP.xml";
+    std::string filename = gsElasticity_DATA"/plateWithHoleMP.xml";
     index_t numUniRef = 5;
     index_t numDegElev = 0;
     index_t numPlotPoints = 10000;
diff --git a/examples/plateWithHole_linElast_2D.cpp b/examples/plateWithHole_linElast_2D.cpp
@@ -19,7 +19,7 @@ int main(int argc, char* argv[]){
                 // Input //
     //=====================================//
 
-    std::string filename = ELAST_DATA_DIR"/plateWithHole.xml";
+    std::string filename = gsElasticity_DATA"/plateWithHole.xml";
     index_t numUniRef = 5;
     index_t numDegElev = 0;
     index_t numPlotPoints = 10000;
diff --git a/examples/rotor_thermalExp_2D.cpp b/examples/rotor_thermalExp_2D.cpp
@@ -16,7 +16,7 @@ int main(int argc, char* argv[]){
                 // Input //
     //=====================================//
 
-    std::string filename = ELAST_DATA_DIR"/rotor_2D.xml";
+    std::string filename = gsElasticity_DATA"/rotor_2D.xml";
     real_t fluxValue = 100.; // heat flux on the north boundary
     real_t thExpCoef = 2e-4; // thermal expansion coeffcient of the material
     real_t initTemp = 20.; // initial temperature
@@ -138,7 +138,7 @@ int main(int argc, char* argv[]){
     assembler.constructSolution(solVector,assembler.allFixedDofs(),solution);
 
     if (numPlotPoints > 0)
-    {    
+    {
         // constructing an IGA field (geometry + solution)
         gsField<> solutionField(assembler.patches(),solution);
         gsField<> heatField(assembler.patches(),temperature);
diff --git a/examples/rotor_thermalExp_2Dt.cpp b/examples/rotor_thermalExp_2Dt.cpp
@@ -19,7 +19,7 @@ int main(int argc, char *argv[])
                 // Input //
     //=====================================//
 
-    std::string filename = ELAST_DATA_DIR"/rotor_2D.xml";
+    std::string filename = gsElasticity_DATA"/rotor_2D.xml";
     real_t fluxValue = 100.; // heat flux on the north boundary
     real_t thExpCoef = 2e-4; // thermal expansion coeffcient of the material
     real_t initTemp = 20.; // initial temperature
diff --git a/examples/singlePatch_meshDeform_2D.cpp b/examples/singlePatch_meshDeform_2D.cpp
@@ -17,7 +17,7 @@ int main(int argc, char* argv[])
     //=====================================//
 
     // input file with a set of 4 compatible boundary curves ordered "west-east-south-north"
-    std::string filename = ELAST_DATA_DIR"/puzzle3_bdry.xml";
+    std::string filename = gsElasticity_DATA"/puzzle3_bdry.xml";
     index_t numUniRef = 0;
     /// Initial domain options
     index_t fittingDegree = 0;
diff --git a/examples/terrific_nonLinElast_3D.cpp b/examples/terrific_nonLinElast_3D.cpp
@@ -19,7 +19,7 @@ int main(int argc, char* argv[]){
                 // Input //
     //=====================================//
 
-    std::string filename = ELAST_DATA_DIR"terrific.xml";
+    std::string filename = gsElasticity_DATA"terrific.xml";
     real_t youngsModulus = 74e9;
     real_t poissonsRatio = 0.33;
     index_t materialLaw = material_law::saint_venant_kirchhoff;
