Ignore:
Timestamp:
Oct 12, 2018 3:17:09 PM (3 years ago)
Author:
kanani
Message:

reintegrate branch resler to trunk

Location:
palm/trunk/SOURCE
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE

  • palm/trunk/SOURCE/time_integration_spinup.f90

    • Property svn:mergeinfo set to (toggle deleted branches)
      /palm/branches/chemistry/SOURCE/time_integration_spinup.f902047-3190,​3218-3297
      /palm/branches/palm4u/SOURCE/time_integration_spinup.f902540-2692
      /palm/branches/rans/SOURCE/time_integration_spinup.f902078-3128
      /palm/branches/resler/SOURCE/time_integration_spinup.f902023-3336
      /palm/branches/forwind/SOURCE/time_integration_spinup.f901564-1913
      /palm/branches/fricke/SOURCE/time_integration_spinup.f90942-977
      /palm/branches/hoffmann/SOURCE/time_integration_spinup.f90989-1052
      /palm/branches/letzel/masked_output/SOURCE/time_integration_spinup.f90296-409
      /palm/branches/suehring/time_integration_spinup.f90423-666
    r3274 r3337  
    2525! -----------------
    2626! $Id$
     27! (from branch resler)
     28! Add pt1 initialization
     29!
     30! 3274 2018-09-24 15:42:55Z knoop
    2731! Modularization of all bulk cloud physics code components
    2832!
     
    295299                k   = surf_usm_h%k(m)
    296300                pt(k,j,i) = pt_spinup
     301                !!!!!!!!!!!!!!!!HACK!!!!!!!!!!!!!
     302                surf_usm_h%pt1 = pt_spinup
     303                !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    297304             ENDDO
    298305
     
    303310                   k   = surf_usm_v(l)%k(m)
    304311                   pt(k,j,i) = pt_spinup
     312                   !!!!!!!!!!!!!!!!HACK!!!!!!!!!!!!!
     313                   surf_usm_v(l)%pt1 = pt_spinup
     314                   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    305315                ENDDO
    306316             ENDDO
Note: See TracChangeset for help on using the changeset viewer.