Attempt to get GCM 11.4 to work for ADAS

components.yaml

@@ -5,13 +5,13 @@ GEOSadas:
 env:
   local: ./@env
   remote: ../ESMA_env.git
-  tag: v4.9.1
+  tag: v4.22.0
   develop: main
 
 cmake:
   local: ./@cmake
   remote: ../ESMA_cmake.git
-  tag: v3.26.0
+  tag: v3.36.0
   develop: develop
 
 ecbuild:
@@ -22,25 +22,25 @@ ecbuild:
 NCEP_Shared:
   local: ./src/Shared/@NCEP_Shared
   remote: ../NCEP_Shared.git
-  tag: v1.3.0
+  tag: v1.2.0
   develop: main
 
 GMAO_Shared:
   local: ./src/Shared/@GMAO_Shared
   remote: ../GMAO_Shared.git
-  tag: v1.9.4
+  branch: feature/rtodling/atmos_11_4_upd
   develop: main
 
 GEOS_Util:
   local: ./src/Shared/@GMAO_Shared/@GEOS_Util
   remote: ../GEOS_Util.git
-  tag: v1.0.2
+  tag: v2.0.4
   develop: main
 
 MAPL:
   local: ./src/Shared/@MAPL
   remote: ../MAPL.git
-  tag: v2.35.2
+  tag: v2.42.0
   develop: develop
 
 FMS:
@@ -52,13 +52,13 @@ FMS:
 GEOSana_GridComp:
   local: ./src/Components/@GEOSana_GridComp
   remote: ../GEOSana_GridComp.git
-  tag: v1.5.7
+  branch: feature/rtodling/rt1_5_6-crtm2_3
   develop: develop
 
 GEOSgcm_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp
   remote: ../GEOSgcm_GridComp.git
-  tag: v1.17.4
+  tag: v2.4.0
   sparse: ./config/GEOSgcm_GridComp.sparse
   develop: develop
 
@@ -77,19 +77,19 @@ GEOSagcmPert_GridComp:
 FVdycoreCubed_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp
   remote: ../FVdycoreCubed_GridComp.git
-  tag: v1.12.1
+  tag: v2.9.0
   develop: develop
 
 fvdycore:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore
   remote: ../GFDL_atmos_cubed_sphere.git
-  tag: geos/v1.5.0
+  tag: geos/v2.8.0
   develop: geos/develop
 
 GEOSchem_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp
   remote: ../GEOSchem_GridComp.git
-  tag: v1.12.0
+  tag: v1.13.1
   develop: develop
 
 HEMCO:
@@ -107,7 +107,7 @@ geos-chem:
 GOCART:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART
   remote: ../GOCART.git
-  tag: v2.1.2
+  tag: v2.2.1
   develop: develop
 
 QuickChem:
@@ -119,13 +119,13 @@ QuickChem:
 TR:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@TR
   remote: ../TR.git
-  tag: v1.0.0
+  tag: v1.1.0
   develop: develop
 
 GMI:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GMI
   remote: ../GMI.git
-  tag: v1.0.0
+  tag: v1.1.0
   develop: develop
 
 StratChem:
@@ -137,7 +137,7 @@ StratChem:
 GEOS_OceanGridComp:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp
   remote: ../GEOS_OceanGridComp.git
-  tag: v1.2.1
+  tag: v2.1.4
   develop: develop
 
 mom:
@@ -149,16 +149,27 @@ mom:
 mom6:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/MOM6_GEOSPlug/@mom6
   remote: ../MOM6.git
-  tag: geos/v2.1.0
+  tag: geos/v2.2.3
   develop: main
   recurse_submodules: true
 
+mit:
+  local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/MIT_GEOS5PlugMod/@mit
+  remote: ../MITgcm.git
+  tag: checkpoint68o
+
 cice6:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/GEOSseaice_GridComp/CICE_GEOSPlug/@cice6
   remote: ../CICE.git
-  tag: geos/v0.0.1
-  develop: geos/main
-  recurse_submodules: true
+  tag: geos/v0.1.3
+  develop: geos/develop
+  ignore_submodules: true
+
+icepack:
+  local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/GEOSseaice_GridComp/CICE_GEOSPlug/@cice6/icepack
+  remote: ../Icepack.git
+  tag: geos/v0.1.1
+  develop: geos/develop
 
 sis2:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/GEOSseaice_GridComp/CICE_GEOSPlug/@sis2
@@ -169,20 +180,20 @@ sis2:
 GEOSradiation_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp
   remote: ../GEOSradiation_GridComp.git
-  tag: v1.2.0
+  tag: v1.5.1
   develop: develop
 
 RRTMGP:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp/GEOS_RadiationShared/@RRTMGP
   remote: ../rte-rrtmgp.git
-  tag: geos/v1.5+1.0.0
+  tag: geos/v1.6+1.1.0
   develop: geos/develop
   sparse: ./config/RRTMGP.sparse
 
 GEOSgcm_App:
   local: ./src/Applications/@GEOSgcm_App
   remote: ../GEOSgcm_App.git
-  tag: v1.9.4
+  branch: bugfix/rtodling/fixes4_2_2_8
   develop: develop
 
 Ocean-LETKF:

