Addcodecov

columnphysics/icepack_atmo.F90

@@ -585,8 +585,6 @@ subroutine neutral_drag_coeffs (apnd,     hpnd,     &
 
       real (kind=dbl_kind) :: &
          apond    , & ! melt pond fraction of grid cell
-         vpond    , & ! mean melt pond depth over grid cell
-         ipond    , & ! mean melt pond ice depth over grid cell
          ardg     , & ! ridged ice area fraction of grid cell
          vrdg         ! ridged ice mean thickness  
 
@@ -639,20 +637,10 @@ subroutine neutral_drag_coeffs (apnd,     hpnd,     &
 
          ! ponds
          apond = c0
-         vpond = c0
-         ipond = c0
          if (tr_pond) then
             do n = 1,ncat
                ! area of pond per unit area of grid cell 
                apond = apond+apnd(n)*aicen(n)  
-               ! volume of pond per unit area of grid cell
-               vpond = vpond+apnd(n)*hpnd(n)*aicen(n)
-            enddo
-         endif
-         if (tr_pond_lvl .and. tr_pond_topo) then
-            do n = 1,ncat
-               ! volume of lid per unit area of grid cell
-               ipond = ipond+apnd(n)*ipnd(n)*aicen(n)
             enddo
          endif
 

configuration/driver/icedrv_init.F90

@@ -255,6 +255,10 @@ subroutine input_data
          read(nu_nml, nml=setup_nml,iostat=nml_error)
          if (nml_error /= 0) exit
 
+         print*,'Reading grid_nml'
+         read(nu_nml, nml=grid_nml,iostat=nml_error)
+         if (nml_error /= 0) exit
+
          print*,'Reading tracer_nml'
          read(nu_nml, nml=tracer_nml,iostat=nml_error)
          if (nml_error /= 0) exit
@@ -530,6 +534,9 @@ subroutine input_data
          write(nu_diag,*)    ' bgc_data_type             = ', &
                                trim(bgc_data_type)
 
+         if (trim(atm_data_type)=='default') &
+         write(nu_diag,*)    ' default_season            = ', trim(default_season)
+
          write(nu_diag,1010) ' update_ocn_f              = ', update_ocn_f
          write(nu_diag,1010) ' l_mpond_fresh             = ', l_mpond_fresh
          write(nu_diag,1005) ' ustar_min                 = ', ustar_min
@@ -1100,8 +1107,14 @@ subroutine set_state_var (nx, &
       !-----------------------------------------------------------------
 
       i = 2  ! 2-m slab, no snow
-      ainit(3) = c1  ! assumes we are using the default ITD boundaries
-      hinit(3) = c2
+      if (3 <= ncat) then
+         n = 3
+         ainit(n) = c1  ! assumes we are using the default ITD boundaries
+         hinit(n) = c2
+      else
+         ainit(ncat) = c1
+         hinit(ncat) = c2
+      endif
       do n = 1, ncat
          ! ice volume, snow volume
          aicen(i,n) = ainit(n)

configuration/scripts/icepack_in

@@ -16,7 +16,7 @@
 /
 
 &grid_nml
-    kcatbound    = 0
+    kcatbound    = 1
 /
 
 &tracer_nml

configuration/scripts/options/set_env.alt02

@@ -0,0 +1,2 @@
+setenv NICELYR   1         # number of vertical layers in the snow
+setenv NICECAT   1         # number of ice thickness categories

configuration/scripts/options/set_env.alt03

@@ -0,0 +1,2 @@
+setenv NSNWLYR   5         # number of vertical layers in the snow
+

configuration/scripts/options/set_nml.alt02

@@ -0,0 +1,10 @@
+    kcatbound    = -1
+    kitd         = 0
+    tr_pond_lvl  = .false.
+    tr_pond_topo = .false.
+    tr_pond_cesm = .false.
+    ktherm            = 0
+    tfrz_option       = linear_salt
+    conduct           = 'bubbly'
+    default_season  = 'winter'
+    atm_data_type   = 'default'

configuration/scripts/options/set_nml.alt03

@@ -0,0 +1,11 @@
+    kcatbound    = 2
+    tr_pond_lvl  = .false.
+    tr_pond_topo = .true.
+    tr_pond_cesm = .false.
+    ktherm            = 1
+    tfrz_option       = 'linear_salt'
+    conduct           = 'bubbly'
+    restore_ocn     = .true.
+    trestore        = 0
+    atm_data_type   = 'default'
+    default_season  = 'summer'

configuration/scripts/options/set_nml.alt04

@@ -0,0 +1,19 @@
+    days_per_year  = 360
+    dumpfreq       = 'd'
+    kcatbound    = 3
+    tr_pond_lvl  = .true.
+    tr_pond_topo = .false.
+    tr_pond_cesm = .false.
+    frzpnd          = 'cesm'
+    ktherm            = 1
+    tfrz_option       = 'linear_salt'
+    conduct           = 'bubbly'
+    krdg_partic     = 0
+    krdg_redist     = 0
+    calc_Tsfc       = .true.
+    highfreq        = .true.
+    update_ocn_f    = .true.
+    l_mpond_fresh   = .true.
+    restore_ocn     = .true.
+    trestore        = 0
+    atm_data_type   = 'CFS'

configuration/scripts/tests/base_suite.ts

@@ -6,6 +6,9 @@ smoke          col     1x1        debug,bgcNICE
 smoke          col     1x1        debug,run1year,thermo1
 smoke          col     1x1        debug,run1year,swccsm3
 smoke          col     1x1        debug,run1year,alt01
+smoke          col     1x1        debug,run1year,alt02
+smoke          col     1x1        debug,run1year,alt03
+smoke          col     1x1        debug,run1year,alt04
 smoke          col     1x1        debug,run1year,leap,dt30min
 smoke          col     1x1        debug,run1year,dyn
 restart        col     1x1        debug
@@ -18,4 +21,7 @@ restart        col     1x1        bgcNICE
 restart        col     1x1        thermo1
 restart        col     1x1        swccsm3
 restart        col     1x1        alt01
+restart        col     1x1        alt02
+#restart        col     1x1        alt03
+#restart        col     1x1        alt04
 restart        col     1x1        dyn