Merge branch 'develop' into fix/ort-resync

Author: FernandoAndrade-NOAA

.github/scripts/check_log_warnings_remarks.py

@@ -34,6 +34,10 @@ def call_API(self, endpoint):
 
       api_call = APICall(endpoint)
       response = requests.get(api_call.url, headers=api_call.header)
+      if response.status_code != 200:
+         logging.warning(response)
+         print(response)
+         sys.exit(1)
       response = json.loads(response.text)
 
       return response
@@ -96,15 +100,15 @@ def _get_pr_data(self, commit):
    def compare_results(self, pr_log, base_log): 
       """Compare warnings/remarks for PR head and base commits to determine whether warnings/remarks have increased."""
 
-      increases = {'warnings': [], 'remarks': []}
+      increases = {'warnings': {}, 'remarks': {}}
 
       for test in pr_log:
          # Check warnings
          if pr_log[test][0] > base_log[test][0]:
-            increases['warnings'].append(test)
+            increases['warnings'].update({test: pr_log[test][0] - base_log[test][0]})
          # Check remarks
          if pr_log[test][1] > base_log[test][1]:
-            increases['remarks'].append(test)
+            increases['remarks'].update({test: pr_log[test][1] - base_log[test][1]})
 
       return increases
 
@@ -118,7 +122,9 @@ def print_html_results(dict):
       for category in results.keys():
          if results[category]:
             mdFile.write(f"\n<h3>{machine.upper()}</h3>\n")
-            unordered_list = [f"**{category.title()}:**", dict[machine][category]]
+            unordered_list = [f"**{category.title()}:**", []]
+            for test, value in dict[machine][category].items():
+               unordered_list[1].append(f"{test}: {value}")
             mdFile.new_list(unordered_list, marked_with='*')
    return mdFile.get_md_text()
 

MOM6-interface/MOM6

@@ -336,7 +336,7 @@ list(APPEND mom6_nuopc_src_files
   MOM6/config_src/drivers/nuopc_cap/mom_cap_time.F90
   MOM6/config_src/drivers/nuopc_cap/mom_ocean_model_nuopc.F90
   MOM6/config_src/drivers/nuopc_cap/mom_surface_forcing_nuopc.F90
-  MOM6/config_src/drivers/nuopc_cap/mom_ufs_trace_wrapper.F90
+  MOM6/config_src/drivers/nuopc_cap/mom_cap_profiling.F90
   MOM6/config_src/drivers/nuopc_cap/mom_inline_mod.F90
   MOM6/config_src/drivers/nuopc_cap/mom_cap_outputlog.F90
   MOM6/config_src/drivers/unit_tests/test_MOM_ANN.F90