Skip to content

Merge NOAA-EMC dev/emc #65

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

Merged
bensonr merged 18 commits into from
Jan 22, 2021
Merged

Merge NOAA-EMC dev/emc #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
13c653f
Add a positive-definite advection option; the reconstructed cell-inte…
XiaqiongZhou-NOAA Sep 10, 2020
272233a
Modify the halo extents of u and vt in the regional_boundary_update c…
chan-hoo Sep 23, 2020
2cbdb7c
Merge pull request #38 from DusanJovic-NOAA/merge_gfdl_dev_emc
DusanJovic-NOAA Sep 24, 2020
2ec76f8
Merge pull request #40 from NOAA-GFDL/dev/emc
DusanJovic-NOAA Sep 30, 2020
f64ff41
Merge remote-tracking branch 'NOAA-EMC/dev/emc' into pd-5
XiaqiongZhou-NOAA Oct 5, 2020
6f3d203
model/fv_dynamics.F90: bugfix when debugging output is enabled
climbfuji Oct 7, 2020
36c6ac2
Merge branch 'dev/emc' of https://github.com/NOAA-EMC/GFDL_atmos_cube…
climbfuji Oct 10, 2020
c3b564f
Comment out test for ntrac > ntracers in tools/external_ic.F90
climbfuji Oct 10, 2020
1a24fa4
To avoid the error ( erroneous arithmetic operation) with the GNU com…
XiaqiongZhou-NOAA Oct 16, 2020
7752840
Merge pull request #36 from XiaqiongZhou-NOAA/pd-5
DusanJovic-NOAA Oct 19, 2020
97ffc4b
Merge branch 'dev/emc' of https://github.com/NOAA-EMC/GFDL_atmos_cube…
climbfuji Oct 22, 2020
f06c176
Necessary changes for HWRF physics (Ferrier-Aligo MP in dycore)
DusanJovic-NOAA Nov 5, 2020
6187585
add GFSv16 dzmin change and changes for Dev/jcsda (#44)
junwang-noaa Nov 17, 2020
9ed4a19
Removed use of mpp_node in fv_mp_mod which was not used anywhere in t…
laurenchilutti Dec 29, 2020
76489d6
model/fv_regional_bc.F90: initialize cld_amt to zero so that GFDL-MP …
climbfuji Jan 6, 2021
34a6fdf
Add calls to ccpp_physics_timestep_init and ccpp_physics_timestep_fin…
climbfuji Jan 8, 2021
00397ef
Remove IPD steps 3 and 5 (cleanup preprocessor directives) (#50)
climbfuji Jan 14, 2021
a413dfb
Merge remote-tracking branch 'NOAA-EMC/dev/emc' into merge_gfdl_emc
XiaqiongZhou-NOAA Jan 15, 2021
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
1 change: 0 additions & 1 deletion docs/Doxyfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ INPUT = ./documentation.dox \
../model/boundary.F90 \
../model/dyn_core.F90 \
../model/fv_arrays.F90 \
../model/fv_cmp.F90 \
../model/fv_control.F90 \
../model/fv_dynamics.F90 \
../model/fv_fill.F90 \
Expand Down
31 changes: 11 additions & 20 deletions driver/fvGFS/atmosphere.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,11 @@ module atmosphere_mod
use tracer_manager_mod, only: get_tracer_index, get_number_tracers, &
NO_TRACER, get_tracer_names
use DYCORE_typedefs, only: DYCORE_data_type
#ifdef GFS_TYPES
use GFS_typedefs, only: IPD_data_type => GFS_data_type, kind_phys
#else
use IPD_typedefs, only: IPD_data_type, kind_phys => IPD_kind_phys
#endif
use fv_iau_mod, only: IAU_external_data_type

!-----------------
Expand Down Expand Up @@ -243,10 +247,7 @@ module atmosphere_mod
logical :: cold_start = .false. ! used in initial condition

integer, dimension(:), allocatable :: id_tracerdt_dyn
integer :: sphum, liq_wat, rainwat, ice_wat, snowwat, graupel ! condensate species tracer indices
#ifdef CCPP
integer :: cld_amt
#endif
integer :: sphum, liq_wat, rainwat, ice_wat, snowwat, graupel, cld_amt ! condensate species tracer indices

integer :: mygrid = 1
integer :: p_split = 1
Expand All @@ -271,15 +272,15 @@ module atmosphere_mod
!! including the grid structures, memory, initial state (self-initialization or restart),
!! and diagnostics.
subroutine atmosphere_init (Time_init, Time, Time_step, Grid_box, area)
#ifdef CCPP

use ccpp_static_api, only: ccpp_physics_init
use CCPP_data, only: ccpp_suite, &
cdata => cdata_tile, &
CCPP_interstitial
#ifdef OPENMP
use omp_lib
#endif
#endif

type (time_type), intent(in) :: Time_init, Time, Time_step
type(grid_box_type), intent(inout) :: Grid_box
real(kind=kind_phys), pointer, dimension(:,:), intent(inout) :: area
Expand All @@ -289,11 +290,7 @@ subroutine atmosphere_init (Time_init, Time, Time_step, Grid_box, area)
logical :: do_atmos_nudge
character(len=32) :: tracer_name, tracer_units
real :: ps1, ps2
#ifdef CCPP
integer :: nthreads
integer :: ierr
#endif

integer :: nthreads, ierr
integer :: nlunit = 9999
character (len = 64) :: fn_nml = 'input.nml'

Expand Down Expand Up @@ -354,9 +351,7 @@ subroutine atmosphere_init (Time_init, Time, Time_step, Grid_box, area)
rainwat = get_tracer_index (MODEL_ATMOS, 'rainwat' )
snowwat = get_tracer_index (MODEL_ATMOS, 'snowwat' )
graupel = get_tracer_index (MODEL_ATMOS, 'graupel' )
#ifdef CCPP
cld_amt = get_tracer_index (MODEL_ATMOS, 'cld_amt')
#endif

if (max(sphum,liq_wat,ice_wat,rainwat,snowwat,graupel) > Atm(mygrid)%flagstruct%nwat) then
call mpp_error (FATAL,' atmosphere_init: condensate species are not first in the list of &
Expand Down Expand Up @@ -425,7 +420,6 @@ subroutine atmosphere_init (Time_init, Time, Time_step, Grid_box, area)

call timing_off('ATMOS_INIT')

#ifdef CCPP
! Do CCPP fast physics initialization before call to adiabatic_init (since this calls fv_dynamics)

! For fast physics running over the entire domain, block
Expand Down Expand Up @@ -474,7 +468,6 @@ subroutine atmosphere_init (Time_init, Time, Time_step, Grid_box, area)
call mpp_error (FATAL, cdata%errmsg)
end if
end if
#endif

! --- initiate the start for a restarted regional forecast
if ( Atm(mygrid)%gridstruct%regional .and. Atm(mygrid)%flagstruct%warm_start ) then
Expand Down Expand Up @@ -693,17 +686,16 @@ end subroutine atmosphere_dynamics
!>@brief The subroutine 'atmosphere_end' is an API for the termination of the
!! FV3 dynamical core responsible for writing out a restart and final diagnostic state.
subroutine atmosphere_end (Time, Grid_box, restart_endfcst)
#ifdef CCPP

use ccpp_static_api, only: ccpp_physics_finalize
use CCPP_data, only: ccpp_suite
use CCPP_data, only: cdata => cdata_tile
#endif

type (time_type), intent(in) :: Time
type(grid_box_type), intent(inout) :: Grid_box
logical, intent(in) :: restart_endfcst

#ifdef CCPP
integer :: ierr

if (Atm(mygrid)%flagstruct%do_sat_adj) then
! Finalize fast physics
call ccpp_physics_finalize(cdata, suite_name=trim(ccpp_suite), group_name="fast_physics", ierr=ierr)
Expand All @@ -712,7 +704,6 @@ subroutine atmosphere_end (Time, Grid_box, restart_endfcst)
call mpp_error (FATAL, cdata%errmsg)
end if
end if
#endif

! initialize domains for writing global physics data
call set_domain ( Atm(mygrid)%domain )
Expand Down
7 changes: 0 additions & 7 deletions makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@ else
$(info )
endif

ifneq (,$(findstring CCPP,$(CPPDEFS)))
FAST_PHYSICS_SRCS_F90 =
else
FAST_PHYSICS_SRCS_F90 = ./model/fv_cmp.F90
endif

LIBRARY = libfv3core.a

FFLAGS += -I$(FMS_DIR) -I../gfsphysics -I../ipd -I../io -I.
Expand All @@ -37,7 +31,6 @@ SRCS_F90 = \
./model/boundary.F90 \
./model/dyn_core.F90 \
./model/fv_arrays.F90 \
$(FAST_PHYSICS_SRCS_F90) \
./model/fv_control.F90 \
./model/fv_dynamics.F90 \
./model/fv_fill.F90 \
Expand Down
Loading