#469: update remaining files

DARMA-tasking · Oct 18, 2023 · 0ceda3f · 0ceda3f
1 parent ce9e896
commit 0ceda3f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/config/update-config-script.py b/config/update-config-script.py
@@ -60,14 +60,18 @@ def __update_conf(self, config: dict):
 
         if "output_dir" in config:
             output_dir = config["output_dir"]
+        else:
+            output_dir = "../output"
 
-            if "output_file_stem" in config:
+        if "output_file_stem" in config:
                 file_stem = config["output_file_stem"]
+        else:
+            file_stem = "output_file"
 
-                if "LBAF_Viz" in config:
-                    config["visualization"] = config.pop("LBAF_Viz")
-                    config["visualization"]["output_visualization_dir"] = output_dir
-                    config["visualization"]["output_visualization_file_stem"] = file_stem
+        if "LBAF_Viz" in config:
+            config["visualization"] = config.pop("LBAF_Viz")
+            config["visualization"]["output_visualization_dir"] = output_dir
+            config["visualization"]["output_visualization_file_stem"] = file_stem
 
         return config
 
@@ -123,7 +127,7 @@ def run(self, filepath: str):
         self.__logger.info(f"Updating {filename}")
 
         new_config = self.__update_conf(config)
-        # self.__validate_configuration(new_config)
+        self.__validate_configuration(new_config)
         self.__write_config(new_config, output_dir, filename)
 
 if __name__ == "__main__":

diff --git a/tests/unit/config/conf_correct_from_data_min_config.yml b/tests/unit/config/conf_correct_from_data_min_config.yml
@@ -19,11 +19,13 @@ algorithm:
 
 # Specify output
 output_file_stem: output_file
-LBAF_Viz:
+visualization:
   x_ranks: 2
   y_ranks: 2
   z_ranks: 1
   object_jitter: 0.5
   rank_qoi: work
   object_qoi: work
   force_continuous_object_qoi: true
+  output_visualization_dir: ../output
+  output_visualization_file_stem: output_file
diff --git a/tests/unit/config/conf_wrong_algorithm_invalid_001.yml b/tests/unit/config/conf_wrong_algorithm_invalid_001.yml
@@ -21,11 +21,13 @@ algorithm:
 
 # Specify output
 output_file_stem: output_file
-LBAF_Viz:
+visualization:
   x_ranks: 2
   y_ranks: 2
   z_ranks: 1
   object_jitter: 0.5
   rank_qoi: work
   object_qoi: work
   force_continuous_object_qoi: true
+  output_visualization_dir: ../output
+  output_visualization_file_stem: output_file