diff --git a/earthdiagnostics/config.py b/earthdiagnostics/config.py index cb21d9b6cdb82e3895638d1a47a34f9f9814a552..ae148a8cb59e90a01ba85b4d8915363de4011200 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 c6bb6aabd5d72be53211e50413242c45b17df097..7d2f47799e970eacdfecbfaa2f2b79111fd22bd8 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):