Changeset 2669 for palm/trunk/SOURCE
- Timestamp:
- Dec 6, 2017 4:03:27 PM (7 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/check_open.f90
r2516 r2669 25 25 ! ----------------- 26 26 ! $Id$ 27 ! file name extension for masked data files is changed to "_M##" and is now 28 ! appended at the end of the filename, 29 ! file ids not used any more have been removed 30 ! 31 ! 2516 2017-10-04 11:03:04Z suehring 27 32 ! Remove tabs 28 33 ! … … 184 189 IMPLICIT NONE 185 190 186 CHARACTER (LEN= 2) :: mask_char !<191 CHARACTER (LEN=4) :: mask_char !< 187 192 CHARACTER (LEN=2) :: suffix !< 188 193 CHARACTER (LEN=30) :: filename !< … … 209 214 IF ( openfile(file_id)%opened_before ) THEN 210 215 SELECT CASE ( file_id ) 211 CASE ( 13, 14, 21, 22, 23, 80 :85, 117 )216 CASE ( 13, 14, 21, 22, 23, 80, 85, 117 ) 212 217 IF ( file_id == 14 .AND. openfile(file_id)%opened_before ) THEN 213 218 message_string = 're-open of unit ' // & … … 230 235 SELECT CASE ( file_id ) 231 236 232 CASE ( 15, 16, 17, 18, 19, 50:59, 81:84,104:105, 107, 109, 117 )237 CASE ( 15, 16, 17, 18, 19, 50:59, 104:105, 107, 109, 117 ) 233 238 234 239 IF ( myid /= 0 ) THEN … … 260 265 ENDIF 261 266 262 CASE ( 27, 28, 29, 31, 33, 71:73,90:99 )267 CASE ( 90:99 ) 263 268 264 269 ! … … 479 484 ENDIF 480 485 481 CASE ( 81 )482 483 OPEN ( 81, FILE='PLOTSP_X_PAR'//TRIM( coupling_char ), &484 FORM='FORMATTED', DELIM='APOSTROPHE', RECL=1500, &485 POSITION='APPEND' )486 487 CASE ( 82 )488 489 OPEN ( 82, FILE='PLOTSP_X_DATA'//TRIM( coupling_char ), &490 FORM='FORMATTED', POSITION = 'APPEND' )491 492 CASE ( 83 )493 494 OPEN ( 83, FILE='PLOTSP_Y_PAR'//TRIM( coupling_char ), &495 FORM='FORMATTED', DELIM='APOSTROPHE', RECL=1500, &496 POSITION='APPEND' )497 498 CASE ( 84 )499 500 OPEN ( 84, FILE='PLOTSP_Y_DATA'//TRIM( coupling_char ), &501 FORM='FORMATTED', POSITION='APPEND' )502 503 486 CASE ( 85 ) 504 487 … … 1078 1061 IF ( file_id <= 200+max_masks ) THEN 1079 1062 mid = file_id - 200 1080 WRITE ( mask_char,'( I2.2)')mid1081 filename = 'DATA_MASK_ ' // mask_char // '_NETCDF' //&1082 TRIM( coupling_char )1063 WRITE ( mask_char,'(A2,I2.2)') '_M', mid 1064 filename = 'DATA_MASK_NETCDF' // TRIM( coupling_char ) // & 1065 mask_char 1083 1066 av = 0 1084 1067 ELSE 1085 1068 mid = file_id - (200+max_masks) 1086 WRITE ( mask_char,'( I2.2)')mid1087 filename = 'DATA_MASK_ ' // mask_char // '_AV_NETCDF' //&1088 TRIM( coupling_char )1069 WRITE ( mask_char,'(A2,I2.2)') '_M', mid 1070 filename = 'DATA_MASK_AV_NETCDF' // TRIM( coupling_char ) // & 1071 mask_char 1089 1072 av = 1 1090 1073 ENDIF -
palm/trunk/SOURCE/check_parameters.f90
r2628 r2669 25 25 ! ----------------- 26 26 ! $Id$ 27 ! mrun-string replaced by palmrun 28 ! 29 ! 2628 2017-11-20 12:40:38Z schwenkel 27 30 ! Enabled particle advection with grid stretching -> Removed parameter check 28 31 ! … … 1022 1025 !-- ocean run (this setting is done via mrun-option -y) 1023 1026 message_string = 'ocean = .F. does not allow coupling_char = "' // & 1024 TRIM( coupling_char ) // '" set by mrun-option "-y"'1027 TRIM( coupling_char ) // '" set by palmrun-option "-y"' 1025 1028 CALL message( 'check_parameters', 'PA0317', 1, 2, 0, 6, 0 ) 1026 1029 -
palm/trunk/SOURCE/init_coupling.f90
r2365 r2669 25 25 ! ------------------ 26 26 ! $Id$ 27 ! file extension for vertical nesting changed to "_NV" 28 ! 29 ! 2365 2017-08-21 14:59:59Z kanani 27 30 ! Vertical nesting implemented (SadiqHuq) 28 31 ! … … 192 195 ! 193 196 !-- Set file extension for vertical nesting 194 coupling_char = '_N '197 coupling_char = '_NV' 195 198 ENDIF 196 199 -
palm/trunk/SOURCE/modules.f90
r2575 r2669 25 25 ! ----------------- 26 26 ! $Id$ 27 ! CONTIGUOUS-attribut added to 3d pointer arrays, 28 ! coupling_char extended to LEN=8 29 ! 30 ! 2575 2017-10-24 09:57:58Z maronga 27 31 ! Renamed phi -> latitude, moved longitude from radiation model to modules 28 32 ! … … 776 780 REAL(wp), DIMENSION(:,:,:), ALLOCATABLE, TARGET :: w_3 !< pointer for swapping of timelevels for respective quantity 777 781 778 REAL(wp), DIMENSION(:,:,:), POINTER :: e !< pointer: subgrid-scale turbulence kinetic energy (sgs tke)779 REAL(wp), DIMENSION(:,:,:), POINTER :: e_p !< pointer: prognostic value of sgs tke780 REAL(wp), DIMENSION(:,:,:), POINTER :: nc !< pointer: cloud drop number density781 REAL(wp), DIMENSION(:,:,:), POINTER :: nc_p !< pointer: prognostic value of cloud drop number density782 REAL(wp), DIMENSION(:,:,:), POINTER :: nr !< pointer: rain drop number density783 REAL(wp), DIMENSION(:,:,:), POINTER :: nr_p !< pointer: prognostic value of rain drop number density784 REAL(wp), DIMENSION(:,:,:), POINTER :: prho !< pointer: potential density785 REAL(wp), DIMENSION(:,:,:), POINTER :: pt !< pointer: potential temperature786 REAL(wp), DIMENSION(:,:,:), POINTER :: pt_p !< pointer: prognostic value of potential temperature787 REAL(wp), DIMENSION(:,:,:), POINTER :: q !< pointer: specific humidity788 REAL(wp), DIMENSION(:,:,:), POINTER :: q_p !< pointer: prognostic value of specific humidity789 REAL(wp), DIMENSION(:,:,:), POINTER :: qc !< pointer: cloud water content790 REAL(wp), DIMENSION(:,:,:), POINTER :: qc_p !< pointer: cloud water content791 REAL(wp), DIMENSION(:,:,:), POINTER :: ql !< pointer: liquid water content792 REAL(wp), DIMENSION(:,:,:), POINTER :: ql_c !< pointer: change in liquid water content due to793 !< condensation/evaporation during last time step794 REAL(wp), DIMENSION(:,:,:), POINTER :: qr !< pointer: rain water content795 REAL(wp), DIMENSION(:,:,:), POINTER :: qr_p !< pointer: prognostic value of rain water content796 REAL(wp), DIMENSION(:,:,:), POINTER :: rho_ocean !< pointer: density of ocean797 REAL(wp), DIMENSION(:,:,:), POINTER :: s !< pointer: passive scalar798 REAL(wp), DIMENSION(:,:,:), POINTER :: s_p !< pointer: prognostic value of passive scalar799 REAL(wp), DIMENSION(:,:,:), POINTER :: sa !< pointer: ocean salinity800 REAL(wp), DIMENSION(:,:,:), POINTER :: sa_p !< pointer: prognostic value of ocean salinity801 REAL(wp), DIMENSION(:,:,:), POINTER :: te_m !< pointer: weighted tendency of e for previous sub-timestep (Runge-Kutta)802 REAL(wp), DIMENSION(:,:,:), POINTER :: tnc_m !< pointer: weighted tendency of nc for previous sub-timestep (Runge-Kutta)803 REAL(wp), DIMENSION(:,:,:), POINTER :: tnr_m !< pointer: weighted tendency of nr for previous sub-timestep (Runge-Kutta)804 REAL(wp), DIMENSION(:,:,:), POINTER :: tpt_m !< pointer: weighted tendency of pt for previous sub-timestep (Runge-Kutta)805 REAL(wp), DIMENSION(:,:,:), POINTER :: tq_m !< pointer: weighted tendency of q for previous sub-timestep (Runge-Kutta)806 REAL(wp), DIMENSION(:,:,:), POINTER :: tqc_m !< pointer: weighted tendency of qc for previous sub-timestep (Runge-Kutta)807 REAL(wp), DIMENSION(:,:,:), POINTER :: tqr_m !< pointer: weighted tendency of qr for previous sub-timestep (Runge-Kutta)808 REAL(wp), DIMENSION(:,:,:), POINTER :: ts_m !< pointer: weighted tendency of s for previous sub-timestep (Runge-Kutta)809 REAL(wp), DIMENSION(:,:,:), POINTER :: tsa_m !< pointer: weighted tendency of sa for previous sub-timestep (Runge-Kutta)810 REAL(wp), DIMENSION(:,:,:), POINTER :: tu_m !< pointer: weighted tendency of u for previous sub-timestep (Runge-Kutta)811 REAL(wp), DIMENSION(:,:,:), POINTER :: tv_m !< pointer: weighted tendency of v for previous sub-timestep (Runge-Kutta)812 REAL(wp), DIMENSION(:,:,:), POINTER :: tw_m !< pointer: weighted tendency of w for previous sub-timestep (Runge-Kutta)813 REAL(wp), DIMENSION(:,:,:), POINTER :: u !< pointer: horizontal velocity component u (x-direction)814 REAL(wp), DIMENSION(:,:,:), POINTER :: u_p !< pointer: prognostic value of u815 REAL(wp), DIMENSION(:,:,:), POINTER :: v !< pointer: horizontal velocity component v (y-direction)816 REAL(wp), DIMENSION(:,:,:), POINTER :: v_p !< pointer: prognostic value of v817 REAL(wp), DIMENSION(:,:,:), POINTER :: vpt !< pointer: virtual potential temperature818 REAL(wp), DIMENSION(:,:,:), POINTER :: w !< pointer: vertical velocity component w (z-direction)819 REAL(wp), DIMENSION(:,:,:), POINTER :: w_p !< pointer: prognostic value of w782 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: e !< pointer: subgrid-scale turbulence kinetic energy (sgs tke) 783 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: e_p !< pointer: prognostic value of sgs tke 784 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: nc !< pointer: cloud drop number density 785 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: nc_p !< pointer: prognostic value of cloud drop number density 786 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: nr !< pointer: rain drop number density 787 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: nr_p !< pointer: prognostic value of rain drop number density 788 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: prho !< pointer: potential density 789 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: pt !< pointer: potential temperature 790 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: pt_p !< pointer: prognostic value of potential temperature 791 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: q !< pointer: specific humidity 792 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: q_p !< pointer: prognostic value of specific humidity 793 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: qc !< pointer: cloud water content 794 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: qc_p !< pointer: cloud water content 795 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: ql !< pointer: liquid water content 796 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: ql_c !< pointer: change in liquid water content due to 797 !< condensation/evaporation during last time step 798 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: qr !< pointer: rain water content 799 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: qr_p !< pointer: prognostic value of rain water content 800 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: rho_ocean !< pointer: density of ocean 801 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: s !< pointer: passive scalar 802 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: s_p !< pointer: prognostic value of passive scalar 803 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: sa !< pointer: ocean salinity 804 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: sa_p !< pointer: prognostic value of ocean salinity 805 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: te_m !< pointer: weighted tendency of e for previous sub-timestep (Runge-Kutta) 806 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: tnc_m !< pointer: weighted tendency of nc for previous sub-timestep (Runge-Kutta) 807 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: tnr_m !< pointer: weighted tendency of nr for previous sub-timestep (Runge-Kutta) 808 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: tpt_m !< pointer: weighted tendency of pt for previous sub-timestep (Runge-Kutta) 809 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: tq_m !< pointer: weighted tendency of q for previous sub-timestep (Runge-Kutta) 810 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: tqc_m !< pointer: weighted tendency of qc for previous sub-timestep (Runge-Kutta) 811 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: tqr_m !< pointer: weighted tendency of qr for previous sub-timestep (Runge-Kutta) 812 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: ts_m !< pointer: weighted tendency of s for previous sub-timestep (Runge-Kutta) 813 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: tsa_m !< pointer: weighted tendency of sa for previous sub-timestep (Runge-Kutta) 814 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: tu_m !< pointer: weighted tendency of u for previous sub-timestep (Runge-Kutta) 815 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: tv_m !< pointer: weighted tendency of v for previous sub-timestep (Runge-Kutta) 816 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: tw_m !< pointer: weighted tendency of w for previous sub-timestep (Runge-Kutta) 817 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: u !< pointer: horizontal velocity component u (x-direction) 818 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: u_p !< pointer: prognostic value of u 819 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: v !< pointer: horizontal velocity component v (y-direction) 820 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: v_p !< pointer: prognostic value of v 821 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: vpt !< pointer: virtual potential temperature 822 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: w !< pointer: vertical velocity component w (z-direction) 823 REAL(wp), DIMENSION(:,:,:), POINTER, CONTIGUOUS :: w_p !< pointer: prognostic value of w 820 824 #endif 821 825 … … 971 975 CHARACTER (LEN=1) :: cycle_mg = 'w' !< namelist parameter (see documentation) 972 976 CHARACTER (LEN=1) :: timestep_reason = ' ' !< 'A'dvection or 'D'iffusion criterion, written to RUN_CONTROL file 973 CHARACTER (LEN=3) :: coupling_char = '' !< appended to filenames in coupled ocean-atmosphere runs ('_O': ocean PE, '_A': atmosphere PE) 977 CHARACTER (LEN=8) :: coupling_char = '' !< appended to filenames in coupled or nested runs ('_O': ocean PE, 978 !< '_NV': vertically nested atmosphere PE, '_N##': PE of nested domain ## 974 979 CHARACTER (LEN=8) :: most_method = 'newton' !< namelist parameter 975 980 CHARACTER (LEN=8) :: run_date !< date of simulation run, printed to HEADER file -
palm/trunk/SOURCE/plant_canopy_model_mod.f90
r2512 r2669 25 25 ! ----------------- 26 26 ! $Id$ 27 ! coupling_char removed 28 ! 29 ! 2512 2017-10-04 08:26:59Z raasch 27 30 ! upper bounds of 3d output changed from nx+1,ny+1 to nx,ny 28 31 ! no output of ghost layer data … … 564 567 565 568 USE control_parameters, & 566 ONLY: coupling_char, dz, humidity, io_blocks, io_group,&567 message_string, ocean,passive_scalar, urban_surface569 ONLY: dz, humidity, io_blocks, io_group, message_string, ocean, & 570 passive_scalar, urban_surface 568 571 569 572 USE surface_mod, & -
palm/trunk/SOURCE/pmc_interface_mod.f90
r2663 r2669 26 26 ! ----------------- 27 27 ! $Id$ 28 ! file extension for nested domains changed to "_N##", 29 ! created flag file in order to enable combine_plot_fields to process nest data 30 ! 31 ! 2663 2017-12-04 17:40:50Z suehring 28 32 ! Bugfix, wrong coarse-grid index in init_tkefactor used. 29 33 ! … … 561 565 IF ( cpl_id >= 2 ) THEN 562 566 nest_domain = .TRUE. 563 WRITE( coupling_char, '(A 1,I2.2)') '_', cpl_id567 WRITE( coupling_char, '(A2,I2.2)') '_N', cpl_id 564 568 ENDIF 565 569 … … 591 595 IMPLICIT NONE 592 596 597 INTEGER(iwp) :: ncpl !< number of nest domains 598 593 599 CALL location_message( 'setup the nested model configuration', .FALSE. ) 594 600 ! … … 605 611 !-- (e.g., all children have to follow the end_time settings of the root master) 606 612 CALL pmci_check_setting_mismatches 613 ! 614 !-- Set flag file for combine_plot_fields for precessing the nest output data 615 OPEN( 90, FILE='3DNESTING', FORM='FORMATTED' ) 616 CALL pmc_get_model_info( ncpl = ncpl ) 617 WRITE( 90, '(I2)' ) ncpl 618 CLOSE( 90 ) 607 619 608 620 CALL location_message( 'finished', .TRUE. ) -
palm/trunk/SOURCE/synthetic_turbulence_generator_mod.f90
r2576 r2669 25 25 ! ----------------- 26 26 ! $Id$ 27 ! unit number for file containing turbulence generator data changed to 90 28 ! bugfix: preprocessor directives added for MPI specific code 29 ! 30 ! 2576 2017-10-24 13:49:46Z Giersch 27 31 ! Definition of a new function called stg_skip_var_list to skip module 28 32 ! parameters during reading restart data … … 312 316 IMPLICIT NONE 313 317 318 #if defined( __parallel ) 314 319 INTEGER(KIND=MPI_ADDRESS_KIND) :: extent !< extent of new MPI type 315 320 INTEGER(KIND=MPI_ADDRESS_KIND) :: tob=0 !< dummy variable 321 #endif 316 322 317 323 INTEGER(iwp) :: j !> loop index … … 362 368 tu(nzb:nzt+1), tv(nzb:nzt+1), tw(nzb:nzt+1) ) 363 369 370 #if defined( __parallel ) 364 371 ! 365 372 !-- Define MPI type used in stg_generate_seed_yz to gather vertical splitted … … 391 398 displs(j) = 0 + (nzt_x-nzb_x+1) * (j-1) 392 399 ENDDO 400 #endif 393 401 394 402 ! … … 408 416 !-- zw: lwy, lwz, tw, r31, r32, r33, d3 409 417 !-- WARNING: zz is not used at the moment 410 OPEN( 24, FILE='STG_PROFILES'//TRIM( coupling_char ), STATUS='OLD', &418 OPEN( 90, FILE='STG_PROFILES'//TRIM( coupling_char ), STATUS='OLD', & 411 419 FORM='FORMATTED') 412 420 413 421 ! Skip header 414 READ( 24, * )422 READ( 90, * ) 415 423 416 424 DO k = nzb, nzt+1 417 READ( 24, * ) zz, luy, luz, tu(k), lvy, lvz, tv(k), lwy, lwz, tw(k), &425 READ( 90, * ) zz, luy, luz, tu(k), lvy, lvz, tv(k), lwy, lwz, tw(k), & 418 426 r11(k), r21(k), r22(k), r31(k), r32(k), r33(k), & 419 427 d1, d2, d3, d5 … … 438 446 ENDDO 439 447 440 CLOSE( 24)448 CLOSE( 90 ) 441 449 442 450 ! -
palm/trunk/SOURCE/wind_turbine_model_mod.f90
r2576 r2669 26 26 ! ----------------- 27 27 ! $Id$ 28 ! filename of turbine output changed to WTM_OUTPUT_DATA. File extension now 29 ! includes the nest domain number. Turbine extension changed to "_T##" 30 ! 31 ! 2576 2017-10-24 13:49:46Z Giersch 28 32 ! Definition of a new function called wtm_skip_var_list to skip module 29 33 ! parameters during reading restart data … … 113 117 114 118 USE control_parameters, & 115 ONLY: dt_3d, dz, message_string, simulated_time, wind_turbine, &116 initializing_actions119 ONLY: coupling_char, dt_3d, dz, message_string, simulated_time, & 120 wind_turbine, initializing_actions 117 121 118 122 USE cpulog, & … … 1556 1560 IMPLICIT NONE 1557 1561 1558 CHARACTER (LEN= 2) :: turbine_id1562 CHARACTER (LEN=4) :: turbine_id 1559 1563 1560 1564 INTEGER(iwp) :: i, j, k !< loop indices … … 2367 2371 ELSE 2368 2372 2369 WRITE ( turbine_id,'(I2.2)') inot 2370 OPEN ( 400+inot, FILE=( 'TURBINE_PARAMETERS'//turbine_id ), & 2371 FORM='FORMATTED' ) 2373 WRITE ( turbine_id,'(A2,I2.2)') '_T', inot 2374 OPEN ( 400+inot, FILE=( 'WTM_OUTPUT_DATA' // & 2375 TRIM( coupling_char ) // & 2376 turbine_id ), FORM='FORMATTED' ) 2372 2377 WRITE ( 400+inot, 105 ) inot 2373 2378 WRITE ( 400+inot, 106 ) simulated_time, omega_rot(inot), &
Note: See TracChangeset
for help on using the changeset viewer.