change FRZR to be treated as liquid based on consensus; also fixes AOIL call to include ICE and FRZR

Author: zhaobin74

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp.F90

@@ -3491,7 +3491,7 @@ subroutine CICECORE(NT_ORIGINAL,RC)
     if(associated(USTARI))   USTARI     = sqrt(sqrt(TAUXBOT**2+TAUYBOT**2)/MAPL_RHO_SEAWATER)
 
     if(associated(PR_C5)) then
-          PR_C5 = FRCICE * (PLS + PCU)
+          PR_C5 = FRCICE * (PLS + PCU + FRZR)
           where(FRCICE == 0.0)
              PR_C5 = 0.0
           endwhere
@@ -4546,7 +4546,7 @@ subroutine CICE_THERMO1 (N,NSUB,NT,ICE,LATS,LONS,LATSO,LONSO,DT,TF,FR,TS,
 
           TRACERSDB      =  TRACERS(:,NSUB)
           LWDNSRFDB      =  LWDNSRF(K)
-          SNODB          =  SNO(K) + ICEF(K) + FRZR(K)
+          SNODB          =  SNO(K) + ICEF(K)
           TBOTDB         =  TBOT(K)
           FBOTDB         =  FBOT(K)
           FSWABSDB       =  FSWABS(K)
@@ -4660,7 +4660,7 @@ subroutine CICE_THERMO1 (N,NSUB,NT,ICE,LATS,LONS,LATSO,LONSO,DT,TF,FR,TS,
              VOLSNODB        =  VOLSNO(K,NSUB)
              APONDNDB        =  APONDN(K,NSUB)
              HPONDNDB        =  HPONDN(K,NSUB)
-             FRAINDB         =  PCU(K) + PLS(K)
+             FRAINDB         =  PCU(K) + PLS(K) + FRZR(K)
              call compute_ponds(1, 1,                      &
                            1, 1, 1, 1,                     &
                            MELTTDB, MELTSDB, FRAINDB,      &

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_OpenWaterGridComp.F90

@@ -2574,7 +2574,7 @@ subroutine OPENWATERCORE(NT,RC)
 
     call AOIL_v0 (NT, DO_SKIN_LAYER, DO_DATASEA, n_iter_cool, fr_ice_thresh, trim(DO_GRAD_DECAY_warmLayer), &
                   DT, MUSKIN, epsilon_d, MaxWaterDepth, MinWaterDepth, MaxSalinity, MinSalinity,            &
-                  STOKES_SPEED, CM(:,WATER), CFT, CFQ, SH, EVAP, DSH, DEV, THATM, QHATM, PS, SNO, PCU+PLS,  &
+                  STOKES_SPEED, CM(:,WATER), CFT, CFQ, SH, EVAP, DSH, DEV, THATM, QHATM, PS, SNO+ICE, PCU+PLS+FRZR,  &
                   UUA, VVA, UW, VW, FRWATER, SWN, SWN_surf, PEN, PEN_ocean, LWDNSRF, ALW, BLW,              &
                   HH(:,WATER), TS(:,WATER), SS(:,WATER), QS(:,WATER), TS_FOUNDi,                            &
                   DWARM_, TBAR_, USTARW_, DCOOL_, TDROP_, SWCOOL_, QCOOL_, BCOOL_, LCOOL_,                  &
@@ -2631,18 +2631,17 @@ subroutine OPENWATERCORE(NT,RC)
     if(associated(AOSHFLX)) AOSHFLX = SHF    *FRWATER
     if(associated(AOQFLUX)) AOQFLUX = EVP    *FRWATER
     if(associated(AOLWFLX)) AOLWFLX = (LWDNSRF-ALW-BLW*TS(:,WATER))*FRWATER
-    if(associated(AORAIN )) AORAIN  = PCU + PLS
-    if(associated(AOSNOW )) AOSNOW  = (SNO+ICE+FRZR) *FRWATER
+    if(associated(AORAIN )) AORAIN  = PCU + PLS + FRZR
+    if(associated(AOSNOW )) AOSNOW  = (SNO+ICE) *FRWATER
     if(associated(AODRNIR)) AODRNIR = (1.-ALBNRO)*DRNIR*FRWATER
     if(associated(AODFNIR)) AODFNIR = (1.-ALBNFO)*DFNIR*FRWATER
     if(associated(FSURF  )) FSURF   = SWN+LWDNSRF-(ALW+BLW*TS(:,WATER))-SHF-LHF
     if(associated(PENOCNe)) PENOCNe = PEN_ocean * FRWATER
 
     if(associated(SNOWOCN)) SNOWOCN = SNO*FR(:,WATER)
     if(associated(ICEFOCN)) ICEFOCN = ICE*FR(:,WATER)
-    ! NOTE: FRZR may be moved to be part of RAINOCN
-    if(associated(SPTOTOCN))SPTOTOCN = (SNO+ICE+FRZR)*FR(:,WATER)
-    if(associated(RAINOCN)) RAINOCN = PCU + PLS
+    if(associated(SPTOTOCN))SPTOTOCN = (SNO+ICE)*FR(:,WATER)
+    if(associated(RAINOCN)) RAINOCN = PCU + PLS + FRZR
     if(associated(HLWUP  )) HLWUP   = ALW*FR(:,WATER) 
     if(associated(LWNDSRF)) LWNDSRF = (LWDNSRF - ALW)*FR(:,WATER)
 

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_SeaiceInterfaceGridComp.F90

@@ -2513,9 +2513,9 @@ subroutine CICECORE(NT,RC)
 ! Aggregate imports if required
 !-----------------------------------
 
-    RAIN = PLS + PCU
+    RAIN = PLS + PCU + FRZR
 
-    SNOW = SNO + ICEF + FRZR
+    SNOW = SNO + ICEF
 
 ! Initialize PAR and UVR beam fluxes
 !-----------------------------------

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_SimpleSeaiceGridComp.F90

@@ -2172,7 +2172,7 @@ subroutine SEAICECORE(NT,RC)
        QS(:,N) = QS(:,N) + DQS
 
        if (.not. seaIceT_extData) then
-         HH(:,N) = HH(:,N) + DT*(SNO + ICEF + FRZR - EVP)
+         HH(:,N) = HH(:,N) + DT*(SNO + ICEF - EVP)
          HH(:,N) = max(min(HH(:,N),  MAXICEDEPTH),  MINICEDEPTH)
        endif