Merge pull request #554 from GEOS-ESM/hotfix/jkolassa/cnclm45_rst_gen

Hotfix to maintain backward compatibility for reading CatchmentCNCLM45 bcs file in generation of CatchmentCNCLM45 restarts
GEOS-ESM · Feb 28, 2022 · b95d148 · b95d148
2 parents 371616d + 0e78d6e
commit b95d148
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...dComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/mk_restarts/mk_GEOSldasRestarts.F90 b/...dComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/mk_restarts/mk_GEOSldasRestarts.F90
@@ -1421,7 +1421,7 @@ SUBROUTINE read_bcs_data (ntiles, SURFLAY,MODEL, DataDir, InRestart, rc)
           if(clm45) then
             open(unit=30, file=trim(DataDir)//'CLM4.5_abm_peatf_gdp_hdm_fc' ,form='formatted')
             do n=1,ntiles
-              read (30,'(2I10, i3, f8.4, f8.2, f10.2, f8.4)' ) i, j, abm(n), peatf(n), &
+              read (30, *) i, j, abm(n), peatf(n), &
                      gdp(n), hdm(n), fc(n)
             end do
             CLOSE (30, STATUS = 'KEEP')
@@ -1478,7 +1478,7 @@ SUBROUTINE read_bcs_data (ntiles, SURFLAY,MODEL, DataDir, InRestart, rc)
                 read (29, *) i,j, CLMC45_pt1(n), CLMC45_pt2(n), CLMC45_st1(n), CLMC45_st2(n), &
                      CLMC45_pf1(n), CLMC45_pf2(n), CLMC45_sf1(n), CLMC45_sf2(n)
 
-                read (30,'(2I10, i3, f8.4, f8.2, f10.2, f8.4)' ) i, j, abm(n), peatf(n), &
+                read (30, *) i, j, abm(n), peatf(n), &
                      gdp(n), hdm(n), fc(n)
              endif
           endif