Revert "CMIP changes (#219)"

This reverts commit bc64e87.
CICE-Consortium · Sep 21, 2018 · 3b6dee0 · 3b6dee0
1 parent bc64e87
commit 3b6dee0
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 105 deletions.
diff --git a/columnphysics/icepack_flux.F90 b/columnphysics/icepack_flux.F90
@@ -32,22 +32,18 @@ subroutine merge_fluxes (aicen,                &
                                strairxn, strairyn,   &
                                Cdn_atm_ratio_n,      &
                                fsurfn,   fcondtopn,  &  
-                               fcondbotn,            &
                                fsensn,   flatn,      & 
                                fswabsn,  flwoutn,    &
                                evapn,                &
-                               evapsn,   evapin,     &
                                Trefn,    Qrefn,      &
                                freshn,   fsaltn,     &
                                fhocnn,   fswthrun,   &
                                strairxT, strairyT,   &  
                                Cdn_atm_ratio,        &
                                fsurf,    fcondtop,   &
-                               fcondbot,             &
                                fsens,    flat,       & 
                                fswabs,   flwout,     &
                                evap,                 & 
-                               evaps,    evapi,      &
                                Tref,     Qref,       &
                                fresh,    fsalt,      & 
                                fhocn,    fswthru,    &
@@ -66,14 +62,11 @@ subroutine merge_fluxes (aicen,                &
           Cdn_atm_ratio_n, & ! ratio of total drag over neutral drag  
           fsurfn  , & ! net heat flux to top surface    (W/m**2)
           fcondtopn,& ! downward cond flux at top sfc   (W/m**2)
-          fcondbotn,& ! downward cond flux at bottom sfc   (W/m**2)
           fsensn  , & ! sensible heat flx               (W/m**2)
           flatn   , & ! latent   heat flx               (W/m**2)
           fswabsn , & ! shortwave absorbed heat flx     (W/m**2)
           flwoutn , & ! upwd lw emitted heat flx        (W/m**2)
           evapn   , & ! evaporation                     (kg/m2/s)
-          evapsn  , & ! evaporation over snow           (kg/m2/s)
-          evapin  , & ! evaporation over ice            (kg/m2/s)
           Trefn   , & ! air tmp reference level         (K)
           Qrefn   , & ! air sp hum reference level      (kg/kg)
           freshn  , & ! fresh water flux to ocean       (kg/m2/s)
@@ -96,14 +89,11 @@ subroutine merge_fluxes (aicen,                &
           Cdn_atm_ratio, & ! ratio of total drag over neutral drag
           fsurf   , & ! net heat flux to top surface    (W/m**2)
           fcondtop, & ! downward cond flux at top sfc   (W/m**2)
-          fcondbot, & ! downward cond flux at bottom sfc   (W/m**2)
           fsens   , & ! sensible heat flx               (W/m**2)
           flat    , & ! latent   heat flx               (W/m**2)
           fswabs  , & ! shortwave absorbed heat flx     (W/m**2)
           flwout  , & ! upwd lw emitted heat flx        (W/m**2)
           evap    , & ! evaporation                     (kg/m2/s)
-          evaps   , & ! evaporation over snow           (kg/m2/s)
-          evapi   , & ! evaporation over ice            (kg/m2/s)
           Tref    , & ! air tmp reference level         (K)
           Qref    , & ! air sp hum reference level      (kg/kg)
           fresh   , & ! fresh water flux to ocean       (kg/m2/s)
@@ -136,15 +126,12 @@ subroutine merge_fluxes (aicen,                &
                       Cdn_atm_ratio_n   * aicen
       fsurf      = fsurf    + fsurfn    * aicen
       fcondtop   = fcondtop + fcondtopn * aicen 
-      fcondbot   = fcondbot + fcondbotn * aicen 
       fsens      = fsens    + fsensn    * aicen
       flat       = flat     + flatn     * aicen
       fswabs     = fswabs   + fswabsn   * aicen
       flwout     = flwout   &
            + (flwoutn - (c1-emissivity)*flw) * aicen
       evap       = evap     + evapn     * aicen
-      evaps      = evaps    + evapsn    * aicen
-      evapi      = evapi    + evapin    * aicen
       Tref       = Tref     + Trefn     * aicen
       Qref       = Qref     + Qrefn     * aicen
 

diff --git a/columnphysics/icepack_shortwave.F90 b/columnphysics/icepack_shortwave.F90
@@ -3482,8 +3482,7 @@ subroutine shortwave_dEdd_set_snow(nslyr,    R_snw,    &
          Tsfc   , & ! surface temperature 
          hs0        ! snow depth for transition to bare sea ice (m)
 
-!    real (kind=dbl_kind), intent(inout) :: &
-     real (kind=dbl_kind), intent(out) :: &
+      real (kind=dbl_kind), intent(out) :: &
          fs     , & ! horizontal coverage of snow
          hs         ! snow depth
 

diff --git a/columnphysics/icepack_therm_mushy.F90 b/columnphysics/icepack_therm_mushy.F90
@@ -1029,7 +1029,7 @@ subroutine prep_picard(nilyr, nslyr,  &
          hilyr  , & ! ice layer thickness (m)
          hslyr      ! snow layer thickness (m)
 
-    real(kind=dbl_kind), dimension(:), intent(inout) :: &
+    real(kind=dbl_kind), dimension(:), intent(out) :: &
          zTin   , & ! ice layer temperature (C)
          Sbr    , & ! ice layer brine salinity (ppt)
          phi    , & ! ice layer liquid fraction
@@ -1971,7 +1971,7 @@ subroutine solve_heat_conduction(lsnow,  lcold,        &
     real(kind=dbl_kind), dimension(:), intent(inout) :: &
          zTin             ! ice layer temperature (C)
 
-    real(kind=dbl_kind), dimension(:), intent(inout) :: &
+    real(kind=dbl_kind), dimension(:), intent(out) :: &
          zTsn             ! snow layer temperature (C)
 
     real(kind=dbl_kind), dimension(nilyr+nslyr+1) :: &