Skip to content

Minor fixes in runoff ocn mapping #28

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
alperaltuntas merged 2 commits into from
Dec 15, 2025
Merged

Minor fixes in runoff ocn mapping #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b29c1e2
fix guard expression for ROF to OCN Mapping stage
alperaltuntas Dec 15, 2025
417b168
relax upper bounds for rof ocn mapping smoothing params
alperaltuntas Dec 15, 2025
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
8 changes: 4 additions & 4 deletions visualCaseGen/specs/relational_constraints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,11 @@ def get_relational_constraints(cvars):
ROF_OCN_MAPPING_FOLD > 0:
"ROF_OCN_MAPPING_FOLD must be a positive number.",

ROF_OCN_MAPPING_RMAX <= 1000:
"ROF_OCN_MAPPING_RMAX must be less than or equal to 1000 km.",
ROF_OCN_MAPPING_RMAX <= 4000:
"ROF_OCN_MAPPING_RMAX must be less than or equal to 4000 km.",

ROF_OCN_MAPPING_FOLD <= 1000:
"ROF_OCN_MAPPING_FOLD must be less than or equal to 1000 km.",
ROF_OCN_MAPPING_FOLD <= 8000:
"ROF_OCN_MAPPING_FOLD must be less than or equal to 8000 km.",

#### Assertions to stress-test the CSP solver

Expand Down
3 changes: 2 additions & 1 deletion visualCaseGen/stages/grid_stages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from pathlib import Path
import time
import os
from z3 import And

from ProConPy.config_var import cvars
from ProConPy.stage import Stage, Guard
Expand Down Expand Up @@ -321,7 +322,7 @@ def initialize_grid_stages(cime):
parent=Guard(
title="ROF to OCN Mapping",
parent=stg_custom_rof_grid,
condition=cvars["COMP_OCN"] == "mom",
condition=And(cvars["COMP_OCN"] == "mom", cvars["COMP_ROF"] != "srof")
),
varlist=[cvars["ROF_OCN_MAPPING_STATUS"]],
)
Loading