Skip to content

Commit 9df6749

Browse files
caiohamamuracaiohamamura
committed
Change include mpi.h to use mpi
1 parent c189e33 commit 9df6749

File tree

13 files changed

+279
-49
lines changed

13 files changed

+279
-49
lines changed

‎ED/build/shell/dependency.mk‎

Lines changed: 208 additions & 0 deletions
Large diffs are not rendered by default.

‎ED/build/shell/sources.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SOURCES = ED/src/driver/ed_1st.F90 ED/src/driver/ed_driver.F90 ED/src/driver/ed_met_driver.f90 ED/src/driver/ed_model.F90 ED/src/dynamics/bdf2_solver.f90 ED/src/dynamics/canopy_struct_dynamics.f90 ED/src/dynamics/disturbance.f90 ED/src/dynamics/euler_driver.f90 ED/src/dynamics/events.f90 ED/src/dynamics/farq_katul.f90 ED/src/dynamics/farq_leuning.f90 ED/src/dynamics/fire.f90 ED/src/dynamics/forestry.f90 ED/src/dynamics/growth_balive.f90 ED/src/dynamics/heun_driver.f90 ED/src/dynamics/hybrid_driver.f90 ED/src/dynamics/lsm_hyd.f90 ED/src/dynamics/mortality.f90 ED/src/dynamics/multiple_scatter.f90 ED/src/dynamics/old_twostream_rad.f90 ED/src/dynamics/phenology_aux.f90 ED/src/dynamics/phenology_driv.f90 ED/src/dynamics/photosyn_driv.f90 ED/src/dynamics/plant_hydro.f90 ED/src/dynamics/radiate_driver.f90 ED/src/dynamics/reproduction.f90 ED/src/dynamics/rk4_copy_patch.f90 ED/src/dynamics/rk4_derivs.f90 ED/src/dynamics/rk4_driver.F90 ED/src/dynamics/rk4_integ_utils.f90 ED/src/dynamics/rk4_misc.f90 ED/src/dynamics/soil_respiration.f90 ED/src/dynamics/stem_resp_driv.f90 ED/src/dynamics/structural_growth.f90 ED/src/dynamics/twostream_rad.f90 ED/src/dynamics/vegetation_dynamics.f90 ED/src/init/ed_bigleaf_init.f90 ED/src/init/ed_init.F90 ED/src/init/ed_init_atm.F90 ED/src/init/ed_nbg_init.f90 ED/src/init/ed_params.f90 ED/src/init/ed_type_init.f90 ED/src/init/landuse_init.f90 ED/src/init/phenology_startup.f90 ED/src/io/average_utils.f90 ED/src/io/edio.f90 ED/src/io/ed_init_history.f90 ED/src/io/ed_load_namelist.f90 ED/src/io/ed_opspec.F90 ED/src/io/ed_print.F90 ED/src/io/ed_read_ed10_20_history.f90 ED/src/io/ed_read_ed21_history.f90 ED/src/io/ed_xml_config.f90 ED/src/io/h5_output.F90 ED/src/io/leaf_database.f90 ED/src/memory/c34constants.f90 ED/src/memory/canopy_air_coms.f90 ED/src/memory/canopy_layer_coms.f90 ED/src/memory/canopy_radiation_coms.f90 ED/src/memory/consts_coms.F90 ED/src/memory/decomp_coms.f90 ED/src/memory/detailed_coms.f90 ED/src/memory/disturb_coms.f90 ED/src/memory/ed_max_dims.F90 ED/src/memory/ed_mem_alloc.f90 ED/src/memory/ed_misc_coms.f90 ED/src/memory/ed_state_vars.F90 ED/src/memory/ed_var_tables.f90 ED/src/memory/ed_work_vars.f90 ED/src/memory/ename_coms.f90 ED/src/memory/fusion_fission_coms.f90 ED/src/memory/grid_coms.f90 ED/src/memory/hdf5_coms.f90 ED/src/memory/hydrology_coms.f90 ED/src/memory/hydrology_constants.f90 ED/src/memory/mem_polygons.f90 ED/src/memory/met_driver_coms.f90 ED/src/memory/pft_coms.f90 ED/src/memory/phenology_coms.f90 ED/src/memory/physiology_coms.f90 ED/src/memory/rk4_coms.f90 ED/src/memory/soil_coms.F90 ED/src/mpi/ed_mpass_init.F90 ED/src/mpi/ed_node_coms.f90 ED/src/mpi/ed_para_coms.f90 ED/src/mpi/ed_para_init.f90 ED/src/utils/allometry.f90 ED/src/utils/budget_utils.f90 ED/src/utils/charutils.f90 ED/src/utils/dateutils.f90 ED/src/utils/ed_cn_utils.f90 ED/src/utils/ed_filelist.F90 ED/src/utils/ed_grid.f90 ED/src/utils/ed_therm_lib.f90 ED/src/utils/fatal_error.F90 ED/src/utils/fuse_fiss_utils.f90 ED/src/utils/great_circle.f90 ED/src/utils/hdf5_utils.f90 ED/src/utils/hrzshade_utils.f90 ED/src/utils/invmondays.f90 ED/src/utils/lapse.f90 ED/src/utils/libxml2f90.f90_pp.f90 ED/src/utils/numutils.f90 ED/src/utils/radiate_utils.f90 ED/src/utils/random_utils.F90 ED/src/utils/rsys.F90 ED/src/utils/stable_cohorts.f90 ED/src/utils/therm_lib.f90 ED/src/utils/therm_lib8.f90 ED/src/utils/update_derived_utils.f90 ED/src/utils/utils_f.f90 ED/src/utils/utils_c.c

