Add support for running G-Cases

.github/workflows/omega-buildnml-workflow.yml

@@ -0,0 +1,111 @@
+name: omega-buildnml
+
+on:
+  push:
+    branches: [develop]
+    paths:
+      - 'components/omega/cime_config/**'
+      - '!components/omega/cime_config/*.xml'
+      - 'components/omega/configs/Default.yml'
+      - 'components/omega/dev-conda.txt'
+      - '.github/workflows/omega-buildnml-workflow.yml'
+
+  pull_request:
+    branches: [develop]
+    paths:
+      - 'components/omega/cime_config/**'
+      - '!components/omega/cime_config/*.xml'
+      - 'components/omega/configs/Default.yml'
+      - 'components/omega/dev-conda.txt'
+      - '.github/workflows/omega-buildnml-workflow.yml'
+
+  workflow_dispatch:
+
+concurrency:
+  # Cancel in progress runs testing the same git ref
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  PYTHON_VERSION: "3.13"
+
+jobs:
+  validate-config:
+    if: ${{ github.repository == 'E3SM-Project/E3SM' ||
+            github.repository == 'E3SM-Project/Omega' }}
+    name: validate configuration files
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    defaults:
+      run:
+        shell: bash -l {0}
+    steps:
+      - name: Checkout Code Repository
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - name: Set up Conda Environment
+        uses: conda-incubator/setup-miniconda@v3
+        with:
+          activate-environment: "omega_ci"
+          miniforge-version: latest
+          channels: conda-forge
+          channel-priority: strict
+          auto-update-conda: true
+          python-version: ${{ env.PYTHON_VERSION }}
+
+      - name: Install dependencies
+        run: |
+          conda create -n omega_dev --file components/omega/dev-conda.txt \
+              python=${{ env.PYTHON_VERSION }}
+          conda activate omega_dev
+          conda list
+
+      - name: Validate Omega configuration files
+        run: |
+          conda activate omega_dev
+          cd components/omega/cime_config
+          ./validate_config.py
+
+  unit-tests:
+    if: ${{ github.repository == 'E3SM-Project/E3SM' ||
+            github.repository == 'E3SM-Project/Omega' }}
+    name: unit tests (python ${{ matrix.python-version }})
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+    defaults:
+      run:
+        shell: bash -l {0}
+    steps:
+      - name: Checkout Code Repository
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - name: Set up Conda Environment
+        uses: conda-incubator/setup-miniconda@v3
+        with:
+          activate-environment: "omega_ci"
+          miniforge-version: latest
+          channels: conda-forge
+          channel-priority: strict
+          auto-update-conda: true
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: |
+          conda create -n omega_dev --file components/omega/dev-conda.txt \
+              python=${{ matrix.python-version }}
+          conda activate omega_dev
+          conda list
+
+      - name: Run omega_buildnml unit tests
+        run: |
+          conda activate omega_dev
+          cd components/omega/cime_config
+          python -m pytest omega_buildnml/tests -v

.pre-commit-config.yaml

@@ -43,7 +43,7 @@ repos:
       - id: mypy
         args: ["--config=components/omega/mypy.cfg", "--show-error-codes"]
         verbose: true
-        additional_dependencies: ['types-requests']
+        additional_dependencies: ['types-requests', 'types-PyYAML']
         exclude: ^components/omega/cime_config/build.*
 
   # Can run individually with `pre-commit run fortitude --all-files`

cime_config/allactive/config_compsets.xml

@@ -85,6 +85,11 @@
   <lname>1850_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
 </compset>
 
+<compset>
+  <alias>WCYCL1850NS-OMEGA</alias>
+  <lname>1850_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI_OMEGA_MOSART_SGLC_SWAV</lname>
+</compset>
+
 <!-- Same as WCYCL1850NS but for 2010 (to avoid needing transient files). Mainly for testing. -->
 <compset>
   <alias>WCYCL2010NS</alias>

components/cmake/build_omega.cmake

@@ -1,8 +1,12 @@
 function(build_omega)
 
-  # Set CIME source path relative to components
-  set(CIMESRC_PATH "../cime/src")
+  if (COMP_NAMES MATCHES ".*omega.*")
 
-  add_subdirectory("omega")
+     # Set CIME source path relative to components
+     set(CIMESRC_PATH "../cime/src")
+
+     add_subdirectory("omega")
+
+  endif()
 
 endfunction(build_omega)

components/eam/bld/config_files/definition.xml

@@ -110,7 +110,7 @@ Use clm, stub land or no lnd model in cam build: clm, slnd, none
 <entry id="rof" valid_values="rtm,srof,none" value="rtm">
 Use rtm, stub runoff or no runoff model in cam build: rtm, srof, none
 </entry>
-<entry id="ocn" valid_values="docn,dom,socn,aquaplanet,pop,mpaso" value="docn">
+<entry id="ocn" valid_values="docn,dom,socn,aquaplanet,pop,mpaso,omega" value="docn">
 Use data ocean model (docn or dom), stub ocean (socn), or aqua planet ocean
 (aquaplanet) in cam build.  When built from the CESM scripts the value of
 ocn may be set to pop, but this doesn't impact how CAM is built.

components/eam/bld/configure

@@ -212,7 +212,7 @@ OPTIONS
   Options for surface components used in standalone EAM mode:
 
      -ice <name>        Build EAM with sea ice model [cice | sice | none ]. Default: cice.
-     -ocn <name>        Build EAM with ocean model [docn | dom | socn | aquaplanet | pop | mpaso]. Default: docn.
+     -ocn <name>        Build EAM with ocean model [docn | dom | socn | aquaplanet | pop | mpaso | omega]. Default: docn.
      -lnd <name>        Build EAM with land model [clm | slnd | none]. Default: clm.
      -rof <name>        Build EAM with runoff model [rtm | srof | none]. Default: rtm.
 

components/eam/bld/namelist_files/namelist_defaults_eam.xml

@@ -180,6 +180,7 @@
 <ieflx_opt  ocn="socn"  >0</ieflx_opt>
 <ieflx_opt  ocn="docn"  >0</ieflx_opt>
 <ieflx_opt  ocn="mpaso" >3</ieflx_opt>
+<ieflx_opt  ocn="omega" >3</ieflx_opt>
 
 <!-- Bulk aerosol physical properties (includes optics) -->