correct ks units, clean up comments, bug fix for BL99 enthalpy calcul…

…ation (#476) * correct ks units, clean up comments, big fix for BL99 enthalpy calculation * make it pretty
CICE-Consortium · Nov 14, 2023 · b129416 · b129416
1 parent d1a42fb
commit b129416
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 39 deletions.
diff --git a/columnphysics/icepack_mechred.F90 b/columnphysics/icepack_mechred.F90
@@ -68,7 +68,6 @@ module icepack_mechred
          Gstar  = p15     , & ! max value of G(h) that participates
                               ! (krdg_partic = 0)
          astar  = p05     , & ! e-folding scale for G(h) participation
-!echmod         astar  = p1        , & ! e-folding scale for G(h) participation
                               ! (krdg_partic = 1)
          maxraft= c1      , & ! max value of hrmin - hi = max thickness
                               ! of ice that rafts (m)

diff --git a/columnphysics/icepack_shortwave.F90 b/columnphysics/icepack_shortwave.F90
@@ -1844,7 +1844,7 @@ subroutine compute_dEdd_3bd(                           &
          delr    , & ! snow grain radius interpolation parameter
       ! inherent optical properties (iop) for snow
          Qs      , & ! Snow extinction efficiency
-         ks      , & ! Snow mass extinction coefficient (m^2/kg)  ! echmod - CHECK units and usage
+         ks      , & ! Snow mass extinction coefficient (1/m)
          ws      , & ! Snow single scattering albedo
          gs          ! Snow asymmetry parameter
 

diff --git a/columnphysics/icepack_shortwave_data.F90 b/columnphysics/icepack_shortwave_data.F90
@@ -448,14 +448,6 @@ subroutine icepack_shortwave_init_dEdd5band
 
       character (len=*),parameter :: subname='(icepack_shortwave_init_dEdd5band)'
 
-      ! 5-bands ice surface scattering layer (ssl) iops to match SNICAR calculations
-      ! note by Cheng Dang:
-      ! for now these data are not needed since the sea ice layer IOPs can be directly
-      ! assigned based on the 3 bands data after adjustment based on tuning parameter R_ice
-      ! In the future, when 5-band sea ice IOPs are available, these data shall be updated
-      ! and the sea ice layer IOPs shall be calculated based on updated 5band iops*
-!echmod - the comment above says these are not needed but they are nevertheless used below
-      !
       ! The 5band data given in this section are based on CICE and SNICAR band choice:
       ! SNICAR band 1 = CICE band 1
       ! SNICAR band 2 + SNICAR band 3 = CICE band 2

diff --git a/columnphysics/icepack_therm_itd.F90 b/columnphysics/icepack_therm_itd.F90
@@ -2293,7 +2293,6 @@ subroutine icepack_step_therm2 (dt, ncat, nltrcr,           &
       ! thickness, and the other half decreases the area).
       !-----------------------------------------------------------------
 
-!echmod: test this
       if (ncat==1) &
          call reduce_area (hin_max   (0),                &
                            aicen     (1), vicen     (1), &

diff --git a/columnphysics/icepack_therm_vertical.F90 b/columnphysics/icepack_therm_vertical.F90
@@ -962,21 +962,18 @@ subroutine init_vertical_profile(nilyr,    nslyr,    &
       !-----------------------------------------------------------------
 
          if (ktherm /= 2) then
-
             if (zTin(k) > c0) then
-               zTin(k) = c0
-               zqin(k) = -rhoi*Lfresh
+                zTin(k) = c0
+                zqin(k) = -rhoi*Lfresh
             endif
-
          endif
 
-! echmod: is this necessary?
-!         if (ktherm == 1) then
-!               if (zTin(k)>= -zSin(k)*depressT) then
-!                   zTin(k) = -zSin(k)*depressT - puny
-!                   zqin(k) = -rhoi*cp_ocn*zSin(k)*depressT
-!               endif
-!         endif
+         if (ktherm == 1) then
+            if (zTin(k)>= -zSin(k)*depressT) then
+                zTin(k) = -zSin(k)*depressT - puny
+                zqin(k) = -zSin(k)*depressT*rhoi*cp_ocn
+            endif
+         endif
 
       !-----------------------------------------------------------------
       ! initial energy per unit area of ice/snow, relative to 0 C
@@ -2495,22 +2492,6 @@ subroutine icepack_step_therm1(dt, ncat, nilyr, nslyr,    &
          fsnow    =           fsnow*(c1-worka)
       endif ! snwredist
 
-!echmod - remove all of this code - non-BFB because of values carried in tracer arrays when the snow physics options are not active
-      !-----------------------------------------------------------------
-      ! solid and liquid components of snow mass
-      !-----------------------------------------------------------------
-!      massicen(:,:) = c0
-!      massliqn(:,:) = c0
-!      if (snwgrain) then
-!         rnslyr = c1 / real(nslyr, dbl_kind)
-!         do n = 1, ncat
-!            do k = 1, nslyr
-!               massicen(k,n) = smicen(k,n) * vsnon(n) * rnslyr ! kg/m^2
-!               massliqn(k,n) = smliqn(k,n) * vsnon(n) * rnslyr
-!            enddo
-!         enddo
-!      endif
-
       !-----------------------------------------------------------------
       ! Update the neutral drag coefficients to account for form drag
       ! Oceanic and atmospheric drag coefficients

diff --git a/configuration/driver/icedrv_step.F90 b/configuration/driver/icedrv_step.F90
@@ -237,7 +237,6 @@ subroutine step_therm1 (dt)
       enddo ! i
 
       do i = 1, nx
-!echmod            do i = 3,3
         if (tr_aero) then
           ! trcrn(nt_aero) has units kg/m^3
           do n = 1, ncat