fix two bugs: 1) restart inconsistent in assimsun,assimsha,etrsun,etr…

…sha,gssun,gssha, 2) create_test typo in Queue
CoLM-SYSU · Feb 21, 2025 · b1c17a0 · b1c17a0
1 parent c3ea9df
commit b1c17a0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/main/MOD_Thermal.F90 b/main/MOD_Thermal.F90
@@ -705,6 +705,12 @@ SUBROUTINE THERMAL (ipatch ,patchtype,is_dry_lake,lb            ,deltim        ,
          ldew          = 0.
          rstfacsun_out = 0.
          rstfacsha_out = 0.
+         assimsun_out  = 0.
+         assimsha_out  = 0.
+         etrsun_out    = 0.
+         etrsha_out    = 0.
+         gssun_out     = 0.
+         gssha_out     = 0.
          IF (DEF_USE_PLANTHYDRAULICS) THEN
             vegwp = -2.5e4
          ENDIF
@@ -896,6 +902,14 @@ SUBROUTINE THERMAL (ipatch ,patchtype,is_dry_lake,lb            ,deltim        ,
       fevpl_p (ps:pe) = 0.
       etr_p   (ps:pe) = 0.
       hprl_p  (ps:pe) = 0.
+      assimsun_p (ps:pe) = 0.
+      assimsha_p (ps:pe) = 0.
+      etrsun_p   (ps:pe) = 0.
+      etrsha_p   (ps:pe) = 0.
+      gssun_p    (ps:pe) = 0.
+      gssha_p    (ps:pe) = 0.
+      rstfacsun_p(ps:pe) = 0.
+      rstfacsha_p(ps:pe) = 0.
       z0m_p   (ps:pe) = (1.-fsno)*zlnd + fsno*zsno
       z0m             = sum( z0m_p (ps:pe)*pftfrac(ps:pe) )
 

diff --git a/run/scripts/create_test b/run/scripts/create_test
@@ -46,7 +46,7 @@ submitall()
 	   SLURM) 
 		   JobSubmit="sbatch"
                    if [ "$Mode" == "RunNoMkSrf" ];then
-                      job1_id=`$JobSubmit -p $QUEUE wait.bash| grep -o '[0-9]*'`
+                      job1_id=`$JobSubmit -p $Queue wait.bash| grep -o '[0-9]*'`
                    else
                       job1_id=`$JobSubmit mksrf.submit| grep -o '[0-9]*'`
                    fi