Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

do_diss_est and dycore_only bugfixes #34

Merged
merged 15 commits into from
Oct 16, 2024
Merged

do_diss_est and dycore_only bugfixes #34

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2a1e623
Bugfix from Jan-Huey, which created output every dt_atmos for the phy…
lharris4 May 25, 2022
a52d921
Merge tag '2022.02' of github.com:NOAA-GFDL/atmos_drivers into main
lharris4 Jul 8, 2022
d73e2b5
Updates for new interface in SHiELD Physics
lharris4 Sep 9, 2022
7d19941
Fixed solo calendar
lharris4 Sep 9, 2022
9babded
Merge remote-tracking branch 'origin/io_fixes' into HEAD
lharris4 Sep 9, 2022
b175050
Merge branch 'my-temporary-branch' into main
lharris4 Sep 9, 2022
a00fc30
Allows gfdl_diag_output() to access namelist options. Needed for comm…
lharris4 Aug 26, 2023
c110fdb
Merge remote-tracking branch 'upstream/main'. (This includes critical…
lharris4 Oct 27, 2023
a7455da
Cleanup of arguments, exposes full IPD_Control data structure, to gfd…
lharris4 Nov 27, 2023
c30f4e6
Merge remote-tracking branch 'upstream/main'
lharris4 Nov 27, 2023
341aec7
Eliminated updates to call to gfdl_diag_output()
lharris4 Nov 29, 2023
e4f66a6
Fixes a bug in which do_diss_est was disabled if do_skeb not enabled.…
lharris4 Jan 16, 2024
9af8b53
Merge remote-tracking branch 'upstream/main'
lharris4 Jan 16, 2024
5f5796a
Changed clocks so dycore_only option works.
lharris4 Feb 16, 2024
f272ec0
Merge remote-tracking branch 'upstream/main'
lharris4 Mar 1, 2024
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
17 changes: 11 additions & 6 deletions SHiELD/atmos_model.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ module atmos_model_mod

use mpp_mod, only: mpp_pe, mpp_root_pe, mpp_clock_id, mpp_clock_begin
use mpp_mod, only: mpp_clock_end, CLOCK_COMPONENT, MPP_CLOCK_SYNC
use mpp_mod, only: mpp_min, mpp_max, mpp_error, mpp_chksum
use mpp_mod, only: mpp_min, mpp_max, mpp_error, mpp_chksum, NOTE
use mpp_domains_mod, only: domain2d
use mpp_mod, only: mpp_get_current_pelist_name
use mpp_mod, only: input_nml_file, stdlog, stdout
Expand Down Expand Up @@ -230,13 +230,17 @@ subroutine update_atmos_radiation_physics(Atmos)
! FMScoupler/SHiELD/coupler_main.F90.
type (atmos_data_type), intent(in) :: Atmos

call mpp_clock_begin(shieldClock)

call update_atmos_pre_radiation(Atmos)

if (.not. dycore_only) then
call update_atmos_radiation(Atmos)
call update_atmos_physics(Atmos)
end if

call mpp_clock_end(shieldClock)

end subroutine update_atmos_radiation_physics

subroutine update_atmos_pre_radiation (Atmos)
Expand All @@ -246,8 +250,6 @@ subroutine update_atmos_pre_radiation (Atmos)
integer :: nb, jdat(8)
integer :: nthrds

call mpp_clock_begin(shieldClock)

#ifdef OPENMP
nthrds = omp_get_max_threads()
#else
Expand Down Expand Up @@ -365,8 +367,6 @@ subroutine update_atmos_physics (Atmos)
call getiauforcing(IPD_Control,IAU_data)
if (mpp_pe() == mpp_root_pe() .and. debug) write(6,*) "end of radiation and physics step"

call mpp_clock_end(shieldClock)

!-----------------------------------------------------------------------
end subroutine update_atmos_physics
! </SUBROUTINE>
Expand Down Expand Up @@ -532,7 +532,12 @@ subroutine atmos_model_init (Atmos, Time_init, Time, Time_step, iau_offset)
end if
#endif

Atm(mygrid)%flagstruct%do_diss_est = IPD_Control%do_skeb
if (IPD_Control%do_skeb .and. .not. Atm(mygrid)%flagstruct%do_diss_est) then
call mpp_error(NOTE, "If using stochy physics (gfs_physics_nml::do_skeb = .T.) ")
call mpp_error(NOTE, " a dissipation estimate must be provided.")
call mpp_error(NOTE, " Setting fv_core_nml::do_diss_est=.T. to enable.")
Atm(mygrid)%flagstruct%do_diss_est = .true.
endif

! initialize the IAU module
call iau_initialize (IPD_Control,IAU_data,Init_parm)
Expand Down