From 1ce87d695e56f942d6308e5b04ec3f6594009169 Mon Sep 17 00:00:00 2001
From: Dr Jeff Polton <jpolton@gmail.com>
Date: Fri, 22 Mar 2019 21:40:02 +0000
Subject: [PATCH] revert to Ash source directories

---
 SCRIPTS/make_nemo.sh  | 9 ++++++---
 SCRIPTS/make_paths.sh | 3 ++-
 SCRIPTS/make_xios.sh  | 3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/SCRIPTS/make_nemo.sh b/SCRIPTS/make_nemo.sh
index ab15a15..ca98593 100755
--- a/SCRIPTS/make_nemo.sh
+++ b/SCRIPTS/make_nemo.sh
@@ -1,6 +1,7 @@
 svn co http://forge.ipsl.jussieu.fr/nemo/svn/trunk/NEMOGCM@8395 $NEMO/trunk_NEMOGCM_r8395
 
-cp $GITCLONE/ARCH/arch-XC_ARCHER_INTEL.fcm $CDIR/../ARCH/
+#cp $GITCLONE/ARCH/arch-XC_ARCHER_INTEL.fcm $CDIR/../ARCH/
+cp $ARCH/arch-XC_ARCHER_INTEL.fcm $CDIR/../ARCH/
 
 cd $CDIR
 
@@ -9,8 +10,10 @@ printf 'y\nn\nn\nn\nn\nn\nn\nn\n' | ./makenemo -n $CONFIG -m XC_ARCHER_INTEL -j
 ./makenemo -n $CONFIG -m XC_ARCHER_INTEL -j 10 clean
 
 
-cp $GITCLONE/MY_SRC/* $CDIR/$CONFIG/MY_SRC/.
-cp $GITCLONE/cpp_file.fcm $CONFIG/cpp_$CONFIG.fcm
+#cp $GITCLONE/MY_SRC/* $CDIR/$CONFIG/MY_SRC/.
+cp $GFILE/f_files/* $CDIR/$CONFIG/MY_SRC/.
+#cp $GITCLONE/cpp_file.fcm $CONFIG/cpp_$CONFIG.fcm
+cp $GFILE/cpp_file.fcm $CONFIG/cpp_$CONFIG.fcm
 
 ./makenemo -n $CONFIG -m XC_ARCHER_INTEL -j 10
 
diff --git a/SCRIPTS/make_paths.sh b/SCRIPTS/make_paths.sh
index 65b5742..a8fee99 100755
--- a/SCRIPTS/make_paths.sh
+++ b/SCRIPTS/make_paths.sh
@@ -1,5 +1,6 @@
 export CONFIG=INDIAN_OCEAN_AUTO
 export WORK=/work/n01/n01/$USER
+export AWORK=/work/n01/n01/ashbre
 export WDIR=$WORK/$CONFIG
 export NEMO=$WORK/NEMO/
 export DOMAIN=$WDIR/DOMAIN
@@ -11,7 +12,7 @@ export CDIR=$NEMO/trunk_NEMOGCM_r8395/CONFIG
 export TDIR=$NEMO/trunk_NEMOGCM_r8395/TOOLS
 export RUND=$WDIR/RUN_DIRECTORY/
 export EXP=$RUND/$CONFIG
-export GFILE=$WORK/GENERIC_NEMO_FILES
+export GFILE=$AWORK/GENERIC_NEMO_FILES
 export ARCH=$GFILE/ARCH
 export XIOS_DIR=$WORK/xios-2.0_r1242
 export BATHY=global_merged2.nc
diff --git a/SCRIPTS/make_xios.sh b/SCRIPTS/make_xios.sh
index 76a0012..f3dd9ce 100755
--- a/SCRIPTS/make_xios.sh
+++ b/SCRIPTS/make_xios.sh
@@ -3,7 +3,8 @@ cd $WORK
 svn co -r1242 http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/trunk $XIOS_DIR
 cd $XIOS_DIR
 
-cp $GITCLONE/ARCH/arch-XC30_ARCHER* arch/.
+#cp $GITCLONE/ARCH/arch-XC30_ARCHER* arch/.
+cp $ARCH/arch-XC30_ARCHER* arch/.
 
 ./make_xios --full --prod --arch XC30_ARCHER --netcdf_lib netcdf4_par
 
-- 
GitLab