src/Applications/GAAS_App/aeronet_all.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 Splits AERONET into synoptic chunks.
 """
@@ -17,7 +17,7 @@ def makethis_dir(path):
     if path != '':
         rc = os.system('mkdir -p '+path)
         if rc:
-            raise IOError, "could not create directory "+path
+            raise IOError("could not create directory "+path)
 
 if __name__ == "__main__":
 
@@ -28,16 +28,16 @@ def makethis_dir(path):
     onehour = timedelta(seconds=60*60)
 
     if len(sys.argv)<2:
-        print "Usage:"
-        print "        aeronet4_all.py  year1 [year2]"
+        print("Usage:")
+        print("        aeronet4_all.py  year1 [year2]")
         sys.exit(1)
     else:
         y1 = sys.argv[1]
         if len(sys.argv)>2:
             y2 = sys.argv[2]
         else:
             y2 = y1
-        Years = range(int(y1),int(y2)+1)
+        Years = list(range(int(y1),int(y2)+1))
 
     # Loop over years
     # ---------------
@@ -49,7 +49,7 @@ def makethis_dir(path):
 
             today = tyme0 + (doy-1) * oneday
 
-            print 'Day: ', today
+            print('Day: ', today)
 
             # Read AERONET for this day
             # -------------------------

src/Applications/GAAS_App/aod_data.py

@@ -1,15 +1,15 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import os, sys
 
 def aod_type(dataID, stdoutFLG=True):
     """
+    input_parameters
+     => dataID: label used to identify data set in the obsys_rc file
+     => stdoutFLG: set to False, if calling directly from Python code
+
     purpose
     Identify AOD data type
 
-    input parameters
-     => dataID: label used to identify data set in the obsys_rc file
-     => stdoutFLG: if True, then print result to STDOUT before returning it
-
     return value
      => aod_type_val: AOD data type
     """
@@ -49,12 +49,13 @@ def aod_type(dataID, stdoutFLG=True):
 #.......................................................................
 def aod_filter(classlist_string, stdoutFLG=True):
     """
-    purpose: remove excess AOD data sets from obsclass list.
+    input_parameters
+     => classlist_string: AOD obsclass list (separated by commas, no spaces)
+     => stdoutFLG: set to False, if calling directly from Python code
+
+    purpose: remove duplicate AOD data sets from obsclass list
 
-    input parameters
-     => classlist_string: AOD obsclass list (string with labels separated by
-                          commas, no spaces)
-     => stdoutFLG: if True, then print result to STDOUT before returning it
+    NOTE: THIS ROUTINE DOES NOT CHECK DATA AVAILABILITY
 
     return value
      => newlist_string: filtered obsclass list string
@@ -114,8 +115,8 @@ def aod_filter(classlist_string, stdoutFLG=True):
 
     if len(sys.argv) < 2:
         scriptname = os.path.basename(sys.argv[0])
-        print("\n    usage: {0} routineName routineParams".format(scriptname))
-        print( "     routineName options = {0}\n".format(routineList.keys()))
+        print(("\n    usage: {0} routineName routineParams".format(scriptname)))
+        print(( "     routineName options = {0}\n".format(routineList.keys())))
         exit()
 
     routineName = sys.argv[1]

src/Applications/GAAS_App/avhrr_all.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 Splits AVHRR into synoptic chunks.
 """
@@ -14,16 +14,16 @@
     onehour = timedelta(seconds=60*60)
 
     if len(sys.argv)<2:
-        print "Usage:"
-        print "        avhrr_all.py  year1 [year2]"
+        print("Usage:")
+        print("        avhrr_all.py  year1 [year2]")
         sys.exit(1)
     else:
         y1 = sys.argv[1]
         if len(sys.argv)>2:
             y2 = sys.argv[2]
         else:
             y2 = y1
-        Years = range(int(y1),int(y2)+1)
+        Years = list(range(int(y1),int(y2)+1))
 
     # Loop over years
     # ---------------
@@ -42,5 +42,5 @@
 
                 cmd = 'python avhrr_l2a.py -v asc %d %d'%(nymd,nhms)
 
-                print cmd
+                print(cmd)
                 os.system(cmd)

src/Applications/GAAS_App/avhrr_l2a.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -W ignore::DeprecationWarning
 
 """
@@ -54,10 +54,10 @@
     i = 0
     for orbit in cf('AVHRR_L2A_ORBITS').split(','):
         cmd = "patmosx_l2a.py %s %s %s %s"%(Options,orbit,nymd,nhms)
-        print cmd
+        print(cmd)
         if not options.dryrun:
             if system(cmd):
-                raise ValueError, "patmosx_l2a.py failed for %s on %s %s"%(orbit,nymd,nhms)
+                raise ValueError("patmosx_l2a.py failed for %s on %s %s"%(orbit,nymd,nhms))
 
         i += 1
 

src/Applications/GAAS_App/avhrr_nnr.py

@@ -77,7 +77,7 @@ def _getInputs(self):
         for inputName in self.net.InputNames:
 
             if self.verbose>0:
-                print 'Getting NN input ',inputName
+                print('Getting NN input ',inputName)
 
             # Retrieve input
             # --------------
@@ -114,15 +114,15 @@ def apply(self,nnFile='/nobackup/NNR/Net/nnr_001b.avhrr_Tau.net'):
             return # no good data to work with
 
         if len(self.net.TargetNames)>1:
-            raise ValueError, 'Strange, more than one predictor'
+            raise ValueError('Strange, more than one predictor')
 
         # Evaluate NN on inputs
         # ---------------------
         targets = self.net(self._getInputs())
 
         name = self.net.TargetNames[0]
         if self.verbose>0:
-            print "Evaluating NNR for <%s> with Log-AOD = "%name, self.net.laod 
+            print("Evaluating NNR for <%s> with Log-AOD = "%name, self.net.laod) 
 
         # Output is always AOD
         # --------------------