From 9e7395e1d13d1e98f33f2b2799697298625e34ed Mon Sep 17 00:00:00 2001 From: psharda Date: Mon, 21 Aug 2023 23:38:43 +0200 Subject: [PATCH 1/4] remove duplication --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b749d1ca6e..92a6ecd6c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,7 +87,7 @@ function(setup_target_for_microphysics_compilation network_name output_dir) #below to update headers - execute_process(COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${PYTHONPATH}:${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/general_null" python3 "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/update_headers.py" --net "${networkdir}" --microphysics_path "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/" --odir "${output_dir}" WORKING_DIRECTORY ${output_dir}/) + #execute_process(COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${PYTHONPATH}:${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/general_null" python3 "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/update_headers.py" --net "${networkdir}" --microphysics_path "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/" --odir "${output_dir}" WORKING_DIRECTORY ${output_dir}/) #below for NAUX execute_process(COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${PYTHONPATH}:${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/general_null" python3 "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/get_naux.py" --net "${networkdir}" --microphysics_path "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/" WORKING_DIRECTORY ${output_dir}/) From 5493c83e14d2068122decbb1bb8a2826d587be45 Mon Sep 17 00:00:00 2001 From: psharda Date: Mon, 21 Aug 2023 23:49:53 +0200 Subject: [PATCH 2/4] change AMREX --> AMReX --- CMakeLists.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 92a6ecd6c5..49bbb2988c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,8 +86,6 @@ function(setup_target_for_microphysics_compilation network_name output_dir) ${output_dir}/extern_parameters.cpp PARENT_SCOPE) - #below to update headers - #execute_process(COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${PYTHONPATH}:${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/general_null" python3 "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/update_headers.py" --net "${networkdir}" --microphysics_path "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/" --odir "${output_dir}" WORKING_DIRECTORY ${output_dir}/) #below for NAUX execute_process(COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${PYTHONPATH}:${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/general_null" python3 "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/get_naux.py" --net "${networkdir}" --microphysics_path "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/" WORKING_DIRECTORY ${output_dir}/) @@ -103,17 +101,17 @@ endfunction() #set a cache variable that controls whether #we want to fetch and link amrex or not -set(BUILD_AMREX false CACHE BOOL "Do you want to build and link amrex? (true/false)") -message("Building and linking amrex -- ${BUILD_AMREX}") +set(BUILD_AMReX false CACHE BOOL "Do you want to build and link amrex? (true/false)") +message("Building and linking amrex -- ${BUILD_AMReX}") -if(BUILD_AMREX) +if(BUILD_AMReX) #fetching amrex - set (AMREX_TAG "development") + set (AMReX_TAG "development") include(FetchContent) FetchContent_Declare( amrex GIT_REPOSITORY https://github.com/AMReX-Codes/amrex - GIT_TAG "${AMREX_TAG}" + GIT_TAG "${AMReX_TAG}" ) # CMake 3.14+ From 5475da85cadb1eb0c438e0690a939b68c6da63bc Mon Sep 17 00:00:00 2001 From: psharda Date: Mon, 21 Aug 2023 23:56:12 +0200 Subject: [PATCH 3/4] change AMREX --> AMReX --- .github/workflows/cmake_build_cell_primordial_chem.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake_build_cell_primordial_chem.yml b/.github/workflows/cmake_build_cell_primordial_chem.yml index d92509d5ac..9332fbf99c 100644 --- a/.github/workflows/cmake_build_cell_primordial_chem.yml +++ b/.github/workflows/cmake_build_cell_primordial_chem.yml @@ -17,6 +17,6 @@ jobs: - name: Compile and run run: | mkdir build && cd build - cmake .. -DBUILD_UNIT_TEST=true -DBUILD_AMREX=true + cmake .. -DBUILD_UNIT_TEST=true -DBUILD_AMReX=true make -j2 ctest --output-on-failure From c937a88c110a6258f52421ef1d7948bfccca354d Mon Sep 17 00:00:00 2001 From: psharda Date: Mon, 21 Aug 2023 23:57:46 +0200 Subject: [PATCH 4/4] change AMREX --> AMReX --- .github/workflows/macos_build_cell_primordial_chem.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos_build_cell_primordial_chem.yml b/.github/workflows/macos_build_cell_primordial_chem.yml index 3218c09828..8d6e64769e 100644 --- a/.github/workflows/macos_build_cell_primordial_chem.yml +++ b/.github/workflows/macos_build_cell_primordial_chem.yml @@ -16,6 +16,6 @@ jobs: - name: Compile and run run: | mkdir build && cd build - cmake .. -DBUILD_UNIT_TEST=true -DBUILD_AMREX=true + cmake .. -DBUILD_UNIT_TEST=true -DBUILD_AMReX=true make -j2 ctest --output-on-failure