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

Merge May 16 EMC develop to gsl/develop #144

Merged
merged 86 commits into from
May 19, 2022
Merged

Merge May 16 EMC develop to gsl/develop #144

Show file tree
Hide file tree
Changes from 85 commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
eb463bc
Feature/ccpp codeowners (#442)
SamuelTrahanNOAA Dec 16, 2021
6c27fdb
Code cleanup. Remove used code/variables. Fix minor inconsistencies. …
DusanJovic-NOAA Dec 17, 2021
71f27b2
CCPP cloud cover change for Thompson MP associated with Xu Randall (#…
climbfuji Dec 20, 2021
85b1a90
Wrapper for ccpp-physics #806, #807, #813 (#447)
grantfirl Dec 21, 2021
8afe51e
Wrapper for ccpp-physics #808 and 816 (roughness length over ice and …
grantfirl Dec 23, 2021
96a2554
Use 'model set run clock' routine in FV3 NUOPC cap. (#450)
DusanJovic-NOAA Dec 27, 2021
42dd808
Clean up iovr=4 (exponential cloud overlapping method) in RRTMG (#445)
mzhangw Dec 28, 2021
9ab2847
Bug fix for dimensions of eta level variables and WAM variables in Fo…
climbfuji Dec 30, 2021
edcdfc5
Update inline post with latest UPP release upp_v10.0.11 (#449)
WenMeng-NOAA Jan 3, 2022
8198cee
Wrapper for ccpp-physics #812 (#453)
grantfirl Jan 5, 2022
7eb0ee2
MYNN sfclay (RAP suite) restart reproducibility, P8 suite definition …
climbfuji Jan 7, 2022
c2f06d5
Fixes on initializing snow depth over ice and changes z0ice (#461)
SMoorthi-emc Jan 10, 2022
9038ef7
Radar-derived microphysics temperature tendencies similar to operatio…
SamuelTrahanNOAA Jan 11, 2022
7362f7d
fixing snod bug in atmos_model.F90 (#465)
SMoorthi-emc Jan 13, 2022
500ceaa
Thompson MP cloud tuning (#463)
grantfirl Jan 18, 2022
f1a35e1
Feature/hwrf legacy (#459)
ChunxiZhang-NOAA Jan 19, 2022
12a5441
CCPP: Update consistency checks and effective radii calculation for T…
climbfuji Jan 20, 2022
83ea4a2
Unified write_netcdf, add single file 'cubed_sphere_grid' output (#466)
DusanJovic-NOAA Jan 25, 2022
a9e7909
Change standard name and unit of CCPP error flag variable in CCPP fra…
climbfuji Jan 26, 2022
4e43229
Add code to enable ESMF managed threading (#469)
junwang-noaa Jan 27, 2022
23b7dd3
Revisions to repair iovr=5 cloud overlap option (#471)
grantfirl Jan 31, 2022
6901981
Add 2d decomposition on the write grid comp (#470)
junwang-noaa Feb 2, 2022
e19a77c
4DIAU bug when iau_filter_increments=T (#458)
jswhit Feb 4, 2022
33efbc9
Add lsm_cold_start variable for RUC LSM SCM support and gwdps bugfix …
grantfirl Feb 8, 2022
91836a8
add lon info in the write group (#476)
junwang-noaa Feb 10, 2022
9929dcd
Multiple output grids (#480)
DusanJovic-NOAA Feb 15, 2022
277517d
GPU-enabled version of Grell-Freitas convection in ccpp-physics (#479)
DomHeinzeller Feb 16, 2022
b3f98fe
Enable Thompson MP when coupling with UFS-Aerosols (#484)
rmontuoro Feb 22, 2022
bc562d7
Add support for Stochastically Perturbed Parameterizations (SPP) in F…
JeffBeck-NOAA Feb 23, 2022
ae438f7
lateral boundary fix for regional runs (#482)
MatthewPyle-NOAA Feb 25, 2022
47d391c
Feature: NSSL Microphysics support (#472)
MicroTed Mar 4, 2022
3bcba51
Add p8b SDF (#491)
JessicaMeixner-NOAA Mar 10, 2022
b2272de
Split CCPP finalize into physics_finalize and (framework) finalize; m…
climbfuji Mar 11, 2022
8c582f7
Add 'valid time' variable using ISO string format (#492)
DusanJovic-NOAA Mar 17, 2022
1cebcf1
Fix Lambert Conformal Conic mapping in the write component on the sou…
DusanJovic-NOAA Mar 18, 2022
2b988fe
Rectify total number of Thompson MP species for PBL mixing (#509)
rmontuoro Mar 22, 2022
55e98b2
update upp revision (#505)
WenMeng-NOAA Mar 24, 2022
dd68016
move some parameters in mynn surface layer to namelist options
joeolson42 Mar 25, 2022
d86aba4
land surface upgrades for p8c (#499)
HelinWei-NOAA Mar 29, 2022
c02869a
Added capability for cdmbgwd(1) to scale GSL blocking drag (#502)
mdtoyNOAA Mar 30, 2022
241db75
release/p8c: it is related to ccpp-physics PBL and cumulus updates pl…
ChunxiZhang-NOAA Apr 4, 2022
8a58e19
Bring AQM model into UFS (#511)
BrianCurtis-NOAA Apr 4, 2022
cec4d38
RRTMGP for prototype 8 (#498)
dustinswales Apr 8, 2022
6e6d9c7
HAFS related moving-nesting, nest coupling, and movable output grid c…
BinLiu-NOAA Apr 11, 2022
bffbeeb
Split GFS_typedefs.F90, rename CCPP_interstitial, import ccpp_t from …
climbfuji Apr 12, 2022
70cafa6
Fix uninitialized min_rand variable in Thompson MP when using SPP (#516)
JeffBeck-NOAA Apr 20, 2022
ec95157
A bug fix for wet scavenging of aerosols and a minor modification for…
ChunxiZhang-NOAA Apr 21, 2022
38720ac
Update ccpp_prebuild_config.py for one-to-one CCPP physics schemes/fi…
grantfirl Apr 22, 2022
ff41d1c
Merge NOAA-EMC develop
SamuelTrahanNOAA Apr 22, 2022
20f6731
point to gsl/merge-develop branch
SamuelTrahanNOAA Apr 22, 2022
db3107c
Point to gsl/merge-develop-to-community branch for ccpp/physics
SamuelTrahanNOAA Apr 22, 2022
86a111a
Corrections to merge + joe updates
SamuelTrahanNOAA Apr 23, 2022
de62617
Merge remote-tracking branch 'joe/mynn2' into gsl/merge-develop-to-co…
SamuelTrahanNOAA Apr 23, 2022
de363fe
Point .gitmodules to Sam's fork
SamuelTrahanNOAA Apr 27, 2022
8c60e05
Correct issues found by reviewers
SamuelTrahanNOAA Apr 27, 2022
dbb405c
Rename mynnpbl to mynnedmf
SamuelTrahanNOAA Apr 27, 2022
dc25f3d
Remove some empty _init and _finalize routines and update a comment i…
SamuelTrahanNOAA Apr 27, 2022
9018acf
Feature/lndp noahmp2 : add land perturbation scheme for Noah-MP fract…
ClaraDraper-NOAA Apr 28, 2022
45955d0
Add \file to smoke files
SamuelTrahanNOAA Apr 28, 2022
f8cc77f
Add hailcast code in atmos_cubed_sphere (#528)
binli2337 Apr 29, 2022
c521b5d
Combine PROD and REPRO build options into 'Release' build type (#524)
DusanJovic-NOAA May 3, 2022
6ee5395
Unify inline post (#521)
WenMeng-NOAA May 5, 2022
2400711
adding bug fix from jili dong and removing U* averaging
SamuelTrahanNOAA May 5, 2022
189806f
adding bug fix from jili dong and removing U* averaging
SamuelTrahanNOAA May 5, 2022
6613803
Merge develop
SamuelTrahanNOAA May 5, 2022
ba5e9b7
Remove some commented-out code from cu_gf_driver in ccpp-physics.
SamuelTrahanNOAA May 6, 2022
fda178f
Turn rrtmg smoke band 10 into a model namelist variable
SamuelTrahanNOAA May 6, 2022
da0435f
Switch ccpp-physics smoke arguments to implied shape
SamuelTrahanNOAA May 6, 2022
ebbcfb7
Remove some stops and gotos from ccpp-physics smoke
SamuelTrahanNOAA May 6, 2022
1fc9e5f
Remove some hard-coded constants and rename some meta entries
SamuelTrahanNOAA May 9, 2022
c5d7221
Change RRTMGP to RRTMG in two P8 SDFs (#527)
ChunxiZhang-NOAA May 9, 2022
b03c955
Rename some standard_names, change a unit, and remove a "use physcons"
SamuelTrahanNOAA May 9, 2022
5301b65
NSSL ccpp-physics bugfixes and new ccpp-framework debugging feature (…
grantfirl May 11, 2022
c302ad5
merge develop
SamuelTrahanNOAA May 11, 2022
8edf82e
Set num3d correctly when using radar_tten
SamuelTrahanNOAA May 11, 2022
fe30500
Only add cnv_3d_ud_mf to the restart files when needed
SamuelTrahanNOAA May 13, 2022
e3a3c7e
Pass some chemistry varibles to mynn_bl_driver correctly
SamuelTrahanNOAA May 16, 2022
981e49d
Correct argument passing within mynn edmf
SamuelTrahanNOAA May 16, 2022
4bf92d9
point to NCAR main ccpp/physics
SamuelTrahanNOAA May 17, 2022
ee9cb8d
Merge branch 'gsl/merge-develop-to-community' of ssh://github.com/Sam…
SamuelTrahanNOAA May 17, 2022
1e9c3da
merge gsl institutional fork (#526)
SamuelTrahanNOAA May 17, 2022
c94bcc0
Merge remote-tracking branch 'community/develop' into gsl/merge-commu…
SamuelTrahanNOAA May 17, 2022
a7a24d2
point to sam's repo
SamuelTrahanNOAA May 17, 2022
4f8edc8
ccpp/physics: Change to GSL CODEOWNERS
SamuelTrahanNOAA May 17, 2022
d22a506
Returned the comments on soil resistance back.
SamuelTrahanNOAA May 18, 2022
e247454
point to gsl/develop for ccpp/physics
SamuelTrahanNOAA May 18, 2022
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
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
branch = main
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/NOAA-GSL/ccpp-physics
branch = gsl/develop
url = ssh://git@github.com/SamuelTrahanNOAA/ccpp-physics
branch = gsl/merge-community-to-develop
[submodule "upp"]
path = upp
url = https://github.com/NOAA-EMC/UPP
Expand Down
9 changes: 8 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ set(use_WRTCOMP ON)
set(GFS_PHYS ON)
set(GFS_TYPES ON)
set(USE_GFSL63 ON)
if(MOVING_NEST)
set(MOVING_NEST ON)
endif()
add_subdirectory(atmos_cubed_sphere)

###############################################################################
Expand All @@ -22,7 +25,7 @@ add_subdirectory(atmos_cubed_sphere)
if(INLINE_POST)
set(BUILD_POSTEXEC OFF)
add_subdirectory(upp)
set(POST_SRC io/inline_post.F90 io/post_nems_routines.F90 io/post_gfs.F90 io/post_regional.F90)
set(POST_SRC io/inline_post.F90 io/post_nems_routines.F90 io/post_fv3.F90)
else()
set(POST_SRC io/inline_post_stub.F90)
list(APPEND _fv3atm_defs_private NO_INLINE_POST)
Expand All @@ -32,6 +35,10 @@ if(NOT PARALLEL_NETCDF)
list(APPEND _fv3atm_defs_private NO_PARALLEL_NETCDF)
endif()

if(MOVING_NEST)
list(APPEND _fv3atm_defs_private MOVING_NEST)
endif()

add_library(fv3atm
atmos_model.F90
fv3_cap.F90
Expand Down
2 changes: 1 addition & 1 deletion atmos_cubed_sphere
Open in desktop
Submodule atmos_cubed_sphere updated 27 files
+16 −0 CMakeLists.txt
+239 −26 driver/fvGFS/atmosphere.F90
+181 −25 driver/fvGFS/fv_nggps_diag.F90
+14 −3 model/fv_arrays.F90
+18 −4 model/fv_control.F90
+66 −16 model/fv_dynamics.F90
+12 −0 model/fv_grid_utils.F90
+58 −22 model/fv_mapz.F90
+108 −14 model/fv_nesting.F90
+10 −3 model/fv_regional_bc.F90
+433 −13 model/fv_sg.F90
+6 −4 model/fv_update_phys.F90
+175 −0 moving_nest/bounding_box.F90
+2,740 −0 moving_nest/fv_moving_nest.F90
+1,199 −0 moving_nest/fv_moving_nest_main.F90
+1,737 −0 moving_nest/fv_moving_nest_physics.F90
+621 −0 moving_nest/fv_moving_nest_types.F90
+3,858 −0 moving_nest/fv_moving_nest_utils.F90
+1,837 −0 moving_nest/fv_tracker.F90
+23 −4 tools/coarse_grained_diagnostics.F90
+29 −13 tools/external_ic.F90
+124 −8 tools/fv_diagnostics.F90
+3 −0 tools/fv_diagnostics.h
+425 −51 tools/fv_grid_tools.F90
+292 −0 tools/fv_mp_mod.F90
+1 −1 tools/fv_surf_map.F90
+1,798 −0 tools/module_diag_hailcast.F90
381 changes: 292 additions & 89 deletions atmos_model.F90
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 2 additions & 15 deletions ccpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,9 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
message(STATUS "Setting build type to 'Release' as none was specified.")
set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
# Set the possible values of build type for cmake-gui
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "Coverage")
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release")
endif()

#------------------------------------------------------------------------------
# CMake Modules
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/framework/cmake")

#------------------------------------------------------------------------------
# Call to CCPP code generator
if(DEBUG)
Expand Down Expand Up @@ -54,21 +50,13 @@ if(MPI)
add_definitions(-DMPI)
endif()

#------------------------------------------------------------------------------
# Set additional flags for debug build
if(DEBUG)
if(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -init=snan,arrays")
endif()
endif()

#------------------------------------------------------------------------------
# Set flag for 32bit dynamics build
if(32BIT)
message(STATUS "Compile CCPP slow physics with 64-bit precision, fast physics with 32-bit precision")
add_definitions(-DOVERLOAD_R4)
if(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
set(CMAKE_Fortran_FLAGS_PHYSICS "-real-size 64 -no-prec-div -no-prec-sqrt")
set(CMAKE_Fortran_FLAGS_PHYSICS "-real-size 64")
elseif(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
set(CMAKE_Fortran_FLAGS_PHYSICS "-fdefault-real-8 -fdefault-double-8")
endif()
Expand Down Expand Up @@ -117,7 +105,6 @@ add_library(
# Compile GFS_diagnostics.F90 without optimization, this leads to out of memory errors on wcoss_dell_p3
set_property(SOURCE driver/GFS_diagnostics.F90 APPEND_STRING PROPERTY COMPILE_FLAGS "-O0")


target_link_libraries(fv3ccpp PUBLIC ccpp_framework)
target_link_libraries(fv3ccpp PUBLIC ccpp_physics)

Expand Down
95 changes: 59 additions & 36 deletions ccpp/config/ccpp_prebuild_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@
'module_radlw_parameters' : '',
},
'CCPP_typedefs' : {
'CCPP_interstitial_type' : 'CCPP_interstitial',
'GFS_interstitial_type' : 'GFS_Interstitial(cdata%thrd_no)',
'GFDL_interstitial_type' : 'GFDL_interstitial',
'CCPP_typedefs' : '',
},
'CCPP_data' : {
'CCPP_data' : '',
},
'GFS_typedefs' : {
'GFS_control_type' : 'GFS_Control',
'GFS_interstitial_type' : 'GFS_Interstitial(cdata%thrd_no)',
'GFS_data_type' : 'GFS_Data(cdata%blk_no)',
'GFS_diag_type' : 'GFS_Data(cdata%blk_no)%Intdiag',
'GFS_tbd_type' : 'GFS_Data(cdata%blk_no)%Tbd',
Expand Down Expand Up @@ -96,11 +96,16 @@
# Relative path to source (from where ccpp_prebuild.py is called) : [ list of physics sets in which scheme may be called ];
# current restrictions are that each scheme can only belong to one physics set, and all schemes within one group in the
# suite definition file have to belong to the same physics set
'physics/physics/GFS_DCNV_generic.F90',
'physics/physics/GFS_GWD_generic.F90',
'physics/physics/GFS_MP_generic.F90',
'physics/physics/GFS_PBL_generic.F90',
'physics/physics/GFS_SCNV_generic.F90',
'physics/physics/GFS_DCNV_generic_pre.F90',
'physics/physics/GFS_DCNV_generic_post.F90',
'physics/physics/GFS_GWD_generic_pre.F90',
'physics/physics/GFS_GWD_generic_post.F90',
'physics/physics/GFS_MP_generic_pre.F90',
'physics/physics/GFS_MP_generic_post.F90',
'physics/physics/GFS_PBL_generic_pre.F90',
'physics/physics/GFS_PBL_generic_post.F90',
'physics/physics/GFS_SCNV_generic_pre.F90',
'physics/physics/GFS_SCNV_generic_post.F90',
'physics/physics/GFS_debug.F90',
'physics/physics/GFS_phys_time_vary.fv3.F90',
'physics/physics/GFS_rad_time_vary.fv3.F90',
Expand All @@ -109,10 +114,22 @@
'physics/physics/GFS_rrtmg_pre.F90',
'physics/physics/GFS_rrtmg_setup.F90',
'physics/physics/GFS_stochastics.F90',
'physics/physics/GFS_suite_interstitial.F90',
'physics/physics/GFS_surface_generic.F90',
'physics/physics/GFS_surface_composites.F90',
'physics/physics/GFS_surface_loop_control.F90',
'physics/physics/GFS_suite_interstitial_rad_reset.F90',
'physics/physics/GFS_suite_interstitial_phys_reset.F90',
'physics/physics/GFS_suite_interstitial_1.F90',
'physics/physics/GFS_suite_interstitial_2.F90',
'physics/physics/GFS_suite_stateout_reset.F90',
'physics/physics/GFS_suite_stateout_update.F90',
'physics/physics/GFS_suite_interstitial_3.F90',
'physics/physics/GFS_suite_interstitial_4.F90',
'physics/physics/GFS_suite_interstitial_5.F90',
'physics/physics/GFS_surface_generic_pre.F90',
'physics/physics/GFS_surface_generic_post.F90',
'physics/physics/GFS_surface_composites_pre.F90',
'physics/physics/GFS_surface_composites_inter.F90',
'physics/physics/GFS_surface_composites_post.F90',
'physics/physics/GFS_surface_loop_control_part1.F90',
'physics/physics/GFS_surface_loop_control_part2.F90',
'physics/physics/GFS_time_vary_pre.fv3.F90',
'physics/physics/cires_ugwp.F90',
'physics/physics/cires_ugwp_post.F90',
Expand All @@ -121,20 +138,25 @@
'physics/physics/ugwpv1_gsldrag.F90',
'physics/physics/ugwpv1_gsldrag_post.F90',
'physics/physics/cnvc90.f',
'physics/physics/cs_conv_pre.F90',
'physics/physics/cs_conv.F90',
'physics/physics/cs_conv_post.F90',
'physics/physics/cs_conv_aw_adj.F90',
'physics/physics/cu_ntiedtke_pre.F90',
'physics/physics/cu_ntiedtke.F90',
'physics/physics/cu_ntiedtke_post.F90',
'physics/physics/dcyc2.f',
'physics/physics/dcyc2t3.f',
'physics/physics/drag_suite.F90',
'physics/physics/gcm_shoc.F90',
'physics/physics/shoc.F90',
'physics/physics/get_prs_fv3.F90',
'physics/physics/get_phi_fv3.F90',
'physics/physics/gfdl_cloud_microphys.F90',
'physics/physics/gfdl_fv_sat_adj.F90',
'physics/physics/fv_sat_adj.F90',
'physics/physics/gfdl_sfc_layer.F90',
'physics/physics/gscond.f',
'physics/physics/zhaocarr_gscond.f',
'physics/physics/gwdc_pre.f',
'physics/physics/gwdc.f',
'physics/physics/gwdc_post.f',
'physics/physics/gwdps.f',
'physics/physics/h2ophys.f',
'physics/physics/samfdeepcnv.f',
Expand All @@ -143,28 +165,30 @@
'physics/physics/shalcnv.F',
'physics/physics/maximum_hourly_diagnostics.F90',
'physics/physics/m_micro.F90',
'physics/physics/m_micro_interstitial.F90',
'physics/physics/m_micro_pre.F90',
'physics/physics/m_micro_post.F90',
'physics/physics/cu_gf_driver_pre.F90',
'physics/physics/cu_gf_driver.F90',
'physics/physics/cu_gf_driver_post.F90',
'physics/physics/moninedmf.f',
'physics/physics/hedmf.f',
'physics/physics/moninshoc.f',
'physics/physics/satmedmfvdif.F',
'physics/physics/satmedmfvdifq.F',
'physics/physics/shinhongvdif.F90',
'physics/physics/ysuvdif.F90',
'physics/physics/module_MYNNPBL_wrapper.F90',
'physics/physics/module_MYNNSFC_wrapper.F90',
'physics/physics/module_SGSCloud_RadPre.F90',
'physics/physics/module_SGSCloud_RadPost.F90',
'physics/physics/module_MYJSFC_wrapper.F90',
'physics/physics/module_MYJPBL_wrapper.F90',
'physics/physics/mynnedmf_wrapper.F90',
'physics/physics/mynnsfc_wrapper.F90',
'physics/physics/sgscloud_radpre.F90',
'physics/physics/sgscloud_radpost.F90',
'physics/physics/myjsfc_wrapper.F90',
'physics/physics/myjpbl_wrapper.F90',
'physics/physics/mp_thompson_pre.F90',
'physics/physics/mp_thompson.F90',
'physics/physics/mp_thompson_post.F90',
'physics/physics/mp_nssl.F90' ,
'physics/physics/ozphys.f',
'physics/physics/ozphys_2015.f',
'physics/physics/precpd.f',
'physics/physics/zhaocarr_precpd.f',
'physics/physics/phys_tend.F90',
'physics/physics/radlw_main.F90',
'physics/physics/radsw_main.F90',
Expand All @@ -173,16 +197,18 @@
'physics/physics/rrtmg_lw_post.F90',
'physics/physics/rrtmg_lw_pre.F90',
'physics/physics/rrtmg_sw_post.F90',
'physics/physics/rrtmg_sw_pre.F90',
'physics/physics/rad_sw_pre.F90',
'physics/physics/sfc_diag.f',
'physics/physics/sfc_diag_post.F90',
'physics/physics/sfc_drv_ruc.F90',
'physics/physics/lsm_ruc.F90',
'physics/physics/sfc_cice.f',
'physics/physics/sfc_diff.f',
'physics/physics/sfc_drv.f',
'physics/physics/sfc_noahmp_drv.F90',
'physics/physics/lsm_noah.f',
'physics/physics/noahmpdrv.F90',
'physics/physics/flake_driver.F90',
'physics/physics/sfc_nst_pre.f',
'physics/physics/sfc_nst.f',
'physics/physics/sfc_nst_post.f',
'physics/physics/sfc_ocean.F',
'physics/physics/sfc_sice.f',
# HAFS FER_HIRES
Expand All @@ -196,28 +222,24 @@
'physics/physics/rrtmgp_lw_cloud_optics.F90',
'physics/physics/rrtmgp_sw_gas_optics.F90',
'physics/physics/rrtmgp_sw_cloud_optics.F90',
'physics/physics/rrtmgp_sw_aerosol_optics.F90',
'physics/physics/rrtmgp_aerosol_optics.F90',
'physics/physics/rrtmgp_lw_rte.F90',
'physics/physics/rrtmgp_sw_rte.F90',
'physics/physics/rrtmgp_lw_aerosol_optics.F90',
'physics/physics/GFS_rrtmgp_setup.F90',
'physics/physics/GFS_rrtmgp_pre.F90',
'physics/physics/rrtmgp_lw_pre.F90',
'physics/physics/GFS_rrtmgp_sw_pre.F90',
'physics/physics/GFS_rrtmgp_lw_post.F90',
'physics/physics/rrtmgp_lw_cloud_sampling.F90',
'physics/physics/rrtmgp_sw_cloud_sampling.F90',
'physics/physics/GFS_cloud_diagnostics.F90',
'physics/physics/GFS_rrtmgp_thompsonmp_pre.F90',
'physics/physics/GFS_rrtmgp_gfdlmp_pre.F90',
'physics/physics/GFS_rrtmgp_zhaocarr_pre.F90',
'physics/physics/GFS_rrtmgp_cloud_overlap_pre.F90',
'physics/physics/GFS_rrtmgp_cloud_mp.F90',
'physics/physics/GFS_rrtmgp_cloud_overlap.F90',
'physics/physics/GFS_rrtmgp_sw_post.F90'
]

# Default build dir, relative to current working directory,
# if not specified as command-line argument
DEFAULT_BUILD_DIR = 'FV3'
DEFAULT_BUILD_DIR = 'build'

# Auto-generated makefile/cmakefile snippets that contain all type definitions
TYPEDEFS_MAKEFILE = '{build_dir}/physics/CCPP_TYPEDEFS.mk'
Expand Down Expand Up @@ -245,6 +267,7 @@
STATIC_API_SRCFILE = '{build_dir}/physics/CCPP_STATIC_API.sh'

# Directory for writing HTML pages generated from metadata files
# used by metadata2html.py for generating scientific documentation
METADATA_HTML_OUTPUT_DIR = '{build_dir}/physics/physics/docs'

# HTML document containing the model-defined CCPP variables
Expand Down
10 changes: 5 additions & 5 deletions ccpp/data/CCPP_data.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ module CCPP_data
!!

use ccpp_types, only: ccpp_t
use CCPP_typedefs, only: CCPP_interstitial_type
use CCPP_typedefs, only: GFS_interstitial_type, &
GFDL_interstitial_type
use GFS_typedefs, only: GFS_control_type, &
GFS_data_type, &
GFS_interstitial_type
GFS_data_type

implicit none

Expand All @@ -18,7 +18,7 @@ module CCPP_data
cdata_domain, &
cdata_block, &
ccpp_suite, &
CCPP_interstitial, &
GFDL_interstitial, &
GFS_control, &
GFS_data, &
GFS_interstitial
Expand All @@ -34,7 +34,7 @@ module CCPP_data
!------------------------------------------------------!
! CCPP data containers for dynamics (fast physics) !
!------------------------------------------------------!
type(CCPP_interstitial_type), save, target :: CCPP_interstitial
type(GFDL_interstitial_type), save, target :: GFDL_interstitial

!------------------------------------------------------!
! CCPP containers for the six tiles used in dynamics, !
Expand Down
8 changes: 4 additions & 4 deletions ccpp/data/CCPP_data.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
units = DDT
dimensions = ()
type = ccpp_t
[CCPP_interstitial]
standard_name = CCPP_interstitial_type_instance
long_name = instance of derived type CCPP_interstitial_type
[GFDL_interstitial]
standard_name = GFDL_interstitial_type_instance
long_name = instance of derived type GFDL_interstitial_type
units = DDT
dimensions = ()
type = CCPP_interstitial_type
type = GFDL_interstitial_type
[GFS_Control]
standard_name = GFS_control_type_instance
long_name = instance of derived type GFS_control_type
Expand Down
Loading