Skip to content

Commit

Permalink
fix JRA55do runoff remapping bug; closes COSIMA/access-om3#208
Browse files Browse the repository at this point in the history
  • Loading branch information
@aekiss @dougiesquire
aekiss authored and dougiesquire committed Aug 29, 2024
1 parent 2bc6107 commit 3cc383f
Show file tree
Hide file tree
Showing 3 changed files with 204 additions and 211 deletions.
3 changes: 2 additions & 1 deletion config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
334 changes: 162 additions & 172 deletions datm.streams.xml
View file
Original file line number Diff line number Diff line change
@@ -1,198 +1,188 @@
<?xml version="1.0"?>
<?xml version="1.0" ?>
<file id="stream" version="2.0">

<stream_info name="CORE_IAF_JRA55do.PRSN">
<taxmode>cycle</taxmode>
<tintalgo>linear</tintalgo>
<readmode>single</readmode>
<mapalgo>bilinear</mapalgo>
<dtlimit>1.5</dtlimit>
<year_first>1900</year_first>
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./INPUT/JRA55do-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<metadata>
<File_type>DATM xml file provides forcing data</File_type>
<date_generated>2024-08-29 20:55:19</date_generated>
<history>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</history>
</metadata>
<stream_info name="JRA55do.PRSN">
<taxmode>cycle</taxmode>
<readmode>single</readmode>
<mapalgo>bilinear</mapalgo>
<dtlimit>1.5</dtlimit>
<year_first>1900</year_first>
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./INPUT/JRA55do-datm-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<file>./INPUT/RYF.prsn.1990_1991.nc</file>
</datafiles>
<datavars>
</datafiles>
<datavars>
<var>prsn Faxa_prsn</var>
</datavars>
<offset>0</offset>
</datavars>
<offset>0</offset>
<tintalgo>linear</tintalgo>
</stream_info>

<stream_info name="CORE_IAF_JRA55do.PRRN">
<taxmode>cycle</taxmode>
<tintalgo>linear</tintalgo>
<readmode>single</readmode>
<mapalgo>bilinear</mapalgo>
<dtlimit>1.5</dtlimit>
<year_first>1900</year_first>
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./INPUT/JRA55do-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<stream_info name="JRA55do.PRRN">
<taxmode>cycle</taxmode>
<readmode>single</readmode>
<mapalgo>bilinear</mapalgo>
<dtlimit>1.5</dtlimit>
<year_first>1900</year_first>
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./INPUT/JRA55do-datm-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<file>./INPUT/RYF.prra.1990_1991.nc</file>
</datafiles>
<datavars>
</datafiles>
<datavars>
<var>prra Faxa_prrn</var>
</datavars>
<offset>0</offset>
</datavars>
<offset>0</offset>
<tintalgo>linear</tintalgo>
</stream_info>

<stream_info name="CORE_IAF_JRA55do.LWDN">
<taxmode>cycle</taxmode>
<tintalgo>linear</tintalgo>
<readmode>single</readmode>
<mapalgo>bilinear</mapalgo>
<dtlimit>1.5</dtlimit>
<year_first>1900</year_first>
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./INPUT/JRA55do-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<stream_info name="JRA55do.LWDN">
<taxmode>cycle</taxmode>
<readmode>single</readmode>
<mapalgo>bilinear</mapalgo>
<dtlimit>1.5</dtlimit>
<year_first>1900</year_first>
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./INPUT/JRA55do-datm-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<file>./INPUT/RYF.rlds.1990_1991.nc</file>
</datafiles>
<datavars>
</datafiles>
<datavars>
<var>rlds Faxa_lwdn</var>
</datavars>
<offset>0</offset>
</datavars>
<offset>0</offset>
<tintalgo>linear</tintalgo>
</stream_info>


<stream_info name="CORE_IAF_JRA55do.SWDN">
<taxmode>cycle</taxmode>
<tintalgo>coszen</tintalgo>
<readmode>single</readmode>
<mapalgo>bilinear</mapalgo>
<dtlimit>1.5</dtlimit>
<year_first>1900</year_first>
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./INPUT/JRA55do-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<stream_info name="JRA55do.SWDN">
<taxmode>cycle</taxmode>
<readmode>single</readmode>
<mapalgo>bilinear</mapalgo>
<dtlimit>1.5</dtlimit>
<year_first>1900</year_first>
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./INPUT/JRA55do-datm-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<file>./INPUT/RYF.rsds.1990_1991.nc</file>
</datafiles>
<datavars>
</datafiles>
<datavars>
<var>rsds Faxa_swdn</var>
</datavars>
<offset>0</offset>
</datavars>
<offset>0</offset>
<tintalgo>coszen</tintalgo>
</stream_info>


