Changeset 4535 for palm


Ignore:
Timestamp:
May 15, 2020 12:07:23 PM (7 months ago)
Author:
raasch
Message:

bugfix for restart data format query

Location:
palm/trunk/SOURCE
Files:
22 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/biometeorology_mod.f90

    r4517 r4535  
    2727! -----------------
    2828! $Id$
     29! bugfix for restart data format query
     30!
     31! 4517 2020-05-03 14:29:30Z raasch
    2932! added restart with MPI-IO for reading local arrays
    3033!
     
    15161519       WRITE ( 14 )  average_trigger_mrt
    15171520
    1518     ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     1521    ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    15191522
    15201523       CALL wrd_mpi_io( 'do_average_theta', do_average_theta )
     
    15551558       ENDIF
    15561559
    1557     ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     1560    ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    15581561
    15591562!
  • palm/trunk/SOURCE/bulk_cloud_model_mod.f90

    r4533 r4535  
    2525! -----------------
    2626! $Id$
     27! bugfix for restart data format query
     28!
     29! 4533 2020-05-14 14:46:46Z schwenkel
    2730! Reformat intrinsic function
    2831!
     
    37423745          WRITE ( 14 )  ice_crystal_sedimentation
    37433746
    3744        ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     3747       ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    37453748
    37463749          CALL wrd_mpi_io( 'c_sedimentation', c_sedimentation )
     
    38653868          ENDIF
    38663869
    3867        ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     3870       ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    38683871
    38693872          IF ( ALLOCATED( prr ) )  CALL wrd_mpi_io( 'prr', prr )
  • palm/trunk/SOURCE/check_parameters.f90

    r4534 r4535  
    2525! -----------------
    2626! $Id$
     27! unneccessary query for restart data format removed
     28!
     29! 4534 2020-05-14 18:35:22Z raasch
    2730! adjustments for I/O on reduced number of cores using shared memory MPI
    2831!
     
    284287       message_string = 'illegal restart data output format "' //                                  &
    285288                        TRIM( restart_data_format_output ) // '"'
    286        CALL message( 'check_parameters', 'PA....', 1, 2, 0, 6, 0 )
    287     ENDIF
    288 
    289     IF ( ( TRIM( restart_data_format_input ) == 'mpi_shared_memory'  .AND.                         &
    290            TRIM( restart_data_format_output ) /= 'mpi_shared_memory' )  .OR.                       &
    291          ( TRIM( restart_data_format_input ) /= 'mpi_shared_memory'  .AND.                         &
    292            TRIM( restart_data_format_output ) == 'mpi_shared_memory' ) )  THEN
    293        message_string = 'restart data formats both must be set "mpi_shared_memory"'
    294289       CALL message( 'check_parameters', 'PA....', 1, 2, 0, 6, 0 )
    295290    ENDIF
  • palm/trunk/SOURCE/chemistry_model_mod.f90

    r4517 r4535  
    2727! -----------------
    2828! $Id$
     29! bugfix for restart data format query
     30!
     31! 4517 2020-05-03 14:29:30Z raasch
    2932! added restart with MPI-IO
    3033!
     
    32503253       ENDDO
    32513254
    3252     ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     3255    ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    32533256
    32543257       DO  lsp = 1, nspec
  • palm/trunk/SOURCE/diagnostic_output_quantities_mod.f90

    r4518 r4535  
    2525! -----------------
    2626! $Id$
     27! bugfix for restart data format query
     28!
     29! 4518 2020-05-04 15:44:28Z suehring
    2730! * Define arrays over ghost points in order to allow for standard mpi-io
    2831!   treatment. By this modularization of restart-data input is possible with
     
    22732276       ENDIF
    22742277
    2275     ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     2278    ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    22762279
    22772280       IF ( ALLOCATED( pt_2m_av ) )     CALL wrd_mpi_io( 'pt_2m_av', pt_2m_av )
  • palm/trunk/SOURCE/gust_mod.f90

    r4517 r4535  
    2525! -----------------
    2626! $Id$
     27! bugfix for restart data format query
     28!
     29! 4517 2020-05-03 14:29:30Z raasch
    2730! added restart with MPI-IO for reading local arrays
    2831!
     
    727730!          ENDIF
    728731
    729        ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     732       ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    730733
    731734!          CALL wrd_mpi_io( 'global_parameter', global_parameter )
     
    757760!          ENDIF
    758761
    759        ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     762       ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    760763
    761764!          IF ( ALLOCATED( u2_av ) )  CALL wrd_mpi_io( 'u2_av', u2_av )
  • palm/trunk/SOURCE/lagrangian_particle_model_mod.f90

    r4520 r4535  
    2525! -----------------
    2626! $Id$
     27! bugfix for restart data format query
     28!
     29! 4520 2020-05-06 08:57:19Z schwenkel
    2730! Add error number
    2831!
     
    32293232       WRITE ( 14 )  iran, iran_part
    32303233
    3231     ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     3234    ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    32323235
    32333236       CALL wrd_mpi_io( 'iran', iran )  ! matching random numbers is still unresolved issue
     
    32603263       WRITE ( 14 )  interpolation_trilinear
    32613264
    3262     ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     3265    ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    32633266
    32643267       CALL wrd_mpi_io( 'curvature_solution_effects', curvature_solution_effects )
  • palm/trunk/SOURCE/land_surface_model_mod.f90

    r4534 r4535  
    2525! -----------------
    2626! $Id$
     27! bugfix for restart data format query
     28!
     29! 4534 2020-05-14 18:35:22Z raasch
    2730! bugfix for switching on restart data output with MPI-IO
    2831!
     
    66636666       ENDDO
    66646667
    6665     ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     6668    ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    66666669
    66676670       IF ( ALLOCATED( c_liq_av ) )  CALL wrd_mpi_io( 'c_liq_av',  c_liq_av )
  • palm/trunk/SOURCE/ocean_mod.f90

    r4517 r4535  
    2525! -----------------
    2626! $Id$
     27! bugfix for restart data format query
     28!
     29! 4517 2020-05-03 14:29:30Z raasch
    2730! added restart with MPI-IO for reading local arrays
    2831!
     
    22022205       WRITE ( 14 )  wave_breaking
    22032206
    2204     ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     2207    ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    22052208
    22062209       CALL wrd_mpi_io( 'bc_sa_t', bc_sa_t )
     
    22522255       ENDIF
    22532256
    2254     ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     2257    ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    22552258
    22562259       IF ( ALLOCATED( rho_ocean_av ) )  CALL wrd_mpi_io( 'rho_ocean_av', rho_ocean_av )
  • palm/trunk/SOURCE/palm.f90

    r4496 r4535  
    2525! -----------------
    2626! $Id$
     27! bugfix for restart data format query
     28!
     29! 4496 2020-04-15 08:37:26Z raasch
    2730! bugfix: coupling character added to restart output filename
    2831!
     
    432435          ENDDO
    433436
    434        ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     437       ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    435438!
    436439!--       Open MPI-IO restart file
  • palm/trunk/SOURCE/parin.f90

    r4505 r4535  
    2525! -----------------
    2626! $Id$
     27! bugfix for restart data format query
     28!
     29! 4505 2020-04-20 15:37:15Z schwenkel
    2730! Add flag for saturation check
    2831!
     
    511514!--          input needs to be set now! This is normally done later in check parameters.
    512515             IF ( TRIM( restart_data_format ) /= 'fortran_binary'  .AND.                           &
    513                   TRIM( restart_data_format ) /= 'mpi' )  THEN
     516                  TRIM( restart_data_format ) /= 'mpi'             .AND.                           &
     517                  TRIM( restart_data_format ) /= 'mpi_shared_memory' )  THEN
    514518                message_string = 'illegal restart data format "' // TRIM( restart_data_format ) // '"'
    515519                CALL message( 'parin', 'PA....', 1, 2, 0, 6, 0 )
  • palm/trunk/SOURCE/plant_canopy_model_mod.f90

    r4525 r4535  
    2727! -----------------
    2828! $Id$
     29! bugfix for restart data format query
     30!
     31! 4525 2020-05-10 17:05:07Z raasch
    2932! bugfix for reading/writing pcm_...rate_av with MPI-IO
    3033!
     
    25772580          WRITE ( 14 )  pch_index
    25782581
    2579        ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     2582       ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    25802583
    25812584          CALL wrd_mpi_io( 'pch_index', pch_index )
     
    26122615          ENDIF
    26132616
    2614        ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     2617       ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    26152618
    26162619!
  • palm/trunk/SOURCE/radiation_model_mod.f90

    r4531 r4535  
    2828! -----------------
    2929! $Id$
     30! bugfix for restart data format query
     31!
     32! 4531 2020-05-13 09:52:22Z moh.hefny
    3033! Bugfix in gather flux pabs_pc_lwdif in non_parallel case
    3134!
     
    1208112084       ENDIF
    1208212085
    12083     ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     12086    ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    1208412087
    1208512088       IF ( ALLOCATED( rad_net_av ) )  CALL wrd_mpi_io( 'rad_net_av', rad_net_av )
  • palm/trunk/SOURCE/salsa_mod.f90

    r4527 r4535  
    2626! -----------------
    2727! $Id$
     28! bugfix for restart data format query
     29!
     30! 4527 2020-05-11 09:39:55Z monakurppa
    2831! Correct a bug in salsa_wrd_global and salsa_check_data_output,
    2932! and add reglim to be read/written in the restart data
     
    34023405       WRITE ( 14 )  reglim
    34033406
    3404     ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     3407    ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    34053408
    34063409       DO  i = 1, 7
     
    35273530       ENDIF
    35283531
    3529     ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     3532    ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    35303533
    35313534       ALLOCATE( tmp_3d(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
  • palm/trunk/SOURCE/surface_data_output_mod.f90

    r4517 r4535  
    2525! -----------------
    2626! $Id$
     27! bugfix for restart data format query
     28!
     29! 4517 2020-05-03 14:29:30Z raasch
    2730! added restart with MPI-IO for reading local arrays
    2831!
     
    49544957          WRITE ( 14 )  average_count_surf
    49554958
    4956        ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     4959       ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    49574960
    49584961         CALL wrd_mpi_io( 'average_count_surf', average_count_surf )
     
    49794982          ENDIF
    49804983
    4981        ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     4984       ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    49824985
    49834986          IF ( ALLOCATED( surfaces%var_av ) )  CALL wrd_mpi_io( 'surfaces%var_av', surfaces%var_av )
  • palm/trunk/SOURCE/surface_mod.f90

    r4521 r4535  
    2626! -----------------
    2727! $Id$
     28! bugfix for restart data format query
     29!
     30! 4521 2020-05-06 11:39:49Z schwenkel
    2831! Rename variable
    2932!
     
    39553958          ENDDO
    39563959
    3957        ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     3960       ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    39583961
    39593962!
  • palm/trunk/SOURCE/synthetic_turbulence_generator_mod.f90

    r4495 r4535  
    2525! -----------------
    2626! $Id$
     27! bugfix for restart data format query
     28!
     29! 4495 2020-04-13 20:11:20Z raasch
    2730! restart data handling with MPI-IO added
    2831!
     
    12691272       WRITE ( 14 )  use_syn_turb_gen
    12701273
    1271     ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     1274    ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    12721275
    12731276       CALL wrd_mpi_io( 'time_stg_adjust', time_stg_adjust )
  • palm/trunk/SOURCE/urban_surface_mod.f90

    r4517 r4535  
    2727! -----------------
    2828! $Id$
     29! bugfix for restart data format query
     30!
     31! 4517 2020-05-03 14:29:30Z raasch
    2932! added restart with MPI-IO for reading local arrays
    3033!
     
    86608663       ENDDO
    86618664
    8662     ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     8665    ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    86638666!
    86648667!--    There is no information about the PE-grid necessary because the restart files consists of the
  • palm/trunk/SOURCE/user_module.f90

    r4517 r4535  
    2525! -----------------
    2626! $Id$
     27! bugfix for restart data format query
     28!
     29! 4517 2020-05-03 14:29:30Z raasch
    2730! added restart with MPI-IO for reading local arrays
    2831!
     
    12411244!       WRITE ( 14 )  global_parameter
    12421245
    1243     ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     1246    ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    12441247
    12451248!    CALL rrd_mpi_io( 'global_parameter', global_parameter )
     
    12701273!       ENDIF
    12711274
    1272     ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     1275    ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    12731276
    12741277!       IF ( ALLOCATED( u2_av ) )  CALL wrd_mpi_io( 'u2_av', u2_av )
  • palm/trunk/SOURCE/virtual_flight_mod.f90

    r4522 r4535  
    2525! -----------------
    2626! $Id$
     27! bugfix for restart data format query
     28!
     29! 4522 2020-05-06 14:17:05Z suehring
    2730! Modularize user_init_flight in order to provide an explicit interface.
    2831!
     
    11121115       WRITE ( 14 )  z_pos
    11131116
    1114     ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     1117    ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    11151118
    11161119       CALL wrd_mpi_io_global_array( 'u_agl', u_agl )
  • palm/trunk/SOURCE/wind_turbine_model_mod.f90

    r4528 r4535  
    2626! -----------------
    2727! $Id$
     28! bugfix for restart data format query
     29!
     30! 4528 2020-05-11 14:14:09Z oliver.maas
    2831! added namelist parameter smearing_kernel_size
    2932!
     
    610613       WRITE ( 14 )  torque_gen_old
    611614
    612     ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
     615    ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    613616
    614617       CALL wrd_mpi_io_global_array( 'generator_speed', generator_speed )
  • palm/trunk/SOURCE/write_restart_data_mod.f90

    r4514 r4535  
    2424! -----------------
    2525! $Id$
     26! bugfix for restart data format query
     27!
     28! 4514 2020-04-30 16:29:59Z suehring
    2629! qsurf and ssurf added
    2730!
     
    876879       WRITE ( 14 )  z_i
    877880
    878     ELSEIF ( restart_data_format_output == 'mpi' )  THEN
     881    ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    879882!
    880883!--    Write global restart data using MPI-IO
     
    14711474       ENDIF
    14721475
    1473     ELSEIF ( restart_data_format_output == 'mpi' )  THEN
     1476    ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    14741477!
    14751478!--    Write local restart data using MPI-IO
Note: See TracChangeset for help on using the changeset viewer.