Convert ranks to top level FOMs

Author: douglasjacobsen

var/ramble/repos/builtin/applications/openfoam-org/application.py

@@ -210,28 +210,56 @@ class OpenfoamOrg(SpackApplication):
 
     log_prefix = os.path.join(Expander.expansion_str('experiment_run_dir'), 'log.')
 
+    config_file = "{experiment_run_dir}/openfoam_config"
+
     figure_of_merit('Number of cells', log_file=(log_prefix + 'snappyHexMesh'),
                     fom_regex=r'Layer mesh\s+:\s+cells:(?P<ncells>[0-9]+)\s+.*',
                     group_name='ncells', units='')
 
-    figure_of_merit('snappyHexMesh Time ({n_ranks_hex} ranks)', log_file=(log_prefix + 'snappyHexMesh'),
+    figure_of_merit('snappyHexMesh Time', log_file=(log_prefix + 'snappyHexMesh'),
                     fom_regex=r'Finished meshing in = (?P<mesh_time>[0-9]+\.?[0-9]*).*',
                     group_name='mesh_time', units='s')
 
-    figure_of_merit('simpleFoam Time ({n_ranks} ranks)', log_file=(log_prefix + 'simpleFoam'),
+    figure_of_merit('snappyHexMesh Ranks', log_file=config_file,
+                    fom_regex=r'snappyHexMesh ranks: (?P<ranks>[0-9]+)',
+                    group_name='ranks', units='')
+
+    figure_of_merit('simpleFoam Time', log_file=(log_prefix + 'simpleFoam'),
                     fom_regex=r'\s*ExecutionTime = (?P<foam_time>[0-9]+\.?[0-9]*).*',
                     group_name='foam_time', units='s')
 
-    figure_of_merit('potentialFoam Time ({n_ranks} ranks)', log_file=(log_prefix + 'potentialFoam'),
+    figure_of_merit('simpleFoam Time', log_file=(log_prefix + 'simpleFoam'),
                     fom_regex=r'\s*ExecutionTime = (?P<foam_time>[0-9]+\.?[0-9]*).*',
                     group_name='foam_time', units='s')
 
+    figure_of_merit('simpleFoam Ranks', log_file=config_file,
+                    fom_regex=r'simpleFoam ranks: (?P<ranks>[0-9]+)',
+                    group_name='ranks', units='')
+
+    figure_of_merit('potentialFoam Time', log_file=(log_prefix + 'potentialFoam'),
+                    fom_regex=r'\s*ExecutionTime = (?P<foam_time>[0-9]+\.?[0-9]*).*',
+                    group_name='foam_time', units='s')
+
+    figure_of_merit('potentialFoam Ranks', log_file=config_file,
+                    fom_regex=r'potentialFoam ranks: (?P<ranks>[0-9]+)',
+                    group_name='ranks', units='')
+
     success_criteria('snappyHexMesh_completed', mode='string', match='Finalising parallel run',
                      file='{experiment_run_dir}/log.snappyHexMesh')
 
     success_criteria('simpleFoam_completed', mode='string', match='Finalising parallel run',
                      file='{experiment_run_dir}/log.simpleFoam')
 
+    def _prepare_analysis(self, workspace, app_inst=None):
+        conf_path = self.expander.expand_var(self.config_file)
+
+        with open(conf_path, "w+") as f:
+            hex_ranks = self.expander.expand_var("{n_ranks_hex}")
+            simple_ranks = self.expander.expand_var("{n_ranks}")
+            f.write(f"snappyHexMesh ranks: {hex_ranks}\n")
+            f.write(f"simpleFoam ranks: {simple_ranks}\n")
+            f.write(f"potentialFoam ranks: {simple_ranks}\n")
+
     def _define_commands(self, exec_graph):
         export_prefix = self.expander.expand_var_name('export_prefix')
         export_vars = self.expander.expand_var_name('export_variables').split(',')