Skip to content

Commit

Permalink
fix run scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
celdredsandia committed Nov 7, 2023
1 parent 3cf8b84 commit 484857d
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 41 deletions.
3 changes: 0 additions & 3 deletions dynamics/spam/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -84,5 +83,3 @@ endif()
if ("${PAMC_IO}" STREQUAL "none")
target_compile_definitions(dycore INTERFACE -DPAMC_NOIO)
endif()


7 changes: 0 additions & 7 deletions standalone/mmf_simplified/pam-c/debug_run_extruded_script.sh

This file was deleted.

7 changes: 0 additions & 7 deletions standalone/mmf_simplified/pam-c/debug_run_layer_script.sh

This file was deleted.

4 changes: 0 additions & 4 deletions standalone/mmf_simplified/pam-c/make_debug_script.sh

This file was deleted.

4 changes: 0 additions & 4 deletions standalone/mmf_simplified/pam-c/make_script.sh

This file was deleted.

33 changes: 29 additions & 4 deletions standalone/mmf_simplified/pam-c/run_extruded_script.sh
Original file line number Diff line number Diff line change
@@ -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
24 changes: 21 additions & 3 deletions standalone/mmf_simplified/pam-c/run_layer_script.sh
Original file line number Diff line number Diff line change
@@ -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
9 changes: 0 additions & 9 deletions standalone/mmf_simplified/pam-c/set_pamc_cmakevars.sh

This file was deleted.

0 comments on commit 484857d

Please sign in to comment.