From e3a9714cc37333b95e813ffa2cf8a52d9a246236 Mon Sep 17 00:00:00 2001
From: Elizabeth Hunke <eclare@lanl.gov>
Date: Mon, 12 Feb 2018 15:35:38 -0700
Subject: [PATCH] changes to default settings and interpolation bug fix (#163)

---
 configuration/driver/icedrv_forcing.F90     | 6 +++++-
 configuration/scripts/icepack_in            | 4 ++--
 configuration/scripts/options/set_nml.SHEBA | 2 --
 configuration/scripts/options/set_nml.alt01 | 3 ++-
 configuration/scripts/tests/base_suite.ts   | 2 ++
 5 files changed, 11 insertions(+), 6 deletions(-)
 delete mode 100644 configuration/scripts/options/set_nml.SHEBA

diff --git a/configuration/driver/icedrv_forcing.F90 b/configuration/driver/icedrv_forcing.F90
index 31eabea55..ca5a5af91 100644
--- 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
index d9ad0b156..609d9aa4f 100644
--- 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
deleted file mode 100644
index 9967f412d..000000000
--- a/configuration/scripts/options/set_nml.SHEBA
+++ /dev/null
@@ -1,2 +0,0 @@
-npt = 8760
-ocn_data_type = "SHEBA"
diff --git a/configuration/scripts/options/set_nml.alt01 b/configuration/scripts/options/set_nml.alt01
index 017e0e5b4..cdeb3597c 100644
--- 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
index 5bf995d7a..05f6d24bb 100644
--- 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