Added recent changes to files.

Author: ledm

bgcval2/functions/circulation.py

@@ -861,7 +861,7 @@ def gulfstream(nc, keys, **kwargs):
         if not loadedAltMask:
              loadAtlanticMask(altmaskfile, maskname='tmaskatl', grid=grid)
 
-        if nc.variables[keys[0]].shape == (332, 362):
+        if nc.variables['nav_lat'].shape == (332, 362):
             lonslice_70W = slice(207, 220) 
             gs_e1v = e1v_AMOC26N
             print('Classic grid')
@@ -871,7 +871,8 @@ def gulfstream(nc, keys, **kwargs):
             gs_e1v = e1v_AMOC26N
 
         else:
-            print('grid not recognised:', nc.variables[keys[0]].shape, grid)
+            print('grid not recognised:', nc.variables[keys[0]].shape, grid, keys)
+            print('in ', nc.filename)
             assert 0
     elif grid == 'eORCA025':
         latslice26Nnm = eORCA025_latslice26Nnm

key_files/soicecov.yml

@@ -5,6 +5,7 @@ dimensions      : 2
 model           : CICE
 # The filenames
 modelFiles      : $BASEDIR_MODEL/$JOBID/nemo_$JOBIDo_1y_*_grid-T.nc
+# Note that soicecov moved to CICE in CMIP7. It
 #modelFile_p2p   : $BASEDIR_MODEL/$JOBID/nemo*$JOBIDo_1y_*$YEAR????_grid-T.nc
 gridFile        : $PATHS_GRIDFILE
 

key_files/somxzint1.yml

@@ -11,8 +11,8 @@ modelFile_p2p   : $BASEDIR_MODEL/$JOBID/nemo*_$JOBIDo_1y_*$YEAR????_grid-T.nc
 #dataFile        : $BASEDIR_OBS/IFREMER-MLD/mld_DT02_c1m_reg2.0-annual.nc
 
 # Model coordinates/dimension names
-model_vars      : somxzint1
-model_convert   : NoChange
+model_vars      : somxzint1 mldzintt0_2
+model_convert   : choose_best_var #NoChange
 layers          : layerless
 
 #model_vars      : somxl010 somxzint1

key_lists/tfamoc.yml

@@ -23,9 +23,9 @@ keys:
     # NoCaspianAirSeaFluxCO2: True
     # IntPP_OSU: True
     # GlobalExportRatio: True
-    TotalIceExtent: True
-    NorthernTotalIceExtent: True
-    SouthernTotalIceExtent: True
+#    TotalIceExtent: True
+#    NorthernTotalIceExtent: True
+#    SouthernTotalIceExtent: True
     GlobalMeanSalinity: True
     fsitherm: True
     ficeberg: True
@@ -37,8 +37,8 @@ keys:
 #    hfbasinatlantic: True
 #    sowindsp: True
     friver: True
-    soicecov: True
-    agessc: True
+#    soicecov: True
+#    agessc: True
     RHOSW: True
 #    thkcello: True