Skip to content

Commit dc51fd5

Browse files
bobpawbobpaw
committed
rename HAVE_SIMADVMESHING to PUMI_HAS_SIMADVMESHING
- apf_sim/CMakeLists.txt: rename PUMI_USE_SIMADVMESHING to PUMI_HAS_SIMADVMESHING. in a7b765 I changed it because I could not find the input variable HAVE_SIMADVMESHING. turns out it was the name being used as a C macro. - apf_sim/apf_simConfig.h.in: change #cmakedefine line - phasta/CMakeLists.txt: remove HAVE_SIMADVMESHING from compile definitions since it should now be read from apf_simConfig.h. - phasta/chef.cc: #include apf_simConfig.h and replace HAVE_SIMADVMESHING with PUMI_HAS_SIMADVMESHING. - phasta/cut_interface.cc: #include apf_simConfig.h and replace HAVE_SIMADVMESHING with PUMI_HAS_SIMADVMESHING. - phasta/phMeshQuality.cc: #include apf_simConfig.h and replace HAVE_SIMADVMESHING with PUMI_HAS_SIMADVMESHING. - test/CMakeLists.txt: remove HAVE_SIMADVMESHING as a private compile definition since it shoudl be read from apf_simConfig.h - test/measureAnisoStats.cc: #include apf_simConfig.h and replace HAVE_SIMADVMESHING with PUMI_HAS_SIMADVMESHING. - test/measureIsoStats.cc: #include apf_simConfig.h and replace HAVE_SIMADVMESHING with PUMI_HAS_SIMADVMESHING. - test/sim_part.cc: #include apf_simConfig.h and replace HAVE_SIMADVMESHING with PUMI_HAS_SIMADVMESHING. Signed-off-by: Aiden Woodruff <woodra@rpi.edu>
1 parent 2d94a80 commit dc51fd5

10 files changed

Lines changed: 28 additions & 33 deletions

‎apf_sim/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ set(PUMI_USE_FIELDSIM FALSE)
3131
if( ${SIMMODSUITE_SimField_FOUND} AND PUMI_ENABLE_FIELDSIM )
3232
set(PUMI_USE_FIELDSIM TRUE)
3333
endif()
34-
set(PUMI_USE_SIM_ADVMESHING ${SIMMODSUITE_SimAdvMeshing_FOUND})
34+
set(PUMI_HAS_SIMADVMESHING ${SIMMODSUITE_SimAdvMeshing_FOUND})
3535

