Commit 2486837a authored by Cristian Lalescu's avatar Cristian Lalescu
Browse files

finalize rename

parent d294c760
Pipeline #49663 passed with stage
in 3 minutes and 10 seconds
...@@ -98,8 +98,8 @@ class DNS(_code): ...@@ -98,8 +98,8 @@ class DNS(_code):
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{{ {{
bool fpe = ( bool fpe = (
(getenv("BFPS_FPE_OFF") == nullptr) || (getenv("TURTLE_FPE_OFF") == nullptr) ||
(getenv("BFPS_FPE_OFF") != std::string("TRUE"))); (getenv("TURTLE_FPE_OFF") != std::string("TRUE")));
return main_code< {0} >(argc, argv, fpe); return main_code< {0} >(argc, argv, fpe);
}} }}
""".format(self.dns_type + '<{0}>'.format(self.C_field_dtype)) """.format(self.dns_type + '<{0}>'.format(self.C_field_dtype))
......
...@@ -97,8 +97,8 @@ class PP(_code): ...@@ -97,8 +97,8 @@ class PP(_code):
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{{ {{
bool fpe = ( bool fpe = (
(getenv("BFPS_FPE_OFF") == nullptr) || (getenv("TURTLE_FPE_OFF") == nullptr) ||
(getenv("BFPS_FPE_OFF") != std::string("TRUE"))); (getenv("TURTLE_FPE_OFF") != std::string("TRUE")));
return main_code< {0} >(argc, argv, fpe); return main_code< {0} >(argc, argv, fpe);
}} }}
""".format(self.dns_type + '<{0}>'.format(self.C_field_dtype)) """.format(self.dns_type + '<{0}>'.format(self.C_field_dtype))
......
...@@ -97,8 +97,8 @@ class TEST(_code): ...@@ -97,8 +97,8 @@ class TEST(_code):
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{{ {{
bool fpe = ( bool fpe = (
(getenv("BFPS_FPE_OFF") == nullptr) || (getenv("TURTLE_FPE_OFF") == nullptr) ||
(getenv("BFPS_FPE_OFF") != std::string("TRUE"))); (getenv("TURTLE_FPE_OFF") != std::string("TRUE")));
return main_code< {0} >(argc, argv, fpe); return main_code< {0} >(argc, argv, fpe);
}} }}
""".format(self.dns_type + '<{0}>'.format(self.C_field_dtype)) """.format(self.dns_type + '<{0}>'.format(self.C_field_dtype))
......
...@@ -76,7 +76,7 @@ class _code(_base): ...@@ -76,7 +76,7 @@ class _code(_base):
//begincpp //begincpp
int main(int argc, char *argv[]) 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); feenableexcept(FE_INVALID | FE_OVERFLOW);
} }
else{ else{
...@@ -215,20 +215,20 @@ class _code(_base): ...@@ -215,20 +215,20 @@ class _code(_base):
outfile.write(' message(STATUS "Using CMAKE_C_COMPILER=MPICC")\n') outfile.write(' message(STATUS "Using CMAKE_C_COMPILER=MPICC")\n')
outfile.write('endif()\n') outfile.write('endif()\n')
#ideally we should use something like the following 2 lines #ideally we should use something like the following 2 lines
#outfile.write('set(CMAKE_CXX_COMPILER ${BFPS_CXX_COMPILER})\n') #outfile.write('set(CMAKE_CXX_COMPILER ${TURTLE_CXX_COMPILER})\n')
#outfile.write('set(CMAKE_C_COMPILER ${BFPS_C_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('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 11)\n')
outfile.write('set(CMAKE_CXX_STANDARD_REQUIRED ON)\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_CXX_COMPILE_FLAGS "${CMAKE_CXX_COMPILE_FLAGS} ${TURTLE_CXX_COMPILE_FLAGS}")\n')
outfile.write('set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${BFPS_EXE_LINKER_FLAGS}")\n') outfile.write('set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${TURTLE_EXE_LINKER_FLAGS}")\n')
outfile.write('include_directories(${BFPS_INCLUDE_DIRECTORIES} ${BFPS_INCLUDE_DIR}/TurTLE)\n') outfile.write('include_directories(${TURTLE_INCLUDE_DIRECTORIES} ${TURTLE_INCLUDE_DIR}/TurTLE)\n')
outfile.write('link_directories(${BFPS_LINK_DIRECTORIES} ${BFPS_LIBRARIES_DIR})\n') outfile.write('link_directories(${TURTLE_LINK_DIRECTORIES} ${TURTLE_LIBRARIES_DIR})\n')
outfile.write('find_library(BFPS_STATIC_LIBRARY TurTLE)\n') outfile.write('find_library(TURTLE_STATIC_LIBRARY TurTLE)\n')
outfile.write('add_executable({0} {0}.cpp)\n'.format(self.name)) 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 + ' ${TURTLE_STATIC_LIBRARY})\n')
outfile.write('target_link_libraries(' + self.name + ' ${BFPS_LIBS})\n') outfile.write('target_link_libraries(' + self.name + ' ${TURTLE_LIBS})\n')
subprocess.check_call(['cmake', '.']) subprocess.check_call(['cmake', '.'])
current_environment = os.environ current_environment = os.environ
if not no_debug: if not no_debug:
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
set -e set -e
bfps.test_fftw turtle.test_fftw
bfps.test_Parseval turtle.test_Parseval
bfps.test_NSVEparticles turtle.test_NSVEparticles
# test postprocessing # test postprocessing
bfps PP field_single_to_double --simname dns_nsveparticles --iter0 32 --iter1 32 turtle PP field_single_to_double --simname dns_nsveparticles --iter0 32 --iter1 32
bfps PP get_rfields --simname dns_nsveparticles --iter0 0 --iter1 64 turtle PP get_rfields --simname dns_nsveparticles --iter0 0 --iter1 64
bfps PP joint_acc_vel_stats --simname dns_nsveparticles --iter0 0 --iter1 64 turtle 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 resize --simname dns_nsveparticles --new_nx 96 --new_ny 96 --new_nz 96 --new_simname dns_nsveparticles_resized
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment