Skip to content

Commit 5c997f1

Browse files
nichannahnichannah
committed
Update ERA5 forcing fields. COSIMA/access-om2#242 
1 parent 7f2a4a0 commit 5c997f1

File tree

2 files changed

+29
-30
lines changed

2 files changed

+29
-30
lines changed

‎libforcing/src/forcing_field.F90

-9
Original file line numberDiff line numberDiff line change
@@ -198,15 +198,6 @@ subroutine forcing_field_calculate(self, file_index, result_array)
198198
call self%ncvars(2)%read_data(file_index, tmp2)
199199
result_array(:, :) = tmp1(:, :) + tmp2(:, :)
200200

201-
elseif (trim(self%coupling_name) == 'runof_ai') then
202-
! Runoff is calculated as msror
203-
! (mean surface runoff rate [kg m**-2 s**-1]) plus
204-
! mssror (mean sub-surface runoff rate [kg m**-2 s**-1])
205-
206-
call self%ncvars(1)%read_data(file_index, tmp1)
207-
call self%ncvars(2)%read_data(file_index, tmp2)
208-
result_array(:, :) = tmp1(:, :) + tmp2(:, :)
209-
210201
elseif (trim(self%coupling_name) == 'qair_ai') then
211202
! Specific humidity at 2m
212203

‎tests/ERA5/forcing.json

+29-21
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
"realm": "atmosphere",
88
"input_fields": [
99
{
10-
"filename": "/g/data/rt52/era5/single-levels/reanalysis/msdrswrf/{{year}}/msdrswrf_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc",
11-
"fieldname": "msdrswrf"
10+
"filename": "/g/data/rt52/era5/single-levels/reanalysis/msdwswrf/{{year}}/msdwswrf_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc",
11+
"fieldname": "msdwswrf",
12+
"units": "W m**-2"
1213
}
1314
]
1415
},
@@ -18,7 +19,8 @@
1819
"input_fields": [
1920
{
2021
"filename": "/g/data/rt52/era5/single-levels/reanalysis/msdwlwrf/{{year}}/msdwlwrf_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc",
21-
"fieldname": "msdwlwrf"
22+
"fieldname": "msdwlwrf",
23+
"units": "W m**-2"
2224
}
2325
]
2426
},
@@ -27,12 +29,14 @@
2729
"realm": "atmosphere",
2830
"input_fields": [
2931
{
30-
"filename": "/g/data/rt52/era5/single-levels/reanalysis/mcpr/{{year}}/mcpr_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc",
31-
"fieldname": "mcpr"
32+
"filename": "/g/data/rt52/era5/single-levels/reanalysis/crr/{{year}}/crr_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc",
33+
"fieldname": "crr",
34+
"units": "kg m**-2 s**-1"
3235
},
3336
{
34-
"filename": "/g/data/rt52/era5/single-levels/reanalysis/mlspr/{{year}}/mlspr_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc",
35-
"fieldname": "mlspr"
37+
"filename": "/g/data/rt52/era5/single-levels/reanalysis/lsrr/{{year}}/lsrr_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc",
38+
"fieldname": "lsrr",
39+
"units": "kg m**-2 s**-1"
3640
}
3741
]
3842
},
@@ -41,8 +45,9 @@
4145
"realm": "atmosphere",
4246
"input_fields": [
4347
{
44-
"filename": "/g/data/rt52/era5/single-levels/reanalysis/mlssr/{{year}}/mlssr_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc",
45-
"fieldname": "mlssr"
48+
"filename": "/g/data/rt52/era5/single-levels/reanalysis/msr/{{year}}/msr_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc",
49+
"fieldname": "msr",
50+
"units": "kg m**-2 s**-1"
4651
}
4752
]
4853
},
@@ -52,7 +57,8 @@
5257
"input_fields": [
5358
{
5459
"filename": "/g/data/rt52/era5/single-levels/reanalysis/msl/{{year}}/msl_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc",
55-
"fieldname": "msl"
60+
"fieldname": "msl",
61+
"units": "Pa"
5662
}
5763
]
5864
},
@@ -61,12 +67,9 @@
6167
"realm": "land",
6268
"input_fields": [
6369
{
64-
"filename": "/g/data/rt52/era5/single-levels/reanalysis/msror/{{year}}/msror_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc",
65-
"fieldname": "msror"
66-
},
67-
{
68-
"filename": "/g/data/rt52/era5/single-levels/reanalysis/mssror/{{year}}/mssror_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc",
69-
"fieldname": "mssror"
70+
"filename": "/g/data/rt52/era5/single-levels/reanalysis/mror/{{year}}/mror_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc",
71+
"fieldname": "mror",
72+
"units": "kg m**-2 s**-1"
7073
}
7174
]
7275
},
@@ -75,7 +78,8 @@
7578
"input_fields": [
7679
{
7780
"filename": "/g/data/rt52/era5/single-levels/reanalysis/2t/{{year}}/2t_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc",
78-
"fieldname": "t2m"
81+
"fieldname": "t2m",
82+
"units": "K"
7983
}
8084
]
8185
},
@@ -84,11 +88,13 @@
8488
"input_fields": [
8589
{
8690
"filename": "/g/data/rt52/era5/single-levels/reanalysis/2d/{{year}}/2d_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc",
87-
"fieldname": "d2m"
91+
"fieldname": "d2m",
92+
"units": "K"
8893
},
8994
{
9095
"filename": "/g/data/rt52/era5/single-levels/reanalysis/sp/{{year}}/sp_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc",
91-
"fieldname": "sp"
96+
"fieldname": "sp",
97+
"units": "Pa"
9298
}
9399
]
94100
},
@@ -97,7 +103,8 @@
97103
"input_fields": [
98104
{
99105
"filename": "/g/data/rt52/era5/single-levels/reanalysis/10u/{{year}}/10u_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc",
100-
"fieldname": "u10"
106+
"fieldname": "u10",
107+
"units": "m s**-1"
101108
}
102109
]
103110
},
@@ -106,7 +113,8 @@
106113
"input_fields": [
107114
{
108115
"filename": "/g/data/rt52/era5/single-levels/reanalysis/10v/{{year}}/10v_era5_oper_sfc_{{year}}{{month}}{{start_day}}-{{year}}{{month}}{{end_day}}.nc",
109-
"fieldname": "v10"
116+
"fieldname": "v10",
117+
"units": "m s**-1"
110118
}
111119
]
112120
}

0 commit comments

Comments
 (0)