Changeset 3582 for palm/trunk/SOURCE/advec_ws.f90
- Timestamp:
- Nov 29, 2018 7:16:36 PM (5 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE
- Property svn:mergeinfo changed
/palm/branches/salsa/SOURCE merged: 3493,3503-3504,3519,3566,3576
- Property svn:mergeinfo changed
-
palm/trunk/SOURCE/advec_ws.f90
r3551 r3582 20 20 ! Current revisions: 21 21 ! ------------------ 22 ! 22 ! Move the control parameter "salsa" from salsa_mod to control_parameters 23 ! (M. Kurppa) 23 24 ! 24 25 ! Former revisions: … … 317 318 USE control_parameters, & 318 319 ONLY: humidity, loop_optimization, passive_scalar, ocean_mode, & 319 rans_tke_e, ws_scheme_mom, ws_scheme_sca 320 rans_tke_e, ws_scheme_mom, ws_scheme_sca, salsa 320 321 321 322 USE indices, & … … 399 400 sums_wssas_ws_l = 0.0_wp 400 401 ENDIF 401 ! 402 !-- Mona: Now always allocated 403 ALLOCATE( sums_salsa_ws_l(nzb:nzt+1,0:threads_per_task-1) ) 404 sums_salsa_ws_l = 0.0_wp 402 403 IF ( salsa ) THEN 404 ALLOCATE( sums_salsa_ws_l(nzb:nzt+1,0:threads_per_task-1) ) 405 sums_salsa_ws_l = 0.0_wp 406 ENDIF 405 407 406 408 ENDIF … … 1115 1117 USE control_parameters, & 1116 1118 ONLY: humidity, passive_scalar, ocean_mode, ws_scheme_mom, & 1117 ws_scheme_sca 1119 ws_scheme_sca, salsa 1118 1120 1119 1121 USE kinds … … 1158 1160 ENDIF 1159 1161 IF ( ocean_mode ) sums_wssas_ws_l = 0.0_wp 1160 1161 sums_salsa_ws_l = 0.0_wp 1162 1163 1162 IF ( salsa ) sums_salsa_ws_l = 0.0_wp 1163 1164 1164 ENDIF 1165 1165
Note: See TracChangeset
for help on using the changeset viewer.