Merge branch 'develop' into feature/wjiang/use_mapl_read_write_nc4

Author: sdrabenh

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_shared.py

@@ -5,7 +5,6 @@
 import os
 import glob
 
-BUILT_ON_SLES15 = "@BUILT_ON_SLES15@"
 def get_script_head() :
 
   head =  """#!/bin/csh -x
@@ -18,14 +17,12 @@ def get_script_head() :
 #SBATCH --job-name={GRIDNAME}.j
 """
   constraint = '#SBATCH --constraint="[mil|cas]"'
-  #if 'TRUE' not in BUILT_ON_SLES15:
-  #   constraint = "#SBATCH --constraint=sky"
 
   head = head + constraint + """
-echo "-----------------------------" 
-echo "make_bcs starts date/time" 
-echo `date` 
-echo "-----------------------------" 
+echo "-----------------------------"
+echo "make_bcs starts date/time"
+echo `date`
+echo "-----------------------------"
 
 cd {SCRATCH_DIR}
 
@@ -141,7 +138,7 @@ def get_script_mv(grid_type):
         clsm/country_and_state_code.data \\
         land/{GRIDNAME}/clsm/
 
-""" 
+"""
    mv_template = mv_template + get_change_til_file(grid_type)
    mv_template = mv_template + """
 
@@ -151,10 +148,10 @@ def get_script_mv(grid_type):
 
 mkdir -p ../../geometry ../../land/shared ../../logs
 
-echo "-----------------------------" 
-echo "make_bcs ends date/time" 
-echo `date` 
-echo "-----------------------------" 
+echo "-----------------------------"
+echo "make_bcs ends date/time"
+echo `date`
+echo "-----------------------------"
 
 /bin/mv ../logs/{GRIDNAME}  ../../logs/.
 
@@ -167,7 +164,7 @@ def get_script_mv(grid_type):
 
 /bin/rm -r {TMP_DIR}
 
-# if necessary, copy resolution-independent CO2 file from MAKE_BCS_INPUT_DIR to bcs dir 
+# if necessary, copy resolution-independent CO2 file from MAKE_BCS_INPUT_DIR to bcs dir
 
 if(-f land/shared/CO2_MonthlyMean_DiurnalCycle.nc4) then
     echo "CO2_MonthlyMean_DiurnalCycle.nc4 already present in bcs dir."

GEOSogcm_GridComp/GEOS_OgcmGridComp.F90

@@ -805,12 +805,14 @@ subroutine SetServices ( GC, RC )
             SRC_ID = SEAICE,            &
             RC=STATUS  )
        VERIFY_(STATUS)
-       call MAPL_AddConnectivity ( GC,   &
-          SHORT_NAME  = (/'UWC','VWC'/), &
-          SRC_ID = OCEAN,                &
-          DST_ID = SEAICE,               &
-          _RC)
-     endif
+       if (trim(OCEAN_NAME) /= "MIT") then  !
+          call MAPL_AddConnectivity ( GC,   &
+               SHORT_NAME  = (/'UWC','VWC'/), &
+               SRC_ID = OCEAN,                &
+               DST_ID = SEAICE,               &
+               _RC)
+       endif
+    end if
   end if
 
   if (DO_CICE_THERMO > 1) then