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

Fix some build-time bugs for release v7 #1083

Merged
merged 3 commits into from
Sep 5, 2024
Merged

Fix some build-time bugs for release v7 #1083

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
965a00c
add module_mp_radar.F90 as dependency for schemes that need module_mp…
grantfirl Aug 29, 2024
d1695fa
fix compilation errors in YSU PBL and FA MP
grantfirl Aug 29, 2024
afa7c3a
Merge branch 'main' into fix_rad_mp_radar_dep
grantfirl Sep 5, 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.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
type = scheme
relative_path = ../../
dependencies = tools/funcphys.f90,hooks/machine.F
dependencies = MP/Thompson/module_mp_thompson.F90,MP/Thompson/module_mp_thompson_make_number_concentrations.F90
dependencies = MP/module_mp_radar.F90,MP/Thompson/module_mp_thompson.F90,MP/Thompson/module_mp_thompson_make_number_concentrations.F90
dependencies = Radiation/RRTMG/radcons.f90,Radiation/radiation_aerosols.f
dependencies = Radiation/radiation_astronomy.f,Radiation/radiation_clouds.f,Radiation/radiation_gases.f
dependencies = Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_param.f,Radiation/radiation_cloud_overlap.F90
Expand Down
2 changes: 1 addition & 1 deletion physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_setup.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
dependencies = Radiation/radiation_aerosols.f
dependencies = Radiation/radiation_astronomy.f,Radiation/radiation_clouds.f,Radiation/radiation_gases.f
dependencies = Radiation/RRTMG/radlw_main.F90,Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_main.F90,Radiation/RRTMG/radsw_param.f
dependencies = MP/Thompson/module_mp_thompson.F90,photochem/module_ozphys.F90
dependencies = MP/module_mp_radar.F90,MP/Thompson/module_mp_thompson.F90,photochem/module_ozphys.F90

########################################################################
[ccpp-arg-table]
Expand Down
2 changes: 1 addition & 1 deletion physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
relative_path = ../../
dependencies = hooks/machine.F
dependencies = Radiation/radiation_tools.F90,Radiation/radiation_clouds.f,Radiation/RRTMGP/rrtmgp_lw_cloud_optics.F90
dependencies = MP/Thompson/module_mp_thompson_make_number_concentrations.F90,MP/Thompson/module_mp_thompson.F90
dependencies = MP/module_mp_radar.F90,MP/Thompson/module_mp_thompson_make_number_concentrations.F90,MP/Thompson/module_mp_thompson.F90

########################################################################
[ccpp-arg-table]
Expand Down
2 changes: 1 addition & 1 deletion physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_setup.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = GFS_rrtmgp_setup
type = scheme
relative_path = ../../
dependencies = hooks/machine.F,MP/Thompson/module_mp_thompson.F90
dependencies = hooks/machine.F,MP/module_mp_radar.F90,MP/Thompson/module_mp_thompson.F90
dependencies = Radiation/radiation_aerosols.f,photochem/module_ozphys.F90
dependencies = Radiation/radiation_gases.f,Radiation/radiation_astronomy.f

Expand Down
2 changes: 1 addition & 1 deletion physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
relative_path = ../../
dependencies = tools/funcphys.f90,hooks/machine.F
dependencies = hooks/physcons.F90,Radiation/RRTMG/radcons.f90
dependencies = Radiation/radiation_clouds.f,MP/Thompson/module_mp_thompson.F90
dependencies = Radiation/radiation_clouds.f,MP/module_mp_radar.F90,MP/Thompson/module_mp_thompson.F90

########################################################################
[ccpp-arg-table]
Expand Down
6 changes: 3 additions & 3 deletions physics/MP/Ferrier_Aligo/module_MP_FER_HIRES.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ MODULE MODULE_MP_FER_HIRES
!-----------------------------------------------------------------------------

#ifdef MPI
USE mpi
USE mpi_f08
#endif
USE machine
!MZ
Expand Down Expand Up @@ -2448,7 +2448,7 @@ SUBROUTINE FERRIER_INIT_hr (GSMDT,MPI_COMM_COMP,MPIRANK,MPIROOT,THREADS, &
!-----------------------------------------------------------------------
!
#ifdef MPI
use mpi
use mpi_f08
#endif
IMPLICIT NONE
!
Expand All @@ -2466,7 +2466,7 @@ SUBROUTINE FERRIER_INIT_hr (GSMDT,MPI_COMM_COMP,MPIRANK,MPIROOT,THREADS, &
REAL, INTENT(IN) :: GSMDT
INTEGER, INTENT(IN) :: MPIRANK
INTEGER, INTENT(IN) :: MPIROOT
INTEGER, INTENT(IN) :: MPI_COMM_COMP
TYPE(MPI_Comm), INTENT(IN) :: MPI_COMM_COMP
INTEGER, INTENT(IN) :: THREADS
CHARACTER(LEN=*), INTENT(OUT) :: errmsg
INTEGER, INTENT(OUT) :: errflg
Expand Down
2 changes: 1 addition & 1 deletion physics/PBL/YSU/ysuvdif.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ subroutine ysuvdif_run(im,km,ux,vx,tx,qx,p2d,p2di,pi2d,karman, &
intent(inout) :: utnp,vtnp,ttnp
real(kind=kind_phys), dimension( :,:,: ) , &
intent(inout) :: qtnp
real(kind=kind_phys), optional, intent(inout), optional :: dtend(:,:,:)
real(kind=kind_phys), intent(inout), optional :: dtend(:,:,:)
integer, intent(in) :: dtidx(:,:), ntqv, index_of_temperature, &
index_of_x_wind, index_of_y_wind, index_of_process_pbl
!
Expand Down
Loading