Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion atmos_model.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1785,7 +1785,7 @@ subroutine assign_importdata(jdat, rc)
fldname = 'sea_surface_temperature'
if (trim(impfield_name) == trim(fldname)) then
findex = queryImportFields(fldname)
if (importFieldsValid(findex)) then
if (importFieldsValid(findex) .and. GFS_control%cplocn2atm) then
!$omp parallel do default(shared) private(i,j,nb,ix)
do j=jsc,jec
do i=isc,iec
Expand Down
6 changes: 5 additions & 1 deletion ccpp/data/GFS_typedefs.F90
Original file line number Diff line number Diff line change
Expand Up @@ -629,6 +629,7 @@ module GFS_typedefs
!--- coupling parameters
logical :: cplflx !< default no cplflx collection
logical :: cplice !< default yes cplice collection (used together with cplflx)
logical :: cplocn2atm !< default yes ocn->atm coupling
logical :: cplwav !< default no cplwav collection
logical :: cplwav2atm !< default no wav->atm coupling
logical :: cplchm !< default no cplchm collection
Expand Down Expand Up @@ -3110,6 +3111,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
!--- coupling parameters
logical :: cplflx = .false. !< default no cplflx collection
logical :: cplice = .true. !< default yes cplice collection (used together with cplflx)
logical :: cplocn2atm = .true. !< default yes cplocn2atm coupling (turn on the feedback from ocn to atm)
logical :: cplwav = .false. !< default no cplwav collection
logical :: cplwav2atm = .false. !< default no cplwav2atm coupling
logical :: cplchm = .false. !< default no cplchm collection
Expand Down Expand Up @@ -3577,7 +3579,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
naux3d, aux2d_time_avg, aux3d_time_avg, fhcyc, &
thermodyn_id, sfcpress_id, &
!--- coupling parameters
cplflx, cplice, cplwav, cplwav2atm, cplchm, &
cplflx, cplice, cplocn2atm, cplwav, cplwav2atm, cplchm, &
cpl_imp_mrg, cpl_imp_dbg, &
lsidea, &
!--- radiation parameters
Expand Down Expand Up @@ -3855,6 +3857,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
!--- coupling parameters
Model%cplflx = cplflx
Model%cplice = cplice
Model%cplocn2atm = cplocn2atm
Model%cplwav = cplwav
Model%cplwav2atm = cplwav2atm
Model%cplchm = cplchm
Expand Down Expand Up @@ -5444,6 +5447,7 @@ subroutine control_print(Model)
print *, 'coupling parameters'
print *, ' cplflx : ', Model%cplflx
print *, ' cplice : ', Model%cplice
print *, ' cplocn2atm : ', Model%cplocn2atm
print *, ' cplwav : ', Model%cplwav
print *, ' cplwav2atm : ', Model%cplwav2atm
print *, ' cplchm : ', Model%cplchm
Expand Down
6 changes: 6 additions & 0 deletions ccpp/data/GFS_typedefs.meta
Original file line number Diff line number Diff line change
Expand Up @@ -2594,6 +2594,12 @@
units = flag
dimensions = ()
type = logical
[cplocn2atm]
standard_name = flag_for_one_way_ocean_coupling_to_atmosphere
long_name = flag controlling ocean coupling to the atmosphere (default on)
units = flag
dimensions = ()
type = logical
[cplwav]
standard_name = flag_for_ocean_wave_coupling
long_name = flag controlling cplwav collection (default off)
Expand Down