From 43e52db38cae4d0f1be09c7320aee31970d4e901 Mon Sep 17 00:00:00 2001
From: Lee de Mora <ledm@pml.ac.uk>
Date: Tue, 25 Apr 2023 15:08:36 +0100
Subject: [PATCH] Update bgcval2_make_report.py

---
 bgcval2/bgcval2_make_report.py | 57 ++++++++++++++++++++++++----------
 1 file changed, 41 insertions(+), 16 deletions(-)

diff --git a/bgcval2/bgcval2_make_report.py b/bgcval2/bgcval2_make_report.py
index bfaf3e32..dbb84d71 100755
--- a/bgcval2/bgcval2_make_report.py
+++ b/bgcval2/bgcval2_make_report.py
@@ -165,6 +165,7 @@ def newImageLocation(fn):
     Level1Profiles = True
     level2Horizontal = True
     level2Physics = False
+    level2_auto = True
     summarySections = False
     level3OMZ = False
     Level3Salinity = False
@@ -954,27 +955,51 @@ def newImageLocation(fn):
             FileLists=FileLists,
             FileOrder=FileOrder)
 
-    if level2Physics:
-        l2Fields = [
-            'Temperature',
-            'Salinity',
-            'MLD',
-            'ZonalCurrent',
-            'MeridionalCurrent',
-            'VerticalCurrent',
-        ]
+
+
+
+
+    if level2Physics or level2_auto:
+         if level2Physics: 
+            l2Fields = [
+                'Temperature',
+                'Salinity',
+                'MLD',
+                'ZonalCurrent',
+                'MeridionalCurrent',
+                'VerticalCurrent',
+            ]
+            slices = [
+                'Surface',
+                '1000m',
+                'Transect',
+            ]
+            SectionTitle = 'Level 2 - Physics'
+            region = 'Global'
+
+        if level2_auto:
+            l2Fields = glob(imagedir + '/' + jobID + '/P2Pplots')
+            l2Fields = [os.path.basename(fn) for fn in sorted(l2Fields)]
+            levels = ['Surface', '50m', '100m', '200m', '500m', '750m', '1000m', '1500m', '2000m', '4000m','Transect']
+            outdict = {}
+            outlevels = {}
+            for i, fn in enumerate(l2Fields):
+                for lv in levels:
+                    if fn.find(lv)>-1:
+                        outlevels[lv]= True
+                    fn = fn.replace(lv, '')
+                outdict[fn]= True
+                
+            l2Fields = [key for key, v in outdict.items()]
+            slices = [key for key, v in outlevels.items()]
+            SectionTitle = 'Level 2'
+            region = '*'
+
         hrefs = []
         Titles = {}
         SidebarTitles = {}
         Descriptions = {}
         FileLists = {}
-        SectionTitle = 'Level 2 - Physics'
-        region = 'Global'
-        slices = [
-            'Surface',
-            '1000m',
-            'Transect',
-        ]
         FileOrder = {}
 
         for key in sorted(l2Fields):