adapt parflow output and restart handling

Author: s-poll

ctl/expid.conf

@@ -29,6 +29,8 @@ clmoutvar='TWS','H2OSOI','TSOI','TG','EFLX_LH_TOT','FSH','FSA','FSR','FIRA','Rne
 pfl_ngx=444
 pfl_ngy=432
 pfl_mask=PfbMask4SolidFile_eCLM.pfsol
+pfloutmfilt=24
+pfltsfilerst=$((pfloutmfilt - 1))
 
 [sim_config_oas]
 icon_ncg=189976

ctl/sim_ctl/sim_cleanup.sh

@@ -85,11 +85,12 @@ if [[ "${modelid}" == *parflow* ]]; then
 
   # Restart
   mkdir -p ${simout_dir}/rst/parflow ${simrst_dir}/parflow
-  pflnout=$(printf "%05d" $(echo "${simlenhr} / (${pfloutfrq} * ${pfloutmfilt})" | bc))
+  pflnout=$(echo "( ((${simlenhr}/${pfloutfrq}) + ${pfloutmfilt} -1) / ${pfloutmfilt})" | bc)
+  pflnlast=$(printf "%05d" $(echo "1 + (${pflnout} -1) * ${pfloutmfilt}" | bc))
 #  cp -v $(ls -1 ${sim_dir}/*.out.?????.nc | tail -1) ${simout_dir}/rst/parflow
   # save twice as simout is archived
-  cp -v ${sim_dir}/${EXP_ID}.out.${pflnout}.nc ${simout_dir}/rst/parflow
-  cp -v ${sim_dir}/${EXP_ID}.out.${pflnout}.nc ${simrst_dir}/parflow/${EXP_ID}.out.$(date -u -d "${datep1}" +%Y%m%d%H%M%S).nc # 2nd copy
+  cp -v ${sim_dir}/${EXP_ID}.out.${pflnlast}.nc ${simout_dir}/rst/parflow
+  cp -v ${sim_dir}/${EXP_ID}.out.${pflnlast}.nc ${simrst_dir}/parflow/${EXP_ID}.out.$(date -u -d "${datep1}" +%Y%m%d%H%M%S).nc # 2nd copy
 
   # Copy binary
   cp -v parflow ${simout_dir}/bin/

ctl/sim_ctl/sim_config.sh

@@ -221,7 +221,8 @@ if [[ "${modelid}" == *parflow* ]]; then
   parflow_base=${parflow_base:-0.0025}
 #  parflow_inifile=${frc_dir}/parflow/ini/ic_press.pfb
   pfloutfrq=${pfloutfrq:-1.0}
-  pfloutmfilt=${pfloutmfilt:-24}
+  pfloutmfilt=${pfloutmfilt:-1}
+  pfltsfilerst=${pfltsfilerst:-0}
 
 # copy namelist
   cp ${nml_dir}/parflow/ascii2pfb_slopes.tcl ascii2pfb_slopes.tcl
@@ -249,6 +250,7 @@ if [[ "${modelid}" == *parflow* ]]; then
   sed -i "s/__dump_pfl_interval__/$pfloutfrq/" coup_oas.tcl
   sed -i "s/__pfl_casename__/$EXP_ID/" coup_oas.tcl
   sed -i "s#__inifile__#$(basename "$fini_pfl")#" coup_oas.tcl
+  sed -i "s/__pfltsfilerst__/${pfltsfilerst}/" coup_oas.tcl
   sed -i "s/__pfloutmfilt__/${pfloutmfilt}/" coup_oas.tcl
   sed -i "s/__pfl_expid__/$EXP_ID/" slm_multiprog_mapping.conf