Changeset 4629 for palm/trunk/SOURCE
- Timestamp:
- Jul 29, 2020 9:37:56 AM (4 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/data_output_binary_module.f90
r4597 r4629 24 24 ! ----------------- 25 25 ! $Id$ 26 ! support for MPI Fortran77 interface (mpif.h) removed 27 ! 28 ! 4597 2020-07-09 19:21:53Z gronemeier 26 29 ! change: update argument list of routine binary_init_dimension due to changes in interface 27 30 ! … … 62 65 USE kinds 63 66 64 #if defined( __parallel ) && !defined( __mpifh )67 #if defined( __parallel ) 65 68 USE MPI 66 69 #endif … … 68 71 IMPLICIT NONE 69 72 70 #if defined( __parallel ) && defined( __mpifh )71 INCLUDE "mpif.h"72 #endif73 73 74 74 CHARACTER(LEN=*), PARAMETER :: config_file_name = 'BINARY_TO_NETCDF_CONFIG' !< name of config file -
palm/trunk/SOURCE/data_output_netcdf4_module.f90
r4599 r4629 24 24 ! ----------------- 25 25 ! $Id$ 26 ! support for MPI Fortran77 interface (mpif.h) removed 27 ! 28 ! 4599 2020-07-10 12:42:02Z gronemeier 26 29 ! bugfix: set no-fill mode per variable 27 30 ! … … 70 73 USE kinds 71 74 72 #if defined( __parallel ) && !defined( __mpifh )75 #if defined( __parallel ) 73 76 USE MPI 74 77 #endif … … 80 83 IMPLICIT NONE 81 84 82 #if defined( __parallel ) && defined( __mpifh )83 INCLUDE "mpif.h"84 #endif85 85 86 86 CHARACTER(LEN=*), PARAMETER :: mode_parallel = 'parallel' !< string selecting netcdf4 parallel mode -
palm/trunk/SOURCE/lagrangian_particle_model_mod.f90
r4628 r4629 25 25 ! ----------------- 26 26 ! $Id$ 27 ! support for MPI Fortran77 interface (mpif.h) removed 28 ! 29 ! 4628 2020-07-29 07:23:03Z raasch 27 30 ! extensions required for MPI-I/O of particle data to restart files 28 31 ! … … 270 273 ! ONLY: dop_active, dop_init, dop_output_tseries 271 274 272 #if defined( __parallel ) && !defined( __mpifh )275 #if defined( __parallel ) 273 276 USE MPI 274 277 #endif -
palm/trunk/SOURCE/modules.f90
r4581 r4629 20 20 ! Current revisions: 21 21 ! ------------------ 22 ! 23 ! 22 ! 23 ! 24 24 ! Former revisions: 25 25 ! ----------------- 26 26 ! $Id$ 27 ! support for MPI Fortran77 interface (mpif.h) removed 28 ! 29 ! 4581 2020-06-29 08:49:58Z suehring 27 30 ! +sums_wschs_ws_l 28 31 ! … … 1278 1281 1279 1282 #if defined( __parallel ) 1280 #if defined( __mpifh )1281 INCLUDE "mpif.h"1282 #else1283 1283 USE MPI 1284 1284 #endif 1285 #endif 1285 1286 1286 CHARACTER(LEN=2) :: send_receive = 'al' !< 1287 1287 CHARACTER(LEN=7) :: myid_char = '' !< character string containing processor id number -
palm/trunk/SOURCE/pmc_child_mod.f90
r4360 r4629 21 21 ! Current revisions: 22 22 ! ------------------ 23 ! 24 ! 23 ! 24 ! 25 25 ! Former revisions: 26 26 ! ----------------- 27 27 ! $Id$ 28 ! support for MPI Fortran77 interface (mpif.h) removed 29 ! 30 ! 4360 2020-01-07 11:25:50Z suehring 28 31 ! 29 32 ! … … 60 63 USE, INTRINSIC :: iso_c_binding 61 64 62 #if !defined( __mpifh )63 65 USE MPI 64 #endif65 66 66 67 USE kinds … … 78 79 IMPLICIT NONE 79 80 80 #if defined( __mpifh )81 INCLUDE "mpif.h"82 #endif83 81 84 82 PRIVATE -
palm/trunk/SOURCE/pmc_general_mod.f90
r4360 r4629 21 21 ! Current revisions: 22 22 ! ------------------ 23 ! 24 ! 23 ! 24 ! 25 25 ! Former revisions: 26 26 ! ----------------- 27 27 ! $Id$ 28 ! support for MPI Fortran77 interface (mpif.h) removed 29 ! 30 ! 4360 2020-01-07 11:25:50Z suehring 28 31 ! Corrected "Former revisions" section 29 32 ! … … 50 53 USE kinds 51 54 52 #if !defined( __mpifh )53 55 USE MPI 54 #endif55 56 56 57 IMPLICIT NONE 57 58 58 #if defined( __mpifh )59 INCLUDE "mpif.h"60 #endif61 59 62 60 PRIVATE -
palm/trunk/SOURCE/pmc_handle_communicator_mod.f90
r4360 r4629 20 20 ! Current revisions: 21 21 ! ------------------ 22 ! 23 ! 22 ! 23 ! 24 24 ! Former revisions: 25 25 ! ----------------- 26 26 ! $Id$ 27 ! support for MPI Fortran77 interface (mpif.h) removed 28 ! 29 ! 4360 2020-01-07 11:25:50Z suehring 27 30 ! Corrected "Former revisions" section 28 31 ! … … 52 55 USE kinds 53 56 54 #if !defined( __mpifh )55 57 USE MPI 56 #endif57 58 58 59 USE pmc_general, & … … 63 64 IMPLICIT NONE 64 65 65 #if defined( __mpifh )66 INCLUDE "mpif.h"67 #endif68 66 69 67 TYPE pmc_layout -
palm/trunk/SOURCE/pmc_interface_mod.f90
r4508 r4629 20 20 ! Current revisions: 21 21 ! ------------------ 22 ! 23 ! 22 ! 23 ! 24 24 ! Former revisions: 25 25 ! ----------------- 26 26 ! $Id$ 27 ! support for MPI Fortran77 interface (mpif.h) removed 28 ! 29 ! 4508 2020-04-24 13:32:20Z raasch 27 30 ! salsa variable name changed 28 31 ! … … 257 260 258 261 #if defined( __parallel ) 259 #if !defined( __mpifh )260 262 USE MPI 261 #endif262 263 263 264 USE pegrid, & … … 301 302 IMPLICIT NONE 302 303 303 #if defined( __parallel )304 #if defined( __mpifh )305 INCLUDE "mpif.h"306 #endif307 #endif308 304 309 305 PRIVATE -
palm/trunk/SOURCE/pmc_mpi_wrapper_mod.f90
r4360 r4629 21 21 ! Current revisions: 22 22 ! ------------------ 23 ! 24 ! 23 ! 24 ! 25 25 ! Former revisions: 26 26 ! ----------------- 27 27 ! $Id$ 28 ! support for MPI Fortran77 interface (mpif.h) removed 29 ! 30 ! 4360 2020-01-07 11:25:50Z suehring 28 31 ! Corrected "Former revisions" section 29 32 ! … … 43 46 USE, INTRINSIC :: ISO_C_BINDING 44 47 45 #if !defined( __mpifh )46 48 USE MPI 47 #endif48 49 49 50 USE kinds … … 53 54 IMPLICIT NONE 54 55 55 #if defined( __mpifh )56 INCLUDE "mpif.h"57 #endif58 56 59 57 PRIVATE -
palm/trunk/SOURCE/pmc_parent_mod.f90
r4360 r4629 21 21 ! Current revisions: 22 22 ! ------------------ 23 ! 24 ! 23 ! 24 ! 25 25 ! Former revisions: 26 26 ! ----------------- 27 27 ! $Id$ 28 ! support for MPI Fortran77 interface (mpif.h) removed 29 ! 30 ! 4360 2020-01-07 11:25:50Z suehring 28 31 ! 29 32 ! … … 52 55 USE, INTRINSIC :: ISO_C_BINDING 53 56 54 #if !defined( __mpifh )55 57 USE MPI 56 #endif 58 57 59 USE kinds 58 60 USE pmc_general, & … … 69 71 IMPLICIT NONE 70 72 71 #if defined( __mpifh )72 INCLUDE "mpif.h"73 #endif74 73 75 74 PRIVATE -
palm/trunk/SOURCE/pmc_particle_interface.f90
r4444 r4629 21 21 ! Current revisions: 22 22 ! ------------------ 23 ! 24 ! 25 ! Former revisions: 26 ! ----------------- 27 ! $Id$ 28 ! support for MPI Fortran77 interface (mpif.h) removed 23 29 ! 24 ! 25 ! Former revisions: 26 ! -----------------! 27 ! $Id$ 30 ! 4444 2020-03-05 15:59:50Z raasch 28 31 ! bugfix: preprocessor directives for serial mode added 29 32 ! … … 57 60 USE, INTRINSIC :: ISO_C_BINDING 58 61 59 #if defined( __parallel ) && !defined( __mpifh )60 62 USE MPI 61 #endif62 63 63 64 USE kinds … … 112 113 IMPLICIT NONE 113 114 114 #if defined( __parallel ) && defined( __mpifh )115 INCLUDE "mpif.h"116 #endif117 115 118 116 PRIVATE -
palm/trunk/SOURCE/restart_data_mpi_io_mod.f90
r4628 r4629 25 25 ! ----------------- 26 26 ! $Id$ 27 ! support for MPI Fortran77 interface (mpif.h) removed 28 ! 29 ! 4628 2020-07-29 07:23:03Z raasch 27 30 ! extensions required for MPI-I/O of particle data to restart files 28 31 ! … … 78 81 79 82 #if defined( __parallel ) 80 #if defined( __mpifh )81 INCLUDE "mpif.h"82 #else83 83 USE MPI 84 #endif85 84 #else 86 85 USE posix_interface, & -
palm/trunk/SOURCE/shared_memory_io_mod.f90
r4628 r4629 25 25 ! ----------------- 26 26 ! $Id$ 27 ! support for MPI Fortran77 interface (mpif.h) removed 28 ! 29 ! 4628 2020-07-29 07:23:03Z raasch 27 30 ! extensions required for MPI-I/O of particle data to restart files 28 31 ! … … 53 56 54 57 #if defined( __parallel ) 55 #if defined( __mpifh )56 INCLUDE "mpif.h"57 #else58 58 USE MPI 59 #endif60 59 #endif 61 60 -
palm/trunk/SOURCE/spectra_mod.f90
r4591 r4629 25 25 ! ----------------- 26 26 ! $Id$ 27 ! support for MPI Fortran77 interface (mpif.h) removed 28 ! 29 ! 4591 2020-07-06 15:56:08Z raasch 27 30 ! File re-formatted to follow the PALM coding standard 28 31 ! … … 546 549 547 550 #if defined( __parallel ) 548 #if !defined( __mpifh )549 551 USE MPI 550 #endif551 552 552 553 USE pegrid, & … … 561 562 562 563 IMPLICIT NONE 563 564 #if defined( __parallel )565 #if defined( __mpifh )566 INCLUDE "mpif.h"567 #endif568 #endif569 564 570 565 INTEGER(iwp) :: i !< … … 575 570 576 571 REAL(wp), DIMENSION(nzb:nzt+1) :: var_d_l !< 572 577 573 578 574 SELECT CASE ( TRIM( data_output_sp(m) ) ) … … 657 653 USE kinds 658 654 659 #if !defined( __mpifh )660 655 USE MPI 661 #endif662 656 663 657 USE pegrid, & … … 674 668 675 669 IMPLICIT NONE 676 677 #if defined( __mpifh )678 INCLUDE "mpif.h"679 #endif680 670 681 671 INTEGER(iwp) :: i !< … … 801 791 USE kinds 802 792 803 #if !defined( __mpifh )804 793 USE MPI 805 #endif806 794 807 795 USE pegrid, & … … 818 806 819 807 IMPLICIT NONE 820 821 #if defined( __mpifh )822 INCLUDE "mpif.h"823 #endif824 808 825 809 INTEGER(iwp) :: i !< -
palm/trunk/SOURCE/synthetic_turbulence_generator_mod.f90
r4603 r4629 25 25 ! ----------------- 26 26 ! $Id$ 27 ! support for MPI Fortran77 interface (mpif.h) removed 28 ! 29 ! 4603 2020-07-14 16:08:30Z suehring 27 30 ! Bugfix in initialization from ASCII file - x-length scales at the bottom boundary were not 28 31 ! initialized properly … … 245 248 USE kinds 246 249 247 #if defined( __parallel ) && !defined( __mpifh )250 #if defined( __parallel ) 248 251 USE MPI 249 252 #endif … … 285 288 286 289 IMPLICIT NONE 287 288 #if defined( __parallel ) && defined( __mpifh )289 INCLUDE "mpif.h"290 #endif291 292 290 293 291 INTEGER(iwp) :: id_stg_left !< left lateral boundary core id in case of turbulence generator
Note: See TracChangeset
for help on using the changeset viewer.