3636
configure_file(
3737
"${CMAKE_CURRENT_SOURCE_DIR}/apf_simConfig.h.in"

‎apf_sim/apf_simConfig.h.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#cmakedefine PUMI_USE_FIELDSIM
2-
#cmakedefine PUMI_USE_SIM_ADVMESHING
2+
#cmakedefine PUMI_HAS_SIMADVMESHING
33
#cmakedefine SIMMODSUITE_MAJOR_VERSION @SIMMODSUITE_MAJOR_VERSION@
44
#cmakedefine SIMMODSUITE_MINOR_VERSION @SIMMODSUITE_MINOR_VERSION@

‎phasta/CMakeLists.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@ set(HEADERS
7070
# Add the ph library
7171
add_library(ph ${SOURCES})
7272

73-
# Add the SimAdvMeshing flag
74-
if(SIMMODSUITE_SimAdvMeshing_FOUND) # simmetrix enabled
75-
target_compile_definitions(ph PRIVATE -DHAVE_SIMADVMESHING)
76-
endif()
77-
7873
#determine which timer to use based on the target system and compiler
7974
if(CMAKE_SYSTEM_NAME MATCHES BlueGeneQ*)
8075
add_definitions(-DUSE_PCU_TIME)

‎phasta/chef.cc‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
#include <pumi_version.h>
66
#ifdef PUMI_HAS_SIMMETRIX
77
#include <gmi_sim.h>
8+
#include <apf_simConfig.h>
89
#include <SimUtil.h>
910
#include <MeshSim.h>
1011
#include <SimModel.h>
1112
#include <SimPartitionedMesh.h>
12-
#ifdef HAVE_SIMADVMESHING
13+
#ifdef PUMI_HAS_SIMADVMESHING
1314
#include <SimAdvMeshing.h>
1415
#endif
1516
#endif
@@ -43,7 +44,7 @@ int main(int argc, char** argv)
4344
SimModel_start();
4445
Sim_readLicenseFile(0);
4546
SimPartitionedMesh_start(0, 0);
46-
#ifdef HAVE_SIMADVMESHING
47+
#ifdef PUMI_HAS_SIMADVMESHING
4748
SimAdvMeshing_start();
4849
#endif
4950
gmi_sim_start();
@@ -60,7 +61,7 @@ int main(int argc, char** argv)
6061
freeMesh(m);
6162
#ifdef PUMI_HAS_SIMMETRIX
6263
gmi_sim_stop();
63-
#ifdef HAVE_SIMADVMESHING
64+
#ifdef PUMI_HAS_SIMADVMESHING
6465
SimAdvMeshing_stop();
6566
#endif
6667
SimPartitionedMesh_stop();

‎phasta/cut_interface.cc‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
#include <SimModel.h>
88
#include <SimPartitionedMesh.h>
99
#include <gmi_sim.h>
10-
#ifdef HAVE_SIMADVMESHING
10+
#include <apf_simConfig.h>
11+
#ifdef PUMI_HAS_SIMADVMESHING
1112
#include <SimAdvMeshing.h>
1213
#endif
1314
#endif
@@ -38,7 +39,7 @@ int main(int argc, char** argv)
3839
SimModel_start();
3940
Sim_readLicenseFile(0);
4041
SimPartitionedMesh_start(0, 0);
41-
#ifdef HAVE_SIMADVMESHING
42+
#ifdef PUMI_HAS_SIMADVMESHING
4243
SimAdvMeshing_start();
4344
#endif
4445
gmi_sim_start();
@@ -74,7 +75,7 @@ int main(int argc, char** argv)
7475
apf::destroyMesh(m);
7576
#ifdef PUMI_HAS_SIMMETRIX
7677
gmi_sim_stop();
77-
#ifdef HAVE_SIMADVMESHING
78+
#ifdef PUMI_HAS_SIMADVMESHING
7879
SimAdvMeshing_stop();
7980
#endif
8081
SimPartitionedMesh_stop();

‎phasta/phMeshQuality.cc‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@
1010
#include <maShape.h>
1111

1212
#ifdef PUMI_HAS_SIMMETRIX
13+
#include <apf_simConfig.h>
1314
#include <SimUtil.h>
1415
#include <SimModel.h>
1516
#include <SimPartitionedMesh.h>
1617
#include <SimMeshTools.h>
17-
#ifdef HAVE_SIMADVMESHING
18+
#ifdef PUMI_HAS_SIMADVMESHING
1819
#include <SimAdvMeshing.h>
1920
#endif
2021
#endif
@@ -191,7 +192,7 @@ void core_measure_mesh (double x1[], double x2[], double x3[], int numnp,
191192
/* not support other mesh region type */
192193
if (m->getType(e) != apf::Mesh::TET)
193194
continue;
194-
#ifdef HAVE_SIMADVMESHING
195+
#ifdef PUMI_HAS_SIMADVMESHING
195196
if (EN_isBLEntity(reinterpret_cast<pEntity>(e)))
196197
continue;
197198
#endif
@@ -204,7 +205,7 @@ void core_measure_mesh (double x1[], double x2[], double x3[], int numnp,
204205

205206
// measure mesh face in layered mesh
206207
minfq = 1.0;
207-
#ifdef HAVE_SIMADVMESHING
208+
#ifdef PUMI_HAS_SIMADVMESHING
208209
if (in.simmetrixMesh == 1) {
209210
// get simmetrix mesh
210211
apf::MeshSIM* apf_msim = dynamic_cast<apf::MeshSIM*>(m);

‎test/CMakeLists.txt‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,6 @@ if(PUMI_ENABLE_SIMMETRIX)
135135
util_exe_func(cut_interface ../phasta/cut_interface.cc)
136136
util_exe_func(migrate_interface ../phasta/migrate_interface.cc)
137137
endif()
138-
if(SIMMODSUITE_SimAdvMeshing_FOUND)
139-
target_compile_definitions(chef PRIVATE -DHAVE_SIMADVMESHING)
140-
target_compile_definitions(cut_interface PRIVATE -DHAVE_SIMADVMESHING)
141-
endif()
142138

143139
#PUMIPic print partition utility
144140
util_exe_func(print_pumipic_partition print_pumipic_partition.cc)
@@ -259,8 +255,6 @@ if(PUMI_ENABLE_SIMMETRIX)
259255
util_exe_func(sim_part sim_part.cc)
260256
if(SIMMODSUITE_SimAdvMeshing_FOUND)
261257
util_exe_func(sim_countBL sim_countBL.cc)
262-
target_compile_definitions(sim_part PRIVATE -DHAVE_SIMADVMESHING)
263-
target_compile_definitions(sim_countBL PRIVATE -DHAVE_SIMADVMESHING)
264258
endif()
265259
util_exe_func(simSpjToSmd simSpjToSmd.cc)
266260
if(SIMMODSUITE_SimDiscrete_FOUND)

‎test/measureAnisoStats.cc‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
#ifdef PUMI_HAS_SIMMETRIX
1111
#include <ph.h>
1212
#include <apfSIM.h>
13+
#include <apf_simConfig.h>
1314
#include <gmi_sim.h>
1415
#include <phastaChef.h>
1516
#include <SimPartitionedMesh.h>
16-
#ifdef HAVE_SIMADVMESHING
17+
#ifdef PUMI_HAS_SIMADVMESHING
1718
#include <SimAdvMeshing.h>
1819
#endif
1920
#endif
@@ -60,7 +61,7 @@ int main(int argc, char** argv)
6061
SimModel_start();
6162
Sim_readLicenseFile(0);
6263
SimPartitionedMesh_start(0, 0);
63-
#ifdef HAVE_SIMADVMESHING
64+
#ifdef PUMI_HAS_SIMADVMESHING
6465
SimAdvMeshing_start();
6566
#endif
6667
gmi_sim_start();
@@ -81,7 +82,7 @@ int main(int argc, char** argv)
8182

8283
#ifdef PUMI_HAS_SIMMETRIX
8384
gmi_sim_stop();
84-
#ifdef HAVE_SIMADVMESHING
85+
#ifdef PUMI_HAS_SIMADVMESHING
8586
SimAdvMeshing_stop();
8687
#endif
8788
SimPartitionedMesh_stop();
@@ -244,7 +245,7 @@ void getStats(
244245
apf::writeVtkFiles(ssm.str().c_str(), m);
245246

246247
// measure the triangular mesh face in the BL mesh
247-
#ifdef HAVE_SIMADVMESHING
248+
#ifdef PUMI_HAS_SIMADVMESHING
248249
if (ph::mesh_has_ext(meshFile, "sms")) {
249250
// get simmetrix mesh
250251
apf::MeshSIM* apf_msim = dynamic_cast<apf::MeshSIM*>(m);

‎test/measureIsoStats.cc‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
#ifdef PUMI_HAS_SIMMETRIX
1111
#include <ph.h>
1212
#include <apfSIM.h>
13+
#include <apf_simConfig.h>
1314
#include <gmi_sim.h>
1415
#include <phastaChef.h>
1516
#include <SimPartitionedMesh.h>
16-
#ifdef HAVE_SIMADVMESHING
17+
#ifdef PUMI_HAS_SIMADVMESHING
1718
#include <SimAdvMeshing.h>
1819
#endif
1920
#endif
@@ -61,7 +62,7 @@ int main(int argc, char** argv)
6162
SimModel_start();
6263
Sim_readLicenseFile(0);
6364
SimPartitionedMesh_start(0, 0);
64-
#ifdef HAVE_SIMADVMESHING
65+
#ifdef PUMI_HAS_SIMADVMESHING
6566
SimAdvMeshing_start();
6667
#endif
6768
gmi_sim_start();
@@ -81,7 +82,7 @@ int main(int argc, char** argv)
8182

8283
#ifdef PUMI_HAS_SIMMETRIX
8384
gmi_sim_stop();
84-
#ifdef HAVE_SIMADVMESHING
85+
#ifdef PUMI_HAS_SIMADVMESHING
8586
SimAdvMeshing_stop();
8687
#endif
8788
SimPartitionedMesh_stop();
@@ -236,7 +237,7 @@ void getStats(
236237
apf::writeVtkFiles(ssm.str().c_str(), m);
237238

238239
// measure the triangular mesh face in the BL mesh
239-
#ifdef HAVE_SIMADVMESHING
240+
#ifdef PUMI_HAS_SIMADVMESHING
240241
if (ph::mesh_has_ext(meshFile, "sms")) {
241242
// get simmetrix mesh
242243
apf::MeshSIM* apf_msim = dynamic_cast<apf::MeshSIM*>(m);

‎test/sim_part.cc‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include <lionPrint.h>
2626
#include "gmi_sim_config.h"
2727
#include <gmi_sim.h>
28+
#include <apf_simConfig.h>
2829

2930
#ifdef PUMI_HAS_SIMMETRIX
3031
#include "SimPartitionedMesh.h"
@@ -34,7 +35,7 @@
3435
#ifdef SIM_PARASOLID
3536
#include "SimParasolidKrnl.h"
3637
#endif
37-
#ifdef HAVE_SIMADVMESHING
38+
#ifdef PUMI_HAS_SIMADVMESHING
3839
#include <SimAdvMeshing.h>
3940
#endif
4041
#endif
@@ -75,7 +76,7 @@ int main(int argc, char **argv)
7576
// Also initializes MPI in parallel
7677
SimPartitionedMesh_start(&argc, &argv);
7778
SimDiscrete_start(0);
78-
#ifdef HAVE_SIMADVMESHING
79+
#ifdef PUMI_HAS_SIMADVMESHING
7980
SimAdvMeshing_start();
8081
#endif
8182
#ifdef SIM_PARASOLID
@@ -167,7 +168,7 @@ int main(int argc, char **argv)
167168
SimParasolid_stop(1);
168169
#endif
169170
Sim_unregisterAllKeys();
170-
#ifdef HAVE_SIMADVMESHING
171+
#ifdef PUMI_HAS_SIMADVMESHING
171172
SimAdvMeshing_stop();
172173
#endif
173174
SimDiscrete_stop(0);

0 commit comments

Comments
 (0)