Changeset 3232 for palm/trunk
- Timestamp:
- Sep 7, 2018 12:21:44 PM (6 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 7 edited
-
check_parameters.f90 (modified) (2 diffs)
-
header.f90 (modified) (1 diff)
-
init_coupling.f90 (modified) (2 diffs)
-
modules.f90 (modified) (6 diffs)
-
palm.f90 (modified) (4 diffs)
-
progress_bar_mod.f90 (modified) (1 diff)
-
vertical_nesting_mod.f90 (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/check_parameters.f90
r3183 r3232 25 25 ! ----------------- 26 26 ! $Id: check_parameters.f90 2520 2017-10-05 13:50:26Z gronemeier & 27 ! references to mrun replaced by palmrun, and updated 28 ! 29 ! 2520 2017-10-05 13:50:26Z gronemeier 27 30 ! Rename boundary conditions in offline nesting 28 31 ! … … 1174 1177 ! 1175 1178 !-- Check whether an (uncoupled) atmospheric run has been declared as an 1176 !-- ocean run (this setting is done via mrun-option -y)1179 !-- ocean run (this setting is done via palmrun-option -y) 1177 1180 message_string = 'ocean = .F. does not allow coupling_char = "' // & 1178 1181 TRIM( coupling_char ) // '" set by palmrun-option "-y"' -
palm/trunk/SOURCE/header.f90
r3225 r3232 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! Increase printed length of run identifier22 ! 23 23 ! 24 24 ! Former revisions: 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Increase printed length of run identifier 28 ! 29 ! 3225 2018-08-30 16:33:14Z kanani 27 30 ! Increase printed length of run identifier 28 31 ! -
palm/trunk/SOURCE/init_coupling.f90
r2718 r3232 25 25 ! ------------------ 26 26 ! $Id$ 27 ! references to mrun replaced by palmrun, and updated 28 ! 29 ! 2718 2018-01-02 08:49:38Z maronga 27 30 ! Corrected "Former revisions" section 28 31 ! … … 147 150 ! 148 151 !-- Split the total available PE's into two groups 149 !-- numprocs for Coarse and Fine Grid are specified via mrun argument -N 152 !-- numprocs for coarse and fine grid are read from stdin (see above, and 153 !-- execution command in the palmrun script, numprocs are provided via 154 !-- palmrun option -Y) 150 155 IF ( myid < bc_data(1) ) THEN 151 156 inter_color = 0 -
palm/trunk/SOURCE/modules.f90
r3198 r3232 25 25 ! ----------------- 26 26 ! $Id$ 27 ! references to mrun replaced by palmrun, and updated 28 ! 29 ! 3198 2018-08-15 09:23:10Z sward 27 30 ! Added multi_agent_system_end and multi_agent_system_start 28 31 ! … … 1139 1142 CHARACTER (LEN=20) :: turbulence_closure = 'Moeng_Wyngaard' !< namelist parameter 1140 1143 CHARACTER (LEN=40) :: topography = 'flat' !< namelist parameter 1141 CHARACTER (LEN=64) :: host = '????' !< hostname on which PALM is running, ENVPAR namelist parameter provided bymrun1144 CHARACTER (LEN=64) :: host = '????' !< configuration identifier as given by palmrun option -c, ENVPAR namelist parameter provided by palmrun 1142 1145 CHARACTER (LEN=80) :: log_message !< user-defined message for debugging (sse data_log.f90) 1143 CHARACTER (LEN=80) :: run_identifier !< run identifier as given by mrun option -d, ENVPAR namelist parameter provided bymrun1146 CHARACTER (LEN=80) :: run_identifier !< run identifier as given by palmrun option -r, ENVPAR namelist parameter provided by palmrun 1144 1147 CHARACTER (LEN=100) :: initializing_actions = ' ' !< namelist parameter 1145 1148 CHARACTER (LEN=100) :: restart_string = ' ' !< for storing strings in case of writing/reading restart data … … 1210 1213 INTEGER(iwp) :: masks = 0 !< counter for number of masked output quantities 1211 1214 INTEGER(iwp) :: maximum_grid_level !< number of grid levels that the multigrid solver is using 1212 INTEGER(iwp) :: maximum_parallel_io_streams = -1 !< maximum number of parallel io streams that the underlying parallel file system allows, set with mrun option -w, ENVPAR namelist parameter, provided bymrun1215 INTEGER(iwp) :: maximum_parallel_io_streams = -1 !< maximum number of parallel io streams that the underlying parallel file system allows, set with palmrun option -w, ENVPAR namelist parameter, provided by palmrun 1213 1216 INTEGER(iwp) :: max_pr_user = 0 !< number of user-defined profiles (must not change within a job chain) 1214 1217 INTEGER(iwp) :: mgcycles = 0 !< number of multigrid cycles that the multigrid solver has actually carried out … … 1360 1363 LOGICAL :: rans_tke_e = .FALSE. !< use TKE-e turbulence closure for RANS mode 1361 1364 LOGICAL :: rans_tke_l = .FALSE. !< use TKE-l turbulence closure for RANS mode 1362 LOGICAL :: read_svf = .FALSE. !< ENVPAR namelist parameter to steer input of svf (ENVPAR is created by palmrun)1365 LOGICAL :: read_svf = .FALSE. !< ENVPAR namelist parameter to steer input of svf (ENVPAR is provided by palmrun) 1363 1366 LOGICAL :: recycling_yshift = .FALSE. !< namelist parameter 1364 1367 LOGICAL :: run_control_header = .FALSE. !< onetime output of RUN_CONTROL header … … 1391 1394 LOGICAL :: wall_adjustment = .TRUE. !< namelist parameter 1392 1395 LOGICAL :: wind_turbine = .FALSE. !< flag for use of wind turbine model 1393 LOGICAL :: write_binary = .FALSE. !< ENVPAR namelist parameter to steer restart I/O (ENVPAR is created by palmrun)1394 LOGICAL :: write_svf = .FALSE. !< ENVPAR namelist parameter to steer output of svf (ENVPAR is created by palmrun)1396 LOGICAL :: write_binary = .FALSE. !< ENVPAR namelist parameter to steer restart I/O (ENVPAR is provided by palmrun) 1397 LOGICAL :: write_svf = .FALSE. !< ENVPAR namelist parameter to steer output of svf (ENVPAR is provided by palmrun) 1395 1398 LOGICAL :: ws_scheme_sca = .FALSE. !< use Wicker-Skamarock scheme (scalar advection)? 1396 1399 LOGICAL :: ws_scheme_mom = .FALSE. !< use Wicker-Skamarock scheme (momentum advection)? … … 1672 1675 LOGICAL :: dvrp_overlap !< internal dvr software variable 1673 1676 LOGICAL :: dvrp_total_overlap !< internal dvr software variable 1674 LOGICAL :: local_dvrserver_running !< namelist parameter (ENVPAR namelist provided by mrun)1677 LOGICAL :: local_dvrserver_running !< namelist parameter (ENVPAR namelist provided by palmrun) 1675 1678 LOGICAL :: lock_steering_update = .FALSE. !< internal dvr software variable 1676 1679 LOGICAL :: use_seperate_pe_for_dvrp_output = .FALSE. !< internal dvr software variable -
palm/trunk/SOURCE/palm.f90
r3182 r3232 25 25 ! ----------------- 26 26 ! $Id$ 27 ! references to mrun replaced by palmrun, and updated 28 ! 29 ! 3182 2018-07-27 13:36:03Z suehring 27 30 ! Deduct spinup_time from RUN_CONTROL output of main 3d run 28 31 ! (use time_since_reference_point instead of simulated_time) … … 215 218 ! Description: 216 219 ! ------------ 217 !> Large-Eddy Simulation (LES) model for the convective boundary layer, 218 !> optimized for use on parallel machines (implementation realized using the 219 !> Message Passing Interface (MPI)). The model can also be run on vector machines 220 !> (less well optimized) and workstations. Versions for the different types of 221 !> machines are controlled via cpp-directives. 222 !> Model runs are only feasible using the ksh-script mrun. 220 !> Large-Eddy Simulation (LES) model for atmospheric and oceanic boundary-layer 221 !> flows 222 !> see the PALM homepage https://palm-model.org for further information 223 223 !> 224 !> @todo create routine last_actions instead of calling lsm_last_actions etc.225 224 !> @todo move chem_init call to init_3d_model or to check_parameters 226 225 !------------------------------------------------------------------------------! … … 428 427 CALL pmci_parent_initialize 429 428 ! 430 !-- Exchange_horiz is needed after the nest initialization429 !-- Exchange_horiz is needed after the nest initialization 431 430 IF ( child_domain ) THEN 432 431 CALL exchange_horiz( u, nbgp ) … … 545 544 546 545 ! 547 !-- Write run number to file (used by mrun to create unified cycle numbers for548 !-- output files546 !-- Write run number to file (used by palmrun to create unified cycle numbers 547 !-- for output files 549 548 IF ( myid == 0 .AND. runnr > 0 ) THEN 550 549 OPEN( 90, FILE='RUN_NUMBER', FORM='FORMATTED' ) -
palm/trunk/SOURCE/progress_bar_mod.f90
r3225 r3232 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! Increase printed length of run identifier, 23 ! bugfix for restarts 22 ! 24 23 ! 25 24 ! Former revisions: 26 25 ! ----------------- 27 26 ! $Id$ 27 ! Increase printed length of run identifier, 28 ! bugfix for restarts 29 ! 30 ! 3225 2018-08-30 16:33:14Z kanani 28 31 ! Increase printed length of run identifier, 29 32 ! bugfix for restarts -
palm/trunk/SOURCE/vertical_nesting_mod.f90
r3083 r3232 26 26 ! ----------------- 27 27 ! $Id$ 28 ! references to mrun replaced by palmrun, and updated 29 ! 30 ! 3083 2018-06-19 14:03:12Z gronemeier 28 31 ! Error messages revised 29 32 ! … … 96 99 IMPLICIT NONE 97 100 98 LOGICAL :: vnested = .FALSE. !> set to true when99 !> mrun is called with -N option101 LOGICAL :: vnested = .FALSE. !> set to true if palmrun 102 !> provides specific information via stdin 100 103 LOGICAL :: vnest_init = .FALSE. !> set to true when FG is initialized 101 104 REAL(wp) :: vnest_start_time = 9999999.9 !> simulated time when FG should be … … 107 110 INTEGER(iwp),DIMENSION(3,2) :: bdims = 0 !> sub-domain grid topology of current PE 108 111 INTEGER(iwp),DIMENSION(3,2) :: bdims_rem = 0 !> sub-domain grid topology of partner PE 109 INTEGER(iwp) :: cg_nprocs !> no. of PE in CG. Set by mrun -N110 INTEGER(iwp) :: fg_nprocs !> no. of PE in FG. Set by mrun -N112 INTEGER(iwp) :: cg_nprocs !> no. of PE in CG. Set by palmrun -Y 113 INTEGER(iwp) :: fg_nprocs !> no. of PE in FG. Set by palmrun -Y 111 114 INTEGER(iwp) :: TYPE_VNEST_BC !> derived contiguous data type for interpolation 112 115 INTEGER(iwp) :: TYPE_VNEST_ANTER !> derived contiguous data type for anterpolation
Note: See TracChangeset
for help on using the changeset viewer.
