Merge pull request #1 from jedwards4b/gustMods

Gust mods suggested changes for cam_dev
ESCOMP · Dec 21, 2023 · b908586 · b908586
2 parents 2df3414 + aaa78b8
commit b908586
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 13 deletions.
diff --git a/.github/workflows/extbuild.yml b/.github/workflows/extbuild.yml
@@ -20,11 +20,11 @@ jobs:
       CPPFLAGS: "-I/usr/include -I/usr/local/include"
 
       # Versions of all dependencies can be updated here
-      ESMF_VERSION: v8.4.2
+      ESMF_VERSION: v8.6.0
       PNETCDF_VERSION: checkpoint.1.12.3
-      NETCDF_FORTRAN_VERSION: v4.6.0
-      PIO_VERSION: pio2_6_0
-      CDEPS_VERSION: cdeps1.0.15
+      NETCDF_FORTRAN_VERSION: v4.6.1
+      PIO_VERSION: pio2_6_2
+      CDEPS_VERSION: cdeps1.0.26
     steps:
       - uses: actions/checkout@v3
         # Build the ESMF library, if the cache contains a previous build
@@ -84,7 +84,7 @@ jobs:
           ref: ${{ env.CDEPS_VERSION }}
       - name: Build CDEPS
         if: steps.cache-cdeps.outputs.cache-hit != 'true'
-        uses: ESCOMP/CDEPS/.github/actions/buildcdeps@cdeps1.0.15
+        uses: ESCOMP/CDEPS/.github/actions/buildcdeps@cdeps1.0.26
         with:
           esmfmkfile: $HOME/ESMF/lib/libg/Linux.gfortran.64.openmpi.default/esmf.mk
           pio_path: $HOME/pio
@@ -102,6 +102,6 @@ jobs:
           make VERBOSE=1
           popd
 
-      - name: Setup tmate session
-        if: ${{ failure() }}
-        uses: mxschmitt/action-tmate@v3
+#      - name: Setup tmate session
+#        if: ${{ failure() }}
+#        uses: mxschmitt/action-tmate@v3
diff --git a/.github/workflows/srt.yml b/.github/workflows/srt.yml
@@ -26,8 +26,8 @@ jobs:
       CPPFLAGS: "-I/usr/include -I/usr/local/include "
       LDFLAGS: "-L/usr/lib/x86_64-linux-gnu -lnetcdf -lnetcdff -lpnetcdf"     
       # Versions of all dependencies can be updated here
-      ESMF_VERSION: v8.5.0
-      PARALLELIO_VERSION: pio2_6_0
+      ESMF_VERSION: v8.6.0
+      PARALLELIO_VERSION: pio2_6_2
       CIME_MODEL: cesm
       CIME_DRIVER: nuopc
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -80,7 +80,17 @@ jobs:
         run: |
           pushd cesm
           ./manage_externals/checkout_externals ccs_config cdeps cime share mct cpl7 parallelio
-          
+          cd ccs_config
+          git checkout main
+          cd ../cime
+          git checkout master
+          if [[ ! -e "${PWD}/.gitmodules.bak" ]]
+             then
+              echo "Convering git@github.com to https://github.com urls in ${PWD}/.gitmodules"
+
+              sed -i".bak" "s/git@github.com:/https:\/\/github.com\//g" "${PWD}/.gitmodules"
+          fi
+          git submodule update --init
       - name: Cache ESMF
         id: cache-esmf
         uses: actions/cache@v3

diff --git a/cime_config/buildnml b/cime_config/buildnml
@@ -15,6 +15,7 @@ from CIME.case import Case
 from CIME.nmlgen import NamelistGenerator
 from CIME.utils import expect
 from CIME.utils import get_model, get_time_in_seconds, get_timestamp
+from CIME.namelist import literal_to_python_value
 from CIME.buildnml import create_namelist_infile, parse_input
 from CIME.XML.files import Files
 
@@ -144,6 +145,11 @@ def _create_drv_namelists(case, infile, confdir, nmlgen, files):
     if config["COMP_OCN"] == "docn" and "aqua" in case.get_value("DOCN_MODE"):
         nmlgen.set_value("aqua_planet", value=".true.")
 
+    # make sure that variable add_gusts is only set to true if compset includes cam_dev
+    add_gusts = literal_to_python_value(nmlgen.get_value("add_gusts"), type_="logical")
+    if add_gusts:
+        expect("CAM%DEV" in case.get_value("COMPSET"),"ERROR: add_gusts can only be set if CAM%DEV in compset {}".format(case.get_value("COMPSET")))
+
     # --------------------------------
     # Overwrite: set component coupling frequencies
     # --------------------------------
@@ -658,6 +664,7 @@ def buildnml(case, caseroot, component):
     create_namelist_infile(case, user_nl_file, namelist_infile, infile_text)
     infile = [namelist_infile]
 
+
     # create the files nuopc.runconfig, nuopc.runseq, drv_in and drv_flds_in
     _create_drv_namelists(case, infile, confdir, nmlgen, files)
 

diff --git a/mediator/med_phases_aofluxes_mod.F90 b/mediator/med_phases_aofluxes_mod.F90
@@ -1095,13 +1095,11 @@ subroutine med_aofluxes_update(gcomp, aoflux_in, aoflux_out, rc)
        call flux_atmocn (logunit=logunit, &
             nMax=aoflux_in%lsize, mask=aoflux_in%mask, &
             zbot=aoflux_in%zbot, ubot=aoflux_in%ubot, vbot=aoflux_in%vbot, thbot=aoflux_in%thbot, qbot=aoflux_in%shum, &
-            rainc=aoflux_in%rainc, &
             rbot=aoflux_in%dens, tbot=aoflux_in%tbot, us=aoflux_in%uocn, vs=aoflux_in%vocn, ts=aoflux_in%tocn, &
             ocn_surface_flux_scheme=ocn_surface_flux_scheme, &
             sen=aoflux_out%sen, lat=aoflux_out%lat, lwup=aoflux_out%lwup, evap=aoflux_out%evap, &
             taux=aoflux_out%taux, tauy=aoflux_out%tauy, tref=aoflux_out%tref, qref=aoflux_out%qref, &
             duu10n=aoflux_out%duu10n, & 
-            ugust_out = aoflux_out%ugust_out, &
             missval=0.0_r8)
 #ifdef UFS_AOFLUX
      end if