From 6a9582243ecafdd0eb38113eeb3fab8111d482cb Mon Sep 17 00:00:00 2001 From: apcraig Date: Tue, 25 Sep 2018 22:47:03 +0000 Subject: [PATCH] Revert "Update to CICE master" This reverts commit 37e0b0967b4b65eb1d509b932786be434e708826, reversing changes made to bbec5d1e167264f210f06a9887644c1be1ff541b. --- cicecore/cicedynB/general/ice_flux.F90 | 4 +++- cicecore/shared/ice_distribution.F90 | 16 ---------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/cicecore/cicedynB/general/ice_flux.F90 b/cicecore/cicedynB/general/ice_flux.F90 index 7a46a4550..51e453d43 100644 --- a/cicecore/cicedynB/general/ice_flux.F90 +++ b/cicecore/cicedynB/general/ice_flux.F90 @@ -443,7 +443,7 @@ subroutine init_coupler_flux uocn (:,:,:) = c0 ! surface ocean currents (m/s) vocn (:,:,:) = c0 frzmlt(:,:,:) = c0 ! freezing/melting potential (W/m^2) - frzmlt_init(:,:,:) = c0 ! freezing/melting potential (W/m^2) +! frzmlt_init(:,:,:) = c0 ! freezing/melting potential (W/m^2) sss (:,:,:) = 34.0_dbl_kind ! sea surface salinity (ppt) do iblk = 1, size(Tf,3) @@ -650,6 +650,7 @@ subroutine init_history_therm fcondtopn (:,:,:,:) = c0 flatn (:,:,:,:) = c0 fsensn (:,:,:,:) = c0 + fpond (:,:,:) = c0 fresh_ai (:,:,:) = c0 fsalt_ai (:,:,:) = c0 fhocn_ai (:,:,:) = c0 @@ -670,6 +671,7 @@ subroutine init_history_therm if (formdrag) then Cdn_atm_rdg (:,:,:) = c0 + Cdn_atm_ratio(:,:,:)= c0 Cdn_atm_floe(:,:,:) = c0 Cdn_atm_pond(:,:,:) = c0 Cdn_atm_skin(:,:,:) = c0 diff --git a/cicecore/shared/ice_distribution.F90 b/cicecore/shared/ice_distribution.F90 index b80f0a5ad..fa49adbc9 100644 --- a/cicecore/shared/ice_distribution.F90 +++ b/cicecore/shared/ice_distribution.F90 @@ -375,24 +375,8 @@ subroutine ice_distributionDestroy(distribution) !---------------------------------------------------------------------- deallocate(distribution%blockLocation, stat=istat) - if (istat > 0) then - call abort_ice( & - 'ice_distributionDestroy: error deallocating blockLocation') - return - endif - deallocate(distribution%blockLocalID , stat=istat) - if (istat > 0) then - call abort_ice( & - 'ice_distributionDestroy: error deallocating blockLocalID') - return - endif deallocate(distribution%blockGlobalID, stat=istat) - if (istat > 0) then - call abort_ice( & - 'ice_distributionDestroy: error deallocating blockGlobalID') - return - endif !-----------------------------------------------------------------------