From 9b858c5334ba022ec5b7b0be68c0c182e7665622 Mon Sep 17 00:00:00 2001
From: sloosvel <saskia.loosveldt@bsc.es>
Date: Mon, 28 Feb 2022 12:47:03 +0100
Subject: [PATCH] Add physics and forcing numbers

---
 earthdiagnostics/config.py          | 6 ++++++
 earthdiagnostics/data_convention.py | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/earthdiagnostics/config.py b/earthdiagnostics/config.py
index cb21d9b6..ae148a8c 100644
--- a/earthdiagnostics/config.py
+++ b/earthdiagnostics/config.py
@@ -329,6 +329,12 @@ class CMORConfig(object):
         self.initialization_number = parser.get_int_option(
             "CMOR", "INITIALIZATION_NUMBER", 1
         )
+        self.physics_number = parser.get_int_option(
+            "CMOR", "PHYSICS_NUMBER", 1
+        )
+        self.forcing_number = parser.get_int_option(
+            "CMOR", "FORCING_NUMBER", 1
+        )
         self.physics_description = parser.get_option(
             "CMOR", "PHYSICS_DESCRIPTION", "to be filled"
         )
diff --git a/earthdiagnostics/data_convention.py b/earthdiagnostics/data_convention.py
index c6bb6aab..7d2f4779 100644
--- a/earthdiagnostics/data_convention.py
+++ b/earthdiagnostics/data_convention.py
@@ -985,10 +985,12 @@ class Cmor3Convention(DataConvention):
         str
 
         """
-        template = "r{0}i{1}p1f1"
+        template = "r{0}i{1}p{2}f{3}"
         return template.format(
             member + 1 - self.config.experiment.member_count_start,
             self.config.cmor.initialization_number,
+            self.config.cmor.physics_number,
+            self.config.cmor.forcing_number
         )
 
     def is_cmorized(self, startdate, member, chunk, domain):
-- 
GitLab