From ab947f81b68f9e80cdeac029ef76cf4e06cb9de1 Mon Sep 17 00:00:00 2001 From: "Joseph.Mouallem" Date: Fri, 2 Aug 2024 13:51:48 -0400 Subject: [PATCH] checkout main coupler branch and remove DLAND_GRID_FROM_ATMOS --- Build/mk_scripts/mk_makefile | 2 +- CHECKOUT_code | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Build/mk_scripts/mk_makefile b/Build/mk_scripts/mk_makefile index d7f4951..322b0bc 100755 --- 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 index cacf0a7..579dab8 100755 --- 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