Skip to content

Commit 3305e11

Browse files
authored
Merge pull request #474 from jedwards4b/add_gust_fix3
new fix for add_gusts
2 parents 06a825a + fbb2318 commit 3305e11

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/workflows/srt.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ jobs:
9595
cd ../components/cdeps
9696
git checkout main
9797
git submodule update --init
98+
cd ../../share
99+
git checkout main
98100
99101
- name: Cache ESMF
100102
id: cache-esmf
@@ -170,6 +172,6 @@ jobs:
170172
popd
171173
# the following can be used by developers to login to the github server in case of errors
172174
# see https://github.com/marketplace/actions/debugging-with-tmate for further details
173-
# - name: Setup tmate session
174-
# if: ${{ failure() }}
175-
# uses: mxschmitt/action-tmate@v3
175+
- name: Setup tmate session
176+
if: ${{ failure() }}
177+
uses: mxschmitt/action-tmate@v3

cesm/nuopc_cap_share/seq_drydep_mod.F90

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module seq_drydep_mod
22

33
use shr_drydep_mod, only: seq_drydep_setHCoeff=>shr_drydep_setHCoeff
4-
use shr_drydep_mod
5-
64
implicit none
75

86
! method specification

mediator/med_phases_aofluxes_mod.F90

+1-1
Original file line numberDiff line numberDiff line change
@@ -1601,7 +1601,7 @@ subroutine set_aoflux_in_pointers(fldbun_a, fldbun_o, aoflux_in, lsize, xgrid, r
16011601
if (chkerr(rc,__LINE__,u_FILE_u)) return
16021602
call fldbun_getfldptr(fldbun_a, 'Sa_shum', aoflux_in%shum, xgrid=xgrid, rc=rc)
16031603
if (chkerr(rc,__LINE__,u_FILE_u)) return
1604-
if (associated(aoflux_in%rainc)) then
1604+
if (add_gusts) then
16051605
call fldbun_getfldptr(fldbun_a, 'Faxa_rainc', aoflux_in%rainc, xgrid=xgrid, rc=rc)
16061606
if (chkerr(rc,__LINE__,u_FILE_u)) return
16071607
end if

0 commit comments

Comments
 (0)