‎ED/src/driver/ed_1st.F90‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ subroutine ed_1st_master (ipara, nnodestotal,nslaves, headnode_num, max_threads,
2323
use ed_state_vars, only : allocate_edglobals & ! subroutine
2424
, filltab_alltypes ! ! subroutine
2525

26+
#if defined(RAMS_MPI)
27+
use mpi
28+
#endif
2629
implicit none
2730

2831
!----- Pre-compiled variables from MPI. ------------------------------------------------!
29-
#if defined(RAMS_MPI)
30-
include 'mpif.h'
31-
#endif
3232
!----- Arguments. ----------------------------------------------------------------------!
3333
integer , intent(in) :: ipara ! 0 if sequential run; 1 if parallel run
3434
integer , intent(in) :: nnodestotal ! total number of nodes on any run
@@ -176,10 +176,12 @@ end subroutine ed_1st_master
176176
!------------------------------------------------------------------------------------------!
177177
subroutine ed_1st_node()
178178
use ed_mem_alloc, only : ed_memory_allocation ! ! subroutine
179+
#if defined(RAMS_MPI)
180+
use mpi
181+
#endif
179182
implicit none
180183
!----- Pre-compiled variables from MPI. ------------------------------------------------!
181184
#if defined(RAMS_MPI)
182-
include 'mpif.h'
183185
!----- Local variable (MPI only). ------------------------------------------------------!
184186
integer :: ierr
185187
#endif

‎ED/src/driver/ed_driver.F90‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,12 @@ subroutine ed_driver()
3636
use hrzshade_utils , only : init_cci_variables ! ! subroutine
3737
use canopy_radiation_coms, only : ihrzrad ! ! intent(in)
3838
use random_utils , only : init_random_seed ! ! subroutine
39-
implicit none
40-
!----- Included variables. -------------------------------------------------------------!
4139
#if defined(RAMS_MPI)
42-
include 'mpif.h' ! MPI commons
40+
use mpi ! MPI commons
4341
#endif
42+
implicit none
43+
44+
!----- Included variables. -------------------------------------------------------------!
4445
!----- Local variables. ----------------------------------------------------------------!
4546
character(len=12) :: c0
4647
character(len=12) :: c1

‎ED/src/driver/ed_model.F90‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,10 @@ subroutine ed_model()
9494
use vegetation_dynamics , only : veg_dynamics_driver ! ! sub-routine
9595
use ed_type_init , only : ed_init_viable ! ! sub-routine
9696
use soil_respiration , only : zero_litter_inputs ! ! sub-routine
97-
implicit none
98-
!----- Common blocks. ------------------------------------------------------------------!
9997
#if defined(RAMS_MPI)
100-
include 'mpif.h'
98+
use mpi
10199
#endif
100+
implicit none
102101
!----- Local variables. ----------------------------------------------------------------!
103102
type(simtime) :: daybefore
104103
character(len=28) :: fmthead

‎ED/src/driver/edmain.F90‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
!------------------------------------------------------------------------------------------!
1515
program main
1616
!$ use omp_lib
17-
implicit none
17+
#if defined(RAMS_MPI)
18+
use mpi
19+
#endif
20+
implicit none
1821

1922
!---------------------------------------------------------------------------------------!
2023
! Local constants. !
@@ -49,10 +52,7 @@ program main
4952
integer, dimension(64) :: thread_use
5053
integer, dimension(64) :: cpu_use
5154
integer, external :: findmycpu
52-
!------ MPI interface. -----------------------------------------------------------------!
53-
#if defined(RAMS_MPI)
54-
include 'mpif.h'
55-
#endif
55+
5656
!---------------------------------------------------------------------------------------!
5757

5858

‎ED/src/init/ed_init.F90‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,10 +319,10 @@ subroutine load_ecosystem_state()
319319
use ed_node_coms , only : mynum ! ! intent(in)
320320
#endif
321321

322-
implicit none
323322
#if defined(RAMS_MPI)
324-
include 'mpif.h'
323+
use mpi
325324
#endif
325+
implicit none
326326
!----- Local variables --------------------------------------------------------------!
327327
integer :: igr
328328
integer :: ping

‎ED/src/init/ed_init_atm.F90‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ subroutine ed_init_atm()
3333
, terminate_cohorts & ! subroutine
3434
, split_cohorts ! ! subroutine
3535
#if defined(RAMS_MPI)
36+
use mpi
3637
use ed_node_coms , only : nnodetot & ! intent(in)
3738
, mynum & ! intent(in)
3839
, sendnum & ! intent(in)
@@ -95,10 +96,6 @@ subroutine ed_init_atm()
9596
!----- Local variables (MPI only). -----------------------------------------------------!
9697
#if defined(RAMS_MPI)
9798
integer :: ierr
98-
#endif
99-
!----- Add the MPI common block. -------------------------------------------------------!
100-
#if defined(RAMS_MPI)
101-
include 'mpif.h'
10299
#endif
103100
!---------------------------------------------------------------------------------------!
104101

‎ED/src/io/ed_print.F90‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,12 @@ subroutine print_fields(ifm,cgrid)
4848
use ed_var_tables, only : vt_info & ! intent(in)
4949
, num_var ! ! intent(in)
5050
use ed_max_dims , only : str_len_short ! ! intent(in)
51-
implicit none
51+
5252
!----- Standard common blocks. ------------------------------------------------------!
5353
#if defined(RAMS_MPI)
54-
include 'mpif.h'
54+
use mpi
5555
#endif
56+
implicit none
5657
!----- Arguments. -------------------------------------------------------------------!
5758
integer , intent(in) :: ifm
5859
type(edtype) , target :: cgrid

‎ED/src/io/h5_output.F90‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ subroutine h5_output(vtype)
4848
, sitetype & ! structure
4949
, patchtype & ! structure
5050
, gdpy ! ! intent(in)
51-
implicit none
52-
53-
!------ Include standard common blocks. ------------------------------------------------!
51+
52+
!------ Include standard common blocks. ------------------------------------------------!
5453
#if defined(RAMS_MPI)
55-
include 'mpif.h'
54+
use mpi
5655
#endif
56+
implicit none
5757
!------ Arguments. ---------------------------------------------------------------------!
5858
character(len=*) , intent(in) :: vtype
5959
!------ Local variables. ---------------------------------------------------------------!

0 commit comments

Comments
 (0)