Merge branch 'develop' into feature/narnold1/#560-shocmf-updates

GEOS-ESM · Jan 9, 2024 · da496ff · da496ff
2 parents 67754ec + dead05d
commit da496ff
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOS_PhysicsGridComp.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOS_PhysicsGridComp.F90
@@ -1228,7 +1228,8 @@ subroutine SetServices ( GC, RC )
                          'REV_LS  ',  'REV_AN  ', 'REV_CN  ', 'TPREC   ', &
                          'Q       ',  'DQDT    ', 'DQRL    ', 'DQRC    ', &
                          'CNV_MFC ',  'CNV_MFD ', 'CNV_CVW ', 'CNV_FRC ', &
-                         'LFR_GCC ',  'RH2     ', 'CN_PRCP ' /),          &
+                         'LFR_GCC ',  'RH2     ', 'CN_PRCP ',             &
+                         'BYNCY   ',  'CAPE    ', 'INHB    ' /),          &
         DST_ID      = CHEM,                                               &
         SRC_ID      = MOIST,                                              &
                                                        RC=STATUS  )

diff --git a/..._GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_cube.py b/..._GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_cube.py
@@ -89,7 +89,7 @@
 def make_bcs_cube(config):
 
   bin_dir = os.getcwd()
-  if 'install/bin' not in bin_dir:
+  if '/bin' not in bin_dir:
     print(" please run this program in installed bin directory")
     return
   grid_type  = config['grid_type']

diff --git a/..._GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_ease.py b/..._GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_ease.py
@@ -21,7 +21,7 @@
 
 def make_bcs_ease(config):
   bin_dir = os.getcwd()
-  if 'install/bin' not in bin_dir:
+  if '/bin' not in bin_dir:
     print("please run this program in installed bin directory")
     return
 

diff --git a/...ridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_latlon.py b/...ridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_latlon.py
@@ -54,7 +54,7 @@
 
 def make_bcs_latlon(config):
   bin_dir = os.getcwd()
-  if 'install/bin' not in bin_dir:
+  if '/bin' not in bin_dir:
     print(" please run this program in installed bin directory")
     return