revised new esmeval disk.

Author: ledm

bgcval2/Paths/paths_local.py

@@ -77,7 +77,7 @@ def folder(name):
 
 #####
 # Location of data files.
-ObsFolder = "/gws/nopw/j04/esmeval/example_data/bgc/"
+ObsFolder = "/gws/ssde/j25e/esmeval/example_data/bgc/"
 #	ObsFolder 	= "/group_workspaces/jasmin4/esmeval/example_data/bgc/"
 Dustdir = ObsFolder + "/MahowaldDust/"
 WOAFolder_annual = ObsFolder + "WOA/annual/"

bgcval2/default-bgcval2-config.yml

@@ -12,10 +12,10 @@ standard-paths:
       p2p_ppDir: "bgcval2/ukesm_postProcessed"
       imagedir: "bgcval2/images"
       ModelFolder_pref: "BGC_data"
-      shared_mass_scripts: "/gws/nopw/j04/esmeval/bgcval2/shared_mass_scripts/"
-      orcaGridfn: "/gws/nopw/j04/esmeval/bgc-val/mesh_mask_eORCA1_wrk.nc"
-      orca1bathy: "/gws/nopw/j04/esmeval/bgc-val/ORCA1bathy.nc"
-      ObsFolder: "/gws/nopw/j04/esmeval/example_data/bgc"
+      shared_mass_scripts: "/gws/ssde/j25a/esmeval/bgcval2/shared_mass_scripts/"
+      orcaGridfn: "/gws/ssde/j25a/esmeval/bgc-val/mesh_mask_eORCA1_wrk.nc"
+      orca1bathy: "/gws/ssde/j25a/esmeval/bgc-val/ORCA1bathy.nc"
+      ObsFolder: "/gws/ssde/j25a/esmeval/example_data/bgc"
     data-files:
       Dustdir: "MahowaldDust/"
       WOAFolder_annual: "WOA/annual/"

bgcval2/functions/circulation.py

@@ -871,6 +871,7 @@ def gulfstream(nc, keys, **kwargs):
             gs_e1v = e1v_AMOC26N
 
         else:
+            print('grid not recognised:', nc.variables[keys[0]].shape, grid)
             assert 0
     elif grid == 'eORCA025':
         latslice26Nnm = eORCA025_latslice26Nnm

rsync_to_esmeval.sh

@@ -1,7 +1,8 @@
 # Script to copy report to esmeval public facing server.
 # You may need to request access to the esmeval CEDA-JASMIN group
 # or set your own path.
-Outpath=/gws/nopw/j04/esmeval/public/CompareReports/bgcval2/$USER
+# old: /gws/nopw/j04/esmeval/public/CompareReports/bgcval2/
+Outpath=/gws/ssde/j25a/esmeval/public/CompareReports/bgcval2/$USER
 mkdir -p $Outpath
 rsync -av CompareReports2/* $Outpath/.