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

feature/transition-to-capgen-1: update from master 2020/10/02, change horizontal_dimension to horizontal_loop_extent, fix legacy warnings #504

Merged
merged 21 commits into from
Oct 5, 2020
Merged

feature/transition-to-capgen-1: update from master 2020/10/02, change horizontal_dimension to horizontal_loop_extent, fix legacy warnings #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
a609790
Update for new RRTMG cloud overlap methods EXP and ER
mjiacono Jul 17, 2020
b0bc1ab
Merge branch 'rrtmg-cloud-overlap-updates' of https://github.com/mjia…
climbfuji Jul 23, 2020
5b50679
Merge branch 'master' of https://github.com/NCAR/ccpp-physics into HEAD
climbfuji Aug 11, 2020
4c5224a
Add dummy call to get_alpha_exp to physics/module_SGSCloud_RadPre.F90…
climbfuji Aug 11, 2020
43ba47d
fix diagnostic tendencies in moninedmf.f, satmedmfvdifq.F, module_MYN…
grantfirl Aug 18, 2020
38ae970
add check for generic PBL tendencies flag within PBL schemes that wer…
grantfirl Aug 19, 2020
1ce44ad
check for generic PBL tendencies in satmedmfvdif and remove tests for…
grantfirl Aug 19, 2020
0f6528b
add PBL tendencies to MYJ and SHOC schemes
grantfirl Aug 19, 2020
0693903
change horizontal_dimension to horizontal_loop_extent for PBL tendenc…
grantfirl Aug 19, 2020
fd8304a
fix bug in cu_gf_driver tendencies
grantfirl Aug 19, 2020
e2557bd
Merge branch 'master' into fix_PBL_tendencies
grantfirl Sep 3, 2020
8396ef7
change horizontal_dimension to horizontal_loop_extent in _run section…
XiaSun-Atmos Sep 9, 2020
4c2d758
change from horizontal_loop_content to horizontal_dimension in init s…
XiaSun-Atmos Sep 16, 2020
9bb1767
Merge branch 'master' of https://github.com/NCAR/ccpp-physics into ia…
climbfuji Sep 22, 2020
a8d1b6b
Update standard names for flags/controls of cloud overlap methods
climbfuji Sep 23, 2020
f91d1bf
Merge pull request #487 from climbfuji/iacono_cloud_overlap_merged_wi…
climbfuji Sep 25, 2020
9a90aa4
Merge branch 'master' into fix_PBL_tendencies
grantfirl Sep 28, 2020
e177dca
add CMakeLists.txt change from @climbfuji
grantfirl Sep 28, 2020
6f12e14
Merge pull request #489 from grantfirl/fix_PBL_tendencies
climbfuji Sep 30, 2020
df3f1b6
Merge branch 'horidims' of https://github.com/XiaSun-NOAA/ccpp-physic…
climbfuji Oct 2, 2020
0f08d1e
Fix legacy warnings: remove old CCPP arg table hooks for empty subrou…
climbfuji Oct 2, 2020
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: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,9 @@ elseif (${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
endif()

# Remove files with special compiler flags from list of files with standard compiler flags
list(REMOVE_ITEM SCHEMES ${SCHEMES_SFX_OPT})
if (SCHEMES_SFX_OPT)
list(REMOVE_ITEM SCHEMES ${SCHEMES_SFX_OPT})
endif(SCHEMES_SFX_OPT)
# Assign standard compiler flags to all remaining schemes and caps
SET_SOURCE_FILES_PROPERTIES(${SCHEMES} ${CAPS}
PROPERTIES COMPILE_FLAGS "${CMAKE_Fortran_FLAGS_OPT}")
Expand Down
70 changes: 35 additions & 35 deletions physics/GFS_DCNV_generic.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
standard_name = x_wind_updated_by_physics
long_name = zonal wind updated by physics
units = m s-1
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = in
Expand All @@ -68,7 +68,7 @@
standard_name = y_wind_updated_by_physics
long_name = meridional wind updated by physics
units = m s-1
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = in
Expand All @@ -77,7 +77,7 @@
standard_name = air_temperature_updated_by_physics
long_name = temperature updated by physics
units = K
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = in
Expand All @@ -86,7 +86,7 @@
standard_name = water_vapor_specific_humidity_updated_by_physics
long_name = water vapor specific humidity updated by physics
units = kg kg-1
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = inout
Expand All @@ -95,7 +95,7 @@
standard_name = x_wind_save
long_name = x-wind before entering a physics scheme
units = m s-1
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = inout
Expand All @@ -104,7 +104,7 @@
standard_name = y_wind_save
long_name = y-wind before entering a physics scheme
units = m s-1
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = inout
Expand All @@ -113,7 +113,7 @@
standard_name = air_temperature_save
long_name = air temperature before entering a physics scheme
units = K
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = inout
Expand All @@ -122,7 +122,7 @@
standard_name = water_vapor_specific_humidity_save
long_name = water vapor specific humidity before entering a physics scheme
units = kg kg-1
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = inout
Expand All @@ -131,7 +131,7 @@
standard_name = instantaneous_water_vapor_specific_humidity_tendency_due_to_convection
long_name = instantaneous moisture tendency due to convection
units = kg kg-1 s-1
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = inout
Expand Down Expand Up @@ -233,7 +233,7 @@
standard_name = lwe_thickness_of_deep_convective_precipitation_amount
long_name = deep convective rainfall amount on physics timestep
units = m
dimensions = (horizontal_dimension)
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
intent = in
Expand All @@ -251,7 +251,7 @@
standard_name = cloud_work_function
long_name = cloud work function
units = m2 s-2
dimensions = (horizontal_dimension)
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
intent = in
Expand All @@ -260,7 +260,7 @@
standard_name = x_wind_save
long_name = x-wind before entering a physics scheme
units = m s-1
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = in
Expand All @@ -269,7 +269,7 @@
standard_name = y_wind_save
long_name = y-wind before entering a physics scheme
units = m s-1
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = in
Expand All @@ -278,7 +278,7 @@
standard_name = air_temperature_save
long_name = air temperature before entering a physics scheme
units = K
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = in
Expand All @@ -287,7 +287,7 @@
standard_name = water_vapor_specific_humidity_save
long_name = water vapor specific humidity before entering a physics scheme
units = kg kg-1
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = in
Expand All @@ -296,7 +296,7 @@
standard_name = x_wind_updated_by_physics
long_name = zonal wind updated by physics
units = m s-1
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = in
Expand All @@ -305,7 +305,7 @@
standard_name = y_wind_updated_by_physics
long_name = meridional wind updated by physics
units = m s-1
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = in
Expand All @@ -314,7 +314,7 @@
standard_name = air_temperature_updated_by_physics
long_name = temperature updated by physics
units = K
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = in
Expand All @@ -323,7 +323,7 @@
standard_name = water_vapor_specific_humidity_updated_by_physics
long_name = water vapor specific humidity updated by physics
units = kg kg-1
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = in
Expand All @@ -332,7 +332,7 @@
standard_name = instantaneous_atmosphere_updraft_convective_mass_flux
long_name = (updraft mass flux) * delt
units = kg m-2
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = in
Expand All @@ -341,7 +341,7 @@
standard_name = instantaneous_atmosphere_downdraft_convective_mass_flux
long_name = (downdraft mass flux) * delt
units = kg m-2
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = in
Expand All @@ -350,7 +350,7 @@
standard_name = instantaneous_atmosphere_detrainment_convective_mass_flux
long_name = (detrainment mass flux) * delt
units = kg m-2
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = in
Expand Down Expand Up @@ -392,7 +392,7 @@
standard_name = lwe_thickness_of_convective_precipitation_amount_on_dynamics_timestep
long_name = convective rain at this time step
units = m
dimensions = (horizontal_dimension)
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
intent = inout
Expand All @@ -401,7 +401,7 @@
standard_name = cumulative_cloud_work_function
long_name = cumulative cloud work function (valid only with sas)
units = m2 s-1
dimensions = (horizontal_dimension)
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
intent = inout
Expand All @@ -410,7 +410,7 @@
standard_name = cumulative_change_in_temperature_due_to_deep_convection
long_name = cumulative change in temperature due to deep conv.
units = K
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = inout
Expand All @@ -419,7 +419,7 @@
standard_name = cumulative_change_in_water_vapor_specific_humidity_due_to_deep_convection
long_name = cumulative change in water vapor specific humidity due to deep conv.
units = kg kg-1
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = inout
Expand All @@ -428,7 +428,7 @@
standard_name = cumulative_change_in_x_wind_due_to_deep_convection
long_name = cumulative change in x wind due to deep convection
units = m s-1
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = inout
Expand All @@ -437,7 +437,7 @@
standard_name = cumulative_change_in_y_wind_due_to_deep_convection
long_name = cumulative change in y wind due to deep convection
units = m s-1
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = inout
Expand All @@ -446,7 +446,7 @@
standard_name = cumulative_atmosphere_updraft_convective_mass_flux
long_name = cumulative updraft mass flux
units = Pa
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = inout
Expand All @@ -455,7 +455,7 @@
standard_name = cumulative_atmosphere_downdraft_convective_mass_flux
long_name = cumulative downdraft mass flux
units = Pa
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = inout
Expand All @@ -464,7 +464,7 @@
standard_name = cumulative_atmosphere_detrainment_convective_mass_flux
long_name = cumulative detrainment mass flux
units = Pa
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = inout
Expand All @@ -473,7 +473,7 @@
standard_name = convective_cloud_water_mixing_ratio
long_name = moist convective cloud water mixing ratio
units = kg kg-1
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = inout
Expand All @@ -482,7 +482,7 @@
standard_name = convective_cloud_cover
long_name = convective cloud cover
units = frac
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = inout
Expand All @@ -491,7 +491,7 @@
standard_name = convective_cloud_water_mixing_ratio_in_phy_f3d
long_name = convective cloud water mixing ratio in the phy_f3d array
units = kg kg-1
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = inout
Expand All @@ -500,7 +500,7 @@
standard_name = convective_cloud_cover_in_phy_f3d
long_name = convective cloud cover in the phy_f3d array
units = frac
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = inout
Expand Down
Loading