Merge branch 'master' of https://github.com/NOC-MSM/BoBEAS

SCRIPTS/make_nemo.sh

 svn co http://forge.ipsl.jussieu.fr/nemo/svn/trunk/NEMOGCM@8395 $NEMO/trunk_NEMOGCM_r8395
 
-cp $ARCH/arch-XC_ARCHER_INTEL.fcm $CDIR/../ARCH/
+cp $GITCLONE/ARCH/arch-XC_ARCHER_INTEL.fcm $CDIR/../ARCH/
 
 cd $CDIR
 
@@ -9,8 +9,8 @@ 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 $GFILE/f_files/* $CDIR/$CONFIG/MY_SRC/.
-cp $GFILE/cpp_file.fcm $CONFIG/cpp_$CONFIG.fcm
+cp $GITCLONE/MY_SRC/* $CDIR/$CONFIG/MY_SRC/.
+cp $GITCLONE/cpp_file.fcm $CONFIG/cpp_$CONFIG.fcm
 
 ./makenemo -n $CONFIG -m XC_ARCHER_INTEL -j 10
 

SCRIPTS/make_paths.sh

@@ -16,3 +16,4 @@ export ARCH=$GFILE/ARCH
 export XIOS_DIR=$WORK/xios-2.0_r1242
 export BATHY=global_merged2.nc
 export ARCH1=$WORK/ARCH
+export GITCLONE=$WORK/BoBEAS

SCRIPTS/make_xios.sh

@@ -3,7 +3,7 @@ cd $WORK
 svn co -r1242 http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/trunk $XIOS_DIR
 cd $XIOS_DIR
 
-cp $ARCH1/arch-XC30_ARCHER* arch/.
+cp $GITCLONE/ARCH/arch-XC30_ARCHER* arch/.
 
 ./make_xios --full --prod --arch XC30_ARCHER --netcdf_lib netcdf4_par