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

SCRIPTS/interpolate_gebco.sh

+cd $DOMAIN
+
+
+
+cp $GFILE/DOMAIN/namelist_reshape_bilin_gebco $DOMAIN
+
+
+$TDIR/WEIGHTS/scripgrid.exe namelist_reshape_bilin_gebco
+$TDIR/WEIGHTS/scrip.exe namelist_reshape_bilin_gebco
+$TDIR/WEIGHTS/scripinterp.exe namelist_reshape_bilin_gebco
+
+#cp $INPUTS/coordinates.nc     $TDIR/DOMAINcfg/.
+#cp $INPUTS/bathy_meter.nc     $TDIR/DOMAINcfg/.
+#cp $START_FILES/namelist_cfg  $TDIR/DOMAINcfg/.
+#cp $START_FILES/rs.pbs        $TDIR/DOMAINcfg/.
+#cp $WDIR/make_paths.sh        $TDIR/DOMAINcfg/.
+
+#cd $TDIR/DOMAINcfg
+#qsub  rs.pbs
+
+cd $WDIR

SCRIPTS/make_domain_cfg.sh

@@ -2,7 +2,8 @@ cp $DOMAIN/coordinates.nc     $TDIR/DOMAINcfg/.
 cp $DOMAIN/bathy_meter.nc     $TDIR/DOMAINcfg/.
 cp $GFILE/DOMAIN/namelist_cfg  $TDIR/DOMAINcfg/.
 cp $GFILE/DOMAIN/rs.pbs        $TDIR/DOMAINcfg/.
-cp $WDIR/make_paths.sh        $TDIR/DOMAINcfg/.
+#cp $WDIR/make_paths.sh        $TDIR/DOMAINcfg/.
+cp $WDIR/../BoBEAS/SCRIPTS/make_paths.sh        $TDIR/DOMAINcfg/.
 
 cd $TDIR/DOMAINcfg
 qsub  rs.pbs

SCRIPTS/make_nemo.sh

 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
 

SCRIPTS/make_paths.sh

 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

SCRIPTS/make_tides.sh

+cd $TIDE
+
+# copy a number of grid / tides / namelist and runscript files
+#cp $GFILE/TIDAL_FORCING/* .
+cp $DOMAIN/bathy_meter.nc .
+cp $DOMAIN/domain_cfg.nc .
+
+qsub run_script.pbs
+
+cd $WDIR 
+

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