From 5c997f1c75c7a9105dd8ca0ae40fbdb25cd380d2 Mon Sep 17 00:00:00 2001 From: Nic Hannah Date: Tue, 14 Sep 2021 15:15:28 +1000 Subject: [PATCH] Update ERA5 forcing fields. https://github.com/COSIMA/access-om2/issues/242 --- libforcing/src/forcing_field.F90 | 9 ------ tests/ERA5/forcing.json | 50 ++++++++++++++++++-------------- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/libforcing/src/forcing_field.F90 b/libforcing/src/forcing_field.F90 index f4862b5..ec0a237 100644 --- a/libforcing/src/forcing_field.F90 +++ b/libforcing/src/forcing_field.F90 @@ -198,15 +198,6 @@ subroutine forcing_field_calculate(self, file_index, result_array) call self%ncvars(2)%read_data(file_index, tmp2) result_array(:, :) = tmp1(:, :) + tmp2(:, :) - elseif (trim(self%coupling_name) == 'runof_ai') then - ! Runoff is calculated as msror - ! (mean surface runoff rate [kg m**-2 s**-1]) plus - ! mssror (mean sub-surface runoff rate [kg m**-2 s**-1]) - - call self%ncvars(1)%read_data(file_index, tmp1) - call self%ncvars(2)%read_data(file_index, tmp2) - result_array(:, :) = tmp1(:, :) + tmp2(:, :) - elseif (trim(self%coupling_name) == 'qair_ai') then ! Specific humidity at 2m diff --git a/tests/ERA5/forcing.json b/tests/ERA5/forcing.json index b8efb8d..aa2a2d7 100644 --- a/tests/ERA5/forcing.json +++ b/tests/ERA5/forcing.json @@ -7,8 +7,9 @@ "realm": "atmosphere", "input_fields": [ { - "filename": "/g/data/rt52/era5/single-levels/reanalysis/msdrswrf/{{year}}/msdrswrf_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc", - "fieldname": "msdrswrf" + "filename": "/g/data/rt52/era5/single-levels/reanalysis/msdwswrf/{{year}}/msdwswrf_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc", + "fieldname": "msdwswrf", + "units": "W m**-2" } ] }, @@ -18,7 +19,8 @@ "input_fields": [ { "filename": "/g/data/rt52/era5/single-levels/reanalysis/msdwlwrf/{{year}}/msdwlwrf_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc", - "fieldname": "msdwlwrf" + "fieldname": "msdwlwrf", + "units": "W m**-2" } ] }, @@ -27,12 +29,14 @@ "realm": "atmosphere", "input_fields": [ { - "filename": "/g/data/rt52/era5/single-levels/reanalysis/mcpr/{{year}}/mcpr_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc", - "fieldname": "mcpr" + "filename": "/g/data/rt52/era5/single-levels/reanalysis/crr/{{year}}/crr_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc", + "fieldname": "crr", + "units": "kg m**-2 s**-1" }, { - "filename": "/g/data/rt52/era5/single-levels/reanalysis/mlspr/{{year}}/mlspr_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc", - "fieldname": "mlspr" + "filename": "/g/data/rt52/era5/single-levels/reanalysis/lsrr/{{year}}/lsrr_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc", + "fieldname": "lsrr", + "units": "kg m**-2 s**-1" } ] }, @@ -41,8 +45,9 @@ "realm": "atmosphere", "input_fields": [ { - "filename": "/g/data/rt52/era5/single-levels/reanalysis/mlssr/{{year}}/mlssr_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc", - "fieldname": "mlssr" + "filename": "/g/data/rt52/era5/single-levels/reanalysis/msr/{{year}}/msr_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc", + "fieldname": "msr", + "units": "kg m**-2 s**-1" } ] }, @@ -52,7 +57,8 @@ "input_fields": [ { "filename": "/g/data/rt52/era5/single-levels/reanalysis/msl/{{year}}/msl_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc", - "fieldname": "msl" + "fieldname": "msl", + "units": "Pa" } ] }, @@ -61,12 +67,9 @@ "realm": "land", "input_fields": [ { - "filename": "/g/data/rt52/era5/single-levels/reanalysis/msror/{{year}}/msror_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc", - "fieldname": "msror" - }, - { - "filename": "/g/data/rt52/era5/single-levels/reanalysis/mssror/{{year}}/mssror_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc", - "fieldname": "mssror" + "filename": "/g/data/rt52/era5/single-levels/reanalysis/mror/{{year}}/mror_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc", + "fieldname": "mror", + "units": "kg m**-2 s**-1" } ] }, @@ -75,7 +78,8 @@ "input_fields": [ { "filename": "/g/data/rt52/era5/single-levels/reanalysis/2t/{{year}}/2t_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc", - "fieldname": "t2m" + "fieldname": "t2m", + "units": "K" } ] }, @@ -84,11 +88,13 @@ "input_fields": [ { "filename": "/g/data/rt52/era5/single-levels/reanalysis/2d/{{year}}/2d_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc", - "fieldname": "d2m" + "fieldname": "d2m", + "units": "K" }, { "filename": "/g/data/rt52/era5/single-levels/reanalysis/sp/{{year}}/sp_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc", - "fieldname": "sp" + "fieldname": "sp", + "units": "Pa" } ] }, @@ -97,7 +103,8 @@ "input_fields": [ { "filename": "/g/data/rt52/era5/single-levels/reanalysis/10u/{{year}}/10u_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc", - "fieldname": "u10" + "fieldname": "u10", + "units": "m s**-1" } ] }, @@ -106,7 +113,8 @@ "input_fields": [ { "filename": "/g/data/rt52/era5/single-levels/reanalysis/10v/{{year}}/10v_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc", - "fieldname": "v10" + "fieldname": "v10", + "units": "m s**-1" } ] }