Merge pull request E3SM-Project#7 from darincomeau/darincomeau/seaice…

…-cf-fix Removed Cf from sea ice constants
apcraig · Mar 18, 2022 · f2eb832 · f2eb832
2 parents 586b00a + c2ad1a8
commit f2eb832
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/components/mpas-seaice/src/column/constants/cesm/ice_constants_colpkg.F90 b/components/mpas-seaice/src/column/constants/cesm/ice_constants_colpkg.F90
@@ -67,7 +67,6 @@ module ice_constants_colpkg
          cprho    = cp_ocn*rhow       ,&! for ocean mixed layer (J kg / K m^3)
 
          ! for ice strength
-         Cf       = 17._dbl_kind      ,&! ratio of ridging work to PE change in ridging 
          Cp       = 0.5_dbl_kind*gravit*(rhow-rhoi)*rhoi/rhow ,&! proport const for PE 
          Pstar    = 2.75e4_dbl_kind   ,&! constant in Hibler strength formula 
                                         ! (kstrength = 0) 

diff --git a/components/mpas-seaice/src/column/constants/cice/ice_constants_colpkg.F90 b/components/mpas-seaice/src/column/constants/cice/ice_constants_colpkg.F90
@@ -55,7 +55,6 @@ module ice_constants_colpkg
          cprho    = cp_ocn*rhow       ,&! for ocean mixed layer (J kg / K m^3)
 
          ! for ice strength
-         Cf       = 17._dbl_kind      ,&! ratio of ridging work to PE change in ridging 
          Cp       = 0.5_dbl_kind*gravit*(rhow-rhoi)*rhoi/rhow ,&! proport const for PE 
          Pstar    = 2.75e4_dbl_kind   ,&! constant in Hibler strength formula 
                                         ! (kstrength = 0) 

diff --git a/components/mpas-seaice/src/column/ice_colpkg.F90 b/components/mpas-seaice/src/column/ice_colpkg.F90
@@ -3501,8 +3501,9 @@ subroutine colpkg_ice_strength (ncat,               &
                                       vicen,    &
                                       strength)
 
-      use ice_constants_colpkg, only: p333, c0, c1, c2, Cf, Cp, Pstar, Cstar, &
+      use ice_constants_colpkg, only: p333, c0, c1, c2, Cp, Pstar, Cstar, &
           rhoi, puny
+      use ice_colpkg_shared, only: Cf
       use ice_mechred, only: asum_ridging, ridge_itd
 
       integer (kind=int_kind), intent(in) :: &