Skip to content

Commit da75531

Browse files
authored
Merge pull request #1083 from grantfirl/fix_rad_mp_radar_dep
Fix some build-time bugs for release v7
2 parents c5c88df + afa7c3a commit da75531

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
type = scheme
44
relative_path = ../../
55
dependencies = tools/funcphys.f90,hooks/machine.F
6-
dependencies = MP/Thompson/module_mp_thompson.F90,MP/Thompson/module_mp_thompson_make_number_concentrations.F90
6+
dependencies = MP/module_mp_radar.F90,MP/Thompson/module_mp_thompson.F90,MP/Thompson/module_mp_thompson_make_number_concentrations.F90
77
dependencies = Radiation/RRTMG/radcons.f90,Radiation/radiation_aerosols.f
88
dependencies = Radiation/radiation_astronomy.f,Radiation/radiation_clouds.f,Radiation/radiation_gases.f
99
dependencies = Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_param.f,Radiation/radiation_cloud_overlap.F90

physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_setup.meta

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
dependencies = Radiation/radiation_aerosols.f
77
dependencies = Radiation/radiation_astronomy.f,Radiation/radiation_clouds.f,Radiation/radiation_gases.f
88
dependencies = Radiation/RRTMG/radlw_main.F90,Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_main.F90,Radiation/RRTMG/radsw_param.f
9-
dependencies = MP/Thompson/module_mp_thompson.F90,photochem/module_ozphys.F90
9+
dependencies = MP/module_mp_radar.F90,MP/Thompson/module_mp_thompson.F90,photochem/module_ozphys.F90
1010

1111
########################################################################
1212
[ccpp-arg-table]

physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.meta

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
relative_path = ../../
55
dependencies = hooks/machine.F
66
dependencies = Radiation/radiation_tools.F90,Radiation/radiation_clouds.f,Radiation/RRTMGP/rrtmgp_lw_cloud_optics.F90
7-
dependencies = MP/Thompson/module_mp_thompson_make_number_concentrations.F90,MP/Thompson/module_mp_thompson.F90
7+
dependencies = MP/module_mp_radar.F90,MP/Thompson/module_mp_thompson_make_number_concentrations.F90,MP/Thompson/module_mp_thompson.F90
88

99
########################################################################
1010
[ccpp-arg-table]

physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_setup.meta

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = GFS_rrtmgp_setup
33
type = scheme
44
relative_path = ../../
5-
dependencies = hooks/machine.F,MP/Thompson/module_mp_thompson.F90
5+
dependencies = hooks/machine.F,MP/module_mp_radar.F90,MP/Thompson/module_mp_thompson.F90
66
dependencies = Radiation/radiation_aerosols.f,photochem/module_ozphys.F90
77
dependencies = Radiation/radiation_gases.f,Radiation/radiation_astronomy.f
88

physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
relative_path = ../../
55
dependencies = tools/funcphys.f90,hooks/machine.F
66
dependencies = hooks/physcons.F90,Radiation/RRTMG/radcons.f90
7-
dependencies = Radiation/radiation_clouds.f,MP/Thompson/module_mp_thompson.F90
7+
dependencies = Radiation/radiation_clouds.f,MP/module_mp_radar.F90,MP/Thompson/module_mp_thompson.F90
88

99
########################################################################
1010
[ccpp-arg-table]

physics/MP/Ferrier_Aligo/module_MP_FER_HIRES.F90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ MODULE MODULE_MP_FER_HIRES
109109
!-----------------------------------------------------------------------------
110110

111111
#ifdef MPI
112-
USE mpi
112+
USE mpi_f08
113113
#endif
114114
USE machine
115115
!MZ
@@ -2448,7 +2448,7 @@ SUBROUTINE FERRIER_INIT_hr (GSMDT,MPI_COMM_COMP,MPIRANK,MPIROOT,THREADS, &
24482448
!-----------------------------------------------------------------------
24492449
!
24502450
#ifdef MPI
2451-
use mpi
2451+
use mpi_f08
24522452
#endif
24532453
IMPLICIT NONE
24542454
!
@@ -2466,7 +2466,7 @@ SUBROUTINE FERRIER_INIT_hr (GSMDT,MPI_COMM_COMP,MPIRANK,MPIROOT,THREADS, &
24662466
REAL, INTENT(IN) :: GSMDT
24672467
INTEGER, INTENT(IN) :: MPIRANK
24682468
INTEGER, INTENT(IN) :: MPIROOT
2469-
INTEGER, INTENT(IN) :: MPI_COMM_COMP
2469+
TYPE(MPI_Comm), INTENT(IN) :: MPI_COMM_COMP
24702470
INTEGER, INTENT(IN) :: THREADS
24712471
CHARACTER(LEN=*), INTENT(OUT) :: errmsg
24722472
INTEGER, INTENT(OUT) :: errflg

physics/PBL/YSU/ysuvdif.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ subroutine ysuvdif_run(im,km,ux,vx,tx,qx,p2d,p2di,pi2d,karman, &
101101
intent(inout) :: utnp,vtnp,ttnp
102102
real(kind=kind_phys), dimension( :,:,: ) , &
103103
intent(inout) :: qtnp
104-
real(kind=kind_phys), optional, intent(inout), optional :: dtend(:,:,:)
104+
real(kind=kind_phys), intent(inout), optional :: dtend(:,:,:)
105105
integer, intent(in) :: dtidx(:,:), ntqv, index_of_temperature, &
106106
index_of_x_wind, index_of_y_wind, index_of_process_pbl
107107
!

0 commit comments

Comments
 (0)