added fixed implementation of fixed hypsometry

ESCOMP · Jan 13, 2025 · b819e42 · b819e42
1 parent bc8fa22
commit b819e42
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3,703 deletions.
diff --git a/columnphysics/icepack_meltpond_sealvl.F90 b/columnphysics/icepack_meltpond_sealvl.F90
@@ -390,7 +390,16 @@ subroutine pond_hypsometry(hpnd, apnd, dhpond, dvpond, hin)
          apnd = c0
          hpnd = c0
       else
-         pndasp = calc_pndasp(hin)
+         if (trim(pndhyps) == 'sealevel') then
+            pndasp = calc_pndasp(hin)
+         elseif (trim(pndhyps) == 'fixed') then
+            pndasp = pndaspect
+         else
+            call icepack_warnings_add(subname// &
+               " unsupported pndhyps option" )
+            call icepack_warnings_setabort(.true.,__FILE__,__LINE__)
+            if (icepack_warnings_aborted(subname)) return
+         endif
          apnd = sqrt(vp/pndasp)
          ! preserve pond volume if pond fills all available area
          hpnd = c0

diff --git a/columnphysics/icepack_therm_mushy.F90 b/columnphysics/icepack_therm_mushy.F90
@@ -12,7 +12,6 @@ module icepack_therm_mushy
   use icepack_parameters, only: sw_redist, sw_frac, sw_dtemp
   use icepack_parameters, only: pndmacr
   use icepack_tracers, only: nilyr, nslyr, tr_pond
-  use icepack_parameters, only: pndmacr
   use icepack_mushy_physics, only: icepack_mushy_density_brine, enthalpy_brine, icepack_enthalpy_snow
   use icepack_mushy_physics, only: enthalpy_mush_liquid_fraction
   use icepack_mushy_physics, only: icepack_mushy_temperature_mush, icepack_mushy_liquid_fraction
@@ -192,7 +191,7 @@ subroutine temperature_changes_salinity(dt,                 &
     call flushing_velocity(zTin,   phi,   &
                            hin,    hsn,   &
                            hilyr,         &
-                           hpond,  apond,  &
+                           hpond,  apond, &
                            dt,     w)
     if (icepack_warnings_aborted(subname)) return