Merge pull request #243 from ecmwf/feature/cerise_cmcc

ECC-1915: Feature/cerise cmcc
ecmwf · Sep 6, 2024 · ff5ab61 · ff5ab61
2 parents 6924dc0 + 1ffdb64
commit ff5ab61
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 10 deletions.
diff --git a/definitions/mars/grib.mmsa.em.def b/definitions/mars/grib.mmsa.em.def
@@ -6,7 +6,10 @@ if (class is "od") { alias mars.system = systemNumber; }
 if (class is "c3") { alias mars.system = systemNumber; }
 
 # See ECC-624
-if (centre == 80 && subCentre == 98 && class is "c3") {
+if (centre == 80 && subCentre == 98 && (class is "c3" || class is "ci")) {
   constant cnmc_cmcc = 'cmcc';
   alias mars.origin = cnmc_cmcc;
 }
+
+if (class is "ci") { unalias mars.method; }
+
diff --git a/definitions/mars/grib.mmsa.fcmean.def b/definitions/mars/grib.mmsa.fcmean.def
@@ -8,7 +8,10 @@ if (class is "od") { alias mars.system = systemNumber; }
 if (class is "c3") { alias mars.system = systemNumber; }
 
 # See ECC-624
-if (centre == 80 && subCentre == 98 && class is "c3") {
+if (centre == 80 && subCentre == 98 && (class is "c3" || class is "ci")) {
   constant cnmc_cmcc = 'cmcc';
   alias mars.origin = cnmc_cmcc;
 }
+
+if (class is "ci") { unalias mars.method; }
+
diff --git a/definitions/mars/grib.mmsf.an.def b/definitions/mars/grib.mmsf.an.def
@@ -15,7 +15,7 @@ if (class isnot "gw") { # ECC-1448
 }
 
 # See ECC-624
-if (centre == 80 && subCentre == 98 && class is "c3") {
+if (centre == 80 && subCentre == 98 && (class is "c3" || class is "ci")) {
   constant cnmc_cmcc = 'cmcc';
   alias mars.origin = cnmc_cmcc;
 }

diff --git a/definitions/mars/grib.mmsf.fc.def b/definitions/mars/grib.mmsf.fc.def
@@ -18,7 +18,7 @@ if (class isnot "gw") { # ECC-1448
 }
 
 # See ECC-624
-if (centre == 80 && subCentre == 98 && class is "c3") {
+if (centre == 80 && subCentre == 98 && (class is "c3" || class is "ci")) {
   constant cnmc_cmcc = 'cmcc';
   alias mars.origin = cnmc_cmcc;
 }

diff --git a/definitions/mars/grib.msmm.em.def b/definitions/mars/grib.msmm.em.def
@@ -11,7 +11,10 @@ if (class is "en") { alias mars.system = systemNumber; }
 if (class is "c3") { alias mars.system = systemNumber; }
 
 # See ECC-624
-if (centre == 80 && subCentre == 98 && class is "c3") {
+if (centre == 80 && subCentre == 98 && (class is "c3" || class is "ci")) {
   constant cnmc_cmcc = 'cmcc';
   alias mars.origin = cnmc_cmcc;
 }
+
+if (class is "ci") { unalias mars.method; }
+
diff --git a/definitions/mars/grib.msmm.fcmax.def b/definitions/mars/grib.msmm.fcmax.def
@@ -12,7 +12,10 @@ if (class is "en") { alias mars.system = systemNumber; }
 if (class is "c3") { alias mars.system = systemNumber; }
 
 # See ECC-624
-if (centre == 80 && subCentre == 98 && class is "c3") {
+if (centre == 80 && subCentre == 98 && (class is "c3" || class is "ci")) {
   constant cnmc_cmcc = 'cmcc';
   alias mars.origin = cnmc_cmcc;
 }
+
+if (class is "ci") { unalias mars.method; }
+
diff --git a/definitions/mars/grib.msmm.fcmean.def b/definitions/mars/grib.msmm.fcmean.def
@@ -13,7 +13,7 @@ if (class is "c3") { alias mars.system = systemNumber; }
 if (class is "ci") { alias mars.system = systemNumber; }
 
 # See ECC-624
-if (centre == 80 && subCentre == 98 && class is "c3") {
+if (centre == 80 && subCentre == 98 && (class is "c3" || class is "ci")) {
   constant cnmc_cmcc = 'cmcc';
   alias mars.origin = cnmc_cmcc;
 }

diff --git a/definitions/mars/grib.msmm.fcmin.def b/definitions/mars/grib.msmm.fcmin.def
@@ -12,7 +12,9 @@ if (class is "en") { alias mars.system = systemNumber; }
 if (class is "c3") { alias mars.system = systemNumber; }
 
 # See ECC-624
-if (centre == 80 && subCentre == 98 && class is "c3") {
+if (centre == 80 && subCentre == 98 && (class is "c3" || class is "ci")) {
   constant cnmc_cmcc = 'cmcc';
   alias mars.origin = cnmc_cmcc;
 }
+
+if (class is "ci") { unalias mars.method; }
diff --git a/definitions/mars/grib.msmm.fcstdev.def b/definitions/mars/grib.msmm.fcstdev.def
@@ -13,7 +13,9 @@ if (class is "en") { alias mars.system = systemNumber; }
 if (class is "c3") { alias mars.system = systemNumber; }
 
 # See ECC-624
-if (centre == 80 && subCentre == 98 && class is "c3") {
+if (centre == 80 && subCentre == 98 && (class is "c3" || class is "ci")) {
   constant cnmc_cmcc = 'cmcc';
   alias mars.origin = cnmc_cmcc;
 }
+
+if (class is "ci") { unalias mars.method; }
diff --git a/definitions/mars/grib.msmm.hcmean.def b/definitions/mars/grib.msmm.hcmean.def
diff --git a/definitions/mars/grib.msmm.hcmean.def b/definitions/mars/grib.msmm.hcmean.def
@@ -0,0 +1,19 @@
+# assert(16);
+alias mars.fcmonth = marsForecastMonth;
+unalias mars.step;
+
+alias mars.origin = centre;
+alias mars.method = methodNumber;
+
+if (class is "od") { alias mars.system = systemNumber; }
+if (class is "me") { alias mars.system = systemNumber; }
+if (class is "en") { alias mars.system = systemNumber; }
+if (class is "c3") { alias mars.system = systemNumber; }
+
+# See ECC-624
+if (centre == 80 && subCentre == 98 && (class is "c3" || class is "ci")) {
+  constant cnmc_cmcc = 'cmcc';
+  alias mars.origin = cnmc_cmcc;
+}
+
+if (class is "ci") { unalias mars.method; }