tadd test case and sea-floor diffusivity - pism-exp-gsw - ice stream and sedime… | |
git clone git://src.adamsgaard.dk/pism-exp-gsw | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit b4f397d24a872e90a1b27d6fe167aba02ee69b02 | |
parent 1c7dcced9c0a9c9b8915593268159a4d4490e322 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Mon, 7 Feb 2022 20:43:48 +0100 | |
add test case and sea-floor diffusivity | |
Diffstat: | |
M Makefile | 30 +++++++++++++++++++++++++----- | |
1 file changed, 25 insertions(+), 5 deletions(-) | |
--- | |
diff --git a/Makefile b/Makefile | |
t@@ -17,7 +17,6 @@ PISM_COMMON = \ | |
-sia_e 4.5 -ssa_e 0.512\ | |
-stress_balance.sia.max_diffusivity 1e4\ | |
-backup_size big\ | |
- -o_order zyx\ | |
-log_view\ | |
OUT_VARS =\ | |
t@@ -29,6 +28,10 @@ OUT_COMMON =\ | |
-ts_times 0:50:${T_END}\ | |
-ys 0 -ye ${T_END}\ | |
+TILL_FLUX_OPTS =\ | |
+ -till_flux\ | |
+ -till_sea_floor_diffusivity 6.341958396752918e-07 \ | |
+ | |
all: \ | |
ex_deltaSL-linear_1d-till-evol.pdf\ | |
ex_deltaSL-linear_1d-profile.pdf\ | |
t@@ -58,6 +61,9 @@ ex_nt-constant-linear_1d-profile.pdf: ex_nt-constant-linear_… | |
ex_deltaSL-linear_1d.nc: deltaSL-linear.nc | |
flowline.py -o $@ --collapse -d y ex_deltaSL-linear.nc | |
+ex_test_1d.nc: test.nc | |
+ flowline.py -o $@ --collapse -d y ex_test.nc | |
+ | |
ex_constant-linear_1d.nc: constant-linear.nc | |
flowline.py -o $@ --collapse -d y ex_constant-linear.nc | |
t@@ -72,9 +78,23 @@ deltaSL-linear.nc: init-linear.nc ${SLSERIES} | |
pismr -i init-linear.nc\ | |
${PISM_COMMON}\ | |
${OUT_COMMON}\ | |
- ${OUT_VARS},tilldeposit,tillflux_mag,tillflux\ | |
+ ${OUT_VARS},tilldeposit,tillseafloorchange,tillseafloo… | |
-sea_level constant,delta_sl -ocean_delta_sl_file ${SL… | |
- -till_flux\ | |
+ ${TILL_FLUX_OPTS}\ | |
+ -extra_file ex_$@\ | |
+ -ts_file ts_$@\ | |
+ -o $@ | |
+ | |
+# from constant-linear.nc | |
+test.nc: init-linear.nc | |
+ mpiexec -n ${NPROC} \ | |
+ pismr -i init-linear.nc\ | |
+ ${PISM_COMMON}\ | |
+ -extra_times 0:10:${T_END}\ | |
+ -ts_times 0:10:${T_END}\ | |
+ -ys 0 -ye 1e2\ | |
+ ${OUT_VARS},tilldeposit,tillseafloorchange,tillseafloo… | |
+ ${TILL_FLUX_OPTS}\ | |
-extra_file ex_$@\ | |
-ts_file ts_$@\ | |
-o $@ | |
t@@ -84,8 +104,8 @@ constant-linear.nc: init-linear.nc | |
pismr -i init-linear.nc\ | |
${PISM_COMMON}\ | |
${OUT_COMMON}\ | |
- ${OUT_VARS},tilldeposit,tillflux_mag,tillflux\ | |
- -till_flux\ | |
+ ${OUT_VARS},tilldeposit,tillseafloorchange,tillseafloo… | |
+ ${TILL_FLUX_OPTS}\ | |
-extra_file ex_$@\ | |
-ts_file ts_$@\ | |
-o $@ |