Revised everything for the new disk locations.

Author: ledm

README.md

@@ -430,7 +430,7 @@ The `analysis_compare` tool creates a script in the `mass_scripts` directory.
 This script is copied to a shared directory in the shared ukesm/terrafirma diskspace:
 
 ```
-/gws/nopw/j04/esmeval/bgcval2/shared_mass_scripts
+/gws/ssde/j25a/esmeval/bgcval2/shared_mass_scripts
 ```
 
 A crontab job is set up to execute these scripts overnight on mass-cli1,
@@ -440,14 +440,14 @@ Very old scripts are automatically deleted.
 The crontab script is:
 
 ```
-/gws/nopw/j04/esmeval/bgcval2/shared_mass_cron.sh
+/gws/ssde/j25a/esmeval/bgcval2/shared_mass_cron.sh
 ```
 
 Note that cron executes this script with the `ldemora` username, so permissions may need to be changed
 in some cases. The output log for this script is sent to the file:
 
 ```
-/gws/nopw/j04/esmeval/bgcval2/shared_mass_cron.out
+/gws/ssde/j25a/esmeval/bgcval2/shared_mass_cron.out
 ```
 
 In the case that data is needed immediately, it's posiible to download manually as well.
@@ -642,7 +642,7 @@ input yamls. If you want to "clear the cache", these images need to be deleted.
 The key place to clear is set by default on jasmin to be:
 
 ```
-/gws/nopw/j04/ukesm/BGC_data/$USER/bgcval2/images/TimeseriesCompare/$NAME
+/gws/ssde/j25a/ukesm/BGC_data/$USER/bgcval2/images/TimeseriesCompare/$NAME
 ```
 
 where `$USER` is your jasmin user name and `$NAME` is the name given to this analysis 
@@ -660,7 +660,7 @@ This is where the report is generated.
 The third place that these plots are kept is on the public facing jasmin directory:
 
 ```
-/gws/nopw/j04/esmeval/public/CompareReports/bgcval2/$USER/$NAME
+/gws/ssde/j25a/esmeval/public/CompareReports/bgcval2/$USER/$NAME
 ```
 
 This is where the report is hosted.

bgcval2/RemoteScripts/downloadOnMassCli.sh

@@ -24,7 +24,7 @@ python /home/users/ldemora/workspace/ukesm-validation/RemoteScripts/hello.py $jo
 
 ssh -X -A mass-cli.jasmin.ac.uk "python /home/users/ldemora/workspace/ukesm-validation/download_from_mass.py $jobid"
 #ssh -X -A mass-cli.jasmin.ac.uk "mkdir -p gws/nopw/j04/ukesm/BGC_data/u/group_workspaces/jasmin2/ukesm/BGC_data/$jobid/1y; ln -s  /group_workspaces/jasmin2/ukesm/BGC_data/$jobid/*1y*grid_[UVWT]*.nc /group_workspaces/jasmin2/ukesm/BGC_data/$jobid/1y/.; ls -lhrt /group_workspaces/jasmin2/ukesm/BGC_data/$jobid"
-ssh -X -A mass-cli.jasmin.ac.uk "mkdir -p /gws/nopw/j04/ukesm/BGC_data/$jobid/1y; ln -s  /gws/nopw/j04/ukesm/BGC_data/$jobid/*1y*grid_[UVWT]*.nc /gws/nopw/j04/ukesm/BGC_data/$jobid/1y/.; ls -lhrt /gws/nopw/j04/ukesm/BGC_data/$jobid"
+ssh -X -A mass-cli.jasmin.ac.uk "mkdir -p /gws/ssde/j25a/ukesm/BGC_data/$jobid/1y; ln -s  /gws/ssde/j25a/ukesm/BGC_data/$jobid/*1y*grid_[UVWT]*.nc /gws/ssde/j25a/ukesm/BGC_data/$jobid/1y/.; ls -lhrt /gws/ssde/j25a/ukesm/BGC_data/$jobid"
 
 #####
 # MLD:

bgcval2/default-bgcval2-config.yml

@@ -7,7 +7,7 @@ standard-paths:
   jasmin:
     general:
       machinelocation: "JASMIN"
-      root_dir: "/gws/nopw/j04/ukesm"
+      root_dir: "/gws/ssde/j25a/ukesm"
       shelvedir: "bgcval2/shelves"
       p2p_ppDir: "bgcval2/ukesm_postProcessed"
       imagedir: "bgcval2/images"

key_lists/ecosystem.yml

@@ -30,7 +30,7 @@ keys:
     pn_nlim: True
     pn_jlim: True
     epn100: True
-    o2min: True
+#    o2min: True
 
 #   
 

lotus_bgcval2.sh

@@ -74,7 +74,7 @@ analysis_compare -y $BGCVAL2_SUITE
 #########################
 # Rsync report to web facing directory:
 # (shouldn't need to change this!)
-OUTPATH=/gws/nopw/j04/esmeval/public/CompareReports/bgcval2/$USER
+OUTPATH=/gws/ssde/j25a/esmeval/public/CompareReports/bgcval2/$USER
 mkdir -p $OUTPATH
 rsync -av CompareReports2/* $OUTPATH/.
 

lotus_mass.sh

@@ -18,10 +18,10 @@
 source /etc/bashrc
 
 # Set your target directory for scripts
-TARGET_DIR="/gws/nopw/j04/esmeval/bgcval2/shared_mass_scripts/"
+TARGET_DIR="/home/users/ldemora/workspace/bgcval2/shared_mass_scripts/"
 
 # delete old scripts
-find /gws/nopw/j04/esmeval/bgcval2/shared_mass_scripts -mindepth 1 -mtime +15 -print -delete -name 'u-*.sh'
+find /gws/ssde/j25a/esmeval/bgcval2/shared_mass_scripts -mindepth 1 -mtime +15 -print -delete -name 'u-*.sh'
 
 
 # Create an array of filenames without extensions
@@ -36,10 +36,10 @@ done
 # Shuffle the list and iterate through it
 for JOBID in $(printf "%s\n" "${file_list[@]}" | shuf); do
   # make an output folder (typically done elsewhere)
-  mkdir -p /gws/nopw/j04/ukesm/BGC_data/$JOBID/
+  mkdir -p /gws/ssde/j25a/ukesm/BGC_data/$JOBID/
 
   # Download jobID from mass to the standard location:
-  moo get --fill-gaps moose:/crum/$JOBID/ony.nc.file/*.nc /gws/nopw/j04/ukesm/BGC_data/$JOBID/
+  moo get --fill-gaps moose:/crum/$JOBID/ony.nc.file/*.nc /gws/ssde/j25a/ukesm/BGC_data/$JOBID/
 done