From 2fcb386ecc301b72b0c5bfcb70d34f14a86e60c2 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Wed, 3 Oct 2018 11:02:29 -0400 Subject: [PATCH] Fixes git checkout in wrong directory - Commit 3ccbec6c9ee9 tries to checkout a specific commit of FMS shared code. The clone is made into a directory called "shared" but the subsequent checkout is made in the parent directory and thus fails. --- Makefile_GFDL | 2 +- Makefile_gfortran | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile_GFDL b/Makefile_GFDL index bcf33eb..c69f2b3 100644 --- a/Makefile_GFDL +++ b/Makefile_GFDL @@ -19,7 +19,7 @@ MIDAS: fms_build/libfms.a MOM6_ALE/build_ale/libale.a fms_build/libfms.a: (cd fms;tar xvf fms_env.tar) - (cd fms;git clone https://github.com/NOAA-GFDL/FMS.git shared;git checkout 34097d0) + (cd fms;git clone https://github.com/NOAA-GFDL/FMS.git shared;cd shared;git checkout 34097d0) (cd fms_build;./build_fms.csh) MOM6_ALE/build_ale/libale.a: diff --git a/Makefile_gfortran b/Makefile_gfortran index ce209a7..2ce03c1 100644 --- a/Makefile_gfortran +++ b/Makefile_gfortran @@ -11,7 +11,7 @@ MIDAS: fms_build/libfms.a MOM6_ALE/build_ale/libale.a fms_build/libfms.a: (cd fms;tar xvf fms_env.tar) - (cd fms;git clone https://github.com/NOAA-GFDL/FMS.git shared; git checkout 34097d0) + (cd fms;git clone https://github.com/NOAA-GFDL/FMS.git shared;cd shared;git checkout 34097d0) (cd fms_build;cp build_fms.csh tmp;\ sed -e 's/#set platform = linux/set platform = linux/' < tmp > tmp2;\ sed -e 's/set platform = gfdl_hpcs/#set platform = gfdl_hpcs/' < tmp2 > build_fms.csh;\