Stop running 0th time step

python/ctsm/crop_calendars/generate_gdds_functions.py

@@ -45,6 +45,7 @@ def log(logger, string):
 
 
 def error(logger, string):
+    print(string)
     logger.error(string)
     raise RuntimeError(string)
 
@@ -217,7 +218,7 @@ def import_and_process_1yr(
     else:
         chunks = None
 
-    # Get h2 file (list)
+    # Get h1 file (list)
     h1_pattern = os.path.join(indir, "*h1.*.nc")
     h1_filelist = glob.glob(h1_pattern)
     if not h1_filelist:
@@ -477,13 +478,14 @@ def import_and_process_1yr(
     log(logger, f"   Importing accumulated GDDs...")
     clm_gdd_var = "GDDACCUM"
     myVars = [clm_gdd_var, "GDDHARV"]
-    pattern = os.path.join(indir, f"*h2.{thisYear-1}-01-01*.nc")
-    h2_files = glob.glob(pattern)
-    if not h2_files:
-        pattern = os.path.join(indir, f"*h2.{thisYear-1}-01-01*.nc.base")
+    patterns = [f"*h2.{thisYear-1}-01*.nc", f"*h2.{thisYear-1}-01*.nc.base"]
+    for p in patterns:
+        pattern = os.path.join(indir, p)
         h2_files = glob.glob(pattern)
-        if not h2_files:
-            error(logger, f"No files found matching pattern '*h2.{thisYear-1}-01-01*.nc(.base)'")
+        if h2_files:
+            break
+    if not h2_files:
+        error(logger, f"No files found matching patterns: {patterns}")
     h2_ds = utils.import_ds(
         h2_files,
         myVars=myVars,

src/biogeochem/CNPhenologyMod.F90

@@ -383,19 +383,10 @@ subroutine CNPhenology (bounds, num_soilc, filter_soilc, num_soilp, &
             soilstate_inst, temperature_inst, atm2lnd_inst, wateratm2lndbulk_inst, cnveg_state_inst, &
             cnveg_carbonstate_inst, cnveg_nitrogenstate_inst, cnveg_carbonflux_inst, cnveg_nitrogenflux_inst)
 
-       ! BACKWARDS_COMPATIBILITY(wjs, 2022-02-03) Old restart files generated at the end
-       ! of the year can indicate that a crop was panted on Jan 1, because that used to be
-       ! the time given to the last time step of the year. This would cause problems if we
-       ! ran CropPhenology in time step 0, because now time step 0 is labeled as Dec 31,
-       ! so CropPhenology would see the crop as having been planted 364 days ago, and so
-       ! would want to harvest this newly-planted crop. To avoid this situation, we avoid
-       ! calling CropPhenology on time step 0.
-       !
-       ! This .not. is_first_step() condition can be removed either when we can rely on
-       ! all restart files having been generated with
-       ! https://github.com/ESCOMP/CTSM/issues/1623 resolved, or we stop having a time
-       ! step 0 (https://github.com/ESCOMP/CTSM/issues/925).
-       if (num_pcropp > 0 .and. .not. is_first_step()) then
+!KO       if (num_pcropp > 0 .and. .not. is_first_step()) then
+!KO
+       if (num_pcropp > 0) then
+!KO
           call CropPhenology(num_pcropp, filter_pcropp, &
                waterdiagnosticbulk_inst, temperature_inst, crop_inst, canopystate_inst, cnveg_state_inst, &
                cnveg_carbonstate_inst, cnveg_nitrogenstate_inst, cnveg_carbonflux_inst, cnveg_nitrogenflux_inst, &

src/biogeochem/CNVegetationFacade.F90

@@ -1275,7 +1275,11 @@ subroutine EndOfTimeStepVegDynamics(this, bounds, num_natvegp, filter_natvegp, &
        ! Call dv (dynamic vegetation) at last time step of year
 
        call t_startf('d2dgvm')
-       if (is_end_curr_year() .and. .not. is_first_step())  then
+!KO       if (is_end_curr_year() .and. .not. is_first_step())  then
+!KO
+       ! is_first_step check no longer necessary since there is no nstep=0
+       if (is_end_curr_year())  then
+!KO
 
           ! Get date info.  kyr is used in lpj().  At end of first year, kyr = 2.
           call get_curr_date(yr, mon, day, sec)
@@ -1327,7 +1331,11 @@ subroutine WriteHistory(this, bounds)
 
     ! Write to CNDV history buffer if appropriate
     if (use_cndv) then
-       if (is_end_curr_year() .and. .not. is_first_step())  then
+!KO       if (is_end_curr_year() .and. .not. is_first_step())  then
+!KO
+       ! is_first_step check no longer necessary since there is no nstep=0
+       if (is_end_curr_year())  then
+!KO
           call t_startf('clm_drv_io_hdgvm')
           call CNDVHist( bounds, this%dgvs_inst )
           if (masterproc) write(iulog,*) 'Annual CNDV calculations are complete'

src/biogeochem/CropType.F90

@@ -908,7 +908,11 @@ subroutine CropIncrementYear (this, num_pcropp, filter_pcropp)
     ! Update nyrs when it's the end of the year (unless it's the very start of the
     ! run). This assumes that, if this patch is active at the end of the year, then it was
     ! active for the whole year.
-    if ((kmo == 1 .and. kda == 1 .and. mcsec == 0) .and. .not. is_first_step()) then
+!KO    if ((kmo == 1 .and. kda == 1 .and. mcsec == 0) .and. .not. is_first_step()) then
+!KO
+    ! is_first_step check no longer necessary since there is no nstep=0
+    if ((kmo == 1 .and. kda == 1 .and. mcsec == 0)) then
+!KO
        do fp = 1, num_pcropp
           p = filter_pcropp(fp)
 

src/biogeochem/dynCNDVMod.F90

@@ -99,7 +99,11 @@ subroutine dynCNDV_interp( bounds, dgvs_inst)
           patch%wtcol(p)   = dgvs_inst%fpcgrid_patch(p) + &
                     wt1 * (dgvs_inst%fpcgridold_patch(p) - dgvs_inst%fpcgrid_patch(p))
 
-          if (mon==1 .and. day==1 .and. sec==dtime .and. nstep>0) then
+!KO       ! I don't think this is necessary since there no longer an nstep=0
+!KO          if (mon==1 .and. day==1 .and. sec==dtime .and. nstep>0) then
+!KO
+          if (mon==1 .and. day==1 .and. sec==dtime) then
+!KO
              dgvs_inst%fpcgridold_patch(p) = dgvs_inst%fpcgrid_patch(p)
           end if
        end if

src/biogeophys/WaterStateType.F90

@@ -787,6 +787,7 @@ subroutine Restart(this, bounds, ncid, flag, &
 
     ! If initial run -- ensure that water is properly bounded (read only)
     if (flag == 'read' ) then
+!KO    ! I think leaving this in here is still necessary even though is_first_step is now based on nstep=1
        if ( is_first_step() .and. bound_h2osoi) then
           do c = bounds%begc, bounds%endc
              l = col%landunit(c)