Merge tag 'mi_250210' into update_MARBL_FeForcing

Author: mnlevy1981

.github/workflows/general-ci-tests.yml

@@ -1,10 +1,6 @@
 name: General MOM_interface CI
-
-# This CI workflow tests against the following questions: 
-# 1. Does standalone mom build and run?
-# 2. Does it pass the tests/check_default_params.py test?
-# 3. Do the scripts in cime_config pass the black formatter? 
-# Please see Issue #138 for more information
+ 
+# Please see Issue #138 for more information on this CI workflow
 
 # Controls when the workflow will run
 on:
@@ -52,15 +48,23 @@ jobs:
           cd $GITHUB_WORKSPACE/CESM/components/mom/
           git fetch origin pull/${{ github.event.pull_request.number }}/head:pr-${{ github.event.pull_request.number }}
           git checkout pr-${{ github.event.pull_request.number }}
+          git submodule update --init --recursive
 
       - name: Checkout initial event (Push)
         if: ${{ github.event_name == 'push' }}
         run: |
           echo "Handling push"
           cd $GITHUB_WORKSPACE/CESM/components/mom/
           git checkout ${{ github.sha }}
+          git submodule update --init --recursive
+
+      - name: Check submodule hash consistency
+        run: |
+          echo "Checking if .gitmodules and external hashes are consistent"
+          cd $GITHUB_WORKSPACE/CESM/components/mom/
+          ../../bin/git-fleximod test
 
-      # Build the standalone mom using the macos script. build_examples-ncar doesn't work.    
+      # Build the standalone mom using the ubuntu script. 
       - name: Build Standalone MOM
         run: |
           cd $GITHUB_WORKSPACE/CESM/components/mom/standalone/build
@@ -89,7 +93,36 @@ jobs:
       # Run the test
       - name: Run the check_default_params script
         run: python tests/check_default_params.py
-        
+  
+  # Job to run check_input_data_list script
+  check_input_data_list:
+    
+    runs-on: ubuntu-latest
+    
+    steps:
+      # Checkout the repo
+      - uses: actions/checkout@v4
+      
+      # Run the test
+      - name: Run the check_input_data_list script
+        run: python tests/check_input_data_list.py
+
+  # Job to run check_input_data_repo script
+  check_input_data_repo:
+    
+    runs-on: ubuntu-latest
+    
+    steps:
+      # Checkout the repo
+      - uses: actions/checkout@v4
+
+      # Run the test
+      - name: Run the check_input_data_repo script
+        run: |
+          sudo apt-get update && sudo apt-get install -y subversion
+          pip install 'svn>=1,<1.1'
+          python tests/check_input_data_repo.py
+
   # Job to run the black formatter for cime_config, see black documentation for more info
   check_black_format_for_cime_config:
 

.gitmodules

@@ -2,7 +2,7 @@
   path = MOM6
   url = https://github.com/NCAR/MOM6.git
   fxDONOTUSEurl = https://github.com/NCAR/MOM6.git
-    fxtag = dev/ncar_241101
+    fxtag = dev/ncar_250128
     fxrequired = AlwaysRequired
 
 [submodule "stochastic_physics"]

MOM6

@@ -159,55 +159,44 @@ def expand_func(varname):
                     packing = field_block["packing"]
                     field_list_1d = get_all_fields(field_block)
 
-                    # seperate field_name and output_name:
+                    # seperate field_name, alias, and reduction method
+                    # (the latter two are optional)
                     field_list_1d_seperated = []
                     for field in field_list_1d:
                         field_split = field.split(":")
-                        if len(field_split) == 2:
-                            field = field_split[0], field_split[1]
-                        elif len(field_split) == 1:
-                            field = field_split[0], field_split[0]
-                        else:
-                            raise RuntimeError(
-                                "Cannot infer field name and output name for " + field
-                            )
-                        field_list_1d_seperated.append(field)
+                        field_name = field_split[0]
+                        alias = field_name
+                        reduction = file_block["reduction_method"]
+                        assert 1 <= len(field_split) <= 3, (
+                            "Invalid field format: " + field
+                        )
+                        if len(field_split) >= 2:
+                            alias = field_split[1]
+                        if len(field_split) >= 3:
+                            reduction = field_split[2]
+
+                        field_list_1d_seperated.append((field_name, alias, reduction))
 
                     # check if there are any duplicate fields in the same file:
-                    for field_name, output_name in field_list_1d_seperated:
-                        assert field_name not in all_fields, (
-                            'Field "'
-                            + field_name
-                            + '" is listed more than once'
-                            + " in file: "
-                            + file_block["suffix"]
-                        )
-                        all_fields.append(field_name)
+                    field_set = set()
+                    for field_name, alias, reduction in field_list_1d_seperated:
+                        if alias in field_set:
+                            raise ValueError(
+                                'Field "'
+                                + alias
+                                + '" is listed more than once'
+                                + " in file: "
+                                + file_block["suffix"]
+                            )
+                        field_set.add(alias)
 
                     mfnl = max([len(field) for field in field_list_1d]) + 3
                     mfnl = min(16, mfnl)  # limit to 16
-                    for field_name, output_name in field_list_1d_seperated:
+                    w = lambda s: f'"{s}",'  # wrap string in quotes and add comma
+                    for field_name, alias, reduction in field_list_1d_seperated:
                         diag_table.write(
-                            (
-                                "{module_name:14s} {field_name:"
-                                + str(mfnl)
-                                + "}{output_name:"
-                                + str(mfnl)
-                                + "}"
-                                '{fname} "all", {reduction_method} {regional_section} {packing}\n'
-                            ).format(
-                                module_name='"' + module + '",',
-                                field_name='"' + field_name + '",',
-                                output_name='"' + output_name + '",',
-                                fname=fname + ",",
-                                reduction_method='"'
-                                + str(file_block["reduction_method"])
-                                + '",',
-                                regional_section='"'
-                                + str(file_block["regional_section"])
-                                + '",',
-                                packing=str(packing),
-                            )
+                            f'{w(module)} {w(field_name):{mfnl}}{w(alias):{mfnl}}{fname}, "all", '
+                            f'{w(reduction)} {w(file_block["regional_section"])} {packing}\n'
                         )
 
                 diag_table.write("\n")

cime_config/MOM_RPS/FType_diag_table.py

@@ -83,6 +83,26 @@
     </desc>
   </entry>
 
+  <entry id="MOM6_WW3_CPL_METHOD">
+    <type>char</type>
+    <valid_values>none,legacy,most</valid_values>
+    <default_value>most</default_value>
+    <values>
+      <value grid="w%ww3a">legacy</value>
+      <value compset="_SWAV|_DWAV">none</value>
+    </values>
+    <group>run_component_mom</group>
+    <file>env_run.xml</file>
+    <desc> This variable determines the method used to couple MOM6 to WW3.
+           The method "most" corresponds to the newest coupling method 
+           that turns on FPMix parameterization, Stokes_Bands coupling,
+           and Stokes similarity package. The method "legacy" corresponds to
+           the older coupling method based on receiving a Langmuir number from
+           WW3 and passing it to CVMix. When set to "none", no wave
+           parameterization is used.
+    </desc>
+  </entry>
+
   <entry id="OCN_DIAG_MODE">
     <type>char</type>
     <valid_values>spinup,production,development,none</valid_values>