Minor fixes in runoff ocn mapping (#28)

* fix guard expression for ROF to OCN Mapping stage

* relax upper bounds for rof ocn mapping smoothing params

Author: alperaltuntas

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
 

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"]],
     )