Update emc/develop branch to include most recent updates from ESCOMP/CDEPS

.github/workflows/bumpversion.yml

@@ -0,0 +1,20 @@
+name: Bump version
+on:
+  push:
+    branches:
+      - master
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: '0'
+      - name: Bump version and push tag
+        uses: anothrNick/github-tag-action@1.26.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          WITH_V: true
+          DEFAULT_BUMP: minor
+          RELEASE_BRANCHES: master
+          DRY_RUN: False

CMakeLists.txt

@@ -53,7 +53,9 @@ if(BLD_STANDALONE)
   list(APPEND EXTRA_LIBS cdeps_share)
   list(APPEND EXTRA_INCLUDES "${CMAKE_BINARY_DIR}/share" )
 endif()
-
+if("${COMPILER}" STREQUAL "nag")
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -D__NAG__")
+endif()
 add_subdirectory(fox)
 add_subdirectory(streams)
 add_subdirectory(dshr)
@@ -81,22 +83,24 @@ foreach(COMP datm dice dlnd docn drof dwav)
   target_include_directories(${COMP} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/dshr>
                                             $<INSTALL_INTERFACE:mod>)
 
-  install(TARGETS ${COMP} 
+  install(TARGETS ${COMP}
           EXPORT  ${COMP}
+          ARCHIVE DESTINATION lib
           LIBRARY DESTINATION lib
           COMPONENT Library)
-  install(EXPORT      ${COMP} 
+  install(EXPORT      ${COMP}
           DESTINATION lib/cmake)
 endforeach(COMP)
 
 foreach(DEPS streams dshr cdeps_share FoX_dom FoX_wxml FoX_sax FoX_common FoX_utils FoX_fsys)
   if(NOT BLD_STANDALONE AND ${DEPS} STREQUAL "cdeps_share")
      continue()
   endif()
-  install(TARGETS ${DEPS} 
+  install(TARGETS ${DEPS}
           EXPORT  ${DEPS}
+          ARCHIVE DESTINATION lib
           LIBRARY DESTINATION lib
           COMPONENT Library)
-  install(EXPORT      ${DEPS} 
+  install(EXPORT      ${DEPS}
           DESTINATION lib/cmake)
 endforeach(DEPS)

cime_config/buildlib

@@ -89,7 +89,7 @@ def buildlib(bldroot, libroot, case, compname=None):
             expect(time_counter <= time_to_wait," Timeout waiting for {}".format(dwav_lib))
         print("HERE exeroot {} bldroot {}".format(exe_root, bldroot))
 
-        s,o,e = run_cmd("make install DESTDIR={}".format(libroot), from_dir=bldroot, verbose=True)
+        s,o,e = run_cmd("make install VERBOSE=1 DESTDIR={}".format(libroot), from_dir=bldroot, verbose=True)
         expect(not s,"ERROR from make output={}, error={}".format(o,e))
 
         # Link the CDEPS component directories to the location expected by cime

cime_config/stream_cdeps.py

@@ -42,7 +42,7 @@
  </stream_info>
 
 """
-        
+
 class StreamCDEPS(GenericXML):
 
     def __init__(self, infile, schema):
@@ -64,8 +64,12 @@ def create_stream_xml(self, stream_names, case, streams_xml_file, data_list_file
             stream_file.write('<file id="stream" version="2.0">\n')
         # write contents of stream file
         for stream_name in stream_names:
-            if stream_name:
-                self.stream_nodes = super(StreamCDEPS,self).get_child("stream_entry", {"name" : stream_name}, 
+            if stream_name.startswith("NEON."):
+                self.stream_nodes = super(StreamCDEPS,self).get_child("stream_entry", {"name" : "NEON.$NEONSITE"},
+                                                                     err_msg="No stream_entry {} found".format(stream_name))
+
+            elif stream_name:
+                self.stream_nodes = super(StreamCDEPS,self).get_child("stream_entry", {"name" : stream_name},
                                                                      err_msg="No stream_entry {} found".format(stream_name))
 
             # determine stream_year_first and stream_year_list
@@ -99,26 +103,26 @@ def create_stream_xml(self, stream_names, case, streams_xml_file, data_list_file
                         stream_datafiles = child.xml_element.text
                         stream_datafiles = self._resolve_values(case, stream_datafiles)
                         if 'first_year' in child.xml_element.attrib and 'last_year' in child.xml_element.attrib:
-                            value = child.xml_element.get('first_year') 
+                            value = child.xml_element.get('first_year')
                             value = self._resolve_values(case, value)
                             stream_year_first= int(value)
-                            value = child.xml_element.get('last_year') 
+                            value = child.xml_element.get('last_year')
                             value = self._resolve_values(case, value)
                             stream_year_last = int(value)
                             year_first = max(stream_year_first, data_year_first)
                             year_last = min(stream_year_last, data_year_last)
                             stream_datafiles = self._sub_paths(stream_datafiles, year_first, year_last)
                             stream_datafiles = stream_datafiles.strip()
                         #endif
-                        if stream_vars[node_name]: 
+                        if stream_vars[node_name]:
                             stream_vars[node_name] += "\n      " + self._add_xml_delimiter(stream_datafiles.split("\n"), "file")
                         else:
                             stream_vars[node_name] = self._add_xml_delimiter(stream_datafiles.split("\n"), "file")
 
                 elif (   node_name == 'stream_meshfile'
-                      or node_name == 'stream_mapalgo' 
-                      or node_name == 'stream_tintalgo' 
-                      or node_name == 'stream_taxmode' 
+                      or node_name == 'stream_mapalgo'
+                      or node_name == 'stream_tintalgo'
+                      or node_name == 'stream_taxmode'
                       or node_name == 'stream_dtlimit'):
                     attributes['model_grid'] = case.get_value("GRID")
                     attributes['compset'] = case.get_value("COMPSET")
@@ -130,7 +134,7 @@ def create_stream_xml(self, stream_names, case, streams_xml_file, data_list_file
                 elif node_name.strip():
                     # Get the other dependencies
                     stream_dict = self._add_value_to_dict(stream_vars, case, node)
-                        
+
             # append to stream xml file
             stream_file_text = _stream_nuopc_file_template.format(**stream_vars)
             with open(streams_xml_file, 'a') as stream_file:
@@ -193,7 +197,7 @@ def _get_input_file_hash(self, data_list_file):
 
     def _get_value_match(self, node, child_name, attributes=None, exact_match=False):
         '''
-        Get the first best match for multiple tags in child_name based on the 
+        Get the first best match for multiple tags in child_name based on the
         attributes input
 
         <values...>
@@ -396,5 +400,3 @@ def _add_xml_delimiter(list_to_deliminate, delimiter):
             #endif
         #endfor
         return "\n      ".join(list_to_deliminate)
-
-

datm/CMakeLists.txt

@@ -27,3 +27,4 @@ target_include_directories (datm PRIVATE ${CMAKE_SOURCE_DIR})
 target_include_directories (datm PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/share)
 target_include_directories (datm PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/streams)
 target_include_directories (datm PRIVATE ${PIO_Fortran_INCLUDE_DIR})
+target_include_directories (datm PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../fox/include)