Changeset 3248 for palm


Ignore:
Timestamp:
Sep 14, 2018 9:42:06 AM (3 years ago)
Author:
sward
Message:

Minor format changes

Location:
palm/trunk
Files:
22 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS

    • Property svn:ignore
      •  

        old new  
        1 *.x
         1.palm_gf_config
         2.palm_gf_tmp
         3agent_preprocessing
  • palm/trunk/SCRIPTS/NCL

    • Property svn:ignore set to
      .palm_gf_config
      .palm_gf_tmp
      agent_preprocessing
  • palm/trunk/SCRIPTS/NCL/Archive

    • Property svn:ignore set to
      .palm_gf_config
      .palm_gf_tmp
      agent_preprocessing
  • palm/trunk/SCRIPTS/palm_gf_files

    • Property svn:ignore set to
      .palm_gf_config
      .palm_gf_tmp
      agent_preprocessing
  • palm/trunk/SCRIPTS/palm_jm_files

    • Property svn:ignore set to
      .palm_gf_config
      .palm_gf_tmp
      agent_preprocessing
  • palm/trunk/SCRIPTS/palm_wd_files

    • Property svn:ignore set to
      .palm_gf_config
      .palm_gf_tmp
      agent_preprocessing
  • palm/trunk/SCRIPTS/palmrungui_files

    • Property svn:ignore set to
      .palm_gf_config
      .palm_gf_tmp
      agent_preprocessing
  • palm/trunk/SOURCE/chemistry_model_mod.f90

    r3246 r3248  
    2727! -----------------
    2828! $Id$
     29! Minor formating changes
     30!
     31! 3246 2018-09-13 15:14:50Z sward
    2932! Added error handling for input namelist via parin_fail_message
    3033!
     
    869872      REWIND ( 11 )
    870873      line = ' '
    871       DO   WHILE ( INDEX( line, '&chemistry_parameters' ) == 0 )
     874      DO WHILE ( INDEX( line, '&chemistry_parameters' ) == 0 )
    872875         READ ( 11, '(A)', END=20 )  line
    873876      ENDDO
     
    882885
    883886 10   BACKSPACE( 11 )
    884       READ( 11 ,fmt='(A)') line
    885       CALL parin_fail_message ( 'chemistry_parameters', line )
     887      READ( 11 , '(A)') line
     888      CALL parin_fail_message( 'chemistry_parameters', line )
    886889
    887890 20   CONTINUE
  • palm/trunk/SOURCE/land_surface_model_mod.f90

    r3246 r3248  
    2525! -----------------
    2626! $Id$
     27! Minor formating changes
     28!
     29! 3246 2018-09-13 15:14:50Z sward
    2730! Added error handling for input namelist via parin_fail_message
    2831!
     
    49964999       REWIND ( 11 )
    49975000       line = ' '
    4998        DO   WHILE ( INDEX( line, '&land_surface_parameters' ) == 0 )
     5001       DO WHILE ( INDEX( line, '&land_surface_parameters' ) == 0 )
    49995002          READ ( 11, '(A)', END=12 )  line
    50005003       ENDDO
     
    50125015
    50135016 10    BACKSPACE( 11 )
    5014        READ( 11 ,fmt='(A)') line
    5015        CALL parin_fail_message ( 'land_surface_parameters', line )
     5017       READ( 11 , '(A)') line
     5018       CALL parin_fail_message( 'land_surface_parameters', line )
    50165019!
    50175020!--    Try to find old namelist
    50185021 12    REWIND ( 11 )
    50195022       line = ' '
    5020        DO   WHILE ( INDEX( line, '&lsm_par' ) == 0 )
     5023       DO WHILE ( INDEX( line, '&lsm_par' ) == 0 )
    50215024          READ ( 11, '(A)', END=14 )  line
    50225025       ENDDO
     
    50395042
    50405043 13    BACKSPACE( 11 )
    5041        READ( 11 ,fmt='(A)') line
    5042        CALL parin_fail_message ( 'lsm_par', line )
     5044       READ( 11 , '(A)') line
     5045       CALL parin_fail_message( 'lsm_par', line )
    50435046
    50445047
  • palm/trunk/SOURCE/message.f90

    r3247 r3248  
    2525! -----------------
    2626! $Id$
     27! Minor formating changes
     28!
     29! 3247 2018-09-14 07:06:30Z sward
    2730! Subroutine description updated and parin_fail_message now also outputs
    2831! the line number in which namelist reading failed
     
    323326
    324327    REWIND( 11 )
    325     DO   WHILE ( INDEX( line_dum, TRIM(line) ) == 0 )
    326          READ ( 11, '(A)', END=20 )  line_dum
    327          line_counter = line_counter + 1
     328    DO WHILE ( INDEX( line_dum, TRIM(line) ) == 0 )
     329       READ ( 11, '(A)', END=20 )  line_dum
     330       line_counter = line_counter + 1
    328331    ENDDO
    329332
     
    332335                   '&Reading fails on line ', line_counter,                    &
    333336                   ' at&' // line
    334           CALL message( 'parin', 'PA0271', 1, 2, 0, 6, 0 )
     337    CALL message( 'parin', 'PA0271', 1, 2, 0, 6, 0 )
    335338
    336339 END SUBROUTINE parin_fail_message
  • palm/trunk/SOURCE/multi_agent_system_mod.f90

    r3246 r3248  
    2525! -----------------
    2626! $Id$
     27! Minor formating changes
     28!
     29! 3246 2018-09-13 15:14:50Z sward
    2730! Added error handling for input namelist via parin_fail_message
    2831!
     
    37713774       REWIND ( 11 )
    37723775       line = ' '
    3773        DO   WHILE ( INDEX( line, '&agent_parameters' ) == 0 )
     3776       DO WHILE ( INDEX( line, '&agent_parameters' ) == 0 )
    37743777          READ ( 11, '(A)', END=20 )  line
    37753778       ENDDO
     
    37863789
    37873790 10    BACKSPACE( 11 )
    3788        READ( 11 ,fmt='(A)') line
    3789        CALL parin_fail_message ( 'agent_parameters', line )
     3791       READ( 11 , '(A)') line
     3792       CALL parin_fail_message( 'agent_parameters', line )
    37903793
    37913794 20    CONTINUE
  • palm/trunk/SOURCE/package_parin.f90

    r3246 r3248  
    2525! -----------------
    2626! $Id$
     27! Minor formating changes
     28!
     29! 3246 2018-09-13 15:14:50Z sward
    2730! Added error handling for input namelist via parin_fail_message
    2831!
     
    315318 20 BACKSPACE( 11 )
    316319    READ( 11 ,fmt='(A)') line
    317     CALL parin_fail_message ( 'dvrp_graphics_par', line )
     320    CALL parin_fail_message( 'dvrp_graphics_par', line )
    318321
    319322 21 CONTINUE
     
    340343
    34134410  BACKSPACE( 11 )
    342     READ( 11 ,fmt='(A)') line
    343     CALL parin_fail_message ( 'particle_parameters', line )
     345    READ( 11 , '(A)') line
     346    CALL parin_fail_message( 'particle_parameters', line )
    344347
    345348!
     
    34735012  REWIND ( 11 )
    348351    line = ' '
    349     DO   WHILE ( INDEX( line, '&particles_par' ) == 0 )
     352    DO WHILE ( INDEX( line, '&particles_par' ) == 0 )
    350353       READ ( 11, '(A)', END=14 )  line
    351354    ENDDO
     
    369372
    370373 13    BACKSPACE( 11 )
    371        READ( 11 ,fmt='(A)') line
    372        CALL parin_fail_message ( 'particles_par', line )
     374       READ( 11 , '(A)') line
     375       CALL parin_fail_message( 'particles_par', line )
    373376
    374377 14 CONTINUE
  • palm/trunk/SOURCE/parin.f90

    r3246 r3248  
    2525! -----------------
    2626! $Id$
     27! Minor formating changes
     28!
     29! 3246 2018-09-13 15:14:50Z sward
    2730! Added error handling for input namelist via parin_fail_message
    2831!
     
    789792         
    790793 10       BACKSPACE( 11 )
    791           READ( 11 ,fmt='(A)') line
    792           CALL parin_fail_message ( 'initialization_parameters', line )
     794          READ( 11 , '(A)') line
     795          CALL parin_fail_message( 'initialization_parameters', line )
    793796
    794797 11       REWIND ( 11 )
     
    803806 
    804807 12       BACKSPACE( 11 )
    805           READ( 11 ,fmt='(A)') line
    806           CALL parin_fail_message ( 'inipar', line )
     808          READ( 11 , '(A)') line
     809          CALL parin_fail_message( 'inipar', line )
    807810
    808811 13       message_string = 'no initialization_parameters-namelist found'
     
    818821          REWIND ( 11 )
    819822          line = ' '
    820           DO   WHILE ( INDEX( line, '&runtime_parameters' ) == 0 )
     823          DO WHILE ( INDEX( line, '&runtime_parameters' ) == 0 )
    821824             READ ( 11, '(A)', END=16 )  line
    822825          ENDDO
     
    829832
    830833 15       BACKSPACE( 11 )
    831           READ( 11 ,fmt='(A)') line
    832           CALL parin_fail_message ( 'runtime_parameters', line )
     834          READ( 11 , '(A)') line
     835          CALL parin_fail_message( 'runtime_parameters', line )
    833836
    834837 16       REWIND ( 11 )
    835838          line = ' '
    836           DO   WHILE ( INDEX( line, '&d3par' ) == 0 )
     839          DO WHILE ( INDEX( line, '&d3par' ) == 0 )
    837840             READ ( 11, '(A)', END=18 )  line
    838841          ENDDO
     
    851854
    852855 17       BACKSPACE( 11 )
    853           READ( 11 ,fmt='(A)') line
    854           CALL parin_fail_message ( 'd3par', line )
     856          READ( 11 , '(A)') line
     857          CALL parin_fail_message( 'd3par', line )
    855858
    856859 18       CONTINUE
  • palm/trunk/SOURCE/plant_canopy_model_mod.f90

    r3246 r3248  
    2525! -----------------
    2626! $Id$
     27! Minor formating changes
     28!
     29! 3246 2018-09-13 15:14:50Z sward
    2730! Added error handling for input namelist via parin_fail_message
    2831!
     
    10311034       REWIND ( 11 )
    10321035       line = ' '
    1033        DO   WHILE ( INDEX( line, '&plant_canopy_parameters' ) == 0 )
     1036       DO WHILE ( INDEX( line, '&plant_canopy_parameters' ) == 0 )
    10341037          READ ( 11, '(A)', END=12 )  line
    10351038       ENDDO
     
    10471050
    10481051 10    BACKSPACE( 11 )
    1049        READ( 11 ,fmt='(A)') line
    1050        CALL parin_fail_message ( 'plant_canopy_parameters', line )
     1052       READ( 11 , '(A)') line
     1053       CALL parin_fail_message( 'plant_canopy_parameters', line )
    10511054!
    10521055!--    Try to find old namelist
    10531056 12    REWIND ( 11 )
    10541057       line = ' '
    1055        DO   WHILE ( INDEX( line, '&canopy_par' ) == 0 )
     1058       DO WHILE ( INDEX( line, '&canopy_par' ) == 0 )
    10561059          READ ( 11, '(A)', END=14 )  line
    10571060       ENDDO
     
    10741077
    10751078 13    BACKSPACE( 11 )
    1076        READ( 11 ,fmt='(A)') line
    1077        CALL parin_fail_message ( 'canopy_par', line )
     1079       READ( 11 , '(A)') line
     1080       CALL parin_fail_message( 'canopy_par', line )
    10781081
    10791082 14    CONTINUE
  • palm/trunk/SOURCE/radiation_model_mod.f90

    r3246 r3248  
    2828! -----------------
    2929! $Id$
     30! Minor formating changes
     31!
     32! 3246 2018-09-13 15:14:50Z sward
    3033! Added error handling for input namelist via parin_fail_message
    3134!
     
    27892792       REWIND ( 11 )
    27902793       line = ' '
    2791        DO   WHILE ( INDEX( line, '&radiation_parameters' ) == 0 )
     2794       DO WHILE ( INDEX( line, '&radiation_parameters' ) == 0 )
    27922795          READ ( 11, '(A)', END=12 )  line
    27932796       ENDDO
     
    28052808
    28062809 10    BACKSPACE( 11 )
    2807        READ( 11 ,fmt='(A)') line
    2808        CALL parin_fail_message ( 'radiation_parameters', line )
     2810       READ( 11 , '(A)') line
     2811       CALL parin_fail_message( 'radiation_parameters', line )
    28092812!
    28102813!--    Try to find old namelist
    28112814 12    REWIND ( 11 )
    28122815       line = ' '
    2813        DO   WHILE ( INDEX( line, '&radiation_par' ) == 0 )
     2816       DO WHILE ( INDEX( line, '&radiation_par' ) == 0 )
    28142817          READ ( 11, '(A)', END=14 )  line
    28152818       ENDDO
     
    28382841
    28392842 13    BACKSPACE( 11 )
    2840        READ( 11 ,fmt='(A)') line
    2841        CALL parin_fail_message ( 'radiation_par', line )
     2843       READ( 11 , '(A)') line
     2844       CALL parin_fail_message( 'radiation_par', line )
    28422845
    28432846 14    CONTINUE
  • palm/trunk/SOURCE/spectra_mod.f90

    r3246 r3248  
    2525! -----------------
    2626! $Id$
     27! Minor formating changes
     28!
     29! 3246 2018-09-13 15:14:50Z sward
    2730! Added error handling for input namelist via parin_fail_message
    2831!
     
    239242       REWIND ( 11 )
    240243       line = ' '
    241        DO   WHILE ( INDEX( line, '&spectra_parameters' ) == 0 )
     244       DO WHILE ( INDEX( line, '&spectra_parameters' ) == 0 )
    242245          READ ( 11, '(A)', END=12 )  line
    243246       ENDDO
     
    260263
    261264 10    BACKSPACE( 11 )
    262        READ( 11 ,fmt='(A)') line
    263        CALL parin_fail_message ( 'spectra_parameters', line )
     265       READ( 11 , '(A)') line
     266       CALL parin_fail_message( 'spectra_parameters', line )
    264267!
    265268!--    Try to find the old namelist
    266269 12    REWIND ( 11 )
    267270       line = ' '
    268        DO   WHILE ( INDEX( line, '&spectra_par' ) == 0 )
     271       DO WHILE ( INDEX( line, '&spectra_par' ) == 0 )
    269272          READ ( 11, '(A)', END=14 )  line
    270273       ENDDO
     
    292295
    293296 13    BACKSPACE( 11 )
    294        READ( 11 ,fmt='(A)') line
    295        CALL parin_fail_message ( 'spectra_par', line )
     297       READ( 11 , '(A)') line
     298       CALL parin_fail_message( 'spectra_par', line )
    296299       
    297300       
  • palm/trunk/SOURCE/synthetic_turbulence_generator_mod.f90

    r3246 r3248  
    2525! -----------------
    2626! $Id$
     27! Minor formating changes
     28!
     29! 3246 2018-09-13 15:14:50Z sward
    2730! Added error handling for input namelist via parin_fail_message
    2831!
     
    985988
    986989 10 BACKSPACE( 11 )
    987     READ( 11 ,fmt='(A)') line
    988     CALL parin_fail_message ( 'stg_par', line )
     990    READ( 11 , '(A)') line
     991    CALL parin_fail_message( 'stg_par', line )
    989992
    990993 20 CONTINUE
  • palm/trunk/SOURCE/urban_surface_mod.f90

    r3246 r3248  
    2828! -----------------
    2929! $Id$
     30! Minor formating changes
     31!
     32! 3246 2018-09-13 15:14:50Z sward
    3033! Added error handling for input namelist via parin_fail_message
    3134!
     
    53595362       REWIND ( 11 )
    53605363       line = ' '
    5361        DO   WHILE ( INDEX( line, '&urban_surface_parameters' ) == 0 )
     5364       DO WHILE ( INDEX( line, '&urban_surface_parameters' ) == 0 )
    53625365          READ ( 11, '(A)', END=12 )  line
    53635366       ENDDO
     
    53755378
    53765379 10    BACKSPACE( 11 )
    5377        READ( 11 ,fmt='(A)') line
    5378        CALL parin_fail_message ( 'urban_surface_parameters', line )
     5380       READ( 11 , '(A)') line
     5381       CALL parin_fail_message( 'urban_surface_parameters', line )
    53795382!
    53805383!--    Try to find old namelist
    53815384 12    REWIND ( 11 )
    53825385       line = ' '
    5383        DO   WHILE ( INDEX( line, '&urban_surface_par' ) == 0 )
     5386       DO WHILE ( INDEX( line, '&urban_surface_par' ) == 0 )
    53845387          READ ( 11, '(A)', END=14 )  line
    53855388       ENDDO
     
    54025405
    54035406 13    BACKSPACE( 11 )
    5404        READ( 11 ,fmt='(A)') line
    5405        CALL parin_fail_message ( 'urban_surface_par', line )
     5407       READ( 11 , '(A)') line
     5408       CALL parin_fail_message( 'urban_surface_par', line )
    54065409
    54075410
  • palm/trunk/SOURCE/user_parin.f90

    r3246 r3248  
    2525! -----------------
    2626! $Id$
     27! Minor formating changes
     28!
     29! 3246 2018-09-13 15:14:50Z sward
    2730! Added error handling for input namelist via parin_fail_message
    2831!
     
    142145
    143146    line = ' '
    144     DO   WHILE ( INDEX( line, '&user_parameters' ) == 0 )
     147    DO WHILE ( INDEX( line, '&user_parameters' ) == 0 )
    145148       READ ( 11, '(A)', END=12 )  line
    146149    ENDDO
     
    156159
    15716010  BACKSPACE( 11 )
    158     READ( 11 ,fmt='(A)') line
    159     CALL parin_fail_message ( 'user_parameters', line )
     161    READ( 11 , '(A)') line
     162    CALL parin_fail_message( 'user_parameters', line )
    160163
    16116412  REWIND ( 11 )
    162165
    163166    line = ' '
    164     DO   WHILE ( INDEX( line, '&userpar' ) == 0 )
     167    DO WHILE ( INDEX( line, '&userpar' ) == 0 )
    165168       READ ( 11, '(A)', END=14 )  line
    166169    ENDDO
     
    181184
    18218513  BACKSPACE( 11 )
    183     READ( 11 ,fmt='(A)') line
    184     CALL parin_fail_message ( 'userpar', line )
    185 
    186 14 CONTINUE
     186    READ( 11 , '(A)') line
     187    CALL parin_fail_message( 'userpar', line )
     188
     18914  CONTINUE
    187190
    188191!
     
    192195       IF ( data_output_pr_user(1) /= ' ' )  THEN
    193196          i = 1
    194           DO  WHILE ( data_output_pr(i) /= ' '  .AND.  i <= 100 )
     197          DO WHILE ( data_output_pr(i) /= ' '  .AND.  i <= 100 )
    195198             i = i + 1
    196199          ENDDO
    197200          j = 1
    198           DO  WHILE ( data_output_pr_user(j) /= ' '  .AND.  j <= 100 )
     201          DO WHILE ( data_output_pr_user(j) /= ' '  .AND.  j <= 100 )
    199202             data_output_pr(i) = data_output_pr_user(j)
    200203             max_pr_user_tmp   = max_pr_user_tmp + 1
  • palm/trunk/SOURCE/uv_exposure_model_mod.f90

    r3246 r3248  
    2525! -----------------
    2626! $Id$
     27! Minor formating changes
     28!
     29! 3246 2018-09-13 15:14:50Z sward
    2730! Added error handling for input namelist via parin_fail_message and small
    2831! typo bugfix
     
    453456    REWIND ( 11 )
    454457    line = ' '
    455     DO   WHILE ( INDEX( line, '&biometeorology_parameters' ) == 0 )
     458    DO WHILE ( INDEX( line, '&biometeorology_parameters' ) == 0 )
    456459       READ ( 11, '(A)', END=20 )  line
    457460    ENDDO
     
    467470
    468471 10 BACKSPACE( 11 )
    469     READ( 11 ,fmt='(A)') line
    470     CALL parin_fail_message ( 'biometeorology_parameters', line )
     472    READ( 11 , '(A)') line
     473    CALL parin_fail_message( 'biometeorology_parameters', line )
    471474
    472475
  • palm/trunk/SOURCE/virtual_flight_mod.f90

    r3246 r3248  
    2525! -----------------
    2626! $Id$
     27! Minor formating changes
     28!
     29! 3246 2018-09-13 15:14:50Z sward
    2730! Added error handling for input namelist via parin_fail_message
    2831!
     
    252255       REWIND ( 11 )
    253256       line = ' '
    254        DO   WHILE ( INDEX( line, '&virtual_flight_parameters' ) == 0 )
     257       DO WHILE ( INDEX( line, '&virtual_flight_parameters' ) == 0 )
    255258          READ ( 11, '(A)', END=12 )  line
    256259       ENDDO
     
    267270
    268271 10    BACKSPACE( 11 )
    269        READ( 11 ,fmt='(A)') line
    270        CALL parin_fail_message ( 'virtual_flight_parameters', line )
     272       READ( 11 , '(A)') line
     273       CALL parin_fail_message( 'virtual_flight_parameters', line )
    271274!
    272275!--    Try to find the old namelist
    273276 12    REWIND ( 11 )
    274277       line = ' '
    275        DO   WHILE ( INDEX( line, '&flight_par' ) == 0 )
     278       DO WHILE ( INDEX( line, '&flight_par' ) == 0 )
    276279          READ ( 11, '(A)', END=14 )  line
    277280       ENDDO
     
    293296
    294297 13    BACKSPACE( 11 )
    295        READ( 11 ,fmt='(A)') line
    296        CALL parin_fail_message ( 'flight_par', line )
     298       READ( 11 , '(A)') line
     299       CALL parin_fail_message( 'flight_par', line )
    297300
    298301 14    CONTINUE
  • palm/trunk/SOURCE/wind_turbine_model_mod.f90

    r3246 r3248  
    2626! -----------------
    2727! $Id$
     28! Minor formating changes
     29!
     30! 3246 2018-09-13 15:14:50Z sward
    2831! Added error handling for input namelist via parin_fail_message
    2932!
     
    537540       REWIND ( 11 )
    538541       line = ' '
    539        DO  WHILE ( INDEX( line, '&wind_turbine_parameters' ) == 0 )
     542       DO WHILE ( INDEX( line, '&wind_turbine_parameters' ) == 0 )
    540543          READ ( 11, '(A)', END=12 )  line
    541544       ENDDO
     
    552555
    553556 10    BACKSPACE( 11 )
    554        READ( 11 ,fmt='(A)') line
    555        CALL parin_fail_message ( 'wind_turbine_parameters', line )
     557       READ( 11 , '(A)') line
     558       CALL parin_fail_message( 'wind_turbine_parameters', line )
    556559
    557560!
     
    559562 12    REWIND ( 11 )
    560563       line = ' '
    561        DO  WHILE ( INDEX( line, '&wind_turbine_par' ) == 0 )
     564       DO WHILE ( INDEX( line, '&wind_turbine_par' ) == 0 )
    562565          READ ( 11, '(A)', END=14 )  line
    563566       ENDDO
     
    580583
    581584 13    BACKSPACE( 11 )
    582        READ( 11 ,fmt='(A)') line
    583        CALL parin_fail_message ( 'wind_turbine_par', line )
     585       READ( 11 , '(A)') line
     586       CALL parin_fail_message( 'wind_turbine_par', line )
    584587
    585588 14    CONTINUE   ! TBD Change from continue, mit ierrn machen
Note: See TracChangeset for help on using the changeset viewer.