Skip to content

Use conservative and patch remapping #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anton-seaice merged 4 commits into from
Apr 28, 2026
Merged

Use conservative and patch remapping #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
536e8a9
use conserve and patch:
anton-seaice Dec 11, 2025
020dfc7
consd for runoff
anton-seaice Dec 12, 2025
6bf5578
Update remapping for ERA5
anton-seaice Apr 22, 2026
b5fa8db
fix url in metadata
anton-seaice Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions data_stream_xml_generation/generate_xml_datm_era5.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,42 +31,42 @@
# For linear time interpolation, hourly interval fields are therefore shifted by -1800 s so the
# timestamp is at the midpoint of the represented hour. Instantaneous fields keep offset=0.
#
# stream_name, era5_prefix, [(source_var, cime_var), ...], tintalgo, offset_seconds
# stream_name, era5_prefix, [(source_var, cime_var), ...], mapalgo, offset_seconds
STREAM_SPECS = [
("ERA5.RAINC", "cp", [("cp", "Faxa_rainc")], "linear", -1800),
("ERA5.RAINL", "lsp", [("lsp", "Faxa_rainl")], "linear", -1800),
("ERA5.SNOWC", "csf", [("csf", "Faxa_snowc")], "linear", -1800),
("ERA5.SNOWL", "lsf", [("lsf", "Faxa_snowl")], "linear", -1800),
("ERA5.LWDN", "strd", [("strd", "Faxa_lwdn")], "linear", -1800),
("ERA5.SWDN", "ssrd", [("ssrd", "Faxa_swdn")], "linear", -1800),
("ERA5.SWNET", "ssr", [("ssr", "Faxa_swnet")], "linear", -1800),
("ERA5.SWVDR", "aluvp", [("aluvp", "Faxa_swvdr")], "linear", 0),
("ERA5.SWVDF", "aluvd", [("aluvd", "Faxa_swvdf")], "linear", 0),
("ERA5.SWNDR", "alnip", [("alnip", "Faxa_swndr")], "linear", 0),
("ERA5.SWNDF", "alnid", [("alnid", "Faxa_swndf")], "linear", 0),
("ERA5.RAINC", "cp", [("cp", "Faxa_rainc")], "consf", -1800),
("ERA5.RAINL", "lsp", [("lsp", "Faxa_rainl")], "consf", -1800),
("ERA5.SNOWC", "csf", [("csf", "Faxa_snowc")], "consf", -1800),
("ERA5.SNOWL", "lsf", [("lsf", "Faxa_snowl")], "consf", -1800),
("ERA5.LWDN", "strd", [("strd", "Faxa_lwdn")], "consf", -1800),
("ERA5.SWDN", "ssrd", [("ssrd", "Faxa_swdn")], "consf", -1800),
("ERA5.SWNET", "ssr", [("ssr", "Faxa_swnet")], "consf", -1800),
("ERA5.SWVDR", "aluvp", [("aluvp", "Faxa_swvdr")], "patch", 0),
("ERA5.SWVDF", "aluvd", [("aluvd", "Faxa_swvdf")], "patch", 0),
("ERA5.SWNDR", "alnip", [("alnip", "Faxa_swndr")], "patch", 0),
("ERA5.SWNDF", "alnid", [("alnid", "Faxa_swndf")], "patch", 0),
(
"ERA5.SLP_10",
"msl",
[("msl", "Sa_pslv"), ("msl", "Sa_pbot")],
"linear",
"patch",
Comment thread
anton-seaice marked this conversation as resolved.
0,
),
(
"ERA5.T_10",
"2t",
[("t2m", "Sa_t2m"), ("t2m", "Sa_tbot")],
"linear",
"patch",
0,
),
(
"ERA5.TDEW",
"2d",
[("d2m", "Sa_tdew")],
"linear",
"patch",
0,
),
("ERA5.U_10", "10u", [("u10", "Sa_u"), ("u10", "Sa_u10m")], "linear", 0),
("ERA5.V_10", "10v", [("v10", "Sa_v"), ("v10", "Sa_v10m")], "linear", 0),
("ERA5.U_10", "10u", [("u10", "Sa_u"), ("u10", "Sa_u10m")], "patch", 0),
("ERA5.V_10", "10v", [("v10", "Sa_v"), ("v10", "Sa_v10m")], "patch", 0),
]

if len(sys.argv) != 3:
Expand Down Expand Up @@ -100,14 +100,14 @@
SubElement(metadata, "history").text = metadata_info

# Generate stream info elements with changing years
for stream_name, era5_prefix, datavar_pairs, tintalgo, offset_seconds in STREAM_SPECS:
for stream_name, era5_prefix, datavar_pairs, mapalgo, offset_seconds in STREAM_SPECS:
stream_info = SubElement(root, "stream_info", name=stream_name)
if year_first == year_last:
SubElement(stream_info, "taxmode").text = "cycle"
else:
SubElement(stream_info, "taxmode").text = "extend"
SubElement(stream_info, "readmode").text = "single"
SubElement(stream_info, "mapalgo").text = "bilinear"
SubElement(stream_info, "mapalgo").text = mapalgo
SubElement(stream_info, "dtlimit").text = "1.e30"
SubElement(stream_info, "year_first").text = str(year_first)
SubElement(stream_info, "year_last").text = str(year_last)
Expand All @@ -124,7 +124,7 @@
var_element.text = f"{src_var} {cime_var}"

SubElement(stream_info, "offset").text = str(offset_seconds)
SubElement(stream_info, "tintalgo").text = tintalgo
SubElement(stream_info, "tintalgo").text = "linear"

# Use the first source variable for RYF file naming.
driver_src_var = datavar_pairs[0][0]
Expand Down
6 changes: 5 additions & 1 deletion data_stream_xml_generation/generate_xml_datm_jra55.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,11 @@
SubElement(stream_info, "dtlimit").text = "1.0"

SubElement(stream_info, "readmode").text = "single"
SubElement(stream_info, "mapalgo").text = "bilinear"
if stream_name in STREAMS_AVE:
SubElement(stream_info, "mapalgo").text = "consf"
else:
SubElement(stream_info, "mapalgo").text = "patch"

SubElement(stream_info, "year_first").text = str(year_first)
SubElement(stream_info, "year_last").text = str(year_last)
SubElement(stream_info, "year_align").text = str(year_align)
Expand Down
2 changes: 1 addition & 1 deletion data_stream_xml_generation/generate_xml_drof_jra55.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
SubElement(stream_info, "tintalgo").text = "linear"
SubElement(stream_info, "offset").text = "0"
SubElement(stream_info, "readmode").text = "single"
SubElement(stream_info, "mapalgo").text = "bilinear"
SubElement(stream_info, "mapalgo").text = "consd"
SubElement(stream_info, "year_first").text = str(year_first)
SubElement(stream_info, "year_last").text = str(year_last)
SubElement(stream_info, "year_align").text = str(year_align)
Expand Down
2 changes: 1 addition & 1 deletion scripts_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def get_git_url(file):
.strip()
)

return f"{url}/blob/{hash}{rel_path}"
return f"{url}/blob/{hash}/{rel_path}"


def git_status(file):
Expand Down
Loading