noresm3_0_031_cam6_4_121: refactor nudging code to use CDEPS

bld/namelist_files/namelist_definition.xml

@@ -220,67 +220,100 @@
        Default: FALSE
        </entry>
 
-<entry id="Nudge_Path" type="char*256" input_pathname="abs" category="nudging"
+<entry id="Nudge_Datapath" type="char*256" category="nudging"
        group="nudging_nl" valid_values="" >
-       Full pathname of analyses data to use for nudging.
-        (e.g. '/$DIN_LOC_ROOT/atm/cam/nudging/')
+       Full pathname of datapath where Nudge_Filenames are located.
        Default: none
        </entry>
 
-<entry id="Nudge_File_Template" type="char*80" category="nudging"
+<entry id="Nudge_Filenames" type="char*256(100)" category="nudging"
        group="nudging_nl" valid_values="" >
-       Template for Nudging analyses file names.
-        (e.g. '%y/ERAI_ne30np4_L30.cam2.i.%y-%m-%d-%s.nc')
+       Filenames of analyses data to use for nudging.
        Default: none
        </entry>
 
-<entry id="Nudge_Times_Per_Day" type="integer" category="nudging"
+<entry id="Nudge_Meshfile" type="char*256" category="nudging"
        group="nudging_nl" valid_values="" >
-       Number of analyses files per day.
-        (e.g. 4 --> 6 hourly analyses)
+       ESMF mesh file that corresponds to the nudging files
        Default: none
        </entry>
 
-<entry id="Model_Times_Per_Day" type="integer" category="nudging"
+<entry id="Nudge_Data_Year_First" type="integer" category="nudging"
+       group="nudging_nl" valid_values="" >
+       First year of nudging data to use.
+       Default: none
+       </entry>
+
+<entry id="Nudge_Data_Year_Last" type="integer" category="nudging"
+       group="nudging_nl" valid_values="" >
+       Last year of nudging data to use.
+       Default: none
+       </entry>
+
+<entry id="Nudge_Data_Year_Align" type="integer" category="nudging"
+       group="nudging_nl" valid_values="" >
+       Model (simulation) year to align with Nudge_Data_Year_First.
+       Default: none
+       </entry>
+
+<entry id="Nudge_Data_Mapalgo" type="char*256" category="nudging"
+       group="nudging_nl" valid_values="bilinear,consf" >
+       Mapping algorithm to map nudge data to model grid.
+       Default: bilinear
+       </entry>
+
+<entry id="Nudge_Data_Taxmode" type="char*256" category="nudging"
+       group="nudging_nl" valid_values="limit,extend" >
+       Time extrapolation mode for time interpolation.
+       Default: limit
+       </entry>
+
+<entry id="Nudge_Data_levname" type="char*256" category="nudging"
+       group="nudging_nl" valid_values="" >
+       Name of vertical variable in Nudge_filenames.
+       Default: lev
+       </entry>
+
+<entry id="Model_Update_Times_Per_Day" type="integer" category="nudging"
        group="nudging_nl" valid_values="" >
        Number of time to update model data per day.
         (e.g. 48 --> 1800 Second timestep)
-       Default: none
+       Default: 6
        </entry>
 
 <entry id="Nudge_Beg_Year" type="integer" category="nudging"
        group="nudging_nl" valid_values="" >
-       Year at which Nudging Begins.
+       Model year at which nudging begins.
        Default: none
        </entry>
 
 <entry id="Nudge_Beg_Month" type="integer" category="nudging"
        group="nudging_nl" valid_values="" >
-       Month at which Nudging Begins.
+       Model month at which nudging begins.
        Default: none
        </entry>
 
 <entry id="Nudge_Beg_Day" type="integer" category="nudging"
        group="nudging_nl" valid_values="" >
-       Day at which Nudging Begins.
+       Model day at which nudging begins.
        Default: none
        </entry>
 
 <entry id="Nudge_End_Year" type="integer" category="nudging"
        group="nudging_nl" valid_values="" >
-       Year at which Nudging Ends.
+       Model year at which nudging ends.
        Default: none
        </entry>
 
 <entry id="Nudge_End_Month" type="integer" category="nudging"
        group="nudging_nl" valid_values="" >
-       Month at which Nudging Ends.
+       Model month at which nudging ends.
        Default: none
        </entry>
 
 <entry id="Nudge_End_Day" type="integer" category="nudging"
        group="nudging_nl" valid_values="" >
-       Day at which Nudging Ends.
+       Model day at which nudging ends.
        Default: none
        </entry>
 

cime_config/testdefs/testlist_cam.xml

@@ -135,4 +135,24 @@
     </options>
   </test>
 
+  <test compset="NF1850" grid="ne16pg3_ne16pg3_mtn14" name="REP_Ld3" testmods="cam/nudging">
+    <machines>
+      <machine name="betzy" compiler="intel" category="aux_cam_noresm"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:35:00</option>
+      <option name="comment">Test of CAM nudging</option>
+    </options>
+  </test>
+
+  <test compset="NF1850" grid="ne16pg3_ne16pg3_mtn14" name="ERS_Ln9" testmods="cam/nudging">
+    <machines>
+      <machine name="betzy" compiler="intel" category="aux_cam_noresm"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment">Test of CAM nudging</option>
+    </options>
+  </test>
+
 </testlist>

