Changeset 3248 for palm/trunk
- Timestamp:
- Sep 14, 2018 9:42:06 AM (6 years ago)
- Location:
- palm/trunk
- Files:
-
- 22 edited
-
SCRIPTS (modified) (1 prop)
-
SCRIPTS/NCL (modified) (1 prop)
-
SCRIPTS/NCL/Archive (modified) (1 prop)
-
SCRIPTS/palm_gf_files (modified) (1 prop)
-
SCRIPTS/palm_jm_files (modified) (1 prop)
-
SCRIPTS/palm_wd_files (modified) (1 prop)
-
SCRIPTS/palmrungui_files (modified) (1 prop)
-
SOURCE/chemistry_model_mod.f90 (modified) (3 diffs)
-
SOURCE/land_surface_model_mod.f90 (modified) (4 diffs)
-
SOURCE/message.f90 (modified) (3 diffs)
-
SOURCE/multi_agent_system_mod.f90 (modified) (3 diffs)
-
SOURCE/package_parin.f90 (modified) (5 diffs)
-
SOURCE/parin.f90 (modified) (6 diffs)
-
SOURCE/plant_canopy_model_mod.f90 (modified) (4 diffs)
-
SOURCE/radiation_model_mod.f90 (modified) (4 diffs)
-
SOURCE/spectra_mod.f90 (modified) (4 diffs)
-
SOURCE/synthetic_turbulence_generator_mod.f90 (modified) (2 diffs)
-
SOURCE/urban_surface_mod.f90 (modified) (4 diffs)
-
SOURCE/user_parin.f90 (modified) (5 diffs)
-
SOURCE/uv_exposure_model_mod.f90 (modified) (3 diffs)
-
SOURCE/virtual_flight_mod.f90 (modified) (4 diffs)
-
SOURCE/wind_turbine_model_mod.f90 (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SCRIPTS
- Property svn:ignore
-
old new 1 *.x 1 .palm_gf_config 2 .palm_gf_tmp 3 agent_preprocessing
-
- Property svn:ignore
-
palm/trunk/SCRIPTS/NCL
-
Property
svn:ignore
set to
.palm_gf_config
.palm_gf_tmp
agent_preprocessing
-
Property
svn:ignore
set to
-
palm/trunk/SCRIPTS/NCL/Archive
-
Property
svn:ignore
set to
.palm_gf_config
.palm_gf_tmp
agent_preprocessing
-
Property
svn:ignore
set to
-
palm/trunk/SCRIPTS/palm_gf_files
-
Property
svn:ignore
set to
.palm_gf_config
.palm_gf_tmp
agent_preprocessing
-
Property
svn:ignore
set to
-
palm/trunk/SCRIPTS/palm_jm_files
-
Property
svn:ignore
set to
.palm_gf_config
.palm_gf_tmp
agent_preprocessing
-
Property
svn:ignore
set to
-
palm/trunk/SCRIPTS/palm_wd_files
-
Property
svn:ignore
set to
.palm_gf_config
.palm_gf_tmp
agent_preprocessing
-
Property
svn:ignore
set to
-
palm/trunk/SCRIPTS/palmrungui_files
-
Property
svn:ignore
set to
.palm_gf_config
.palm_gf_tmp
agent_preprocessing
-
Property
svn:ignore
set to
-
palm/trunk/SOURCE/chemistry_model_mod.f90
r3246 r3248 27 27 ! ----------------- 28 28 ! $Id$ 29 ! Minor formating changes 30 ! 31 ! 3246 2018-09-13 15:14:50Z sward 29 32 ! Added error handling for input namelist via parin_fail_message 30 33 ! … … 869 872 REWIND ( 11 ) 870 873 line = ' ' 871 DO 874 DO WHILE ( INDEX( line, '&chemistry_parameters' ) == 0 ) 872 875 READ ( 11, '(A)', END=20 ) line 873 876 ENDDO … … 882 885 883 886 10 BACKSPACE( 11 ) 884 READ( 11 , fmt='(A)') line885 CALL parin_fail_message 887 READ( 11 , '(A)') line 888 CALL parin_fail_message( 'chemistry_parameters', line ) 886 889 887 890 20 CONTINUE -
palm/trunk/SOURCE/land_surface_model_mod.f90
r3246 r3248 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Minor formating changes 28 ! 29 ! 3246 2018-09-13 15:14:50Z sward 27 30 ! Added error handling for input namelist via parin_fail_message 28 31 ! … … 4996 4999 REWIND ( 11 ) 4997 5000 line = ' ' 4998 DO 5001 DO WHILE ( INDEX( line, '&land_surface_parameters' ) == 0 ) 4999 5002 READ ( 11, '(A)', END=12 ) line 5000 5003 ENDDO … … 5012 5015 5013 5016 10 BACKSPACE( 11 ) 5014 READ( 11 , fmt='(A)') line5015 CALL parin_fail_message 5017 READ( 11 , '(A)') line 5018 CALL parin_fail_message( 'land_surface_parameters', line ) 5016 5019 ! 5017 5020 !-- Try to find old namelist 5018 5021 12 REWIND ( 11 ) 5019 5022 line = ' ' 5020 DO 5023 DO WHILE ( INDEX( line, '&lsm_par' ) == 0 ) 5021 5024 READ ( 11, '(A)', END=14 ) line 5022 5025 ENDDO … … 5039 5042 5040 5043 13 BACKSPACE( 11 ) 5041 READ( 11 , fmt='(A)') line5042 CALL parin_fail_message 5044 READ( 11 , '(A)') line 5045 CALL parin_fail_message( 'lsm_par', line ) 5043 5046 5044 5047 -
palm/trunk/SOURCE/message.f90
r3247 r3248 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Minor formating changes 28 ! 29 ! 3247 2018-09-14 07:06:30Z sward 27 30 ! Subroutine description updated and parin_fail_message now also outputs 28 31 ! the line number in which namelist reading failed … … 323 326 324 327 REWIND( 11 ) 325 DO 326 327 328 DO WHILE ( INDEX( line_dum, TRIM(line) ) == 0 ) 329 READ ( 11, '(A)', END=20 ) line_dum 330 line_counter = line_counter + 1 328 331 ENDDO 329 332 … … 332 335 '&Reading fails on line ', line_counter, & 333 336 ' at&' // line 334 337 CALL message( 'parin', 'PA0271', 1, 2, 0, 6, 0 ) 335 338 336 339 END SUBROUTINE parin_fail_message -
palm/trunk/SOURCE/multi_agent_system_mod.f90
r3246 r3248 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Minor formating changes 28 ! 29 ! 3246 2018-09-13 15:14:50Z sward 27 30 ! Added error handling for input namelist via parin_fail_message 28 31 ! … … 3771 3774 REWIND ( 11 ) 3772 3775 line = ' ' 3773 DO 3776 DO WHILE ( INDEX( line, '&agent_parameters' ) == 0 ) 3774 3777 READ ( 11, '(A)', END=20 ) line 3775 3778 ENDDO … … 3786 3789 3787 3790 10 BACKSPACE( 11 ) 3788 READ( 11 , fmt='(A)') line3789 CALL parin_fail_message 3791 READ( 11 , '(A)') line 3792 CALL parin_fail_message( 'agent_parameters', line ) 3790 3793 3791 3794 20 CONTINUE -
palm/trunk/SOURCE/package_parin.f90
r3246 r3248 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Minor formating changes 28 ! 29 ! 3246 2018-09-13 15:14:50Z sward 27 30 ! Added error handling for input namelist via parin_fail_message 28 31 ! … … 315 318 20 BACKSPACE( 11 ) 316 319 READ( 11 ,fmt='(A)') line 317 CALL parin_fail_message 320 CALL parin_fail_message( 'dvrp_graphics_par', line ) 318 321 319 322 21 CONTINUE … … 340 343 341 344 10 BACKSPACE( 11 ) 342 READ( 11 , fmt='(A)') line343 CALL parin_fail_message 345 READ( 11 , '(A)') line 346 CALL parin_fail_message( 'particle_parameters', line ) 344 347 345 348 ! … … 347 350 12 REWIND ( 11 ) 348 351 line = ' ' 349 DO 352 DO WHILE ( INDEX( line, '&particles_par' ) == 0 ) 350 353 READ ( 11, '(A)', END=14 ) line 351 354 ENDDO … … 369 372 370 373 13 BACKSPACE( 11 ) 371 READ( 11 , fmt='(A)') line372 CALL parin_fail_message 374 READ( 11 , '(A)') line 375 CALL parin_fail_message( 'particles_par', line ) 373 376 374 377 14 CONTINUE -
palm/trunk/SOURCE/parin.f90
r3246 r3248 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Minor formating changes 28 ! 29 ! 3246 2018-09-13 15:14:50Z sward 27 30 ! Added error handling for input namelist via parin_fail_message 28 31 ! … … 789 792 790 793 10 BACKSPACE( 11 ) 791 READ( 11 , fmt='(A)') line792 CALL parin_fail_message 794 READ( 11 , '(A)') line 795 CALL parin_fail_message( 'initialization_parameters', line ) 793 796 794 797 11 REWIND ( 11 ) … … 803 806 804 807 12 BACKSPACE( 11 ) 805 READ( 11 , fmt='(A)') line806 CALL parin_fail_message 808 READ( 11 , '(A)') line 809 CALL parin_fail_message( 'inipar', line ) 807 810 808 811 13 message_string = 'no initialization_parameters-namelist found' … … 818 821 REWIND ( 11 ) 819 822 line = ' ' 820 DO 823 DO WHILE ( INDEX( line, '&runtime_parameters' ) == 0 ) 821 824 READ ( 11, '(A)', END=16 ) line 822 825 ENDDO … … 829 832 830 833 15 BACKSPACE( 11 ) 831 READ( 11 , fmt='(A)') line832 CALL parin_fail_message 834 READ( 11 , '(A)') line 835 CALL parin_fail_message( 'runtime_parameters', line ) 833 836 834 837 16 REWIND ( 11 ) 835 838 line = ' ' 836 DO 839 DO WHILE ( INDEX( line, '&d3par' ) == 0 ) 837 840 READ ( 11, '(A)', END=18 ) line 838 841 ENDDO … … 851 854 852 855 17 BACKSPACE( 11 ) 853 READ( 11 , fmt='(A)') line854 CALL parin_fail_message 856 READ( 11 , '(A)') line 857 CALL parin_fail_message( 'd3par', line ) 855 858 856 859 18 CONTINUE -
palm/trunk/SOURCE/plant_canopy_model_mod.f90
r3246 r3248 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Minor formating changes 28 ! 29 ! 3246 2018-09-13 15:14:50Z sward 27 30 ! Added error handling for input namelist via parin_fail_message 28 31 ! … … 1031 1034 REWIND ( 11 ) 1032 1035 line = ' ' 1033 DO 1036 DO WHILE ( INDEX( line, '&plant_canopy_parameters' ) == 0 ) 1034 1037 READ ( 11, '(A)', END=12 ) line 1035 1038 ENDDO … … 1047 1050 1048 1051 10 BACKSPACE( 11 ) 1049 READ( 11 , fmt='(A)') line1050 CALL parin_fail_message 1052 READ( 11 , '(A)') line 1053 CALL parin_fail_message( 'plant_canopy_parameters', line ) 1051 1054 ! 1052 1055 !-- Try to find old namelist 1053 1056 12 REWIND ( 11 ) 1054 1057 line = ' ' 1055 DO 1058 DO WHILE ( INDEX( line, '&canopy_par' ) == 0 ) 1056 1059 READ ( 11, '(A)', END=14 ) line 1057 1060 ENDDO … … 1074 1077 1075 1078 13 BACKSPACE( 11 ) 1076 READ( 11 , fmt='(A)') line1077 CALL parin_fail_message 1079 READ( 11 , '(A)') line 1080 CALL parin_fail_message( 'canopy_par', line ) 1078 1081 1079 1082 14 CONTINUE -
palm/trunk/SOURCE/radiation_model_mod.f90
r3246 r3248 28 28 ! ----------------- 29 29 ! $Id$ 30 ! Minor formating changes 31 ! 32 ! 3246 2018-09-13 15:14:50Z sward 30 33 ! Added error handling for input namelist via parin_fail_message 31 34 ! … … 2789 2792 REWIND ( 11 ) 2790 2793 line = ' ' 2791 DO 2794 DO WHILE ( INDEX( line, '&radiation_parameters' ) == 0 ) 2792 2795 READ ( 11, '(A)', END=12 ) line 2793 2796 ENDDO … … 2805 2808 2806 2809 10 BACKSPACE( 11 ) 2807 READ( 11 , fmt='(A)') line2808 CALL parin_fail_message 2810 READ( 11 , '(A)') line 2811 CALL parin_fail_message( 'radiation_parameters', line ) 2809 2812 ! 2810 2813 !-- Try to find old namelist 2811 2814 12 REWIND ( 11 ) 2812 2815 line = ' ' 2813 DO 2816 DO WHILE ( INDEX( line, '&radiation_par' ) == 0 ) 2814 2817 READ ( 11, '(A)', END=14 ) line 2815 2818 ENDDO … … 2838 2841 2839 2842 13 BACKSPACE( 11 ) 2840 READ( 11 , fmt='(A)') line2841 CALL parin_fail_message 2843 READ( 11 , '(A)') line 2844 CALL parin_fail_message( 'radiation_par', line ) 2842 2845 2843 2846 14 CONTINUE -
palm/trunk/SOURCE/spectra_mod.f90
r3246 r3248 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Minor formating changes 28 ! 29 ! 3246 2018-09-13 15:14:50Z sward 27 30 ! Added error handling for input namelist via parin_fail_message 28 31 ! … … 239 242 REWIND ( 11 ) 240 243 line = ' ' 241 DO 244 DO WHILE ( INDEX( line, '&spectra_parameters' ) == 0 ) 242 245 READ ( 11, '(A)', END=12 ) line 243 246 ENDDO … … 260 263 261 264 10 BACKSPACE( 11 ) 262 READ( 11 , fmt='(A)') line263 CALL parin_fail_message 265 READ( 11 , '(A)') line 266 CALL parin_fail_message( 'spectra_parameters', line ) 264 267 ! 265 268 !-- Try to find the old namelist 266 269 12 REWIND ( 11 ) 267 270 line = ' ' 268 DO 271 DO WHILE ( INDEX( line, '&spectra_par' ) == 0 ) 269 272 READ ( 11, '(A)', END=14 ) line 270 273 ENDDO … … 292 295 293 296 13 BACKSPACE( 11 ) 294 READ( 11 , fmt='(A)') line295 CALL parin_fail_message 297 READ( 11 , '(A)') line 298 CALL parin_fail_message( 'spectra_par', line ) 296 299 297 300 -
palm/trunk/SOURCE/synthetic_turbulence_generator_mod.f90
r3246 r3248 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Minor formating changes 28 ! 29 ! 3246 2018-09-13 15:14:50Z sward 27 30 ! Added error handling for input namelist via parin_fail_message 28 31 ! … … 985 988 986 989 10 BACKSPACE( 11 ) 987 READ( 11 , fmt='(A)') line988 CALL parin_fail_message 990 READ( 11 , '(A)') line 991 CALL parin_fail_message( 'stg_par', line ) 989 992 990 993 20 CONTINUE -
palm/trunk/SOURCE/urban_surface_mod.f90
r3246 r3248 28 28 ! ----------------- 29 29 ! $Id$ 30 ! Minor formating changes 31 ! 32 ! 3246 2018-09-13 15:14:50Z sward 30 33 ! Added error handling for input namelist via parin_fail_message 31 34 ! … … 5359 5362 REWIND ( 11 ) 5360 5363 line = ' ' 5361 DO 5364 DO WHILE ( INDEX( line, '&urban_surface_parameters' ) == 0 ) 5362 5365 READ ( 11, '(A)', END=12 ) line 5363 5366 ENDDO … … 5375 5378 5376 5379 10 BACKSPACE( 11 ) 5377 READ( 11 , fmt='(A)') line5378 CALL parin_fail_message 5380 READ( 11 , '(A)') line 5381 CALL parin_fail_message( 'urban_surface_parameters', line ) 5379 5382 ! 5380 5383 !-- Try to find old namelist 5381 5384 12 REWIND ( 11 ) 5382 5385 line = ' ' 5383 DO 5386 DO WHILE ( INDEX( line, '&urban_surface_par' ) == 0 ) 5384 5387 READ ( 11, '(A)', END=14 ) line 5385 5388 ENDDO … … 5402 5405 5403 5406 13 BACKSPACE( 11 ) 5404 READ( 11 , fmt='(A)') line5405 CALL parin_fail_message 5407 READ( 11 , '(A)') line 5408 CALL parin_fail_message( 'urban_surface_par', line ) 5406 5409 5407 5410 -
palm/trunk/SOURCE/user_parin.f90
r3246 r3248 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Minor formating changes 28 ! 29 ! 3246 2018-09-13 15:14:50Z sward 27 30 ! Added error handling for input namelist via parin_fail_message 28 31 ! … … 142 145 143 146 line = ' ' 144 DO 147 DO WHILE ( INDEX( line, '&user_parameters' ) == 0 ) 145 148 READ ( 11, '(A)', END=12 ) line 146 149 ENDDO … … 156 159 157 160 10 BACKSPACE( 11 ) 158 READ( 11 , fmt='(A)') line159 CALL parin_fail_message 161 READ( 11 , '(A)') line 162 CALL parin_fail_message( 'user_parameters', line ) 160 163 161 164 12 REWIND ( 11 ) 162 165 163 166 line = ' ' 164 DO 167 DO WHILE ( INDEX( line, '&userpar' ) == 0 ) 165 168 READ ( 11, '(A)', END=14 ) line 166 169 ENDDO … … 181 184 182 185 13 BACKSPACE( 11 ) 183 READ( 11 , fmt='(A)') line184 CALL parin_fail_message 185 186 14 CONTINUE186 READ( 11 , '(A)') line 187 CALL parin_fail_message( 'userpar', line ) 188 189 14 CONTINUE 187 190 188 191 ! … … 192 195 IF ( data_output_pr_user(1) /= ' ' ) THEN 193 196 i = 1 194 DO 197 DO WHILE ( data_output_pr(i) /= ' ' .AND. i <= 100 ) 195 198 i = i + 1 196 199 ENDDO 197 200 j = 1 198 DO 201 DO WHILE ( data_output_pr_user(j) /= ' ' .AND. j <= 100 ) 199 202 data_output_pr(i) = data_output_pr_user(j) 200 203 max_pr_user_tmp = max_pr_user_tmp + 1 -
palm/trunk/SOURCE/uv_exposure_model_mod.f90
r3246 r3248 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Minor formating changes 28 ! 29 ! 3246 2018-09-13 15:14:50Z sward 27 30 ! Added error handling for input namelist via parin_fail_message and small 28 31 ! typo bugfix … … 453 456 REWIND ( 11 ) 454 457 line = ' ' 455 DO 458 DO WHILE ( INDEX( line, '&biometeorology_parameters' ) == 0 ) 456 459 READ ( 11, '(A)', END=20 ) line 457 460 ENDDO … … 467 470 468 471 10 BACKSPACE( 11 ) 469 READ( 11 , fmt='(A)') line470 CALL parin_fail_message 472 READ( 11 , '(A)') line 473 CALL parin_fail_message( 'biometeorology_parameters', line ) 471 474 472 475 -
palm/trunk/SOURCE/virtual_flight_mod.f90
r3246 r3248 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Minor formating changes 28 ! 29 ! 3246 2018-09-13 15:14:50Z sward 27 30 ! Added error handling for input namelist via parin_fail_message 28 31 ! … … 252 255 REWIND ( 11 ) 253 256 line = ' ' 254 DO 257 DO WHILE ( INDEX( line, '&virtual_flight_parameters' ) == 0 ) 255 258 READ ( 11, '(A)', END=12 ) line 256 259 ENDDO … … 267 270 268 271 10 BACKSPACE( 11 ) 269 READ( 11 , fmt='(A)') line270 CALL parin_fail_message 272 READ( 11 , '(A)') line 273 CALL parin_fail_message( 'virtual_flight_parameters', line ) 271 274 ! 272 275 !-- Try to find the old namelist 273 276 12 REWIND ( 11 ) 274 277 line = ' ' 275 DO 278 DO WHILE ( INDEX( line, '&flight_par' ) == 0 ) 276 279 READ ( 11, '(A)', END=14 ) line 277 280 ENDDO … … 293 296 294 297 13 BACKSPACE( 11 ) 295 READ( 11 , fmt='(A)') line296 CALL parin_fail_message 298 READ( 11 , '(A)') line 299 CALL parin_fail_message( 'flight_par', line ) 297 300 298 301 14 CONTINUE -
palm/trunk/SOURCE/wind_turbine_model_mod.f90
r3246 r3248 26 26 ! ----------------- 27 27 ! $Id$ 28 ! Minor formating changes 29 ! 30 ! 3246 2018-09-13 15:14:50Z sward 28 31 ! Added error handling for input namelist via parin_fail_message 29 32 ! … … 537 540 REWIND ( 11 ) 538 541 line = ' ' 539 DO 542 DO WHILE ( INDEX( line, '&wind_turbine_parameters' ) == 0 ) 540 543 READ ( 11, '(A)', END=12 ) line 541 544 ENDDO … … 552 555 553 556 10 BACKSPACE( 11 ) 554 READ( 11 , fmt='(A)') line555 CALL parin_fail_message 557 READ( 11 , '(A)') line 558 CALL parin_fail_message( 'wind_turbine_parameters', line ) 556 559 557 560 ! … … 559 562 12 REWIND ( 11 ) 560 563 line = ' ' 561 DO 564 DO WHILE ( INDEX( line, '&wind_turbine_par' ) == 0 ) 562 565 READ ( 11, '(A)', END=14 ) line 563 566 ENDDO … … 580 583 581 584 13 BACKSPACE( 11 ) 582 READ( 11 , fmt='(A)') line583 CALL parin_fail_message 585 READ( 11 , '(A)') line 586 CALL parin_fail_message( 'wind_turbine_par', line ) 584 587 585 588 14 CONTINUE ! TBD Change from continue, mit ierrn machen
Note: See TracChangeset
for help on using the changeset viewer.