<stream_info name="CORE_IAF_JRA55do.Q_10">
<taxmode>cycle</taxmode>
<tintalgo>linear</tintalgo>
<readmode>single</readmode>
<mapalgo>bilinear</mapalgo>
<dtlimit>1.5</dtlimit>
<year_first>1900</year_first>
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./INPUT/JRA55do-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<stream_info name="JRA55do.Q_10">
<taxmode>cycle</taxmode>
<readmode>single</readmode>
<mapalgo>bilinear</mapalgo>
<dtlimit>1.5</dtlimit>
<year_first>1900</year_first>
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./INPUT/JRA55do-datm-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<file>./INPUT/RYF.huss.1990_1991.nc</file>
</datafiles>
<datavars>
</datafiles>
<datavars>
<var>huss Sa_shum</var>
</datavars>
<offset>0</offset>
</datavars>
<offset>0</offset>
<tintalgo>linear</tintalgo>
</stream_info>


<stream_info name="CORE_IAF_JRA55do.SLP_10">
<taxmode>cycle</taxmode>
<tintalgo>linear</tintalgo>
<readmode>single</readmode>
<mapalgo>bilinear</mapalgo>
<dtlimit>1.5</dtlimit>
<year_first>1900</year_first>
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./INPUT/JRA55do-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<stream_info name="JRA55do.SLP_10">
<taxmode>cycle</taxmode>
<readmode>single</readmode>
<mapalgo>bilinear</mapalgo>
<dtlimit>1.5</dtlimit>
<year_first>1900</year_first>
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./INPUT/JRA55do-datm-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<file>./INPUT/RYF.psl.1990_1991.nc</file>
</datafiles>
<datavars>
</datafiles>
<datavars>
<var>psl Sa_pslv</var>
</datavars>
<offset>0</offset>
</datavars>
<offset>0</offset>
<tintalgo>linear</tintalgo>
</stream_info>


<stream_info name="CORE_IAF_JRA55do.T_10">
<taxmode>cycle</taxmode>
<tintalgo>linear</tintalgo>
<readmode>single</readmode>
<mapalgo>bilinear</mapalgo>
<dtlimit>1.5</dtlimit>
<year_first>1900</year_first>
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./INPUT/JRA55do-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<stream_info name="JRA55do.T_10">
<taxmode>cycle</taxmode>
<readmode>single</readmode>
<mapalgo>bilinear</mapalgo>
<dtlimit>1.5</dtlimit>
<year_first>1900</year_first>
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./INPUT/JRA55do-datm-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<file>./INPUT/RYF.tas.1990_1991.nc</file>
</datafiles>
<datavars>
<var>tas Sa_tbot</var>
</datavars>
<offset>0</offset>
</datafiles>
<datavars>
<var>tas Sa_tbot</var>
</datavars>
<offset>0</offset>
<tintalgo>linear</tintalgo>
</stream_info>


<stream_info name="CORE_IAF_JRA55do.U_10">
<taxmode>cycle</taxmode>
<tintalgo>linear</tintalgo>
<readmode>single</readmode>
<mapalgo>bilinear</mapalgo>
<dtlimit>1.5</dtlimit>
<year_first>1900</year_first>
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./INPUT/JRA55do-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<stream_info name="JRA55do.U_10">
<taxmode>cycle</taxmode>
<readmode>single</readmode>
<mapalgo>bilinear</mapalgo>
<dtlimit>1.5</dtlimit>
<year_first>1900</year_first>
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./INPUT/JRA55do-datm-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<file>./INPUT/RYF.uas.1990_1991.nc</file>
</datafiles>
<datavars>
<var>uas Sa_u</var>
</datavars>
<offset>0</offset>
</datafiles>
<datavars>
<var>uas Sa_u</var>
</datavars>
<offset>0</offset>
<tintalgo>linear</tintalgo>
</stream_info>


<stream_info name="CORE_IAF_JRA55do.V_10">
<taxmode>cycle</taxmode>
<tintalgo>linear</tintalgo>
<readmode>single</readmode>
<mapalgo>bilinear</mapalgo>
<dtlimit>1.5</dtlimit>
<year_first>1900</year_first>
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./INPUT/JRA55do-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<stream_info name="JRA55do.V_10">
<taxmode>cycle</taxmode>
<readmode>single</readmode>
<mapalgo>bilinear</mapalgo>
<dtlimit>1.5</dtlimit>
<year_first>1900</year_first>
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./INPUT/JRA55do-datm-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<file>./INPUT/RYF.vas.1990_1991.nc</file>
</datafiles>
<datavars>
<var>vas Sa_v</var>
</datavars>
<offset>0</offset>
</datafiles>
<datavars>
<var>vas Sa_v</var>
</datavars>
<offset>0</offset>
<tintalgo>linear</tintalgo>
</stream_info>
</file>
Loading

0 comments on commit 3cc383f

Please sign in to comment.