diff --git a/TurTLE/DNS.py b/TurTLE/DNS.py index cf52a85327c79f493df1aa5d525ab63adfc3e0e5..e6808f11ca51b5c7cd9d5564003f5a052f42628e 100644 --- a/TurTLE/DNS.py +++ b/TurTLE/DNS.py @@ -98,8 +98,8 @@ class DNS(_code): int main(int argc, char *argv[]) {{ bool fpe = ( - (getenv("BFPS_FPE_OFF") == nullptr) || - (getenv("BFPS_FPE_OFF") != std::string("TRUE"))); + (getenv("TURTLE_FPE_OFF") == nullptr) || + (getenv("TURTLE_FPE_OFF") != std::string("TRUE"))); return main_code< {0} >(argc, argv, fpe); }} """.format(self.dns_type + '<{0}>'.format(self.C_field_dtype)) diff --git a/TurTLE/PP.py b/TurTLE/PP.py index 4b19e7b7a0343c3ee5d6907958155dffcb0d2af7..b34470edda9ce68757b48a5d8d9c826537c53463 100644 --- a/TurTLE/PP.py +++ b/TurTLE/PP.py @@ -97,8 +97,8 @@ class PP(_code): int main(int argc, char *argv[]) {{ bool fpe = ( - (getenv("BFPS_FPE_OFF") == nullptr) || - (getenv("BFPS_FPE_OFF") != std::string("TRUE"))); + (getenv("TURTLE_FPE_OFF") == nullptr) || + (getenv("TURTLE_FPE_OFF") != std::string("TRUE"))); return main_code< {0} >(argc, argv, fpe); }} """.format(self.dns_type + '<{0}>'.format(self.C_field_dtype)) diff --git a/TurTLE/TEST.py b/TurTLE/TEST.py index 8de48ac6ff08ccb18c6cd1f6f2df7206731f4bd2..651290bbbe6d8d512288c8483c01bf2cc9c90c5c 100644 --- a/TurTLE/TEST.py +++ b/TurTLE/TEST.py @@ -97,8 +97,8 @@ class TEST(_code): int main(int argc, char *argv[]) {{ bool fpe = ( - (getenv("BFPS_FPE_OFF") == nullptr) || - (getenv("BFPS_FPE_OFF") != std::string("TRUE"))); + (getenv("TURTLE_FPE_OFF") == nullptr) || + (getenv("TURTLE_FPE_OFF") != std::string("TRUE"))); return main_code< {0} >(argc, argv, fpe); }} """.format(self.dns_type + '<{0}>'.format(self.C_field_dtype)) diff --git a/TurTLE/_code.py b/TurTLE/_code.py index c1c47820457f026f97f90fab7920fa83f20c84a8..ec11fd4c21e8ed1f57770ea51b568fb9589f102d 100644 --- a/TurTLE/_code.py +++ b/TurTLE/_code.py @@ -76,7 +76,7 @@ class _code(_base): //begincpp int main(int argc, char *argv[]) { - if(getenv("BFPS_FPE_OFF") == nullptr || getenv("BFPS_FPE_OFF") != std::string("TRUE")){ + if(getenv("TURTLE_FPE_OFF") == nullptr || getenv("TURTLE_FPE_OFF") != std::string("TRUE")){ feenableexcept(FE_INVALID | FE_OVERFLOW); } else{ @@ -215,20 +215,20 @@ class _code(_base): outfile.write(' message(STATUS "Using CMAKE_C_COMPILER=MPICC")\n') outfile.write('endif()\n') #ideally we should use something like the following 2 lines - #outfile.write('set(CMAKE_CXX_COMPILER ${BFPS_CXX_COMPILER})\n') - #outfile.write('set(CMAKE_C_COMPILER ${BFPS_C_COMPILER})\n') + #outfile.write('set(CMAKE_CXX_COMPILER ${TURTLE_CXX_COMPILER})\n') + #outfile.write('set(CMAKE_C_COMPILER ${TURTLE_C_COMPILER})\n') outfile.write('project(project_{0} LANGUAGES CXX)\n'.format(self.name)) - outfile.write('find_package(BFPS REQUIRED)\n') + outfile.write('find_package(TurTLE REQUIRED)\n') outfile.write('set(CMAKE_CXX_STANDARD 11)\n') outfile.write('set(CMAKE_CXX_STANDARD_REQUIRED ON)\n') - outfile.write('set(CMAKE_CXX_COMPILE_FLAGS "${CMAKE_CXX_COMPILE_FLAGS} ${BFPS_CXX_COMPILE_FLAGS}")\n') - outfile.write('set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${BFPS_EXE_LINKER_FLAGS}")\n') - outfile.write('include_directories(${BFPS_INCLUDE_DIRECTORIES} ${BFPS_INCLUDE_DIR}/TurTLE)\n') - outfile.write('link_directories(${BFPS_LINK_DIRECTORIES} ${BFPS_LIBRARIES_DIR})\n') - outfile.write('find_library(BFPS_STATIC_LIBRARY TurTLE)\n') + outfile.write('set(CMAKE_CXX_COMPILE_FLAGS "${CMAKE_CXX_COMPILE_FLAGS} ${TURTLE_CXX_COMPILE_FLAGS}")\n') + outfile.write('set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${TURTLE_EXE_LINKER_FLAGS}")\n') + outfile.write('include_directories(${TURTLE_INCLUDE_DIRECTORIES} ${TURTLE_INCLUDE_DIR}/TurTLE)\n') + outfile.write('link_directories(${TURTLE_LINK_DIRECTORIES} ${TURTLE_LIBRARIES_DIR})\n') + outfile.write('find_library(TURTLE_STATIC_LIBRARY TurTLE)\n') outfile.write('add_executable({0} {0}.cpp)\n'.format(self.name)) - outfile.write('target_link_libraries(' + self.name + ' ${BFPS_STATIC_LIBRARY})\n') - outfile.write('target_link_libraries(' + self.name + ' ${BFPS_LIBS})\n') + outfile.write('target_link_libraries(' + self.name + ' ${TURTLE_STATIC_LIBRARY})\n') + outfile.write('target_link_libraries(' + self.name + ' ${TURTLE_LIBS})\n') subprocess.check_call(['cmake', '.']) current_environment = os.environ if not no_debug: diff --git a/tests/run_all_tests.sh b/tests/run_all_tests.sh index 7865a8a3d9a3b7d56194b0dcda2bc24925aaeafd..63038e6d00e3fcf7898a1d68249a8f223a1d52d6 100644 --- a/tests/run_all_tests.sh +++ b/tests/run_all_tests.sh @@ -2,12 +2,12 @@ set -e -bfps.test_fftw -bfps.test_Parseval -bfps.test_NSVEparticles +turtle.test_fftw +turtle.test_Parseval +turtle.test_NSVEparticles # test postprocessing -bfps PP field_single_to_double --simname dns_nsveparticles --iter0 32 --iter1 32 -bfps PP get_rfields --simname dns_nsveparticles --iter0 0 --iter1 64 -bfps PP joint_acc_vel_stats --simname dns_nsveparticles --iter0 0 --iter1 64 -bfps PP resize --simname dns_nsveparticles --new_nx 96 --new_ny 96 --new_nz 96 --new_simname dns_nsveparticles_resized +turtle PP field_single_to_double --simname dns_nsveparticles --iter0 32 --iter1 32 +turtle PP get_rfields --simname dns_nsveparticles --iter0 0 --iter1 64 +turtle PP joint_acc_vel_stats --simname dns_nsveparticles --iter0 0 --iter1 64 +turtle PP resize --simname dns_nsveparticles --new_nx 96 --new_ny 96 --new_nz 96 --new_simname dns_nsveparticles_resized