From 3b6dee076350017e82908b7aada13c5d1f37c68c Mon Sep 17 00:00:00 2001 From: Tony Craig Date: Fri, 21 Sep 2018 14:56:59 -0700 Subject: [PATCH] Revert "CMIP changes (#219)" This reverts commit bc64e87cd81de4d5622a2d70c5d255f6cd00fd40. --- columnphysics/icepack_flux.F90 | 13 ---- columnphysics/icepack_shortwave.F90 | 3 +- columnphysics/icepack_therm_mushy.F90 | 4 +- columnphysics/icepack_therm_vertical.F90 | 88 ++++++------------------ configuration/driver/icedrv_flux.F90 | 14 +--- configuration/driver/icedrv_step.F90 | 13 ++-- 6 files changed, 30 insertions(+), 105 deletions(-) diff --git a/columnphysics/icepack_flux.F90 b/columnphysics/icepack_flux.F90 index dc1cfb395..4438c1bae 100644 --- 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 index 60f0f8a69..e8368f7f5 100644 --- 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 index 62e2dde01..40deef655 100644 --- 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) :: & diff --git a/columnphysics/icepack_therm_vertical.F90 b/columnphysics/icepack_therm_vertical.F90 index 12f50b603..58b7e9247 100644 --- a/columnphysics/icepack_therm_vertical.F90 +++ b/columnphysics/icepack_therm_vertical.F90 @@ -84,15 +84,13 @@ subroutine thermo_vertical (nilyr, nslyr, & Qa, rhoa, & fsnow, fpond, & fbot, Tbot, & - Tsnice, sss, & + sss, & lhcoef, shcoef, & fswsfc, fswint, & Sswabs, Iswabs, & fsurfn, fcondtopn, & - fcondbotn, & fsensn, flatn, & flwoutn, evapn, & - evapsn, evapin, & freshn, fsaltn, & fhocnn, meltt, & melts, meltb, & @@ -162,17 +160,14 @@ subroutine thermo_vertical (nilyr, nslyr, & ! coupler fluxes to atmosphere real (kind=dbl_kind), intent(out):: & flwoutn , & ! outgoing longwave radiation (W/m^2) - evapn , & ! evaporative water flux (kg/m^2/s) - evapsn , & ! evaporative water flux over snow (kg/m^2/s) - evapin ! evaporative water flux over ice (kg/m^2/s) + evapn ! evaporative water flux (kg/m^2/s) ! Note: these are intent out if calc_Tsfc = T, otherwise intent in real (kind=dbl_kind), intent(inout):: & fsensn , & ! sensible heat flux (W/m^2) flatn , & ! latent heat flux (W/m^2) fsurfn , & ! net flux to top surface, excluding fcondtopn - fcondtopn, & ! downward cond flux at top surface (W m-2) - fcondbotn ! downward cond flux at bottom surface (W m-2) + fcondtopn ! downward cond flux at top surface (W m-2) ! coupler fluxes to ocean real (kind=dbl_kind), intent(out):: & @@ -183,7 +178,6 @@ subroutine thermo_vertical (nilyr, nslyr, & ! diagnostic fields real (kind=dbl_kind), & intent(inout):: & - Tsnice , & ! snow ice interface temperature (deg C) meltt , & ! top ice melt (m/step-->cm/day) melts , & ! snow melt (m/step-->cm/day) meltb , & ! basal ice melt (m/step-->cm/day) @@ -225,6 +219,7 @@ subroutine thermo_vertical (nilyr, nslyr, & ! other 2D flux and energy variables real (kind=dbl_kind) :: & + fcondbot , & ! downward cond flux at bottom surface (W m-2) einit , & ! initial energy of melting (J m-2) efinal , & ! final energy of melting (J m-2) einter ! intermediate energy @@ -240,8 +235,6 @@ subroutine thermo_vertical (nilyr, nslyr, & flwoutn = c0 evapn = c0 - evapsn = c0 - evapin = c0 freshn = c0 fsaltn = c0 fhocnn = c0 @@ -253,8 +246,6 @@ subroutine thermo_vertical (nilyr, nslyr, & congel = c0 snoice = c0 dsnow = c0 - zTsn(:) = c0 - zTin(:) = c0 if (calc_Tsfc) then fsensn = c0 @@ -307,7 +298,7 @@ subroutine thermo_vertical (nilyr, nslyr, & sss, & fsensn, flatn, & flwoutn, fsurfn, & - fcondtopn, fcondbotn, & + fcondtopn, fcondbot, & fadvocn, snoice) if (icepack_warnings_aborted(subname)) return @@ -327,7 +318,7 @@ subroutine thermo_vertical (nilyr, nslyr, & Tsf, Tbot, & fsensn, flatn, & flwoutn, fsurfn, & - fcondtopn, fcondbotn, & + fcondtopn, fcondbot, & einit ) if (icepack_warnings_aborted(subname)) return @@ -346,7 +337,7 @@ subroutine thermo_vertical (nilyr, nslyr, & Tsf, Tbot, & fsensn, flatn, & flwoutn, fsurfn, & - fcondtopn, fcondbotn ) + fcondtopn, fcondbot ) if (icepack_warnings_aborted(subname)) return else @@ -356,7 +347,7 @@ subroutine thermo_vertical (nilyr, nslyr, & ! fcondtop is set in call to set_sfcflux in step_therm1 !------------------------------------------------------------ - fcondbotn = fcondtopn ! zero layer + fcondbot = fcondtopn ! zero layer endif ! calc_Tsfc @@ -372,15 +363,6 @@ subroutine thermo_vertical (nilyr, nslyr, & einter = einter + hilyr * zqin(k) enddo ! k - Tsnice = c0 - if ((hslyr+hilyr) > puny) then - if (hslyr > puny) then - Tsnice = (hslyr*zTsn(nslyr) + hilyr*zTin(1)) / (hslyr+hilyr) - else - Tsnice = Tsf - endif - endif - if (icepack_warnings_aborted(subname)) return !----------------------------------------------------------------- @@ -397,10 +379,9 @@ subroutine thermo_vertical (nilyr, nslyr, & zqin, zqsn, & fbot, Tbot, & flatn, fsurfn, & - fcondtopn, fcondbotn, & + fcondtopn, fcondbot, & fsnow, hsn_new, & fhocnn, evapn, & - evapsn, evapin, & meltt, melts, & meltb, & congel, snoice, & @@ -419,7 +400,7 @@ subroutine thermo_vertical (nilyr, nslyr, & fhocnn, fswint, & fsnow, einit, & einter, efinal, & - fcondtopn, fcondbotn, & + fcondtopn, fcondbot, & fadvocn, fbot ) if (icepack_warnings_aborted(subname)) return @@ -1020,10 +1001,9 @@ subroutine thickness_changes (nilyr, nslyr, & zqin, zqsn, & fbot, Tbot, & flatn, fsurfn, & - fcondtopn, fcondbotn, & + fcondtopn, fcondbot, & fsnow, hsn_new, & fhocnn, evapn, & - evapsn, evapin, & meltt, melts, & meltb, & congel, snoice, & @@ -1048,7 +1028,7 @@ subroutine thickness_changes (nilyr, nslyr, & fcondtopn ! downward cond flux at top surface (W m-2) real (kind=dbl_kind), intent(inout) :: & - fcondbotn ! downward cond flux at bottom surface (W m-2) + fcondbot ! downward cond flux at bottom surface (W m-2) real (kind=dbl_kind), dimension (:), intent(inout) :: & zqin , & ! ice layer enthalpy (J m-3) @@ -1078,9 +1058,7 @@ subroutine thickness_changes (nilyr, nslyr, & real (kind=dbl_kind), intent(out):: & fhocnn , & ! fbot, corrected for any surplus energy (W m-2) - evapn , & ! ice/snow mass sublimated/condensed (kg m-2 s-1) - evapsn , & ! ice/snow mass sublimated/condensed over snow (kg m-2 s-1) - evapin ! ice/snow mass sublimated/condensed over ice (kg m-2 s-1) + evapn ! ice/snow mass sublimated/condensed (kg m-2 s-1) real (kind=dbl_kind), intent(out):: & hsn_new ! thickness of new snow (m) @@ -1213,7 +1191,7 @@ subroutine thickness_changes (nilyr, nslyr, & wk1 = (fsurfn - fcondtopn) * dt etop_mlt = max(wk1, c0) ! etop_mlt > 0 - wk1 = (fcondbotn - fbot) * dt + wk1 = (fcondbot - fbot) * dt ebot_mlt = max(wk1, c0) ! ebot_mlt > 0 ebot_gro = min(wk1, c0) ! ebot_gro < 0 @@ -1225,19 +1203,15 @@ subroutine thickness_changes (nilyr, nslyr, & !-------------------------------------------------------------- evapn = c0 ! initialize - evapsn = c0 ! initialize - evapin = c0 ! initialize if (hsn > puny) then ! add snow with enthalpy zqsn(1) dhs = econ / (zqsn(1) - rhos*Lvap) ! econ < 0, dhs > 0 dzs(1) = dzs(1) + dhs evapn = evapn + dhs*rhos - evapsn = evapsn + dhs*rhos else ! add ice with enthalpy zqin(1) dhi = econ / (qm(1) - rhoi*Lvap) ! econ < 0, dhi > 0 dzi(1) = dzi(1) + dhi evapn = evapn + dhi*rhoi - evapin = evapin + dhi*rhoi ! enthalpy of melt water emlt_atm = emlt_atm - qmlt(1) * dhi endif @@ -1331,7 +1305,6 @@ subroutine thickness_changes (nilyr, nslyr, & esub = esub - dhs*qsub esub = max(esub, c0) ! in case of roundoff error evapn = evapn + dhs*rhos - evapsn = evapsn + dhs*rhos !-------------------------------------------------------------- ! Melt snow (top) @@ -1361,7 +1334,6 @@ subroutine thickness_changes (nilyr, nslyr, & esub = esub - dhi*qsub esub = max(esub, c0) evapn = evapn + dhi*rhoi - evapin = evapin + dhi*rhoi emlt_ocn = emlt_ocn - qmlt(k) * dhi !-------------------------------------------------------------- @@ -1600,8 +1572,6 @@ subroutine thickness_changes (nilyr, nslyr, & efinal = -evapn*Lvap evapn = evapn/dt - evapsn = evapsn/dt - evapin = evapin/dt do k = 1, nslyr efinal = efinal + hslyr*zqsn(k) @@ -1829,7 +1799,7 @@ subroutine conservation_check_vthermo(dt, & fsnow, & einit, einter, & efinal, & - fcondtopn,fcondbotn, & + fcondtopn,fcondbot, & fadvocn, fbot ) real (kind=dbl_kind), intent(in) :: & @@ -1849,7 +1819,7 @@ subroutine conservation_check_vthermo(dt, & einit , & ! initial energy of melting (J m-2) einter , & ! intermediate energy of melting (J m-2) efinal , & ! final energy of melting (J m-2) - fcondbotn + fcondbot ! local variables @@ -1898,7 +1868,7 @@ subroutine conservation_check_vthermo(dt, & call icepack_warnings_add(warnstr) write(warnstr,*) subname, 'fbot,fcondbot:' call icepack_warnings_add(warnstr) - write(warnstr,*) subname, fbot,fcondbotn + write(warnstr,*) subname, fbot,fcondbot call icepack_warnings_add(warnstr) ! if (ktherm == 2) then @@ -1911,10 +1881,10 @@ subroutine conservation_check_vthermo(dt, & einter-einit call icepack_warnings_add(warnstr) write(warnstr,*) subname, 'Conduction Error =', (einter-einit) & - - (fcondtopn*dt - fcondbotn*dt + fswint*dt) + - (fcondtopn*dt - fcondbot*dt + fswint*dt) call icepack_warnings_add(warnstr) write(warnstr,*) subname, 'Melt/Growth Error =', (einter-einit) & - + ferr*dt - (fcondtopn*dt - fcondbotn*dt + fswint*dt) + + ferr*dt - (fcondtopn*dt - fcondbot*dt + fswint*dt) call icepack_warnings_add(warnstr) write(warnstr,*) subname, 'Advection Error =', fadvocn*dt call icepack_warnings_add(warnstr) @@ -2050,13 +2020,11 @@ subroutine icepack_step_therm1(dt, ncat, nilyr, nslyr, n_aero, & sss , Tf , & strocnxT , strocnyT , & fbot , & - Tbot , Tsnice , & frzmlt , rside , & fsnow , frain , & fpond , & fsurf , fsurfn , & fcondtop , fcondtopn , & - fcondbot , fcondbotn , & fswsfcn , fswintn , & fswthrun , fswabs , & flwout , & @@ -2065,7 +2033,6 @@ subroutine icepack_step_therm1(dt, ncat, nilyr, nslyr, n_aero, & fsens , fsensn , & flat , flatn , & evap , & - evaps , evapi , & fresh , fsalt , & fhocn , fswthru , & flatn_f , fsensn_f , & @@ -2124,15 +2091,12 @@ subroutine icepack_step_therm1(dt, ncat, nilyr, nslyr, n_aero, & fswthru , & ! shortwave penetrating to ocean (W/m^2) fsurf , & ! net surface heat flux (excluding fcondtop)(W/m^2) fcondtop , & ! top surface conductive flux (W/m^2) - fcondbot , & ! bottom surface conductive flux (W/m^2) fsens , & ! sensible heat flux (W/m^2) flat , & ! latent heat flux (W/m^2) fswabs , & ! shortwave flux absorbed in ice and ocean (W/m^2) flw , & ! incoming longwave radiation (W/m^2) flwout , & ! outgoing longwave radiation (W/m^2) evap , & ! evaporative water flux (kg/m^2/s) - evaps , & ! evaporative water flux over snow (kg/m^2/s) - evapi , & ! evaporative water flux over ice (kg/m^2/s) congel , & ! basal ice growth (m/step-->cm/day) snoice , & ! snow-ice formation (m/step-->cm/day) Tref , & ! 2m atm reference temperature (K) @@ -2165,8 +2129,6 @@ subroutine icepack_step_therm1(dt, ncat, nilyr, nslyr, n_aero, & rside , & ! fraction of ice that melts laterally sst , & ! sea surface temperature (C) Tf , & ! freezing temperature (C) - Tbot , & ! ice bottom surface temperature (deg C) - Tsnice , & ! snow ice interface temperature (deg C) sss , & ! sea surface salinity (ppt) meltt , & ! top ice melt (m/step-->cm/day) melts , & ! snow melt (m/step-->cm/day) @@ -2191,7 +2153,6 @@ subroutine icepack_step_therm1(dt, ncat, nilyr, nslyr, n_aero, & FY , & ! area-weighted first-year ice area fsurfn , & ! net flux to top surface, excluding fcondtop fcondtopn , & ! downward cond flux at top surface (W m-2) - fcondbotn , & ! downward cond flux at bottom surface (W m-2) flatn , & ! latent heat flux (W m-2) fsensn , & ! sensible heat flux (W m-2) fsurfn_f , & ! net flux to top surface, excluding fcondtop @@ -2236,8 +2197,6 @@ subroutine icepack_step_therm1(dt, ncat, nilyr, nslyr, n_aero, & fswabsn , & ! shortwave absorbed by ice (W/m^2) flwoutn , & ! upward LW at surface (W/m^2) evapn , & ! flux of vapor, atmos to ice (kg m-2 s-1) - evapsn , & ! flux of vapor, atmos to ice over snow (kg m-2 s-1) - evapin , & ! flux of vapor, atmos to ice over ice (kg m-2 s-1) freshn , & ! flux of water, ice to ocean (kg/m^2/s) fsaltn , & ! flux of salt, ice to ocean (kg/m^2/s) fhocnn , & ! fbot corrected for leftover energy (W/m^2) @@ -2247,6 +2206,7 @@ subroutine icepack_step_therm1(dt, ncat, nilyr, nslyr, n_aero, & Trefn , & ! air tmp reference level (K) Urefn , & ! air speed reference level (m/s) Qrefn , & ! air sp hum reference level (kg/kg) + Tbot , & ! ice bottom surface temperature (deg C) shcoef , & ! transfer coefficient for sensible heat lhcoef , & ! transfer coefficient for latent heat rfrac ! water fraction retained for melt ponds @@ -2405,15 +2365,13 @@ subroutine icepack_step_therm1(dt, ncat, nilyr, nslyr, n_aero, & Qa, rhoa, & fsnow, fpond, & fbot, Tbot, & - Tsnice, sss, & + sss, & lhcoef, shcoef, & fswsfcn (n), fswintn (n), & Sswabsn(:,n), Iswabsn(:,n), & fsurfn (n), fcondtopn(n), & - fcondbotn(n), & fsensn (n), flatn (n), & flwoutn, evapn, & - evapsn, evapin, & freshn, fsaltn, & fhocnn, & melttn (n), meltsn (n), & @@ -2529,22 +2487,18 @@ subroutine icepack_step_therm1(dt, ncat, nilyr, nslyr, n_aero, & strairxn, strairyn, & Cdn_atm_ratio_n, & fsurfn(n), fcondtopn(n), & - fcondbotn(n), & fsensn(n), flatn(n), & fswabsn, flwoutn, & evapn, & - evapsn, evapin, & Trefn, Qrefn, & freshn, fsaltn, & fhocnn, fswthrun(n), & strairxT, strairyT, & Cdn_atm_ratio, & fsurf, fcondtop, & - fcondbot, & fsens, flat, & fswabs, flwout, & evap, & - evaps, evapi, & Tref, Qref, & fresh, fsalt, & fhocn, fswthru, & diff --git a/configuration/driver/icedrv_flux.F90 b/configuration/driver/icedrv_flux.F90 index 4cbd7388e..f1117edba 100644 --- a/configuration/driver/icedrv_flux.F90 +++ b/configuration/driver/icedrv_flux.F90 @@ -141,9 +141,7 @@ module icedrv_flux Tref , & ! 2m atm reference temperature (K) Qref , & ! 2m atm reference spec humidity (kg/kg) Uref , & ! 10m atm reference wind speed (m/s) - evap , & ! evaporative water flux (kg/m^2/s) - evaps , & ! evaporative water flux over snow (kg/m^2/s) - evapi ! evaporative water flux over ice (kg/m^2/s) + evap ! evaporative water flux (kg/m^2/s) ! albedos aggregated over categories (if calc_Tsfc) real (kind=dbl_kind), dimension(nx), public :: & @@ -220,10 +218,7 @@ module icedrv_flux real (kind=dbl_kind), dimension (nx), public :: & fsurf , & ! net surface heat flux (excluding fcondtop)(W/m^2) fcondtop,&! top surface conductive flux (W/m^2) - fcondbot,&! bottom surface conductive flux (W/m^2) fbot, & ! heat flux at bottom surface of ice (excluding excess) (W/m^2) - Tbot, & ! Temperature at bottom surface of ice (deg C) - Tsnice, & ! Temperature at snow ice interface (deg C) congel, & ! basal ice growth (m/step-->cm/day) frazil, & ! frazil ice growth (m/step-->cm/day) snoice, & ! snow-ice formation (m/step-->cm/day) @@ -243,7 +238,6 @@ module icedrv_flux dimension (nx,ncat), public :: & fsurfn, & ! category fsurf fcondtopn,& ! category fcondtop - fcondbotn,& ! category fcondbot fsensn, & ! category sensible heat flux flatn ! category latent heat flux @@ -495,8 +489,6 @@ subroutine init_coupler_flux flwout (:) = -stefan_boltzmann*Tffresh**4 ! in case atm model diagnoses Tsfc from flwout evap (:) = c0 - evaps (:) = c0 - evapi (:) = c0 Tref (:) = c0 Qref (:) = c0 Uref (:) = c0 @@ -564,8 +556,6 @@ subroutine init_flux_atm_ocn fswabs (:) = c0 flwout (:) = c0 evap (:) = c0 - evaps (:) = c0 - evapi (:) = c0 Tref (:) = c0 Qref (:) = c0 Uref (:) = c0 @@ -624,7 +614,6 @@ subroutine init_history_therm fsurf (:) = c0 fcondtop(:)= c0 - fcondbot(:)= c0 congel (:) = c0 frazil (:) = c0 snoice (:) = c0 @@ -642,7 +631,6 @@ subroutine init_history_therm endif fsurfn (:,:) = c0 fcondtopn (:,:) = c0 - fcondbotn (:,:) = c0 flatn (:,:) = c0 fsensn (:,:) = c0 fpond (:) = c0 diff --git a/configuration/driver/icedrv_step.F90 b/configuration/driver/icedrv_step.F90 index 2b7c6d7b7..42b156276 100644 --- a/configuration/driver/icedrv_step.F90 +++ b/configuration/driver/icedrv_step.F90 @@ -104,14 +104,14 @@ subroutine step_therm1 (dt) use icedrv_arrays_column, only: fswsfcn, fswintn, fswthrun, Sswabsn, Iswabsn use icedrv_calendar, only: yday use icedrv_domain_size, only: ncat, nilyr, nslyr, n_aero, nx - use icedrv_flux, only: frzmlt, sst, Tf, strocnxT, strocnyT, rside, fbot, Tbot, Tsnice + use icedrv_flux, only: frzmlt, sst, Tf, strocnxT, strocnyT, rside, fbot use icedrv_flux, only: meltsn, melttn, meltbn, congeln, snoicen, uatm, vatm use icedrv_flux, only: wind, rhoa, potT, Qa, zlvl, strax, stray, flatn - use icedrv_flux, only: fsensn, fsurfn, fcondtopn, fcondbotn + use icedrv_flux, only: fsensn, fsurfn, fcondtopn use icedrv_flux, only: flw, fsnow, fpond, sss, mlt_onset, frz_onset use icedrv_flux, only: frain, Tair, strairxT, strairyT, fsurf - use icedrv_flux, only: fcondtop, fcondbot, fsens, fresh, fsalt, fhocn - use icedrv_flux, only: flat, fswabs, flwout, evap, evaps, evapi, Tref, Qref, Uref + use icedrv_flux, only: fcondtop, fsens, fresh, fsalt, fhocn + use icedrv_flux, only: flat, fswabs, flwout, evap, Tref, Qref, Uref use icedrv_flux, only: fswthru, meltt, melts, meltb, congel, snoice use icedrv_flux, only: flatn_f, fsensn_f, fsurfn_f, fcondtopn_f use icedrv_flux, only: dsnown, faero_atm, faero_ocn @@ -263,14 +263,12 @@ subroutine step_therm1 (dt) potT (i), sst (i), & sss (i), Tf (i), & strocnxT (i), strocnyT (i), & - fbot (i), & - Tbot (i), Tsnice (i), & + fbot (i), & frzmlt (i), rside (i), & fsnow (i), frain (i), & fpond (i), & fsurf (i), fsurfn (i,:), & fcondtop (i), fcondtopn (i,:), & - fcondbot (i), fcondbotn (i,:), & fswsfcn (i,:), fswintn (i,:), & fswthrun (i,:), fswabs (i), & flwout (i), & @@ -279,7 +277,6 @@ subroutine step_therm1 (dt) fsens (i), fsensn (i,:), & flat (i), flatn (i,:), & evap (i), & - evaps (i), evapi (i), & fresh (i), fsalt (i), & fhocn (i), fswthru (i), & flatn_f (i,:), fsensn_f (i,:), &