From 3cc383fe1d5205f1e1cbbfc15fb3e36418a4e89e Mon Sep 17 00:00:00 2001
From: Andrew Kiss <31054815+aekiss@users.noreply.github.com>
Date: Wed, 28 Aug 2024 18:54:26 +1000
Subject: [PATCH] fix JRA55do runoff remapping bug; closes
https://github.com/COSIMA/access-om3/issues/208
---
config.yaml | 3 +-
datm.streams.xml | 334 +++++++++++++++++++++++------------------------
drof.streams.xml | 78 +++++------
3 files changed, 204 insertions(+), 211 deletions(-)
diff --git a/config.yaml b/config.yaml
index a50eeef..3622022 100644
--- a/config.yaml
+++ b/config.yaml
@@ -22,7 +22,8 @@ exe: access-om3-MOM6-CICE6
input:
- /g/data/vk83/experiments/inputs/access-om3/share/meshes/global.1deg/2024.01.25/access-om2-1deg-ESMFmesh.nc
- /g/data/vk83/experiments/inputs/access-om3/share/meshes/global.1deg/2024.01.25/access-om2-1deg-nomask-ESMFmesh.nc
- - /g/data/vk83/experiments/inputs/access-om3/share/meshes/share/2024.01.25/JRA55do-ESMFmesh.nc
+ - /g/data/vk83/configurations/inputs/access-om3/share/meshes/share/2024.08.31/JRA55do-datm-ESMFmesh.nc
+ - /g/data/vk83/configurations/inputs/access-om3/share/meshes/share/2024.08.31/JRA55do-drof-ESMFmesh.nc
- /g/data/vk83/experiments/inputs/access-om3/share/grids/global.1deg/2020.10.22/topog.nc
- /g/data/vk83/experiments/inputs/access-om3/mom/grids/mosaic/global.1deg/2020.05.30/ocean_hgrid.nc
- /g/data/vk83/experiments/inputs/access-om3/mom/grids/vertical/global.1deg/2023.07.28/ocean_vgrid.nc
diff --git a/datm.streams.xml b/datm.streams.xml
index 8ff9d45..abf31de 100644
--- a/datm.streams.xml
+++ b/datm.streams.xml
@@ -1,198 +1,188 @@
-
+
-
-
- cycle
- linear
- single
- bilinear
- 1.5
- 1900
- 1900
- 1900
- null
- ./INPUT/JRA55do-ESMFmesh.nc
- null
-
+
+ DATM xml file provides forcing data
+ 2024-08-29 20:55:19
+ Created by ds0092 (dougiesquire) on 2024-08-29, using https://github.com/COSIMA/om3-scripts/blob/1a1cd0a3732ccfcf49286fd1065d9da417396d5a/data_stream_xml_generation/generate_xml_datm.py: /g/data/vk83/apps/om3-scripts/data_stream_xml_generation/generate_xml_datm.py 1900 1900
+
+
+ cycle
+ single
+ bilinear
+ 1.5
+ 1900
+ 1900
+ 1900
+ null
+ ./INPUT/JRA55do-datm-ESMFmesh.nc
+ null
+
./INPUT/RYF.prsn.1990_1991.nc
-
-
+
+
prsn Faxa_prsn
-
- 0
+
+ 0
+ linear
-
-
- cycle
- linear
- single
- bilinear
- 1.5
- 1900
- 1900
- 1900
- null
- ./INPUT/JRA55do-ESMFmesh.nc
- null
-
+
+ cycle
+ single
+ bilinear
+ 1.5
+ 1900
+ 1900
+ 1900
+ null
+ ./INPUT/JRA55do-datm-ESMFmesh.nc
+ null
+
./INPUT/RYF.prra.1990_1991.nc
-
-
+
+
prra Faxa_prrn
-
- 0
+
+ 0
+ linear
-
-
- cycle
- linear
- single
- bilinear
- 1.5
- 1900
- 1900
- 1900
- null
- ./INPUT/JRA55do-ESMFmesh.nc
- null
-
+
+ cycle
+ single
+ bilinear
+ 1.5
+ 1900
+ 1900
+ 1900
+ null
+ ./INPUT/JRA55do-datm-ESMFmesh.nc
+ null
+
./INPUT/RYF.rlds.1990_1991.nc
-
-
+
+
rlds Faxa_lwdn
-
- 0
+
+ 0
+ linear
-
-
-
- cycle
- coszen
- single
- bilinear
- 1.5
- 1900
- 1900
- 1900
- null
- ./INPUT/JRA55do-ESMFmesh.nc
- null
-
+
+ cycle
+ single
+ bilinear
+ 1.5
+ 1900
+ 1900
+ 1900
+ null
+ ./INPUT/JRA55do-datm-ESMFmesh.nc
+ null
+
./INPUT/RYF.rsds.1990_1991.nc
-
-
+
+
rsds Faxa_swdn
-
- 0
+
+ 0
+ coszen
-
-
-
- cycle
- linear
- single
- bilinear
- 1.5
- 1900
- 1900
- 1900
- null
- ./INPUT/JRA55do-ESMFmesh.nc
- null
-
+
+ cycle
+ single
+ bilinear
+ 1.5
+ 1900
+ 1900
+ 1900
+ null
+ ./INPUT/JRA55do-datm-ESMFmesh.nc
+ null
+
./INPUT/RYF.huss.1990_1991.nc
-
-
+
+
huss Sa_shum
-
- 0
+
+ 0
+ linear
-
-
-
- cycle
- linear
- single
- bilinear
- 1.5
- 1900
- 1900
- 1900
- null
- ./INPUT/JRA55do-ESMFmesh.nc
- null
-
+
+ cycle
+ single
+ bilinear
+ 1.5
+ 1900
+ 1900
+ 1900
+ null
+ ./INPUT/JRA55do-datm-ESMFmesh.nc
+ null
+
./INPUT/RYF.psl.1990_1991.nc
-
-
+
+
psl Sa_pslv
-
- 0
+
+ 0
+ linear
-
-
-
- cycle
- linear
- single
- bilinear
- 1.5
- 1900
- 1900
- 1900
- null
- ./INPUT/JRA55do-ESMFmesh.nc
- null
-
+
+ cycle
+ single
+ bilinear
+ 1.5
+ 1900
+ 1900
+ 1900
+ null
+ ./INPUT/JRA55do-datm-ESMFmesh.nc
+ null
+
./INPUT/RYF.tas.1990_1991.nc
-
-
- tas Sa_tbot
-
- 0
+
+
+ tas Sa_tbot
+
+ 0
+ linear
-
-
-
- cycle
- linear
- single
- bilinear
- 1.5
- 1900
- 1900
- 1900
- null
- ./INPUT/JRA55do-ESMFmesh.nc
- null
-
+
+ cycle
+ single
+ bilinear
+ 1.5
+ 1900
+ 1900
+ 1900
+ null
+ ./INPUT/JRA55do-datm-ESMFmesh.nc
+ null
+
./INPUT/RYF.uas.1990_1991.nc
-
-
- uas Sa_u
-
- 0
+
+
+ uas Sa_u
+
+ 0
+ linear
-
-
-
- cycle
- linear
- single
- bilinear
- 1.5
- 1900
- 1900
- 1900
- null
- ./INPUT/JRA55do-ESMFmesh.nc
- null
-
+
+ cycle
+ single
+ bilinear
+ 1.5
+ 1900
+ 1900
+ 1900
+ null
+ ./INPUT/JRA55do-datm-ESMFmesh.nc
+ null
+
./INPUT/RYF.vas.1990_1991.nc
-
-
- vas Sa_v
-
- 0
+
+
+ vas Sa_v
+
+ 0
+ linear
diff --git a/drof.streams.xml b/drof.streams.xml
index 74426a8..3216a17 100644
--- a/drof.streams.xml
+++ b/drof.streams.xml
@@ -1,46 +1,48 @@
-
+
-
-
- cycle
- upper
- single
- bilinear
- 3.0
- 1900
- 1900
- 1900
- null
- ./INPUT/JRA55do-ESMFmesh.nc
- null
-
+
+ DROF xml file provides river runoff data
+ 2024-08-29 20:56:38
+ Created by ds0092 (dougiesquire) on 2024-08-29, using https://github.com/COSIMA/om3-scripts/blob/1a1cd0a3732ccfcf49286fd1065d9da417396d5a/data_stream_xml_generation/generate_xml_drof.py: /g/data/vk83/apps/om3-scripts/data_stream_xml_generation/generate_xml_drof.py 1900 1900
+
+
+ cycle
+ upper
+ single
+ bilinear
+ 3.0
+ 1900
+ 1900
+ 1900
+ null
+ ./INPUT/JRA55do-drof-ESMFmesh.nc
+ null
+
./INPUT/RYF.friver.1990_1991.nc
-
-
+
+
friver Forr_rofl
-
- 0
+
+ 0
-
-
- cycle
- upper
- single
- bilinear
- 3.0
- 1900
- 1900
- 1900
- null
- ./INPUT/JRA55do-ESMFmesh.nc
- null
-
+
+ cycle
+ upper
+ single
+ bilinear
+ 3.0
+ 1900
+ 1900
+ 1900
+ null
+ ./INPUT/JRA55do-drof-ESMFmesh.nc
+ null
+
./INPUT/RYF.licalvf.1990_1991.nc
-
-
+
+
licalvf Forr_rofi
-
- 0
+
+ 0
-