Merge branch 'main' into feature/bugfix

ESCOMP · Jul 1, 2024 · 7a265d7 · 7a265d7
2 parents 527f9a5 + 3305e11
commit 7a265d7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/srt.yml b/.github/workflows/srt.yml
@@ -95,6 +95,8 @@ jobs:
           cd ../components/cdeps
           git checkout main
           git submodule update --init
+          cd ../../share
+          git checkout main
           
       - name: Cache ESMF
         id: cache-esmf
@@ -170,6 +172,6 @@ jobs:
           popd
 #     the following can be used by developers to login to the github server in case of errors
 #     see https://github.com/marketplace/actions/debugging-with-tmate for further details
-#      - 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/cesm/nuopc_cap_share/seq_drydep_mod.F90 b/cesm/nuopc_cap_share/seq_drydep_mod.F90
@@ -1,7 +1,6 @@
 module seq_drydep_mod
 
   use shr_drydep_mod, only: seq_drydep_setHCoeff=>shr_drydep_setHCoeff
-
   implicit none
 
   ! method specification

diff --git a/mediator/med_phases_aofluxes_mod.F90 b/mediator/med_phases_aofluxes_mod.F90
@@ -1601,7 +1601,7 @@ subroutine set_aoflux_in_pointers(fldbun_a, fldbun_o, aoflux_in, lsize, xgrid, r
        if (chkerr(rc,__LINE__,u_FILE_u)) return
        call fldbun_getfldptr(fldbun_a, 'Sa_shum', aoflux_in%shum, xgrid=xgrid, rc=rc)
        if (chkerr(rc,__LINE__,u_FILE_u)) return
-       if (associated(aoflux_in%rainc)) then
+       if (add_gusts) then
           call fldbun_getfldptr(fldbun_a, 'Faxa_rainc', aoflux_in%rainc, xgrid=xgrid, rc=rc)
           if (chkerr(rc,__LINE__,u_FILE_u)) return
        end if