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

Second reconciliation PR from production/RRFS.v1 #228

Merged
merged 3 commits into from
Nov 8, 2024
Merged

Second reconciliation PR from production/RRFS.v1 #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e2d83b
fix some optional arugments
grantfirl Oct 24, 2024
5bdca0d
fix some more optional variables
grantfirl Oct 24, 2024
0678f44
fix another optional argument in RUC LSM
grantfirl Oct 24, 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
2 changes: 1 addition & 1 deletion physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ subroutine GFS_rrtmg_pre_run (im, levs, lm, lmk, lmp, n_var_lndp, lextop,&
real(kind=kind_phys), dimension(:,:,:), intent(out) :: faerlw1,&
faerlw2,&
faerlw3
real(kind=kind_phys), dimension(:,:), intent(out) :: alpha
real(kind=kind_phys), dimension(:,:), intent(out), optional :: alpha
character(len=*), intent(out) :: errmsg
integer, intent(out) :: errflg

Expand Down
1 change: 1 addition & 0 deletions physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1474,6 +1474,7 @@
type = real
kind = kind_phys
intent = out
optional = True
[top_at_1]
standard_name = flag_for_vertical_ordering_in_radiation
long_name = flag for vertical ordering in radiation
Expand Down
3 changes: 2 additions & 1 deletion physics/Radiation/RRTMG/radlw_main.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,8 @@ subroutine rrtmg_lw_run &

real (kind=kind_phys), dimension(:), intent(in) :: sfemis, &
& sfgtmp, de_lgth
real (kind=kind_phys), dimension(npts,nlay), intent(in) :: alpha
real (kind=kind_phys), dimension(npts,nlay),intent(in),optional:: &
alpha

real (kind=kind_phys), dimension(:,:,:),intent(in):: &
& aeraod, aerssa
Expand Down
1 change: 1 addition & 0 deletions physics/Radiation/RRTMG/radlw_main.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@
type = real
kind = kind_phys
intent = in
optional = True
[npts]
standard_name = horizontal_loop_extent
long_name = horizontal dimension
Expand Down
3 changes: 2 additions & 1 deletion physics/Radiation/RRTMG/radsw_main.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,8 @@ subroutine rrtmg_sw_run &

real (kind=kind_phys), intent(in) :: cosz(npts), solcon, &
& de_lgth(npts)
real (kind=kind_phys), dimension(npts,nlay), intent(in) :: alpha
real (kind=kind_phys), dimension(npts,nlay),intent(in),optional:: &
alpha

! --- outputs:
real (kind=kind_phys), dimension(:,:), intent(inout) :: hswc
Expand Down
1 change: 1 addition & 0 deletions physics/Radiation/RRTMG/radsw_main.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@
type = real
kind = kind_phys
intent = in
optional = True
[cosz]
standard_name = cosine_of_solar_zenith_angle_for_daytime_points_on_radiation_timestep
long_name = cosine of the solar zenit angle
Expand Down
7 changes: 4 additions & 3 deletions physics/SFC_Models/Land/RUC/lsm_ruc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,12 +455,13 @@ subroutine lsm_ruc_run & ! inputs
! for land
& sncovr1_lnd, qsurf_lnd, gflux_lnd, evap_lnd, &
& cmm_lnd, chh_lnd, hflx_lnd, sbsno, &
& acsnow_lnd, snowmt_lnd, snohf, &
& snowmt_lnd, snohf, &
! for ice
& sncovr1_ice, qsurf_ice, gflux_ice, evap_ice, ep1d_ice, &
& cmm_ice, chh_ice, hflx_ice, &
& acsnow_ice, snowmt_ice

& snowmt_ice
real (kind_phys), dimension(:), intent(inout), optional :: &
acsnow_lnd, acsnow_ice
real (kind_phys), dimension(:), intent( out) :: &
& albdvis_lnd, albdnir_lnd, albivis_lnd, albinir_lnd
real (kind_phys), dimension(:), intent( out), optional :: &
Expand Down
2 changes: 2 additions & 0 deletions physics/SFC_Models/Land/RUC/lsm_ruc.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1489,6 +1489,7 @@
type = real
kind = kind_phys
intent = inout
optional = True
[snowmt_lnd]
standard_name = surface_snow_melt_over_land
long_name = snow melt during timestep over land
Expand Down Expand Up @@ -1653,6 +1654,7 @@
type = real
kind = kind_phys
intent = inout
optional = True
[snowmt_ice]
standard_name = surface_snow_melt_over_ice
long_name = snow melt during timestep over ice
Expand Down
6 changes: 4 additions & 2 deletions physics/SFC_Models/SeaIce/CICE/sfc_cice.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,10 @@ subroutine sfc_cice_run &

! real (kind=kind_phys), dimension(im), intent(in) :: u1, v1, &
real (kind=kind_phys), dimension(:), intent(in) :: &
& t1, q1, cm, ch, prsl1, wind, snowd

& t1, q1, cm, ch, prsl1, wind
real (kind=kind_phys), dimension(:), intent(in), optional :: &
& snowd

real (kind=kind_phys), dimension(:), intent(in), optional :: &
& dqsfc, dtsfc, dusfc, dvsfc
logical, dimension(:), intent(in) :: flag_cice, flag_iter
Expand Down
1 change: 1 addition & 0 deletions physics/SFC_Models/SeaIce/CICE/sfc_cice.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@
type = real
kind = kind_phys
intent = in
optional = True
[qsurf]
standard_name = surface_specific_humidity_over_ice
long_name = surface air saturation specific humidity over ice
Expand Down
Loading