Merge pull request #18 from LIVVkit/mkstratos/mvksi-fixes

Fix issues running kso on mpas sea ice

Author: mkstratos

evv4esm/ensembles/e3sm.py

@@ -55,6 +55,8 @@ def file_date_str(case_file, style="short", hist_name="h0"):
         search_regex = r"{}\.[0-9]+-[0-9]+-[0-9]+.nc".format(hist_name)
     elif style == "short":
         search_regex = r"{}\.[0-9]+-[0-9]+.nc".format(hist_name)
+    elif style == "yronly":
+        search_regex = r"{}\.[0-9]+.nc".format(hist_name)
     else:
         search_regex = r"{}\.[0-9]+-[0-9]+.nc".format(hist_name)
     result = re.search(search_regex, case_file).group(0)
@@ -68,6 +70,8 @@ def component_monthly_files(
         date_search = "????-??-??-??"
     elif date_style == "med":
         date_search = "????-??-??"
+    elif date_style == "yronly":
+        date_search = "????"
     else:
         date_search = "????-??"
 

evv4esm/extensions/kso.py

@@ -289,20 +289,25 @@ def case_files(args):
         key1 += "1"
         key2 += "2"
 
+    if args.component in ["mpassi"]:
+        date_style = "yronly"
+    else:
+        date_style = "med"
+
     f_sets = {
         key1: e3sm.component_monthly_files(
             args.test_dir,
             args.component,
             args.ninst,
             hist_name=args.hist_name,
-            date_style="med",
+            date_style=date_style,
         ),
         key2: e3sm.component_monthly_files(
             args.ref_dir,
             args.component,
             args.ninst,
             hist_name=args.hist_name,
-            date_style="med",
+            date_style=date_style,
         ),
     }
 

evv4esm/extensions/ocean_vars.json

@@ -5,5 +5,11 @@
         "ssh{}",
         "velocityMeridional{}",
         "velocityZonal{}"
+    ],
+    "seaice": [
+        "uVelocityGeo{}",
+        "vVelocityGeo{}",
+        "iceAreaCell{}",
+        "iceVolumeCell{}"
     ]
 }