From ee10e8448f98222eec870beeb982f840f8cfcc71 Mon Sep 17 00:00:00 2001 From: Lee de Mora Date: Thu, 21 Nov 2024 09:55:46 +0000 Subject: [PATCH] Added NorthEastAtlantic region --- bgcval2/bgcvaltools/pftnames.py | 1 + key_files/evs.yml | 2 +- key_files/friver.yml | 2 +- key_files/fsitherm.yml | 2 +- key_files/hfds.yml | 2 +- key_files/mld.yml | 2 +- key_files/precip.yml | 2 +- key_files/salinity.yml | 2 +- key_files/soicecov.yml | 2 +- key_files/sosafldo.yml | 2 +- key_files/sowaflup.yml | 2 +- key_files/sowflisf.yml | 2 +- key_files/sowindsp.yml | 2 +- key_files/temperature.yml | 2 +- key_files/thkcello.yml | 2 +- 15 files changed, 15 insertions(+), 14 deletions(-) diff --git a/bgcval2/bgcvaltools/pftnames.py b/bgcval2/bgcvaltools/pftnames.py index f3396df..4cc5486 100644 --- a/bgcval2/bgcvaltools/pftnames.py +++ b/bgcval2/bgcvaltools/pftnames.py @@ -438,6 +438,7 @@ def makeLongNameDict(): lnd['NordicSea'] = "Nordic Sea" lnd['LabradorSea'] = "Labrador Sea" + lnd['NorthEastAtlantic'] = "North East Atlantic" lnd['NorwegianSea'] = "Norwegian Sea" lnd['Cornwall'] = "Cornwall" lnd['Ascension'] = "Ascension Island" diff --git a/key_files/evs.yml b/key_files/evs.yml index b26e604..adba422 100644 --- a/key_files/evs.yml +++ b/key_files/evs.yml @@ -14,7 +14,7 @@ model_vars : evs model_convert : choose_best_var layers : layerless -regions : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean SouthAtlanticOcean SPNA STNA GINseas LabradorSea IrmingerSea LIGINseas LIseas +regions : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean SouthAtlanticOcean SPNA STNA GINseas LabradorSea NorthEastAtlantic IrmingerSea LIGINseas LIseas smoothings : DataOnly 5and30 diff --git a/key_files/friver.yml b/key_files/friver.yml index fccfccb..420424e 100644 --- a/key_files/friver.yml +++ b/key_files/friver.yml @@ -27,7 +27,7 @@ model_vars : friver model_convert : choose_best_var layers : layerless -regions : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean SouthAtlanticOcean SPNA LIGINseas STNA LIseas LabradorSea IrmingerSea GINseas +regions : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean SouthAtlanticOcean SPNA LIGINseas STNA LIseas LabradorSea NorthEastAtlantic IrmingerSea GINseas smoothings : DataOnly 5and30 diff --git a/key_files/fsitherm.yml b/key_files/fsitherm.yml index f9df4b7..755055f 100644 --- a/key_files/fsitherm.yml +++ b/key_files/fsitherm.yml @@ -25,7 +25,7 @@ model_vars : fsitherm model_convert : choose_best_var layers : layerless -regions : Global SouthernOcean ArcticOcean NorthAtlanticOcean SouthAtlanticOcean SPNA STNA GINseas LabradorSea IrmingerSea LIGINseas LIseas +regions : Global SouthernOcean ArcticOcean NorthAtlanticOcean SouthAtlanticOcean SPNA STNA GINseas LabradorSea NorthEastAtlantic IrmingerSea LIGINseas LIseas smoothings : DataOnly 5and30 diff --git a/key_files/hfds.yml b/key_files/hfds.yml index 0473352..ad9fb6f 100644 --- a/key_files/hfds.yml +++ b/key_files/hfds.yml @@ -26,7 +26,7 @@ model_vars : hfds model_convert : choose_best_var layers : layerless -regions : Global SouthernOcean ArcticOcean NorthAtlanticOcean SouthAtlanticOcean SPNA STNA GINseas LabradorSea IrmingerSea LIGINseas LIseas +regions : Global SouthernOcean ArcticOcean NorthAtlanticOcean SouthAtlanticOcean SPNA STNA GINseas LabradorSea NorthEastAtlantic IrmingerSea LIGINseas LIseas smoothings : DataOnly 5and30 diff --git a/key_files/mld.yml b/key_files/mld.yml index e784fcb..ee7bcc0 100644 --- a/key_files/mld.yml +++ b/key_files/mld.yml @@ -30,4 +30,4 @@ data_convert: maskname : mask areafile: $BASEDIR_OBS/IFREMER-MLD/mld_DT02_c1m_reg2.0-annual.nc #layers : Surface -regions : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthAtlanticOcean SouthAtlanticOcean NorthPacificOcean SouthPacificOcean SPNA STNA GINseas LabradorSea EquatorialAtlanticOcean IrmingerSea LIGINseas LIseas +regions : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthAtlanticOcean SouthAtlanticOcean NorthPacificOcean SouthPacificOcean SPNA STNA GINseas LabradorSea NorthEastAtlantic EquatorialAtlanticOcean IrmingerSea LIGINseas LIseas diff --git a/key_files/precip.yml b/key_files/precip.yml index 0ba1d5d..2b111e7 100644 --- a/key_files/precip.yml +++ b/key_files/precip.yml @@ -14,7 +14,7 @@ model_vars : pr prsn model_convert : sum layers : layerless -regions : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean SouthAtlanticOcean SPNA GINseas LabradorSea IrmingerSea LIGINseas LIseas +regions : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean SouthAtlanticOcean SPNA GINseas LabradorSea NorthEastAtlantic IrmingerSea LIGINseas LIseas smoothings : DataOnly 5and30 diff --git a/key_files/salinity.yml b/key_files/salinity.yml index c045ccf..24375c1 100644 --- a/key_files/salinity.yml +++ b/key_files/salinity.yml @@ -20,4 +20,4 @@ data_convert : NoChange data_tdict : ZeroToZero layers : Surface 500m -regions : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean SouthAtlanticOcean SPNA STNA GINseas LabradorSea IrmingerSea LIGINseas EquatorialAtlanticOcean LIseas subpolar +regions : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean SouthAtlanticOcean SPNA STNA GINseas LabradorSea NorthEastAtlantic IrmingerSea LIGINseas EquatorialAtlanticOcean LIseas subpolar diff --git a/key_files/soicecov.yml b/key_files/soicecov.yml index 5d0c872..ad7761d 100644 --- a/key_files/soicecov.yml +++ b/key_files/soicecov.yml @@ -13,7 +13,7 @@ model_vars : soicecov model_convert : choose_best_var layers : layerless -regions : Global SouthernOcean ArcticOcean NorthAtlanticOcean SouthAtlanticOcean GINseas LabradorSea IrmingerSea LIGINseas LIseas +regions : Global SouthernOcean ArcticOcean NorthAtlanticOcean SouthAtlanticOcean GINseas LabradorSea NorthEastAtlantic IrmingerSea LIGINseas LIseas smoothings : DataOnly 5and30 diff --git a/key_files/sosafldo.yml b/key_files/sosafldo.yml index 30df089..824b53d 100644 --- a/key_files/sosafldo.yml +++ b/key_files/sosafldo.yml @@ -26,7 +26,7 @@ model_vars : sosafldo model_convert : choose_best_var layers : layerless -regions : Global SouthernOcean ArcticOcean NorthAtlanticOcean SouthAtlanticOcean SPNA STNA GINseas LabradorSea IrmingerSea LIGINseas LIseas +regions : Global SouthernOcean ArcticOcean NorthAtlanticOcean SouthAtlanticOcean SPNA STNA GINseas LabradorSea NorthEastAtlantic IrmingerSea LIGINseas LIseas smoothings : DataOnly 5and30 diff --git a/key_files/sowaflup.yml b/key_files/sowaflup.yml index 871762c..e54d4c2 100644 --- a/key_files/sowaflup.yml +++ b/key_files/sowaflup.yml @@ -26,7 +26,7 @@ model_vars : sowaflup model_convert : choose_best_var layers : layerless -regions : Global SouthernOcean ArcticOcean NorthAtlanticOcean SouthAtlanticOcean SPNA STNA GINseas LabradorSea IrmingerSea LIGINseas LIseas +regions : Global SouthernOcean ArcticOcean NorthAtlanticOcean SouthAtlanticOcean SPNA STNA GINseas LabradorSea NorthEastAtlantic IrmingerSea LIGINseas LIseas smoothings : DataOnly 5and30 diff --git a/key_files/sowflisf.yml b/key_files/sowflisf.yml index ef65de6..28f0641 100644 --- a/key_files/sowflisf.yml +++ b/key_files/sowflisf.yml @@ -14,7 +14,7 @@ model_vars : sowflisf model_convert : choose_best_var layers : layerless -regions : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean SouthAtlanticOcean SPNA LIGINseas LabradorSea IrmingerSea GINseas LIseas +regions : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean SouthAtlanticOcean SPNA LIGINseas LabradorSea NorthEastAtlantic IrmingerSea GINseas LIseas smoothings : DataOnly 5and30 diff --git a/key_files/sowindsp.yml b/key_files/sowindsp.yml index 1556623..00d3074 100644 --- a/key_files/sowindsp.yml +++ b/key_files/sowindsp.yml @@ -14,7 +14,7 @@ model_vars : sowindsp model_convert : choose_best_var layers : layerless -regions : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean SouthAtlanticOcean SPNA LIGINseas STNA LIseas LabradorSea IrmingerSea GINseas +regions : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean SouthAtlanticOcean SPNA LIGINseas STNA LIseas LabradorSea NorthEastAtlantic IrmingerSea GINseas smoothings : DataOnly 5and30 diff --git a/key_files/temperature.yml b/key_files/temperature.yml index 581634e..5b17a5b 100644 --- a/key_files/temperature.yml +++ b/key_files/temperature.yml @@ -21,7 +21,7 @@ data_convert : NoChange data_tdict : ZeroToZero layers : Surface 500m -regions : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean SouthAtlanticOcean SPNA STNA GINseas LabradorSea IrmingerSea LIGINseas LIseas EquatorialAtlanticOcean subpolar # NorthHemisphere SouthHemisphere +regions : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean SouthAtlanticOcean SPNA STNA GINseas LabradorSea NorthEastAtlantic IrmingerSea LIGINseas LIseas EquatorialAtlanticOcean subpolar # NorthHemisphere SouthHemisphere diff --git a/key_files/thkcello.yml b/key_files/thkcello.yml index f015c7e..b5297e7 100644 --- a/key_files/thkcello.yml +++ b/key_files/thkcello.yml @@ -34,7 +34,7 @@ model_convert : choose_best_var #data_tdict : ZeroToZero layers : Surface -regions : Global SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean SPNA STNA GINseas LabradorSea IrmingerSea LIGINseas LIseas EquatorialAtlanticOcean # NorthHemisphere SouthHemisphere +regions : Global SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean SPNA STNA GINseas LabradorSea NorthEastAtlantic IrmingerSea LIGINseas LIseas EquatorialAtlanticOcean # NorthHemisphere SouthHemisphere