Merge branch 'develop' into bugfix/mathomp4/degrade-moist-opt-gnu

GEOS-ESM · Jun 5, 2023 · 384f6d0 · 384f6d0
2 parents cc7800e + 05a6eb7
commit 384f6d0
Showing 1 changed file with 26 additions and 27 deletions.
diff --git a/...gcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/mk_restarts/CatchmentRst.F90 b/...gcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/mk_restarts/CatchmentRst.F90
@@ -148,7 +148,6 @@ function CatchmentRst_create(filename, time, rc) result (catch)
        if (myid ==0) then
           call catch%allocate_catch()
           call catch%read_shared_nc4(formatter, __RC__)
-          call MAPL_VarRead(formatter,"OLD_ITY",catch%ity, __RC__)
        endif
        call formatter%close()
      else
@@ -199,36 +198,36 @@ subroutine read_GEOSldas_rst_bin(this, filename, rc)
       integer, optional, intent(out) :: rc
       integer :: unit
       open(newunit=unit, file=filename, form='unformatted', action='read')
-      read(unit) this%      bf1
-      read(unit) this%      bf2
-      read(unit) this%      bf3
+      read(unit)                  ! skip     bf1
+      read(unit)                  ! skip     bf2
+      read(unit)                  ! skip     bf3
       read(unit) this%   vgwmax
       read(unit) this%    cdcr1
       read(unit) this%    cdcr2
-      read(unit) this%     psis
-      read(unit) this%      bee
+      read(unit)                  ! skip    psis
+      read(unit)                  ! skip     bee
       read(unit) this%    poros
-      read(unit) this%    wpwet
-      read(unit) this%     cond
-      read(unit) this%      gnu
-      read(unit) this%     ars1
-      read(unit) this%     ars2
-      read(unit) this%     ars3
-      read(unit) this%     ara1
-      read(unit) this%     ara2
-      read(unit) this%     ara3
-      read(unit) this%     ara4
-      read(unit) this%     arw1
-      read(unit) this%     arw2
-      read(unit) this%     arw3
-      read(unit) this%     arw4
-      read(unit) this%     tsa1
-      read(unit) this%     tsa2
-      read(unit) this%     tsb1
-      read(unit) this%     tsb2
-      read(unit) this%     atau
-      read(unit) this%     btau
-      read(unit) this%      ity
+      read(unit)                  ! skip   wpwet
+      read(unit)                  ! skip    cond
+      read(unit)                  ! skip     gnu
+      read(unit)                  ! skip    ars1
+      read(unit)                  ! skip    ars2
+      read(unit)                  ! skip    ars3
+      read(unit)                  ! skip    ara1
+      read(unit)                  ! skip    ara2
+      read(unit)                  ! skip    ara3
+      read(unit)                  ! skip    ara4
+      read(unit)                  ! skip    arw1
+      read(unit)                  ! skip    arw2
+      read(unit)                  ! skip    arw3
+      read(unit)                  ! skip    arw4
+      read(unit)                  ! skip    tsa1
+      read(unit)                  ! skip    tsa2
+      read(unit)                  ! skip    tsb1
+      read(unit)                  ! skip    tsb2
+      read(unit)                  ! skip    atau
+      read(unit)                  ! skip    btau
+      read(unit)                  ! skip     ity
       read(unit) this%       tc
       read(unit) this%       qc
       read(unit) this%    capac