Skip to content

Fixes/modifications to ccpp-physics for transition to capgen #584

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
climbfuji merged 18 commits into from
Apr 30, 2021
Merged

Fixes/modifications to ccpp-physics for transition to capgen #584

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
feb3973
Changes to fortran and metadata tables to pass capgen consistency check.
Aug 31, 2020
b61a3b9
Merge branch 'master' into capgen_fixes
Aug 31, 2020
ee38a14
Fixes for intent mismatch, out of order arguments and subroutines
Sep 1, 2020
c52a094
More fixes to intent mismatches, no matching Fortran routine found,
Sep 2, 2020
b267bc8
Merge branch 'master' into capgen_fixes
Sep 2, 2020
65c96f0
Merge branch 'master' into capgen_fixes
Nov 30, 2020
85fa557
Rearrange metadata table entries and add intent to keep capgen happy.
Jan 5, 2021
ad9e16d
Merge branch 'master' into capgen_fixes
Jan 5, 2021
8e7e1b7
Fix order of variables and differing intents.
Jan 6, 2021
72b01ad
Fix CCPPError: No matching Fortran routine found for sfc_sice_run
Jan 6, 2021
dc0f118
Add missing intent statements
Jan 7, 2021
d6cf638
Merge branch 'master' into capgen_fixes
Feb 4, 2021
7cbb6ae
Change intent from out to inout to match fortran.
Feb 4, 2021
3ff716e
Merge branch 'master' into capgen_fixes
Mar 2, 2021
7a1373f
Merge branch 'master' into capgen_fixes
Mar 3, 2021
1223d7a
Fix intent statements as requested by Dom.
Mar 3, 2021
c6f9c79
Merge branch 'master' into capgen_fixes
Apr 6, 2021
bfa9a65
Fix more out of order variables and mismatched intents.
Apr 6, 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
9 changes: 9 additions & 0 deletions physics/GFS_GWD_generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ module GFS_GWD_generic_pre

contains

!! \section arg_table_GFS_GWD_generic_pre_init Argument Table
!! \htmlinclude GFS_GWD_generic_pre_init.html
!!
subroutine GFS_GWD_generic_pre_init()
end subroutine GFS_GWD_generic_pre_init

Expand Down Expand Up @@ -132,6 +135,9 @@ subroutine GFS_GWD_generic_pre_run( &
end subroutine GFS_GWD_generic_pre_run
!> @}

!! \section arg_table_GFS_GWD_generic_pre_finalize Argument Table
!! \htmlinclude GFS_GWD_generic_pre_finalize.html
!!
subroutine GFS_GWD_generic_pre_finalize()
end subroutine GFS_GWD_generic_pre_finalize

Expand Down Expand Up @@ -189,6 +195,9 @@ subroutine GFS_GWD_generic_post_run(lssav, ldiag3d, dtf, dusfcg, dvsfcg, dudt, d
end subroutine GFS_GWD_generic_post_run
!> @}

!! \section arg_table_GFS_GWD_generic_post_finalize Argument Table
!! \htmlinclude GFS_GWD_generic_post_finalize.html
!!
subroutine GFS_GWD_generic_post_finalize()
end subroutine GFS_GWD_generic_post_finalize

