Merge pull request NCAR#1083 from grantfirl/fix_rad_mp_radar_dep

Fix some build-time bugs for release v7
dustinswales · Sep 5, 2024 · da75531 · da75531
2 parents c5c88df + afa7c3a
commit da75531
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta
@@ -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

diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_setup.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_setup.meta
@@ -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]

diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.meta
@@ -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]

diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_setup.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_setup.meta
@@ -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
 

diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta
@@ -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]

diff --git a/physics/MP/Ferrier_Aligo/module_MP_FER_HIRES.F90 b/physics/MP/Ferrier_Aligo/module_MP_FER_HIRES.F90
@@ -109,7 +109,7 @@ MODULE MODULE_MP_FER_HIRES
 !-----------------------------------------------------------------------------
 
 #ifdef MPI
-     USE mpi
+     USE mpi_f08
 #endif
       USE machine
 !MZ
@@ -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
 !
@@ -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

diff --git a/physics/PBL/YSU/ysuvdif.F90 b/physics/PBL/YSU/ysuvdif.F90
@@ -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
 !