Changes from #397

Author: NParsonsMO

CMEW/meta/rose-meta.conf

@@ -4,7 +4,28 @@
 [namelist:cmip6_datasets]
 duplicate=true
 
-[namelist:cmip6_datasets=alias]
+[namelist:cmip6_datasets=experiment_id]
+compulsory=true
+description=The experiment ID of the dataset.
+help=For example, 'historical', 'piControl' or 'abrupt4xco2'.
+sort-key=3
+type=quoted
+
+[namelist:cmip6_datasets=grid]
+compulsory=true
+description=Whether the data is on the native grid of the model.
+help=This will either be 'gn' for native grid or 'gr' for regridded.
+sort-key=5
+values="gn","gr"
+
+[namelist:cmip6_datasets=institute]
+compulsory=true
+description=The institute that produced the dataset.
+help=For example, 'MOHC' or 'EC-Earth-Consortium'.
+sort-key=2
+type=quoted
+
+[namelist:cmip6_datasets=label_for_plots]
 compulsory=false
 description=A label to use on plots for this dataset.
 help=It is recommended to limit the length of this string as much as is
@@ -16,42 +37,21 @@ pattern=^".{0,25}"$
 sort-key=6
 type=quoted
 
-[namelist:cmip6_datasets=dataset]
+[namelist:cmip6_datasets=model_id]
 compulsory=true
-description=The 'model_id' (or 'source_id') of the CMIP6 dataset.
+description=The 'source_id' of the CMIP6 dataset.
 help=For example, 'UKESM1-0-LL' or 'ACCESS-ESM1-5'.
 sort-key=1
 type=quoted
 
-[namelist:cmip6_datasets=ensemble]
+[namelist:cmip6_datasets=variant_label]
 compulsory=true
-description=Also known as 'variant label'.
+description=Also known as 'ensemble'.
 help=Must adhere to CMIP6 variant label format: r<int>i<int>p<int>f<int>.
     =For example, 'r2i1p1f3'. https://help.ceda.ac.uk/article/4801-cmip6-data
 pattern=^"r[0-9]+i[0-9]+p[0-9]+f[0-9]+"$
 sort-key=4
 
-[namelist:cmip6_datasets=exp]
-compulsory=true
-description=The experiment ID of the dataset.
-help=For example, 'historical', 'piControl' or 'abrupt4xco2'.
-sort-key=3
-type=quoted
-
-[namelist:cmip6_datasets=grid]
-compulsory=true
-description=Whether the data is on the native grid of the model.
-help=This will either be 'gn' for native grid or 'gr' for regridded.
-sort-key=5
-values="gn","gr"
-
-[namelist:cmip6_datasets=institute]
-compulsory=true
-description=The institute that produced the dataset.
-help=For example, 'MOHC' or 'EC-Earth-Consortium'.
-sort-key=2
-type=quoted
-
 [namelist:model_runs]
 duplicate=true
 

CMEW/rose-suite.conf

@@ -8,12 +8,12 @@ source=(namelist:cmip6_datasets(:))
 source=(namelist:model_runs(:))
 
 [namelist:cmip6_datasets(1)]
-alias="CMIP6 dataset 001"
-dataset="UKESM1-0-LL"
-ensemble="r5i1p1f3"
-exp="historical"
+experiment_id="historical"
 grid="gn"
 institute="MOHC"
+label_for_plots="CMIP6 dataset 001"
+model_id="UKESM1-0-LL"
+variant_label="r5i1p1f3"
 
 [namelist:model_runs(1)]
 calendar="gregorian"