From b29c1e22c047fa7a5546e0204ba2bfd8bc8de5ab Mon Sep 17 00:00:00 2001 From: alperaltuntas Date: Mon, 15 Dec 2025 11:43:42 -0700 Subject: [PATCH 1/2] fix guard expression for ROF to OCN Mapping stage --- visualCaseGen/stages/grid_stages.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/visualCaseGen/stages/grid_stages.py b/visualCaseGen/stages/grid_stages.py index 611b86c..4b6db00 100644 --- a/visualCaseGen/stages/grid_stages.py +++ b/visualCaseGen/stages/grid_stages.py @@ -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 @@ -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"]], ) From 417b168762549c297341d495907cb89ef41269dd Mon Sep 17 00:00:00 2001 From: alperaltuntas Date: Mon, 15 Dec 2025 11:44:18 -0700 Subject: [PATCH 2/2] relax upper bounds for rof ocn mapping smoothing params --- visualCaseGen/specs/relational_constraints.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/visualCaseGen/specs/relational_constraints.py b/visualCaseGen/specs/relational_constraints.py index 038b378..4bc3c99 100644 --- a/visualCaseGen/specs/relational_constraints.py +++ b/visualCaseGen/specs/relational_constraints.py @@ -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