ACCESS-Community-Hub · paolap · Dec 9, 2024 · Oct 31, 2024 · Oct 31, 2024 · Nov 7, 2024
diff --git a/ACDD_conf.yaml b/ACDD_conf.yaml
@@ -76,13 +76,17 @@ cmor:
     # you can usually leave these empty if processing only atmos
     # ancillary files relative path to <appdir> or fullpath
     ancils_path: "localdata/ancils"
-    grid_ocean: ""
-    grid_ice: ""
+    # grid ocean is the auscom grid file t retrieve lat/lon and their vertices
+    # example is for om2, cm2, esm1.5 versions
+    grid_ocean: "grid_spec.auscom.20110618.nc"
+    grid_seaIce: ""
     mask_ocean: ""
     # to supply land area fraction if not available in output 
     land_frac: ""
     # to supply tile area fraction if not available in output 
     tile_frac: ""
+    # used for atmospheric hybrid coordinates
+    orog: ""
     # defines Controlled Vocabularies and required attributes
     # leave ACDD to follow NCI publishing requirements 
     _control_vocabulary_file: "ACDD_CV.json"
@@ -189,4 +193,4 @@ attrs:
     parent: !!bool false 
     # CMOR will add a tracking_id if you want to define a prefix add here
     tracking_id_prefix: 
-    comment: "post-processed using ACCESS-MOPPeR v1.1.1 https://doi.org/10.5281/zenodo.14010850"
+    comment: "post-processed using ACCESS-MOPPeR v1.2.0 https://doi.org/10.5281/zenodo.14322348"
diff --git a/CMIP6_conf.yaml b/CMIP6_conf.yaml
@@ -69,13 +69,17 @@ cmor:
     # you can usually leave these empty if processing only atmos
     # ancillary files relative path to <appdir> or fullpath
     ancils_path: "localdata/ancils"
-    grid_ocean: ""
-    grid_ice: ""
+    # grid ocean is the auscom grid file t retrieve lat/lon and their vertices
+    # example is for om2, cm2, esm1.5 versions
+    grid_ocean: "grid_spec.auscom.20110618.nc"
+    grid_seaIce: ""
     mask_ocean: ""
     # to supply land area fraction if not available in output
     land_frac: ""
     # to supply tile area fraction if not available in output
     tile_frac: ""
+    # used for atmospheric hybrid coordinates
+    orog: ""
     history_data: ''
     # DO NOT REMOVE OR ALTER this if you don't know what you're doing :-)
     # defines Controlled Vocabularies and required attributes
@@ -180,4 +184,4 @@ attrs:
     #CMOR will add a tracking_id if you want to define a prefix add here
     tracking_id_prefix:
     Conventions: "CF-1.7 CMIP-6.2" 
