checkout main coupler branch and remove DLAND_GRID_FROM_ATMOS

NOAA-GFDL · Aug 2, 2024 · ab947f8 · ab947f8
1 parent 257c3bb
commit ab947f8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Build/mk_scripts/mk_makefile b/Build/mk_scripts/mk_makefile
@@ -71,7 +71,7 @@ FV3_cppDefs="-Duse_libMPI -Duse_netCDF -DHAVE_SCHED_GETAFFINITY -DSPMD -Duse_LAR
 if [ ${CONFIG} = 'shield' ] ; then
   FV3_cppDefs+=" -DGFS_PHYS -DUSE_GFSL63"
 elif [ ${CONFIG} = 'shieldfull' ] || [ ${CONFIG} = 'shiemom' ]  ; then
-  FV3_cppDefs+=" -DGFS_PHYS -DUSE_GFSL63 -D_USE_LEGACY_LAND_ -DLAND_GRID_FROM_ATMOS"
+  FV3_cppDefs+=" -DGFS_PHYS -DUSE_GFSL63 -D_USE_LEGACY_LAND_"
 elif [ ${CONFIG} = 'solo' ] ; then
   FV3_cppDefs+=" -DDCMIP -DDYCORE_SOLO -DHIWPP"
 fi

diff --git a/CHECKOUT_code b/CHECKOUT_code
@@ -91,7 +91,7 @@ git clone -b ${drivers_release}   https://github.com/NOAA-GFDL/atmos_drivers
 if [ $config_name = 'SHiELD' ] || [ $config_name = 'SHiELDFULL' ] || [ $config_name = 'SHiEMOM' ] ; then
    phy_release=$release
    git clone -b ${phy_release}   https://github.com/NOAA-GFDL/SHiELD_physics
-   git clone -b ${fms_release}   https://github.com/NOAA-GFDL/FMSCoupler
+   git clone  https://github.com/NOAA-GFDL/FMSCoupler
 fi
 
 if [ $config_name = 'SHiELDFULL' ] ; then