Merge pull request #31 from ekluzek/upnupopc

Bring updates needed for NUOPC

cime_config/buildlib

@@ -41,6 +41,8 @@ def _build_mosart():
             paths = [ os.path.join(caseroot,"SourceMods","src.mosart"),
                       os.path.join(srcroot,"components","mosart","src","riverroute"),
                       os.path.join(srcroot,"components","mosart","src","cpl",driver)]
+            if driver == 'nuopc':
+                paths.append(os.path.join(srcroot,"cime","src","drivers","nuopc","nuopc_cap_share"))
 
             with open(filepath_file, "w") as filepath:
                 filepath.write("\n".join(paths))

cime_config/namelist_definition_mosart.xml

@@ -167,7 +167,7 @@
     <values>
       <value rof_grid="r05"        >$DIN_LOC_ROOT/rof/mosart/MOSART_routing_Global_0.5x0.5_c170601.nc</value>
       <value rof_grid="r8th"       >$DIN_LOC_ROOT/rof/mosart/MOSART_Global_8th_20191007.nc</value>
-      <value rof_grid="0.125nldas2">$DIN_LOC_ROOT/rof/mosart/MOSART_routing_0.125nldas2_c190415cdf5.nc</value>
+      <value rof_grid="0.125nldas2">$DIN_LOC_ROOT/rof/mosart/MOSART_routing_0.125nldas2_cdf5_c200727.nc</value>
     </values>
     <desc>
       Full pathname of input datafile for RTM.

docs/ChangeLog

@@ -1,3 +1,16 @@
+===============================================================
+Tag name:  mosart1_0_37
+Originator(s): mvertens, erik, jedwards
+Date: August 06, 2020
+One-line Summary: Bring updates needed for NUOPC
+
+Some more changes from @mvertens with updates for the NUOPC cap. 
+There's a new nuopc_cap_share directory added. SetVM is made public
+in rof_comp_nuopc.F90 and some of the logging is slightly changed. 
+RtmIO is now using ROFID rather than instance name.
+
+Also convert the nldas2 file into NetCDF5 format from Jim Edwards.
+
 ===============================================================
 Tag name:  mosart1_0_36
 Originator(s): mvertens, sacks

src/cpl/nuopc/rof_comp_nuopc.F90

@@ -8,6 +8,7 @@ module rof_comp_nuopc
   use NUOPC                 , only : NUOPC_CompDerive, NUOPC_CompSetEntryPoint, NUOPC_CompSpecialize
   use NUOPC                 , only : NUOPC_CompFilterPhaseMap, NUOPC_CompAttributeGet, NUOPC_CompAttributeSet
   use NUOPC_Model           , only : model_routine_SS           => SetServices
+  use NUOPC_Model           , only : SetVM
   use NUOPC_Model           , only : model_label_Advance        => label_Advance
   use NUOPC_Model           , only : model_label_DataInitialize => label_DataInitialize
   use NUOPC_Model           , only : model_label_SetRunClock    => label_SetRunClock
@@ -27,14 +28,15 @@ module rof_comp_nuopc
   use perf_mod              , only : t_startf, t_stopf, t_barrierf
   use rof_import_export     , only : advertise_fields, realize_fields
   use rof_import_export     , only : import_fields, export_fields
-  use rof_shr_methods       , only : chkerr, state_setscalar, state_getscalar, state_diagnose, alarmInit
-  use rof_shr_methods       , only : set_component_logging, get_component_instance, log_clock_advance
+  use nuopc_shr_methods       , only : chkerr, state_setscalar, state_getscalar, state_diagnose, alarmInit
+  use nuopc_shr_methods       , only : set_component_logging, get_component_instance, log_clock_advance
 
   implicit none
   private ! except
 
   ! Module routines
   public  :: SetServices
+  public  :: SetVM
   private :: InitializeP0
   private :: InitializeAdvertise
   private :: InitializeRealize
@@ -715,13 +717,12 @@ subroutine ModelAdvance(gcomp, rc)
        if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=u_FILE_u)) return
     end if
 
-    if (masterproc) then
-       call ESMF_ClockPrint(clock, options="currTime", preString="------>Advancing ROF from: ", rc=rc)
-       if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=u_FILE_u)) return
-       call ESMF_ClockPrint(clock, options="stopTime", preString="--------------------------------> to: ", rc=rc)
-       if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=u_FILE_u)) return
+    if (debug > 1) then
+       call log_clock_advance(clock, 'MOSART', iulog, rc)
+       if (ChkErr(rc,__LINE__,u_FILE_u)) return
     endif
 
+
     !--------------------------------
     ! Reset shr logging to my original values
     !--------------------------------

src/cpl/nuopc/rof_import_export.F90

@@ -9,7 +9,7 @@ module rof_import_export
   use NUOPC_Model     , only : NUOPC_ModelGet
   use shr_kind_mod    , only : r8 => shr_kind_r8
   use shr_sys_mod     , only : shr_sys_abort
-  use rof_shr_methods , only : chkerr
+  use nuopc_shr_methods , only : chkerr
   use RunoffMod       , only : rtmCTL, TRunoff
   use RtmVar          , only : iulog, nt_rtm, rtm_tracers
   use RtmSpmd         , only : masterproc