-    comment: "post-processed using ACCESS-MOPPeR v1.1.1 https://doi.org/10.5281/zenodo.14010850"
+    comment: "post-processed using ACCESS-MOPPeR v1.2.0 https://doi.org/10.5281/zenodo.14322348"
diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 # [ACCESS Model Output Post-Processor (MOPPeR)](https://access-mopper.readthedocs.io/en/latest)
 [![Read the docs](https://readthedocs.org/projects/access-mopper/badge/?version=latest)](https://access-mopper.readthedocs.io/en/latest/)
-[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.14010850.svg)](https://doi.org/10.5281/zenodo.14010850)
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.14322348.svg)](https://doi.org/10.5281/zenodo.14322348)
 
 This code is derived from the [APP4](https://doi.org/10.5281/zenodo.7703469), initially created by Peter Uhe for CMIP5, and further developed for CMIP6-era by Chloe Mackallah from CSIRO, O&A Aspendale.
 
 ---
-# ACCESS-NRI Support for ACCESS-MOPPeR
+## ACCESS-NRI Support for ACCESS-MOPPeR
 
 With the conclusion of the ARC Centre of Excellence for Climate Extremes (CLEX), support for ACCESS-MOPPeR is transitioning to ACCESS-NRI.
 

diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -1,14 +1,14 @@
 package:
     name: mopper 
     #version: "{{ environ.get('GIT_DESCRIBE_TAG', '1.0') }}"
-    version: '1.1.1'
+    version: '1.2.0'
 #source:
 # path: ../.
 
 source:
   #url: https://github.com/ACCESS-Hive/ACCESS-MOPPeR/archive/refs/tags/{{ environ.get('RELEASE_VERSION') }}.tar.gz
   git_url: https://github.com/ACCESS-Hive/ACCESS-MOPPeR.git
-  git_tag: "1.1.1"
+  git_tag: "1.2.0"
   #git_rev: "1.1.0"
   #git_depth: 1 # (Defaults to -1/not shallow)
 

diff --git a/mappings/map_AUS2200.csv b/mappings/map_AUS2200.csv
@@ -29,13 +29,13 @@ hus;fld_s00i010;level_to_height(var[0],levs=(0,66));1;time model_theta_level_num
 huslev1;fld_s00i010;;1;time lat lon;longitude latitude time1;10minPt;atmos;area: time: point;;AUS2200_A10min;AUS2200;float32;22048000;2304;umnsa_spec;SPECIFIC HUMIDITY AFTER TIMESTEP;surface_specific_humidity
 huss;fld_s03i237;;1;time_0 lat lon;longitude latitude time height1.5m;1hr;atmos;area: time: mean;;AUS2200_A1hr;AUS2200;float32;22048000;384;umnsa_slv;SPECIFIC HUMIDITY  AT 1.5M;specific_humidity
 huss;fld_s03i237;;1;time lat lon;longitude latitude time1 height1.5m;10minPt;atmos;area: time: point;;AUS2200_A10min;AUS2200;float32;22048000;2304;umnsa_spec;SPECIFIC HUMIDITY  AT 1.5M;specific_humidity
-lmask;fld_s00i030;var[0].isel(time=0).astype(int);1;time_1 lat lon;longitude latitude;1hrPt;land;area: time: point;;AUS2200_fx;AUS2200;float64;44096000;384;umnsa_slv;LAND MASK (No halo) (LAND=TRUE);land_binary_mask
+lmask;fld_s00i030;var[0].isel(time=0).astype(int);1;time_1 lat lon;longitude latitude;fx;land;area: time: point;;AUS2200_fx;AUS2200;float64;44096000;384;umnsa_slv;LAND MASK (No halo) (LAND=TRUE);land_binary_mask
 lwp;fld_s30i405;;kg m-2;time lat lon;longitude latitude time1;10minPt;atmos;area: time: point;;AUS2200_A10min;AUS2200;float32;22048000;2304;umnsa_spec;TOTAL COLUMN QCL  RHO GRID;atmosphere_cloud_liquid_water_content
 mrso;fld_s08i223;var[0].sum(dim='depth');kg m-2;time depth lat lon;longitude latitude time1;1hrPt;land;area: time: point;;AUS2200_A1hr;AUS2200;float32;22048000;384;umnsa_slv;;
 mrsol;fld_s08i223;;kg m-2;time depth lat lon;longitude latitude sdepth time1;1hrPt;land;area: time: point;;AUS2200_A1hr;AUS2200;float32;88192000;384;umnsa_slv;SOIL MOISTURE CONTENT IN A LAYER;mass_content_of_water_in_soil_layer
 mrsos;fld_s08i223;calc_top_soil(var[0]);kg m-2;time depth lat lon;longitude latitude time1 sdepth1;1hrPt;land;area: time: point;;AUS2200_A1hr;AUS2200;float32;22048000;384;umnsa_slv;;
 nflash;fld_s21i104;;1;time_0 lat lon;longitude latitude time;10min;atmos;area: time: sum;;AUS2200_A10min;AUS2200;float32;22048000;2304;umnsa_spec;Number_of_lightning_flashes;
-orog;fld_s00i033;var[0].isel(time=0);m;time_1 lat lon;longitude latitude;1hrPt;land;area: time: point;;CMIP6_fx;AUS2200;float32;22048000;384;umnsa_slv;OROGRAPHY (/STRAT LOWER BC);surface_altitude
+orog;fld_s00i033;var[0].isel(time=0);m;time_1 lat lon;longitude latitude;fx;land;area: time: point;;CMIP6_fx;AUS2200;float32;22048000;384;umnsa_slv;OROGRAPHY (/STRAT LOWER BC);surface_altitude
 pfull;fld_s00i408;level_to_height(var[0],levs=(0,66));Pa;time model_theta_level_number lat lon_0;longitude latitude alevel time1;1hrPt;atmos;area: time: point;;AUS2200_A1hr;AUS2200;float32;1543360000;384;umnsa_mdl;PRESSURE AT THETA LEVELS AFTER TS;air_pressure
 phalf;fld_s00i407;level_to_height(var[0],levs=(0,66));Pa;time model_rho_level_number_0 lat lon_0;longitude latitude alevel time1;1hrPt;atmos;area: time: point;;AUS2200_A1hr;AUS2200;float32;1565408000;384;umnsa_mdl;PRESSURE AT RHO LEVELS AFTER TS;air_pressure
 pralsns;fld_s04i202;;kg m-2;time_0 lat lon;longitude latitude time;10min;atmos;area: time: sum;;AUS2200_A10min;AUS2200;float32;22048000;2304;umnsa_spec;LARGE SCALE SNOW AMOUNT     KG/M2/TS;stratiform_snowfall_amount

diff --git a/mappings/map_atmos_AM3.csv b/mappings/map_atmos_AM3.csv
@@ -23,7 +23,7 @@ hus17uvgrid;fld_s30i205;;1;time pressure lat_v lon_u;longitude latitude plev17 t
 intuaw;fld_s30i428;;kg m-1 s-1;time lat lon;longitude latitude time;mon;atmos;area: time: mean;;CMIP6_Emon;AM3;float32;110592;480;di787a.pm;dry mass col int u*q  per unit area;
 intvaw;fld_s30i429;;kg m-1 s-1;time lat lon;longitude latitude time;mon;atmos;area: time: mean;;CMIP6_Emon;AM3;float32;110592;480;di787a.pm;dry mass col int v*q  per unit area;
 pfull;fld_s00i408;level_to_height(var[0]);Pa;time model_theta_level_number lat lon;longitude latitude alevel time;mon;atmos;area: time: mean;;CM2_mon;AM3;float32;9400320;480;di787a.pa;PRESSURE AT THETA LEVELS AFTER TS;air_pressure
-phalf;fld_s00i407;level_to_height(var[0]);Pa;time model_rho_level_number lat lon;longitude latitude alevhalf time2;mon;atmos;area: time: mean;;CMIP6_Amon;AM3;float32;9400320;480;di787a.pa;PRESSURE AT RHO LEVELS AFTER TS;air_pressure
+phalf;fld_s00i407;level_to_height(var[0]);Pa;time model_rho_level_number lat lon;longitude latitude alevhalf time;mon;atmos;area: time: mean;;CM2_mon;AM3;float32;9400320;480;di787a.pa;PRESSURE AT RHO LEVELS AFTER TS;air_pressure
 pr;fld_s05i216;;kg m-2 s-1;time lat lon;longitude latitude time;day;atmos;area: time: mean;;CMIP6_day;AM3;float32;110592;14400;di787a.pd;TOTAL PRECIPITATION RATE     KG/M2/S;precipitation_flux
 pr;fld_s05i216;;kg m-2 s-1;time lat lon;longitude latitude time;mon;atmos;area: time: mean;;CMIP6_Amon;AM3;float32;110592;480;di787a.pm;TOTAL PRECIPITATION RATE     KG/M2/S;precipitation_flux
 prlsns;fld_s04i204;;kg m-2 s-1;time lat lon;longitude latitude time;mon;atmos;area: time: mean;;CM2_mon;AM3;float32;110592;480;di787a.pm;LARGE SCALE SNOWFALL RATE    KG/M2/S;stratiform_snowfall_flux

diff --git a/mappings/map_atmos_CM2.csv b/mappings/map_atmos_CM2.csv
@@ -1,6 +1,7 @@
 cmor_var;input_vars;calculation;units;dimensions;axes;frequency;realm;cell_methods;positive;cmor_table;version;vtype;size;nsteps;fpattern;long_name;standard_name
 amdry;fld_s30i403;;kg m-2;time lat lon;longitude latitude time;mon;atmos;area: time: mean;;CM2_mon;CM2;float32;110592;12;cw323a.pm;TOTAL COLUMN DRY MASS  RHO GRID;atmosphere_mass_per_unit_area
 amwet;fld_s30i404;;kg m-2;time lat lon;longitude latitude time;mon;atmos;area: time: mean;;CM2_mon;CM2;float32;110592;12;cw323a.pm;TOTAL COLUMN WET MASS  RHO GRID;atmosphere_mass_per_unit_area
+areacella;areacella;;m2;latitude longitude;longitude latitude;fx;atmos;area: sum;;CMIP6_fx;CM2;float32;110592;1;cm2_areacella;t-cell grid area;cell_area
 ci;fld_s05i269;;1;time lat lon;longitude latitude time;mon;atmos;area: time: mean;;CMIP6_Amon;CM2;float32;110592;12;cw323a.pm;deep convection indicator;
 cl;fld_s02i261;level_to_height(var[0]);1;time model_theta_level_number lat lon;longitude latitude alevel time;mon;atmos;area: time: mean;;CMIP6_Amon;CM2;float32;9400320;12;cw323a.pm;TOTAL CLOUD AMOUNT ON LEVELS;cloud_area_fraction_in_atmosphere_layer
 cli;fld_s02i309;level_to_height(var[0]);1;time model_theta_level_number lat lon;longitude latitude alevel time;mon;atmos;area: time: mean;;CMIP6_Amon;CM2;float32;9400320;12;cw323a.pm;GRIDBOX LSC Qcf IN RADIATION   KG/KG;mass_fraction_of_stratiform_cloud_ice_in_air
@@ -16,6 +17,7 @@ hfls;fld_s03i234;;W m-2;time lat lon;longitude latitude time;day;atmos;area: tim
 hfss;fld_s03i217;;W m-2;time lat lon;longitude latitude time;mon;atmos;area: time: mean;up;CMIP6_Amon;CM2;float32;110592;12;cw323a.pm;SURFACE SENSIBLE HEAT FLUX     W/M2;surface_upward_sensible_heat_flux
 hfss;fld_s03i217;;W m-2;time_0 lat lon;longitude latitude time;3hr;atmos;area: time: mean;up;CMIP6_3hr;CM2;float32;110592;578880;cm000a.p8;SURFACE SENSIBLE HEAT FLUX W/M2;surface_upward_sensible_heat_flux
 hfss;fld_s03i217;;W m-2;time lat lon;longitude latitude time;day;atmos;area: time: mean;up;CMIP6_day;CM2;float32;110592;74772;cm000a.pd;SURFACE SENSIBLE HEAT FLUX     W/M2;surface_upward_sensible_heat_flux
+hur;fld_s30i296;;%;time pressure lat lon;longitude latitude plev8 time;day;atmos;area: time: mean;;CMIP6_day;CM2;float32;2101248;2400;da130a.pd;RELATIVE HUMIDITY ON P LEV/T GRID;relative_humidity
 hur;fld_s30i296;;%;time pressure lat lon;longitude latitude plev19 time;mon;atmos;area: time: mean;;CMIP6_Amon;CM2;float32;2101248;12;cw323a.pm;RELATIVE HUMIDITY ON P LEV/T GRID;relative_humidity
 hur19;fld_s30i296;;%;time pressure lat lon;longitude latitude plev19 time;day;atmos;area: time: mean;;CM2_day;CM2;float32;884736;74772;cm000a.pd;RELATIVE HUMIDITY ON P LEV/T GRID;relative_humidity
 hurs;fld_s03i245;;%;time lat lon;longitude latitude time height1.5m;mon;atmos;area: time: mean;;CM2_mon;CM2;float32;110592;12;cw323a.pm;RELATIVE HUMIDITY AT 1.5M;relative_humidity
@@ -36,7 +38,7 @@ intuaw;fld_s30i428;;kg m-1 s-1;time lat lon;longitude latitude time;mon;atmos;ar
 intvaw;fld_s30i429;;kg m-1 s-1;time lat lon;longitude latitude time;mon;atmos;area: time: mean;;CMIP6_Emon;CM2;float32;110592;12;cw323a.pm;dry mass col int v*q  per unit area;northward_atmosphere_water_transport_across_unit_distance
 mc;fld_s05i250 fld_s05i251;level_to_height((var[0]-var[1])/9.80665);kg m-2 s-1;time model_theta_level_number lat lon;longitude latitude alevel time;mon;atmos;;up;CM2_mon;CM2;float32;9400320;2081;cm000a.pm;Convective Mass Flux;atmosphere_net_upward_convective_mass_flux
 pfull;fld_s00i408;level_to_height(var[0]);Pa;time model_theta_level_number lat lon;longitude latitude alevel time;mon;atmos;area: time: mean;;CM2_mon;CM2;float32;9400320;12;cw323a.pm;PRESSURE AT THETA LEVELS AFTER TS;air_pressure
-phalf;fld_s00i407;level_to_height(var[0]);Pa;time model_rho_level_number lat lon;longitude latitude alevhalf time2;mon;atmos;area: time: mean;;CMIP6_Amon;CM2;float32;9400320;12;cw323a.pm;PRESSURE AT RHO LEVELS AFTER TS;air_pressure
+phalf;fld_s00i407;level_to_height(var[0]);Pa;time model_rho_level_number lat lon;longitude latitude alevel time;mon;atmos;area: time: mean;;CM2_mon;CM2;float32;9400320;12;cw323a.pm;PRESSURE AT RHO LEVELS AFTER TS;air_pressure
 prc;fld_s05i205 fld_s05i206;var[0]+var[1];kg m-2 s-1;time lat lon;longitude latitude time;mon;atmos;area: time: mean;;CMIP6_Amon;CM2;float32;110592;12;cw323a.pm;Convective precipitation at surface, includes both liquid and solid phases;convective_precipitation_flux
 prc;fld_s05i205 fld_s05i206;var[0]+var[1];kg m-2 s-1;time_0 lat lon;longitude latitude time;3hr;atmos;;;CMIP6_3hr;CM2;float32;110592;578880;cm000a.p8;Convective precipitation at surface, includes both liquid and solid phases;convective_precipitation_flux
 prc;fld_s05i205 fld_s05i206;var[0]+var[1];kg m-2 s-1;time lat lon;longitude latitude time;day;atmos;;;CMIP6_day;CM2;float32;110592;74772;cm000a.pd;Convective precipitation at surface, includes both liquid and solid phases;convective_precipitation_flux
@@ -105,7 +107,8 @@ sci;fld_s05i270;;1;time lat lon;longitude latitude time;mon;atmos;area: time: me
 sfcWind;fld_s03i230;;m s-1;time lat lon;longitude latitude time height10m;mon;atmos;area: time: mean;;CMIP6_Amon;CM2;float32;110592;12;cw323a.pm;10 METRE WIND SPEED ON C GRID;wind_speed
 sfcWind;fld_s03i230;;m s-1;time lat lon;longitude latitude time height10m;day;atmos;area: time: mean;;CMIP6_day;CM2;float32;110592;74772;cm000a.pd;10 METRE WIND SPEED ON C GRID;wind_speed
 sfcWindmax;fld_s03i230_max;;m s-1;time lat lon;longitude latitude time height10m;day;atmos;area: time: maximum;;CMIP6_day;CM2;float32;110592;74772;cm000a.pd;10 METRE WIND SPEED ON C GRID;wind_speed
-sftlf;fld_s03i395;;1;time lat lon;longitude latitude;mon;atmos;area: time: mean;;CMIP6_fx;CM2;float32;110592;12;cw323a.pm;FRACTION OF LAND;land_area_fraction
+sftlf;fld_s03i395;var[0].isel(time=0);1;time lat lon;longitude latitude;fx;atmos;area: time: mean;;CMIP6_fx;CM2;float32;110592;12;cw323a.pm;FRACTION OF LAND;land_area_fraction
+siconca;fld_s00i031;;1;time lat lon;time lat lon;mon;atmos;area: time: mean;;CMIP6_SImon;CM2;float32;110592;2400;da130a.pm;FRAC OF SEA ICE IN SEA AFTER TSTEP;sea_ice_area_fraction
 ta;fld_s30i294;;K;time pressure lat lon;longitude latitude plev19 time;mon;atmos;area: time: mean;;CMIP6_Amon;CM2;float32;2101248;12;cw323a.pm;TEMPERATURE ON P LEV/T GRID;air_temperature
 ta;fld_s30i204;;K;time pressure lat_v lon_u;longitude latitude plev19 time;mon;atmos;area: time: mean;;CMIP6_Amon;CM2;float32;2115840;2081;cm000a.pm;TEMPERATURE ON P LEV/UV GRID;air_temperature
 ta19;fld_s30i294;;K;time pressure lat lon;longitude latitude plev19 time1;6hrPt;atmos;area: time: point;;CM2_6hr;CM2;float32;331776;289440;cm000a.p7;TEMPERATURE ON 19 P LEV/T GRID;air_temperature
@@ -116,7 +119,9 @@ tas;fld_s03i236;;K;time lat lon;longitude latitude time height1.5m;mon;atmos;are
 tas;fld_s03i236;;K;time lat lon;longitude latitude time height1.5m;3hrPt;atmos;area: time: point;;CM2_3hr;CM2;float32;110592;578880;cm000a.p8;TEMPERATURE AT 1.5M;air_temperature
 tas;fld_s03i236;;K;time lat lon;longitude latitude time height1.5m;day;atmos;area: time: mean;;CM2_day;CM2;float32;110592;74772;cm000a.pd;TEMPERATURE AT 1.5M;air_temperature
 tasmax;fld_s03i236_max;;K;time lat lon;longitude latitude time height1.5m;day;atmos;area: time: maximum;;CM2_day;CM2;float32;110592;74772;cm000a.pd;TEMPERATURE AT 1.5M;air_temperature
+tasmax;fld_s03i236_max;;K;time lat lon;longitude latitude time height1.5m;mon;atmos;area: time: maximum;;CM2_mon;CM2;float32;110592;2412;cm000a.pm;TEMPERATURE AT 1.5M;air_temperature
 tasmin;fld_s03i236_min;;K;time lat lon;longitude latitude time height1.5m;day;atmos;area: time: minimum;;CM2_day;CM2;float32;110592;74772;cm000a.pd;TEMPERATURE AT 1.5M;air_temperature
+tasmin;fld_s03i236_min;;K;time lat lon;longitude latitude time height1.5m;mon;atmos;area: time: minimum;;CM2_mon;CM2;float32;110592;2412;cm000a.pm;TEMPERATURE AT 1.5M;air_temperature
 tauu;fld_s03i460;;Pa;time lat lon_u;longitude latitude time;mon;atmos;area: time: mean;down;CMIP6_Amon;CM2;float32;110592;12;cw323a.pm;X-COMP SURFACE BL STRESS;surface_downward_eastward_stress
 tauv;fld_s03i461;;Pa;time lat_v lon;longitude latitude time;mon;atmos;area: time: mean;down;CMIP6_Amon;CM2;float32;111360;12;cw323a.pm;Y-COMP SURFACE BL STRESS;surface_downward_northward_stress
 ta19uvgrid;fld_s30i204;;K;time pressure lat_v lon_u;longitude latitude plev19 time;mon;atmos;area: time: mean;;CM2_mon;CM2;float32;2115840;12;cw323a.pm;TEMPERATURE ON P LEV/UV GRID;air_temperature