From 484857df64a92cc81e20143cb33c9ecc0b8f71dc Mon Sep 17 00:00:00 2001 From: Chris Eldred Date: Tue, 7 Nov 2023 14:18:32 -0700 Subject: [PATCH] fix run scripts --- dynamics/spam/CMakeLists.txt | 3 -- .../pam-c/debug_run_extruded_script.sh | 7 ---- .../pam-c/debug_run_layer_script.sh | 7 ---- .../mmf_simplified/pam-c/make_debug_script.sh | 4 --- .../mmf_simplified/pam-c/make_script.sh | 4 --- .../pam-c/run_extruded_script.sh | 33 ++++++++++++++++--- .../mmf_simplified/pam-c/run_layer_script.sh | 24 ++++++++++++-- .../pam-c/set_pamc_cmakevars.sh | 9 ----- 8 files changed, 50 insertions(+), 41 deletions(-) delete mode 100755 standalone/mmf_simplified/pam-c/debug_run_extruded_script.sh delete mode 100755 standalone/mmf_simplified/pam-c/debug_run_layer_script.sh delete mode 100755 standalone/mmf_simplified/pam-c/make_debug_script.sh delete mode 100755 standalone/mmf_simplified/pam-c/make_script.sh delete mode 100644 standalone/mmf_simplified/pam-c/set_pamc_cmakevars.sh diff --git a/dynamics/spam/CMakeLists.txt b/dynamics/spam/CMakeLists.txt index d696e871..736a37a8 100644 --- a/dynamics/spam/CMakeLists.txt +++ b/dynamics/spam/CMakeLists.txt @@ -14,7 +14,6 @@ target_include_directories(dycore INTERFACE src/operators) target_include_directories(dycore INTERFACE src/timesteppers) target_include_directories(dycore INTERFACE src/hamiltonians) target_include_directories(dycore INTERFACE src/grids) -target_include_directories(dycore INTERFACE src/common) target_include_directories(dycore INTERFACE src/io) target_include_directories(dycore INTERFACE src/core) @@ -84,5 +83,3 @@ endif() if ("${PAMC_IO}" STREQUAL "none") target_compile_definitions(dycore INTERFACE -DPAMC_NOIO) endif() - - diff --git a/standalone/mmf_simplified/pam-c/debug_run_extruded_script.sh b/standalone/mmf_simplified/pam-c/debug_run_extruded_script.sh deleted file mode 100755 index b54ccda3..00000000 --- a/standalone/mmf_simplified/pam-c/debug_run_extruded_script.sh +++ /dev/null @@ -1,7 +0,0 @@ -rm *.png *.nc -cd ../build -rm driver -./../pam-c/make_debug_script.sh $3 -mpirun.mpich -n $3 ./driver ../inputs/pamc_input_extruded_$2.yaml -cd ../pam-c -mv ../build/*.nc . diff --git a/standalone/mmf_simplified/pam-c/debug_run_layer_script.sh b/standalone/mmf_simplified/pam-c/debug_run_layer_script.sh deleted file mode 100755 index 2eebc10f..00000000 --- a/standalone/mmf_simplified/pam-c/debug_run_layer_script.sh +++ /dev/null @@ -1,7 +0,0 @@ -rm *.png *.nc -cd ../build -rm driver -./../pam-c/make_debug_script.sh -mpirun.mpich -n $3 ./driver ../inputs/pamc_input_layer_$2.yaml -cd ../pam-c -mv ../build/*.nc . diff --git a/standalone/mmf_simplified/pam-c/make_debug_script.sh b/standalone/mmf_simplified/pam-c/make_debug_script.sh deleted file mode 100755 index 2fc51469..00000000 --- a/standalone/mmf_simplified/pam-c/make_debug_script.sh +++ /dev/null @@ -1,4 +0,0 @@ -cd ../build -source ../../machines/linux_laptop_gnu_mpi_cpu_debug.env -./cmakescript_pamc.sh ../pam-c/set_pamc_cmakevars.sh -make -j $1 diff --git a/standalone/mmf_simplified/pam-c/make_script.sh b/standalone/mmf_simplified/pam-c/make_script.sh deleted file mode 100755 index 306b8166..00000000 --- a/standalone/mmf_simplified/pam-c/make_script.sh +++ /dev/null @@ -1,4 +0,0 @@ -cd ../build -source ../../machines/linux_laptop_gnu_mpi_cpu.env -./cmakescript_pamc.sh ../pam-c/set_pamc_cmakevars.sh -make -j $1 diff --git a/standalone/mmf_simplified/pam-c/run_extruded_script.sh b/standalone/mmf_simplified/pam-c/run_extruded_script.sh index 138658fe..5ea4e10e 100755 --- a/standalone/mmf_simplified/pam-c/run_extruded_script.sh +++ b/standalone/mmf_simplified/pam-c/run_extruded_script.sh @@ -1,9 +1,34 @@ +#clean up any existing files rm *.png *.nc cd ../build rm driver -./../pam-c/make_script.sh $3 -mpirun.mpich -n $3 ./driver ../inputs/pamc_input_extruded_$2.yaml + +#build model +source ../../machines/linux_laptop_gnu_mpi_cpu.env +./cmakescript_pamc.sh PAM_SGS=none PAM_MICRO=none PAMC_MODEL=extrudedmodel PAMC_HAMIL=an PAMC_THERMO=idealgaspottemp PAMC_IO=serial +make -j 4 + +#linux_laptop_gnu_mpi_cpu_debug linux_laptop_gnu_mpi_cpu +#p3 none +#shoc none +#ce mce_rho an man +#idealgaspottemp constkappavirpottemp + + +#run model +mpirun.mpich -n $1 ./driver ../inputs/pamc_idealized/pamc_input_extruded_densitycurrent.yaml cd ../pam-c mv ../build/*.nc . -python3 plot_extrudedmodel2D.py $1 -#python3 plot_extrudedmodel2D_parallel.py $1 ../inputs/pamc_input_extruded_$2.yaml $3 + +#pamc_input_extruded_densitycurrent +#pamc_input_extruded_gravitywave +#pamc_input_extruded_largerisingbubble +#pamc_input_extruded_moistrisingbubble +#pamc_input_extruded_risingbubble +#pamc_input_extruded_twobubbles + + +#plot model +python3 plot_extrudedmodel2D.py an + +#an ce man mce diff --git a/standalone/mmf_simplified/pam-c/run_layer_script.sh b/standalone/mmf_simplified/pam-c/run_layer_script.sh index 8bf08767..520f40e7 100755 --- a/standalone/mmf_simplified/pam-c/run_layer_script.sh +++ b/standalone/mmf_simplified/pam-c/run_layer_script.sh @@ -1,8 +1,26 @@ +#clean up any existing files rm *.png *.nc cd ../build rm driver -./../pam-c/make_script.sh $3 -mpirun.mpich -n $3 ./driver ../inputs/pamc_input_layer_$2.yaml + +#build model +source ../../machines/linux_laptop_gnu_mpi_cpu.env +./cmakescript_pamc.sh PAM_SGS=none PAM_MICRO=none PAMC_MODEL=layermodel PAMC_HAMIL=tswe PAMC_THERMO=none PAMC_IO=serial +make -j 4 + +#linux_laptop_gnu_mpi_cpu_debug linux_laptop_gnu_mpi_cpu +#swe tswe + +#run model +mpirun.mpich -n $1 ./driver ../inputs/pamc_idealized/pamc_input_layer_doublevortex.yaml cd ../pam-c mv ../build/*.nc . -python3 plot_layermodel2D.py $1 + +#pamc_input_layer_bickleyjet +#pamc_input_layer_doublevortex + + +#plot model +python3 plot_layermodel2D.py tswe + +#swe tswe diff --git a/standalone/mmf_simplified/pam-c/set_pamc_cmakevars.sh b/standalone/mmf_simplified/pam-c/set_pamc_cmakevars.sh deleted file mode 100644 index 6a13aac8..00000000 --- a/standalone/mmf_simplified/pam-c/set_pamc_cmakevars.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -add_cmake_vars=" -DPAMC_MODEL=extrudedmodel " -add_cmake_vars+=" -DPAMC_HAMIL=an " -add_cmake_vars+=" -DPAMC_THERMO=idealgaspottemp " -add_cmake_vars+=" -DPAMC_IO=serial " - -#ce mce_rho an man -#idealgaspottemp constkappavirpottemp