Changeset 3337 for palm/trunk/SOURCE/time_integration_spinup.f90
- Timestamp:
- Oct 12, 2018 3:17:09 PM (6 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE
- Property svn:mergeinfo changed
/palm/branches/resler/SOURCE (added) merged: 2136-2138,2324-2325,2655,2679,2684,2694-2695,2783-2786,2810,2985,3000,3015,3017,3060-3061,3063,3154,3317,3319-3321,3323,3335-3336
- Property svn:mergeinfo changed
-
palm/trunk/SOURCE/time_integration_spinup.f90
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/palm/branches/chemistry/SOURCE/time_integration_spinup.f90 2047-3190,3218-3297 /palm/branches/palm4u/SOURCE/time_integration_spinup.f90 2540-2692 /palm/branches/rans/SOURCE/time_integration_spinup.f90 2078-3128 /palm/branches/resler/SOURCE/time_integration_spinup.f90 2023-3336 /palm/branches/forwind/SOURCE/time_integration_spinup.f90 1564-1913 /palm/branches/fricke/SOURCE/time_integration_spinup.f90 942-977 /palm/branches/hoffmann/SOURCE/time_integration_spinup.f90 989-1052 /palm/branches/letzel/masked_output/SOURCE/time_integration_spinup.f90 296-409 /palm/branches/suehring/time_integration_spinup.f90 423-666
r3274 r3337 25 25 ! ----------------- 26 26 ! $Id$ 27 ! (from branch resler) 28 ! Add pt1 initialization 29 ! 30 ! 3274 2018-09-24 15:42:55Z knoop 27 31 ! Modularization of all bulk cloud physics code components 28 32 ! … … 295 299 k = surf_usm_h%k(m) 296 300 pt(k,j,i) = pt_spinup 301 !!!!!!!!!!!!!!!!HACK!!!!!!!!!!!!! 302 surf_usm_h%pt1 = pt_spinup 303 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 297 304 ENDDO 298 305 … … 303 310 k = surf_usm_v(l)%k(m) 304 311 pt(k,j,i) = pt_spinup 312 !!!!!!!!!!!!!!!!HACK!!!!!!!!!!!!! 313 surf_usm_v(l)%pt1 = pt_spinup 314 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 305 315 ENDDO 306 316 ENDDO -
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.