Fix for compare suite and rename (#644)

* minor fixes for comparison tests

* add comparison log type to task questions

* rename compare suite

Author: mranst

…omparison_increment-geos_atmosphere.yaml …omparison_increment-geos_atmosphere.yamlsrc/swell/suites/compare_variational/eva/comparison_increment-geos_atmosphere.yaml renamed to src/swell/suites/compare/eva/comparison_increment-geos_atmosphere.yaml src/swell/suites/compare_variational/eva/comparison_increment-geos_atmosphere.yaml renamed to src/swell/suites/compare/eva/comparison_increment-geos_atmosphere.yaml

@@ -20,7 +20,7 @@ class SuiteConfig(QuestionContainer, Enum):
 
     # --------------------------------------------------------------------------------------------------
 
-    compare_variational = QuestionList(
+    compare = QuestionList(
         list_name="compare",
         questions=[
             sq.all_suites,
@@ -38,7 +38,7 @@ class SuiteConfig(QuestionContainer, Enum):
     compare_variational_marine = QuestionList(
         list_name="compare_variational_marine",
         questions=[
-            compare_variational,
+            compare,
             qd.comparison_log_type('variational'),
             qd.model_components(['geos_marine']),
         ]
@@ -49,7 +49,7 @@ class SuiteConfig(QuestionContainer, Enum):
     compare_variational_atmosphere = QuestionList(
         list_name="compare_variational_atmosphere",
         questions=[
-            compare_variational,
+            compare,
             qd.comparison_log_type('variational'),
             qd.model_components(['geos_atmosphere']),
         ]
@@ -60,7 +60,7 @@ class SuiteConfig(QuestionContainer, Enum):
     compare_fgat_marine = QuestionList(
         list_name="compare_fgat_marine",
         questions=[
-            compare_variational,
+            compare,
             qd.comparison_log_type('fgat'),
             qd.model_components(['geos_marine']),
         ]

…va/comparison_increment-geos_marine.yaml …va/comparison_increment-geos_marine.yamlsrc/swell/suites/compare_variational/eva/comparison_increment-geos_marine.yaml renamed to src/swell/suites/compare/eva/comparison_increment-geos_marine.yaml src/swell/suites/compare_variational/eva/comparison_increment-geos_marine.yaml renamed to src/swell/suites/compare/eva/comparison_increment-geos_marine.yaml

@@ -451,6 +451,15 @@ class TaskQuestions(QuestionContainer, Enum):
 
     # --------------------------------------------------------------------------------------------------
 
+    JediOopsLogParser = QuestionList(
+        list_name="JediOopsLogParser",
+        questions=[
+            qd.comparison_log_type(),
+        ]
+    )
+
+    # --------------------------------------------------------------------------------------------------
+
     LinkGeosOutput = QuestionList(
         list_name="LinkGeosOutput",
         questions=[
@@ -517,7 +526,8 @@ class TaskQuestions(QuestionContainer, Enum):
             qd.observations(),
             qd.total_processors(),
             qd.window_offset(),
-            qd.window_type()
+            qd.window_type(),
+            qd.comparison_log_type('convert_state_soca2cice'),
         ]
     )
 
@@ -534,6 +544,7 @@ class TaskQuestions(QuestionContainer, Enum):
             qd.jedi_forecast_model(),
             qd.observations(),
             qd.observing_system_records_path(),
+            qd.comparison_log_type('ensmeanvariance'),
         ]
     )
 
@@ -543,7 +554,8 @@ class TaskQuestions(QuestionContainer, Enum):
         list_name="RunJediFgatExecutable",
         questions=[
             run_jedi_executable,
-            qd.marine_models()
+            qd.marine_models(),
+            qd.comparison_log_type('fgat')
         ]
     )
 
@@ -561,7 +573,8 @@ class TaskQuestions(QuestionContainer, Enum):
             qd.ensemble_num_members(),
             qd.generate_yaml_and_exit(),
             qd.jedi_forecast_model(),
-            qd.total_processors()
+            qd.total_processors(),
+            qd.comparison_log_type('hofx')
         ]
     )
 
@@ -577,7 +590,8 @@ class TaskQuestions(QuestionContainer, Enum):
             qd.generate_yaml_and_exit(),
             qd.jedi_forecast_model(),
             qd.save_geovals(),
-            qd.total_processors()
+            qd.total_processors(),
+            qd.comparison_log_type('ensemblehofx'),
         ]
     )
 
@@ -616,7 +630,8 @@ class TaskQuestions(QuestionContainer, Enum):
             qd.vertical_localization_ioda_vertical_coord_group(),
             qd.vertical_localization_lengthscale(),
             qd.vertical_localization_method(),
-            qd.perhost()
+            qd.perhost(),
+            qd.comparison_log_type('localensembleda'),
         ]
     )
 
@@ -633,7 +648,8 @@ class TaskQuestions(QuestionContainer, Enum):
             qd.jedi_forecast_model(),
             qd.observing_system_records_path(),
             qd.total_processors(),
-            qd.obs_thinning_rej_fraction()
+            qd.obs_thinning_rej_fraction(),
+            qd.comparison_log_type('obsfilters')
         ]
     )
 
@@ -646,7 +662,8 @@ class TaskQuestions(QuestionContainer, Enum):
             qd.generate_yaml_and_exit(),
             qd.single_observations(),
             qd.window_length(),
-            qd.window_offset()
+            qd.window_offset(),
+            qd.comparison_log_type('ufo_tests'),
         ]
     )
 
@@ -656,7 +673,8 @@ class TaskQuestions(QuestionContainer, Enum):
         list_name="RunJediVariationalExecutable",
         questions=[
             run_jedi_executable,
-            qd.perhost()
+            qd.perhost(),
+            qd.comparison_log_type('variational'),
         ]
     )