diff --git a/README.md b/README.md index 560bc160..3da758c6 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ Some basic tests: python --version # Python 3.11.4 cdo -V # version 2.2.0 drq -v # version 01.02.00 - ece2cmor -V # ece2cmor v2.1.0 + ece2cmor -V # ece2cmor v2.2.0 ece2cmor -h drq -h checkvars -h diff --git a/ece2cmor3/__version__.py b/ece2cmor3/__version__.py index df32b0a0..59053918 100644 --- a/ece2cmor3/__version__.py +++ b/ece2cmor3/__version__.py @@ -1 +1 @@ -version = 'v2.1.0' +version = 'v2.2.0' diff --git a/ece2cmor3/resources/lpjgpar.json b/ece2cmor3/resources/lpjgpar.json index f9af9f5f..623c3a7b 100644 --- a/ece2cmor3/resources/lpjgpar.json +++ b/ece2cmor3/resources/lpjgpar.json @@ -21,8 +21,8 @@ "target": "cLand" }, { - "source": "cLand_1st", - "target": "cLand_1st" + "source": "cLand1st", + "target": "cLand1st" }, { "source": "cLandYr", diff --git a/ece2cmor3/resources/miscellaneous-data-requests/optimesm-request/optimesm-request-EC-EARTH-CC-varlist.json b/ece2cmor3/resources/miscellaneous-data-requests/optimesm-request/optimesm-request-EC-EARTH-CC-varlist.json index 05a6759f..c40751aa 100644 --- a/ece2cmor3/resources/miscellaneous-data-requests/optimesm-request/optimesm-request-EC-EARTH-CC-varlist.json +++ b/ece2cmor3/resources/miscellaneous-data-requests/optimesm-request/optimesm-request-EC-EARTH-CC-varlist.json @@ -134,7 +134,7 @@ ], "Emon": [ "cLand", - "cLand_1st", + "cLand1st", "cLitterCwd", "cLitterSubSurf", "cLitterSurf", diff --git a/ece2cmor3/scripts/add-lpjg-cc-diagnostics.sh b/ece2cmor3/scripts/add-lpjg-cc-diagnostics.sh index 3310e72a..2a4c69f9 100755 --- a/ece2cmor3/scripts/add-lpjg-cc-diagnostics.sh +++ b/ece2cmor3/scripts/add-lpjg-cc-diagnostics.sh @@ -30,7 +30,7 @@ if [ "$#" -eq 0 ]; then # Add: # Eyr cFluxYr # Eyr cLandYr - # Emon cLand_1st + # Emon cLand1st # Add all water related variables and tsl to new created LPJG CMOR tables, # because the same variables delivered by HTESSEL have the preference as @@ -121,7 +121,7 @@ if [ "$#" -eq 0 ]; then ' ${table_file_Eyr} sed -i '/"cLitterCwd": {/i \ - "cLand_1st": { \ + "cLand1st": { \ "frequency": "mon", \ "modeling_realm": "land", \ "standard_name": "mass_content_of_carbon_in_vegetation_and_litter_and_soil_and_forestry_and_agricultural_products", \ @@ -131,7 +131,7 @@ if [ "$#" -eq 0 ]; then "long_name": "Total Carbon in All Terrestrial Carbon Pools", \ "comment": "Report missing data over ocean grid cells. For fractional land report value averaged over the land fraction. Non CMOR standard, but added by the EC-Earth Consortium within the OptimESM project.", \ "dimensions": "longitude latitude time", \ - "out_name": "cLand_1st", \ + "out_name": "cLand1st", \ "type": "real", \ "positive": "", \ "valid_min": "", \ diff --git a/ece2cmor3/scripts/check-for-obsolete-cmor-variables-in-json-file.py b/ece2cmor3/scripts/check-for-obsolete-cmor-variables-in-json-file.py index b046db32..11b18e09 100755 --- a/ece2cmor3/scripts/check-for-obsolete-cmor-variables-in-json-file.py +++ b/ece2cmor3/scripts/check-for-obsolete-cmor-variables-in-json-file.py @@ -36,7 +36,7 @@ def check_obsolete(fname): log.info("Non-cmor target found (see #575 later added) in %s: %s" % (fname, tvar)) elif tvar in ["tosa", "ta23r", "ta36", "ua23r", "ua36", "va23r", "va36", "hus23r", "hus36", "tsl4sl"]: log.info("Non-cmor target found (see #664) in %s: %s" % (fname, tvar)) - elif tvar in ["cLand_1st", "cFluxYr", "cLandYr"]: + elif tvar in ["cLand1st", "cFluxYr", "cLandYr"]: log.info("Non-cmor target found (see #778 & #782) in %s: %s" % (fname, tvar)) elif tvar in ["conccnmode01", "conccnmode02", "conccnmode03", "conccnmode04", "conccnmode05", "conccnmode06", "conccnmode07", "mmraerh2omode01", "mmraerh2omode02", "mmraerh2omode03", "mmraerh2omode04", "mmrbcmode02", "mmrbcmode03", "mmrbcmode04", "mmrbcmode05", "mmrdustmode03", "mmrdustmode04", "mmrdustmode06", "mmrdustmode07", "mmroamode02", "mmroamode03", "mmroamode04", "mmroamode05", "mmrso4mode01", "mmrso4mode02", "mmrso4mode03", "mmrso4mode04", "mmrsoamode01", "mmrsoamode02", "mmrsoamode03", "mmrsoamode04", "mmrsoamode05", "mmrssmode03", "mmrssmode04", "ald2", "c2h4", "c2h5oh", "ch3cocho", "ch3o2h", "ch3o2no2", "ch3oh", "h2o2", "h2so4", "hcooh", "hno4", "hono", "ispd", "mcooh", "msa", "n2o5", "nh3", "ole", "orgntr", "par", "rooh", "terp"]: log.info("Non-cmor target found (see #775) in %s: %s" % (fname, tvar)) diff --git a/ece2cmor3/scripts/genecec-for-individual-experiments.sh b/ece2cmor3/scripts/genecec-for-individual-experiments.sh index 4ee07a72..23021bb1 100755 --- a/ece2cmor3/scripts/genecec-for-individual-experiments.sh +++ b/ece2cmor3/scripts/genecec-for-individual-experiments.sh @@ -131,7 +131,7 @@ if [ "$#" -eq 5 ]; then drq2ppt ${request_option} ${data_request_file} drq2ins ${request_option} ${data_request_file} if [ ${request_option} = '--drq' ]; then - drq2varlist ${request_option} ${data_request_file} --ececonf EC-EARTH-AOGCM --varlist cmip6-data-request-varlist-${mip_name}-${experiment}-${ece_configuration}.json + drq2varlist ${request_option} ${data_request_file} --ececonf ${ece_configuration} --varlist cmip6-data-request-varlist-${mip_name}-${experiment}-${ece_configuration}.json convert_component_to_flat_json cmip6-data-request-varlist-${mip_name}-${experiment}-${ece_configuration}.json checkvars -v --asciionly --drq cmip6-data-request-varlist-${mip_name}-${experiment}-${ece_configuration}-flat.json --output request-overview rm -f cmip6-data-request-varlist-${mip_name}-${experiment}-${ece_configuration}-flat.json diff --git a/ece2cmor3/scripts/generate-lpjguess.json.sh b/ece2cmor3/scripts/generate-lpjguess.json.sh index 10a0c297..78ed76d9 100755 --- a/ece2cmor3/scripts/generate-lpjguess.json.sh +++ b/ece2cmor3/scripts/generate-lpjguess.json.sh @@ -24,7 +24,7 @@ declare -a arr=( "cCwd" "cFluxYr" "cLand" -"cLand_1st" +"cLand1st" "cLandYr" "cLeaf" "cLitter" diff --git a/environment.yml b/environment.yml index 3c1063a7..3004de71 100644 --- a/environment.yml +++ b/environment.yml @@ -12,7 +12,7 @@ # cdo -V # version 2.1.1 # drq -v # version 01.02.00 # drq -h -# ece2cmor -V # ece2cmor v2.1.0 +# ece2cmor -V # ece2cmor v2.2.0 # # The version of one of the packages can be adjusted manually, For instance change the # data request version of the dreq package (ensure the ece2cmor3 environment is active):