Skip to content

Bug fix for dimensions of eta level variables in metadata, remove duplicate Fortran modules from CMakeLists.txt #821

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 4 commits into from
Dec 30, 2021
Merged

Bug fix for dimensions of eta level variables in metadata, remove duplicate Fortran modules from CMakeLists.txt #821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dce3921
Fix dimensions of vertical eta level variables in several metadata files
climbfuji Nov 23, 2021
acb8dc6
Remove physics/rte-rrtmgp/rrtmgp/kernels-openacc/mo_gas_optics_kernel…
climbfuji Dec 21, 2021
8f364ae
Write diag messages to stdout instead of stderr, use standard _OPENMP…
climbfuji Dec 21, 2021
da362d6
Remove more duplicate modules from SCHEMES_OPENMP_OFF list in CMakeLi…
climbfuji Dec 22, 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
3 changes: 0 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ set(SCHEMES_OPENMP_OFF ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/mo_
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/mo_rrtmgp_constants.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/mo_rrtmgp_util_reorder.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/kernels-openacc/mo_gas_optics_kernels.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/mo_rrtmgp_util_string.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/kernels/mo_gas_optics_kernels.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/kernels/mo_rrtmgp_util_reorder_kernels.F90
Expand Down Expand Up @@ -108,8 +107,6 @@ set(SCHEMES_OPENMP_OFF ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/mo_
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_rte_sw.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_fluxes.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_rte_lw.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/kernels-openacc/mo_rte_solver_kernels.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/kernels-openacc/mo_optical_props_kernels.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_rte_util_array.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/kernels/mo_rte_solver_kernels.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/kernels/mo_optical_props_kernels.F90
Expand Down
20 changes: 10 additions & 10 deletions physics/GFS_debug.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
#ifdef MPI
use mpi
#endif
#ifdef OPENMP
#ifdef _OPENMP
use omp_lib
#endif
use GFS_typedefs, only: GFS_control_type, GFS_statein_type, &
Expand Down Expand Up @@ -437,15 +437,15 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
mpisize = 1
mpicomm = 0
#endif
#ifdef OPENMP
#ifdef _OPENMP
omprank = OMP_GET_THREAD_NUM()
ompsize = nthreads
#else
omprank = 0
ompsize = 1
#endif

#ifdef OPENMP
#ifdef _OPENMP
!$OMP BARRIER
#endif
#ifdef MPI
Expand Down Expand Up @@ -929,7 +929,7 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Grid%jindx2_tau', Grid%jindx2_tau )
endif
end if
#ifdef OPENMP
#ifdef _OPENMP
!$OMP BARRIER
#endif
end do
Expand All @@ -938,7 +938,7 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
#endif
end do

#ifdef OPENMP
#ifdef _OPENMP
!$OMP BARRIER
#endif
#ifdef MPI
Expand Down Expand Up @@ -1043,7 +1043,7 @@ subroutine GFS_interstitialtoscreen_run (Model, Statein, Stateout, Sfcprop, Coup
#ifdef MPI
use mpi
#endif
#ifdef OPENMP
#ifdef _OPENMP
use omp_lib
#endif
use machine, only: kind_phys
Expand Down Expand Up @@ -1092,15 +1092,15 @@ subroutine GFS_interstitialtoscreen_run (Model, Statein, Stateout, Sfcprop, Coup
mpisize = 1
mpicomm = 0
#endif
#ifdef OPENMP
#ifdef _OPENMP
omprank = OMP_GET_THREAD_NUM()
ompsize = nthreads
#else
omprank = 0
ompsize = 1
#endif

#ifdef OPENMP
#ifdef _OPENMP
!$OMP BARRIER
#endif
#ifdef MPI
Expand Down Expand Up @@ -1451,7 +1451,7 @@ subroutine GFS_interstitialtoscreen_run (Model, Statein, Stateout, Sfcprop, Coup
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%precip_overlap_param', Interstitial%precip_overlap_param )
end if
end if
#ifdef OPENMP
#ifdef _OPENMP
!$OMP BARRIER
#endif
end do
Expand All @@ -1460,7 +1460,7 @@ subroutine GFS_interstitialtoscreen_run (Model, Statein, Stateout, Sfcprop, Coup
#endif
end do

#ifdef OPENMP
#ifdef _OPENMP
!$OMP BARRIER
#endif
#ifdef MPI
Expand Down
8 changes: 4 additions & 4 deletions physics/GFS_phys_time_vary.fv3.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
!> @{
module GFS_phys_time_vary

#ifdef OPENMP
#ifdef _OPENMP
use omp_lib
#endif

Expand Down Expand Up @@ -355,7 +355,7 @@ subroutine GFS_phys_time_vary_init (
!$OMP section
!--- if sncovr does not exist in the restart, need to create it
if (all(sncovr < zero)) then
if (me == master ) write(0,'(a)') 'GFS_phys_time_vary_init: compute sncovr from weasd and soil vegetation parameters'
if (me == master ) write(*,'(a)') 'GFS_phys_time_vary_init: compute sncovr from weasd and soil vegetation parameters'
!--- compute sncovr from existing variables
!--- code taken directly from read_fix.f
sncovr(:) = zero
Expand All @@ -376,7 +376,7 @@ subroutine GFS_phys_time_vary_init (
!--- For RUC LSM: create sncovr_ice from sncovr
if (lsm == lsm_ruc) then
if (all(sncovr_ice < zero)) then
if (me == master ) write(0,'(a)') 'GFS_phys_time_vary_init: fill sncovr_ice with sncovr for RUC LSM'
if (me == master ) write(*,'(a)') 'GFS_phys_time_vary_init: fill sncovr_ice with sncovr for RUC LSM'
sncovr_ice(:) = sncovr(:)
endif
endif
Expand All @@ -396,7 +396,7 @@ subroutine GFS_phys_time_vary_init (
!--- land and ice - not for restart runs
lsm_init: if (.not.flag_restart) then
if (lsm == lsm_noahmp .or. lsm == lsm_ruc) then
if (me == master ) write(0,'(a)') 'GFS_phys_time_vary_init: initialize albedo for land and ice'
if (me == master ) write(*,'(a)') 'GFS_phys_time_vary_init: initialize albedo for land and ice'
do ix=1,im
albdvis_lnd(ix) = 0.2_kind_phys
albdnir_lnd(ix) = 0.2_kind_phys
Expand Down
8 changes: 4 additions & 4 deletions physics/GFS_phys_time_vary.scm.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
!! aerosol, IN&CCN and surface properties updates.
!> @{
module GFS_phys_time_vary

use machine, only : kind_phys

use mersenne_twister, only: random_setseed, random_number
Expand Down Expand Up @@ -313,7 +313,7 @@ subroutine GFS_phys_time_vary_init (

!--- if sncovr does not exist in the restart, need to create it
if (all(sncovr < zero)) then
if (me == master ) write(0,'(a)') 'GFS_phys_time_vary_init: compute sncovr from weasd and soil vegetation parameters'
if (me == master ) write(*,'(a)') 'GFS_phys_time_vary_init: compute sncovr from weasd and soil vegetation parameters'
!--- compute sncovr from existing variables
!--- code taken directly from read_fix.f
sncovr(:) = zero
Expand All @@ -334,7 +334,7 @@ subroutine GFS_phys_time_vary_init (
!--- For RUC LSM: create sncovr_ice from sncovr
if (lsm == lsm_ruc) then
if (all(sncovr_ice < zero)) then
if (me == master ) write(0,'(a)') 'GFS_phys_time_vary_init: fill sncovr_ice with sncovr for RUC LSM'
if (me == master ) write(*,'(a)') 'GFS_phys_time_vary_init: fill sncovr_ice with sncovr for RUC LSM'
sncovr_ice(:) = sncovr(:)
endif
endif
Expand All @@ -350,7 +350,7 @@ subroutine GFS_phys_time_vary_init (
!--- land and ice - not for restart runs
lsm_init: if (.not.flag_restart) then
if (lsm == lsm_noahmp .or. lsm == lsm_ruc) then
if (me == master ) write(0,'(a)') 'GFS_phys_time_vary_init: initialize albedo for land and ice'
if (me == master ) write(*,'(a)') 'GFS_phys_time_vary_init: initialize albedo for land and ice'
do ix=1,im
albdvis_lnd(ix) = 0.2_kind_phys
albdnir_lnd(ix) = 0.2_kind_phys
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_rrtmg_setup.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
standard_name = sigma_pressure_hybrid_vertical_coordinate
long_name = vertical sigma coordinate for radiation initialization
units = none
dimensions = (vertical_interface_dimension_for_radiation)
dimensions = (vertical_interface_dimension)
type = real
kind = kind_phys
intent = in
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_rrtmgp_setup.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
standard_name = sigma_pressure_hybrid_vertical_coordinate
long_name = vertical sigma coordinate for radiation initialization
units = none
dimensions = (vertical_interface_dimension_for_radiation)
dimensions = (vertical_interface_dimension)
type = real
kind = kind_phys
intent = in
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_stochastics.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
standard_name = sigma_pressure_hybrid_vertical_coordinate
long_name = vertical sigma coordinate for radiation initialization
units = none
dimensions = (vertical_interface_dimension_for_radiation)
dimensions = (vertical_interface_dimension)
type = real
kind = kind_phys
intent = in
Expand Down
4 changes: 2 additions & 2 deletions physics/cires_ugwp.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@
standard_name = sigma_pressure_hybrid_coordinate_a_coefficient
long_name = a parameter for sigma pressure level calculations
units = Pa
dimensions = (vertical_interface_dimension_for_radiation)
dimensions = (vertical_interface_dimension)
type = real
kind = kind_phys
intent = in
[bk]
standard_name = sigma_pressure_hybrid_coordinate_b_coefficient
long_name = b parameter for sigma pressure level calculations
units = none
dimensions = (vertical_interface_dimension_for_radiation)
dimensions = (vertical_interface_dimension)
type = real
kind = kind_phys
intent = in
Expand Down
4 changes: 2 additions & 2 deletions physics/ugwpv1_gsldrag.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,15 @@
standard_name = sigma_pressure_hybrid_coordinate_a_coefficient
long_name = a parameter for sigma pressure level calculations
units = Pa
dimensions = (vertical_interface_dimension_for_radiation)
dimensions = (vertical_interface_dimension)
type = real
kind = kind_phys
intent = in
[bk]
standard_name = sigma_pressure_hybrid_coordinate_b_coefficient
long_name = b parameter for sigma pressure level calculations
units = none
dimensions = (vertical_interface_dimension_for_radiation)
dimensions = (vertical_interface_dimension)
type = real
kind = kind_phys
intent = in
Expand Down
4 changes: 2 additions & 2 deletions physics/unified_ugwp.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@
standard_name = sigma_pressure_hybrid_coordinate_a_coefficient
long_name = a parameter for sigma pressure level calculations
units = Pa
dimensions = (vertical_interface_dimension_for_radiation)
dimensions = (vertical_interface_dimension)
type = real
kind = kind_phys
intent = in
[bk]
standard_name = sigma_pressure_hybrid_coordinate_b_coefficient
long_name = b parameter for sigma pressure level calculations
units = none
dimensions = (vertical_interface_dimension_for_radiation)
dimensions = (vertical_interface_dimension)
type = real
kind = kind_phys
intent = in
Expand Down