new CDEPS stream capability to read in forcing files needed by HAMOCC

cesm/mod_cesm.F90

@@ -33,7 +33,7 @@ module mod_cesm
                              lamult, lasl, ustokes, vstokes, atmco2, atmbrf, &
                              flxdms, flxbrf, &
                              atmn2o, atmnh3, atmnhxdep, atmnoydep, &
-                             use_stream_relaxation
+                             use_nuopc_relaxation, use_nuopc_swaclim
    use mod_ben02,      only: initai, rdcsic, rdctsf, fnlzai
    use mod_rdcsss,     only: rdcsss
    use mod_idarlx,     only: idarlx
@@ -130,7 +130,7 @@ end subroutine inicon_cesm
    subroutine inifrc_cesm
 
       ! If not using NUOPC stream capability
-      if (.not. use_stream_relaxation) then
+      if (.not. use_nuopc_relaxation) then
          ! If SST restoring is requested prepare interpolation and
          ! read climatological sea-ice concentration and surface temperature.
          if (trxday > 0._r8) then

cesm/mod_thermf_cesm.F90

@@ -38,7 +38,7 @@ module mod_thermf_cesm
                            sswflx, salflx, brnflx, salrlx, ustar, &
                            t_rs_nonloc, s_rs_nonloc, &
                            sss_stream, sst_stream, ice_stream, &
-                           use_stream_relaxation
+                           use_nuopc_relaxation
   use mod_cesm,      only: hmlt, frzpot, mltpot
   use mod_utility,   only: util1, util2, util3, util4
   use mod_checksum,  only: csdiag, chksummsk
@@ -200,7 +200,7 @@ subroutine thermf_cesm(m,n,mm,nn,k1m,k1n)
           ! If  trxday>0 , apply relaxation towards observed sst
           if (trxday > epsilt ) then
 
-            if (use_stream_relaxation) then
+            if (use_nuopc_relaxation) then
                sstc = sst_stream(i,j)
                rice = ice_stream(i,j)
                sstc = (1.-rice)*max(sstc,tice_f) + rice*tice_f
@@ -261,7 +261,7 @@ subroutine thermf_cesm(m,n,mm,nn,k1m,k1n)
 
           ! if  srxday>0 , apply relaxation towards observed sss
           if (srxday > epsilt ) then
-            if (use_stream_relaxation) then
+            if (use_nuopc_relaxation) then
                sssc = sss_stream(i,j)
             else
                sssc = intp1d(sssclm(i,j,l1mi),sssclm(i,j,l2mi), &

cime_config/buildnml

@@ -256,7 +256,8 @@ def buildnml(case, caseroot, compname):
         namelist_file += inst_string
 
         # Create BLOM namelist
-        groups=['limits','diffusion','merdia','secdia','diaphy','stream_sss','stream_sst' ]
+        groups=['limits','diffusion','merdia','secdia','diaphy',
+        'stream_sss','stream_sst','stream_swaclim','stream_dust','stream_oalk','stream_rivin']
 
         groups.append('cwmod')