changes to default settings and interpolation bug fix (#163)

CICE-Consortium · Feb 12, 2018 · e3a9714 · e3a9714
1 parent 48240c0
commit e3a9714
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/configuration/driver/icedrv_forcing.F90 b/configuration/driver/icedrv_forcing.F90
@@ -811,7 +811,11 @@ subroutine interp_coeff (recnum, recslot, secint, dataloc, &
       character(len=*), parameter :: subname='(interp_coeff)'
 
       secyr = dayyr * secday         ! seconds in a year
-      tt = mod(time-offset,secyr)
+      if (present(offset)) then
+         tt = mod(time-offset,secyr)
+      else
+         tt = mod(time,secyr)
+      endif
 
       ! Find neighboring times
       rcnum = real(recnum,kind=dbl_kind)

diff --git a/configuration/scripts/icepack_in b/configuration/scripts/icepack_in
@@ -22,7 +22,7 @@
 &tracer_nml
     tr_iage      = .false.
     tr_FY        = .false.
-    tr_lvl       = .false.
+    tr_lvl       = .true.
     tr_pond_cesm = .false.
     tr_pond_topo = .false.
     tr_pond_lvl  = .true.
@@ -239,7 +239,7 @@
     precip_units    = 'mks'
     default_season  = 'spring'
     atm_data_type   = 'clim'
-    ocn_data_type   = 'default'
+    ocn_data_type   = 'SHEBA'
     bgc_data_type   = 'default'
     fyear_init      = 2015
     ycycle          = 1

diff --git a/configuration/scripts/options/set_nml.SHEBA b/configuration/scripts/options/set_nml.SHEBA
diff --git a/configuration/scripts/options/set_nml.alt01 b/configuration/scripts/options/set_nml.alt01
@@ -7,8 +7,9 @@ albedo_type = 'constant'
 tfrz_option = 'minus1p8'
 default_season = 'fall'
 atm_data_type = 'default'
+ocn_data_type = 'default'
 formdrag = .true.
-tr_lvl = .true.
+tr_lvl = .false.
 tr_pond_cesm = .false.
 tr_pond_topo = .false.
 tr_pond_lvl  = .false.
diff --git a/configuration/scripts/tests/base_suite.ts b/configuration/scripts/tests/base_suite.ts
@@ -2,6 +2,7 @@
 smoke          col     1x1        diag1,run1year
 smoke          col     1x1        debug,run1year
 smoke          col     1x1        debug,bgcISPOL
+smoke          col     1x1        debug,bgcNICE
 smoke          col     1x1        debug,run1year,thermo1
 smoke          col     1x1        debug,run1year,swccsm3
 smoke          col     1x1        debug,run1year,alt01
@@ -13,6 +14,7 @@ restart        col     1x1        pondcesm
 restart        col     1x1        pondlvl
 restart        col     1x1        pondtopo
 restart        col     1x1        bgcISPOL
+restart        col     1x1        bgcNICE
 restart        col     1x1        thermo1
 restart        col     1x1        swccsm3
 restart        col     1x1        alt01