Merge pull request #260 from GoogleCloudPlatform/wrf_fom

Fix WRF FOM time calculation
GoogleCloudPlatform · Sep 12, 2023 · a9afb35 · a9afb35
2 parents 25c776c + 84f75f0
commit a9afb35
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/lib/ramble/ramble/test/end_to_end/experiment_excludes.py b/lib/ramble/ramble/test/end_to_end/experiment_excludes.py
@@ -239,7 +239,7 @@ def test_wrfv4_exclusions(mutable_config, mutable_mock_workspace_path):
             # Create fake figures of merit.
             with open(os.path.join(exp_dir, 'rsl.out.0000'), 'w+') as f:
                 for i in range(1, 6):
-                    f.write(f'Timing for main {i}{i}.{i}\n')
+                    f.write(f'Timing for main: time 2019-11-27_00:00:00 on domain 1: {i}{i}.{i}\n')
                 f.write('wrf: SUCCESS COMPLETE WRF\n')
 
             # Create files that match archive patterns
@@ -263,10 +263,10 @@ def test_wrfv4_exclusions(mutable_config, mutable_mock_workspace_path):
 
         with open(text_results_files[0], 'r') as f:
             data = f.read()
-            assert 'Average Timestep Time = 3.3 s' in data
-            assert 'Cumulative Timestep Time = 16.5 s' in data
-            assert 'Minimum Timestep Time = 1.1 s' in data
-            assert 'Maximum Timestep Time = 5.5 s' in data
+            assert 'Average Timestep Time = 33.3 s' in data
+            assert 'Cumulative Timestep Time = 166.5 s' in data
+            assert 'Minimum Timestep Time = 11.1 s' in data
+            assert 'Maximum Timestep Time = 55.5 s' in data
             assert 'Avg. Max Ratio Time = 0.6' in data
             assert 'Number of timesteps = 5' in data
 

diff --git a/lib/ramble/ramble/test/end_to_end/explicit_zips.py b/lib/ramble/ramble/test/end_to_end/explicit_zips.py
@@ -220,7 +220,7 @@ def test_wrfv4_explicit_zips(mutable_config, mutable_mock_workspace_path):
             # Create fake figures of merit.
             with open(os.path.join(exp_dir, 'rsl.out.0000'), 'w+') as f:
                 for i in range(1, 6):
-                    f.write(f'Timing for main {i}{i}.{i}\n')
+                    f.write(f'Timing for main: time 2019-11-27_00:00:00 on domain 1: {i}{i}.{i}\n')
                 f.write('wrf: SUCCESS COMPLETE WRF\n')
 
             # Create files that match archive patterns
@@ -244,10 +244,10 @@ def test_wrfv4_explicit_zips(mutable_config, mutable_mock_workspace_path):
 
         with open(text_results_files[0], 'r') as f:
             data = f.read()
-            assert 'Average Timestep Time = 3.3 s' in data
-            assert 'Cumulative Timestep Time = 16.5 s' in data
-            assert 'Minimum Timestep Time = 1.1 s' in data
-            assert 'Maximum Timestep Time = 5.5 s' in data
+            assert 'Average Timestep Time = 33.3 s' in data
+            assert 'Cumulative Timestep Time = 166.5 s' in data
+            assert 'Minimum Timestep Time = 11.1 s' in data
+            assert 'Maximum Timestep Time = 55.5 s' in data
             assert 'Avg. Max Ratio Time = 0.6' in data
             assert 'Number of timesteps = 5' in data
 

diff --git a/lib/ramble/ramble/test/end_to_end/wrfv4_dry_run.py b/lib/ramble/ramble/test/end_to_end/wrfv4_dry_run.py
@@ -223,7 +223,7 @@ def test_wrfv4_dry_run(mutable_config, mutable_mock_workspace_path):
             # Create fake figures of merit.
             with open(os.path.join(exp_dir, 'rsl.out.0000'), 'w+') as f:
                 for i in range(1, 6):
-                    f.write(f'Timing for main {i}{i}.{i}\n')
+                    f.write(f'Timing for main: time 2019-11-27_00:00:00 on domain 1: {i}{i}.{i}\n')
                 f.write('wrf: SUCCESS COMPLETE WRF\n')
 
             # Create files that match archive patterns
@@ -257,10 +257,10 @@ def test_wrfv4_dry_run(mutable_config, mutable_mock_workspace_path):
         for text_result in text_results_files:
             with open(text_result, 'r') as f:
                 data = f.read()
-                assert 'Average Timestep Time = 3.3 s' in data
-                assert 'Cumulative Timestep Time = 16.5 s' in data
-                assert 'Minimum Timestep Time = 1.1 s' in data
-                assert 'Maximum Timestep Time = 5.5 s' in data
+                assert 'Average Timestep Time = 33.3 s' in data
+                assert 'Cumulative Timestep Time = 166.5 s' in data
+                assert 'Minimum Timestep Time = 11.1 s' in data
+                assert 'Maximum Timestep Time = 55.5 s' in data
                 assert 'Avg. Max Ratio Time = 0.6' in data
                 assert 'Number of timesteps = 5' in data
 

diff --git a/var/ramble/repos/builtin/applications/wrfv3/application.py b/var/ramble/repos/builtin/applications/wrfv3/application.py
@@ -99,7 +99,7 @@ def _analyze_experiments(self, workspace):
                                            'rsl.out.*'))
 
         if file_list:
-            timing_regex = re.compile(r'Timing for main.*(?P<main_time>[0-9]+\.[0-9]*).*')
+            timing_regex = re.compile(r'Timing for main.*:\s+(?P<main_time>[0-9]+\.[0-9]*).*')
             avg_time = 0.0
             min_time = float('inf')
             max_time = float('-inf')

diff --git a/var/ramble/repos/builtin/applications/wrfv4/application.py b/var/ramble/repos/builtin/applications/wrfv4/application.py
@@ -105,7 +105,7 @@ def _analyze_experiments(self, workspace):
                                            'rsl.out.*'))
 
         if file_list:
-            timing_regex = re.compile(r'Timing for main.*(?P<main_time>[0-9]+\.[0-9]*).*')
+            timing_regex = re.compile(r'Timing for main.*:\s+(?P<main_time>[0-9]+\.[0-9]*).*')
             avg_time = 0.0
             min_time = float('inf')
             max_time = float('-inf')