From 4a3faff0a1b8e7dc45e9bfd2debeb38ccd90691e Mon Sep 17 00:00:00 2001
From: Lee de Mora <ledm@pml.ac.uk>
Date: Thu, 13 Jun 2024 15:05:13 +0100
Subject: [PATCH] Added several new physics metrics

---
 bgcval2/bgcvaltools/pftnames.py |  6 ++++++
 key_files/evs.yml               | 22 ++++++++++++++++++++++
 key_files/precip.yml            | 22 ++++++++++++++++++++++
 key_files/sowflisf.yml          | 22 ++++++++++++++++++++++
 key_files/sowindsp.yml          | 22 ++++++++++++++++++++++
 key_files/zos.yml               | 22 ++++++++++++++++++++++
 key_lists/debug.yml             |  7 +++++++
 7 files changed, 123 insertions(+)
 create mode 100644 key_files/evs.yml
 create mode 100644 key_files/precip.yml
 create mode 100644 key_files/sowflisf.yml
 create mode 100644 key_files/sowindsp.yml
 create mode 100644 key_files/zos.yml

diff --git a/bgcval2/bgcvaltools/pftnames.py b/bgcval2/bgcvaltools/pftnames.py
index fb37e422..b295b4aa 100644
--- a/bgcval2/bgcvaltools/pftnames.py
+++ b/bgcval2/bgcvaltools/pftnames.py
@@ -328,6 +328,12 @@ def makeLongNameDict():
     lnd['WeddelIceExent'] = 'Weddel Sea Ice Extent'
     lnd['TotalIceExtent'] = 'Total Ice Extent'
 
+    lnd['ZOS'] = 'Sea Surface Height'
+    lnd['EVS'] = 'Water Evaporation flux '
+    lnd['Precip'] = 'Precipitation'
+    lnd['sowindsp'] = 'Surface wind speed'
+    lnd['sowlisf'] = 'Ice Shelf Melting'
+
     lnd['AMM'] = 'Atlantic Margins'
     lnd['AMM_Shelf'] = 'Atlantic Margins Shelf'
     lnd['AMM_OffShelf'] = 'Atlantic Margins Off Shelf'
diff --git a/key_files/evs.yml b/key_files/evs.yml
new file mode 100644
index 00000000..be09b221
--- /dev/null
+++ b/key_files/evs.yml
@@ -0,0 +1,22 @@
+---
+name            : EVS
+units           : kg/m2/s
+dimensions      : 3
+model           : NEMO
+datasource      : WOA
+# The filenames
+modelFiles      : $BASEDIR_MODEL/$JOBID/nemo_$JOBIDo_1y_*_grid-T.nc
+modelFile_p2p   : $BASEDIR_MODEL/$JOBID/nemo*$JOBIDo_1y_*$YEAR????_grid-T.nc
+gridFile        : $PATHS_GRIDFILE
+
+# Model coordinates/dimension names
+model_vars      : evs
+model_convert   : choose_best_var
+
+layers          : layerless
+regions         : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean  SouthAtlanticOcean SPNA 
+smoothings      : DataOnly 5and30 
+
+
+
+
diff --git a/key_files/precip.yml b/key_files/precip.yml
new file mode 100644
index 00000000..91fe45a2
--- /dev/null
+++ b/key_files/precip.yml
@@ -0,0 +1,22 @@
+---
+name            : Precip
+units           : kg/m2/s
+dimensions      : 3
+model           : NEMO
+datasource      : WOA
+# The filenames
+modelFiles      : $BASEDIR_MODEL/$JOBID/nemo_$JOBIDo_1y_*_grid-T.nc
+modelFile_p2p   : $BASEDIR_MODEL/$JOBID/nemo*$JOBIDo_1y_*$YEAR????_grid-T.nc
+gridFile        : $PATHS_GRIDFILE
+
+# Model coordinates/dimension names
+model_vars      : pr prsn 
+model_convert   : sum
+
+layers          : layerless
+regions         : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean  SouthAtlanticOcean SPNA 
+smoothings      : DataOnly 5and30 
+
+
+
+
diff --git a/key_files/sowflisf.yml b/key_files/sowflisf.yml
new file mode 100644
index 00000000..a6b025af
--- /dev/null
+++ b/key_files/sowflisf.yml
@@ -0,0 +1,22 @@
+---
+name            : iceshelfmelting 
+units           : kg/m2/s
+dimensions      : 3
+model           : NEMO
+datasource      : WOA
+# The filenames
+modelFiles      : $BASEDIR_MODEL/$JOBID/nemo_$JOBIDo_1y_*_isf-T.nc
+modelFile_p2p   : $BASEDIR_MODEL/$JOBID/nemo*$JOBIDo_1y_*$YEAR????_isf-T.nc
+gridFile        : $PATHS_GRIDFILE
+
+# Model coordinates/dimension names
+model_vars      : sowflisf
+model_convert   : choose_best_var
+
+layers          : layerless
+regions         : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean  SouthAtlanticOcean SPNA 
+smoothings      : DataOnly 5and30 
+
+
+
+
diff --git a/key_files/sowindsp.yml b/key_files/sowindsp.yml
new file mode 100644
index 00000000..edd4d40e
--- /dev/null
+++ b/key_files/sowindsp.yml
@@ -0,0 +1,22 @@
+---
+name            : Windspeed
+units           : m/s
+dimensions      : 3
+model           : NEMO
+datasource      : WOA
+# The filenames
+modelFiles      : $BASEDIR_MODEL/$JOBID/nemo_$JOBIDo_1y_*_grid-T.nc
+modelFile_p2p   : $BASEDIR_MODEL/$JOBID/nemo*$JOBIDo_1y_*$YEAR????_grid-T.nc
+gridFile        : $PATHS_GRIDFILE
+
+# Model coordinates/dimension names
+model_vars      : sowindsp 
+model_convert   : choose_best_var
+
+layers          : layerless
+regions         : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean  SouthAtlanticOcean SPNA 
+smoothings      : DataOnly 5and30 
+
+
+
+
diff --git a/key_files/zos.yml b/key_files/zos.yml
new file mode 100644
index 00000000..3bf33caf
--- /dev/null
+++ b/key_files/zos.yml
@@ -0,0 +1,22 @@
+---
+name            : ZOS
+units           : m
+dimensions      : 3
+model           : NEMO
+datasource      : WOA
+# The filenames
+modelFiles      : $BASEDIR_MODEL/$JOBID/nemo_$JOBIDo_1y_*_grid-T.nc
+modelFile_p2p   : $BASEDIR_MODEL/$JOBID/nemo*$JOBIDo_1y_*$YEAR????_grid-T.nc
+gridFile        : $PATHS_GRIDFILE
+
+# Model coordinates/dimension names
+model_vars      : zos 
+model_convert   : choose_best_var
+
+layers          : layerless
+regions         : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean  SouthAtlanticOcean SPNA 
+smoothings      : DataOnly 5and30 
+
+
+
+
diff --git a/key_lists/debug.yml b/key_lists/debug.yml
index e8c9dfbf..32cbbad9 100644
--- a/key_lists/debug.yml
+++ b/key_lists/debug.yml
@@ -13,6 +13,13 @@ keys:
     TotalIceArea: True
     NorthernTotalIceArea: True
     SouthernTotalIceArea: True
+
+    ZOS: True
+    sowindsp: True
+    sowflisf: True
+    evs: True
+    precip: True
+
 #     AtlanticSubtropicSalinity: True
 #     MLD: True
 #     Temperature: True