Expand Down
4 changes: 2 additions & 2 deletions physics/GFS_GWD_generic.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = inout
intent = in
optional = F
[dvdt]
standard_name = tendency_of_y_wind_due_to_model_physics
Expand All @@ -171,7 +171,7 @@
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = inout
intent = in
optional = F
[dtdt]
standard_name = tendency_of_air_temperature_due_to_model_physics
Expand Down
4 changes: 2 additions & 2 deletions physics/GFS_MP_generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ subroutine GFS_MP_generic_pre_run(im, levs, ldiag3d, qdiag3d, do_aw, ntcw, nncl,
real(kind=kind_phys), dimension(im, levs), intent(in) :: gt0
real(kind=kind_phys), dimension(im, levs, ntrac), intent(in) :: gq0

real(kind=kind_phys), dimension(im, levs), intent(inout) :: save_t, save_qv
real(kind=kind_phys), dimension(im, levs, ntrac), intent(inout) :: save_q
real(kind=kind_phys), dimension(im, levs), intent(out) :: save_t, save_qv

@climbfuji climbfuji Mar 2, 2021

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These must be intent(inout) because they are only modified under certain conditions, otherwise let unchanged. Fix also in metadata.

real(kind=kind_phys), dimension(im, levs, ntrac), intent(out) :: save_q

character(len=*), intent(out) :: errmsg
integer, intent(out) :: errflg
Expand Down
6 changes: 3 additions & 3 deletions physics/GFS_MP_generic.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = inout
intent = out

@climbfuji climbfuji Mar 2, 2021

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See above

optional = F
[save_qv]
standard_name = water_vapor_specific_humidity_save
Expand All @@ -114,7 +114,7 @@
dimensions = (horizontal_loop_extent,vertical_dimension,number_of_tracers)
type = real
kind = kind_phys
intent = inout
intent = out
optional = F
[errmsg]
standard_name = ccpp_error_message
Expand Down Expand Up @@ -330,7 +330,7 @@
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
intent = in
intent = inout
optional = F
[rain1]
standard_name = lwe_thickness_of_explicit_precipitation_amount
Expand Down
12 changes: 6 additions & 6 deletions physics/GFS_PBL_generic.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1334,18 +1334,18 @@
kind = kind_phys
intent = in
optional = F
[hefac]
standard_name = surface_upward_latent_heat_flux_reduction_factor
long_name = surface upward latent heat flux reduction factor from canopy heat storage
[hffac]
standard_name = surface_upward_sensible_heat_flux_reduction_factor
long_name = surface upward sensible heat flux reduction factor from canopy heat storage
units = none
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
intent = in
optional = F
[hffac]
standard_name = surface_upward_sensible_heat_flux_reduction_factor
long_name = surface upward sensible heat flux reduction factor from canopy heat storage
[hefac]
standard_name = surface_upward_latent_heat_flux_reduction_factor
long_name = surface upward latent heat flux reduction factor from canopy heat storage
units = none
dimensions = (horizontal_loop_extent)
type = real
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_SCNV_generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ subroutine GFS_SCNV_generic_pre_run (im, levs, ldiag3d, qdiag3d, gu0, gv0, gt0,
logical, intent(in) :: ldiag3d, qdiag3d, flag_for_scnv_generic_tend
real(kind=kind_phys), dimension(im,levs), intent(in) :: gu0, gv0, gt0, gq0_water_vapor

real(kind=kind_phys), dimension(im,levs), intent(inout) :: save_u, save_v, save_t, save_qv
real(kind=kind_phys), dimension(im,levs), intent(out) :: save_u, save_v, save_t, save_qv

@climbfuji climbfuji Mar 2, 2021

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, intent(inout), see above. Also fix in physics/GFS_SCNV_generic.meta

character(len=*), intent(out) :: errmsg
integer, intent(out) :: errflg

Expand Down
12 changes: 6 additions & 6 deletions physics/GFS_SCNV_generic.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,17 +179,17 @@
type = logical
intent = in
optional = F
[qdiag3d]
standard_name = flag_tracer_diagnostics_3D
long_name = flag for 3d tracer diagnostic fields
[ldiag3d]
standard_name = flag_diagnostics_3D
long_name = flag for 3d diagnostic fields
units = flag
dimensions = ()
type = logical
intent = in
optional = F
[ldiag3d]
standard_name = flag_diagnostics_3D
long_name = flag for 3d diagnostic fields
[qdiag3d]
standard_name = flag_tracer_diagnostics_3D
long_name = flag for 3d tracer diagnostic fields
units = flag
dimensions = ()
type = logical
Expand Down
52 changes: 26 additions & 26 deletions physics/GFS_cloud_diagnostics.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,15 @@
intent = in
kind = kind_phys
optional = F
[de_lgth]
standard_name = cloud_decorrelation_length
long_name = cloud decorrelation length
units = km
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
intent = in
optional = F
[p_lay]
standard_name = air_pressure_at_layer_for_RRTMGP_in_hPa
long_name = air pressure at vertical layer for radiation calculation
Expand Down Expand Up @@ -74,31 +83,6 @@
kind = kind_phys
intent = in
optional = F
[mtopa]
standard_name = model_layer_number_at_cloud_top
long_name = vertical indices for low, middle and high cloud tops
units = index
dimensions = (horizontal_loop_extent,3)
type = integer
intent = out
optional = F
[mbota]
standard_name = model_layer_number_at_cloud_base
long_name = vertical indices for low, middle and high cloud bases
units = index
dimensions = (horizontal_loop_extent,3)
type = integer
intent = out
optional = F
[de_lgth]
standard_name = cloud_decorrelation_length
long_name = cloud decorrelation length
units = km
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
intent = in
optional = F
[deltaZ]
standard_name = layer_thickness
long_name = layer_thickness
Expand Down Expand Up @@ -135,6 +119,22 @@
kind = kind_phys
intent = in
optional = F
[mtopa]
standard_name = model_layer_number_at_cloud_top
long_name = vertical indices for low, middle and high cloud tops
units = index
dimensions = (horizontal_loop_extent,3)
type = integer
intent = out
optional = F
[mbota]
standard_name = model_layer_number_at_cloud_base
long_name = vertical indices for low, middle and high cloud bases
units = index
dimensions = (horizontal_loop_extent,3)
type = integer
intent = out
optional = F
[cldsa]
standard_name = cloud_area_fraction_for_radiation
long_name = fraction of clouds for low, middle, high, total and BL
Expand All @@ -160,4 +160,4 @@
dimensions = ()
type = integer
intent = out
optional = F
optional = F
Loading