From 1efd64ac483d17b84dd5e37f9f9038532027d020 Mon Sep 17 00:00:00 2001
From: Lee de Mora <ledm@pml.ac.uk>
Date: Mon, 25 Mar 2024 11:54:05 +0000
Subject: [PATCH] Added bug fixes.

---
 bgcval2/timeseries/timeseriesAnalysis.py | 3 ++-
 bgcval2/timeseries/timeseriesTools.py    | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bgcval2/timeseries/timeseriesAnalysis.py b/bgcval2/timeseries/timeseriesAnalysis.py
index 33ff2bb4..9d098f4d 100644
--- a/bgcval2/timeseries/timeseriesAnalysis.py
+++ b/bgcval2/timeseries/timeseriesAnalysis.py
@@ -272,7 +272,8 @@ def loadModel(self):
                 self.modeldetails,
                 regions=self.regions,
                 layers=self.layers,
-                modeldataD=self.modeldataD,
+                metrics= self.metrics,
+                modeldataD=modeldataD,
             )
 
             for l in self.layers:
diff --git a/bgcval2/timeseries/timeseriesTools.py b/bgcval2/timeseries/timeseriesTools.py
index 6dfbd439..15ec9569 100644
--- a/bgcval2/timeseries/timeseriesTools.py
+++ b/bgcval2/timeseries/timeseriesTools.py
@@ -324,8 +324,8 @@ def run(self):
 
             for region in self.regions:
                 loadthisregion = 0
-                for m in metrics:
-                    if self.modeldataD.get((r, l, m), False) and self.meantime in modeldataD[(r, l, m)]:
+                for m in self.metrics:
+                    if self.modeldataD.get((region, l, m), False) and self.meantime in self.modeldataD[(region, l, m)]:
                         # Data arra already exists and This time point's data already exists                         
                         continue
                     # This region does not exist in the processed data, so add it.