cime_config/testdefs/testmods_dirs/cam/nudging/shell_commands

@@ -3,4 +3,5 @@ if [ "$driver" = "nuopc" ]; then
   ./xmlchange ROF_NCPL=\$ATM_NCPL
   ./xmlchange GLC_NCPL=\$ATM_NCPL
 fi
-./xmlchange RUN_STARTDATE=2009-01-01
+./xmlchange RUN_STARTDATE=0001-01-01
+./xmlchange CALENDAR=GREGORIAN

cime_config/testdefs/testmods_dirs/cam/nudging/user_nl_cam

@@ -1,52 +1,36 @@
 ! Users should add all user specific namelist changes below in the form of 
 ! namelist_var = new_namelist_value 
-
-&cam_inparm
- fincl1='U','V','T','Q','PS','Nudge_U','Nudge_V','Nudge_T','Nudge_Q'
- fincl2='U','V','T','Q','PS','Nudge_U','Nudge_V','Nudge_T','Nudge_Q'
- fincl3='U','V','T','Q','PS','Nudge_U','Nudge_V','Nudge_T','Nudge_Q','Target_U','Target_V','Target_T','Target_Q'
- nhtfrq=0,-6,1
- mfilt =1,4,48
- write_nstep0 = .true.
-
- ncdata='$DIN_LOC_ROOT/atm/cam/nudging/ERAI_fv09_BILIN/ERAI_fv09_DART2.cam2.i.2009-01-01-00000.nc'
-/
+fincl1='U','V','T','Q','PS','Nudge_U','Nudge_V'
+fincl2='U','V','T','Q','PS','Nudge_U','Nudge_V'
+fincl3='U','V','T','Q','PS','Nudge_U','Nudge_V','Target_U','Target_V'
+nhtfrq=0,-6,1
+mfilt =1,4,48
+interpolate_nlat   = 96, 96, 96
+interpolate_nlon   = 144, 144, 144
+interpolate_output = .true., .true., .true. 
 
-&nudging_nl
- Nudge_Model        =.true.
- Nudge_Path         ='$DIN_LOC_ROOT/atm/cam/nudging/ERAI_fv09_BILIN/'
- Nudge_File_Template='ERAI_fv09_DART2.cam2.i.%y-%m-%d-%s.nc'
- Nudge_Force_Opt     = 1
- Nudge_TimeScale_Opt = 0
- Nudge_Times_Per_Day=4
- Model_Times_Per_Day=48
- Nudge_Uprof  =1
- Nudge_Ucoef  =1.00
- Nudge_Vprof  =1
- Nudge_Vcoef  =1.00
- Nudge_Tprof  =1
- Nudge_Tcoef  =1.00
- Nudge_Qprof  =0
- Nudge_Qcoef  =0.00
- Nudge_PSprof =0
- Nudge_PScoef =0.00
- Nudge_Beg_Year =2008
- Nudge_Beg_Month=12
- Nudge_Beg_Day  =16
- Nudge_End_Year =2009
- Nudge_End_Month=4
- Nudge_End_Day  =5
- Nudge_Hwin_lat0    =46.0
- Nudge_Hwin_latWidth=20.0
- Nudge_Hwin_latDelta=2.0
- Nudge_Hwin_lon0    =180.
- Nudge_Hwin_lonWidth=30.
- Nudge_Hwin_lonDelta=5.
- Nudge_Hwin_Invert  =.false.
- Nudge_Vwin_Hindex  =22.
- Nudge_Vwin_Hdelta  =1.0
- Nudge_Vwin_Lindex  =5.
- Nudge_Vwin_Ldelta  =1.0
- Nudge_Vwin_Invert  =.false.
-/
+Nudge_Model = .true.
+Nudge_Filenames = 'era5_UVPS_58levels_201801.nc',
+                'era5_UVPS_58levels_201802.nc',
+                'era5_UVPS_58levels_201803.nc'
 
+Nudge_Datapath = '$DIN_LOC_ROOT/noresm-only/inputForNudging/era5_UVPS_58levels_2018-2020/'
+Nudge_Meshfile  = '$DIN_LOC_ROOT/noresm-only/inputForNudging/era5_UVPS_ESMF_Mesh_cdf5.nc'
+Nudge_Data_Taxmode = 'limit'
+Nudge_Beg_Year = 1
+Nudge_Beg_Month = 1
+Nudge_Beg_Day = 1
+Nudge_End_Day = 31
+Nudge_End_Month = 12
+Nudge_End_Year = 2
+Nudge_Data_Year_Align = 1
+Nudge_Data_Year_First = 2018
+Nudge_Data_Year_Last = 2018
+Model_Update_Times_Per_Day = 48
+Nudge_Force_Opt = 1
+Nudge_Uprof     = 1
+Nudge_Ucoef     = 1.0
+Nudge_Vprof     = 1
+Nudge_Vcoef     = 1.0
+
+