Changeset 3608 for palm/trunk
- Timestamp:
- Dec 7, 2018 12:59:57 PM (6 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/init_3d_model.f90
- Property svn:mergeinfo changed
/palm/branches/resler/SOURCE/init_3d_model.f90 (added) merged: 2136-2138,2684,2783,2785,2985,3000,3015,3060-3061,3317,3366,3407,3438,3450,3466,3478,3578,3604
r3589 r3608 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Bugfix in initialization of surfaces in cyclic-fill case 28 ! 29 ! 3589 2018-11-30 15:09:51Z suehring 27 30 ! Move the control parameter "salsa" from salsa_mod to control_parameters 28 31 ! (M. Kurppa) … … 1604 1607 .FALSE. ) 1605 1608 ! 1606 !-- Initialize surface elements and its attributes, e.g. heat- and1607 !-- momentumfluxes, roughness, scaling parameters. As number of surface1608 !-- elements might be different between runs, e.g. in case of cyclic fill,1609 !-- and not all surface elements are read, surface elements need to be1610 !-- initialized before.1611 CALL init_surfaces1612 !1613 1609 !-- When reading data for cyclic fill of 3D prerun data files, read 1614 1610 !-- some of the global variables from the restart file which are required … … 1637 1633 #endif 1638 1634 ENDDO 1635 ! 1636 !-- Initialize surface elements and its attributes, e.g. heat- and 1637 !-- momentumfluxes, roughness, scaling parameters. As number of surface 1638 !-- elements might be different between runs, e.g. in case of cyclic fill, 1639 !-- and not all surface elements are read, surface elements need to be 1640 !-- initialized before. 1641 !-- Please note, surfaces should be initialized after restart data is read, 1642 !-- else, individual settings of surface parameters will be overwritten 1643 !-- from data of precursor run. 1644 CALL init_surfaces 1639 1645 1640 1646 ! - Property svn:mergeinfo changed
-
palm/trunk/SOURCE/radiation_model_mod.f90
r3607 r3608 28 28 ! ----------------- 29 29 ! $Id$ 30 ! Bugfix radiation output 31 ! 32 ! 3607 2018-12-07 11:56:58Z suehring 30 33 ! Output of radiation-related quantities migrated to radiation_model_mod. 31 34 ! … … 10372 10375 10373 10376 IF ( surf(ix,isurfs) == is .AND. surf(iy,isurfs) == js .AND. surf(iz,isurfs) == ks .AND. & 10374 (surf(id,isurfs) == idsint_u .OR. surfl(id,isurf ) == idsint_l ) ) THEN10377 (surf(id,isurfs) == idsint_u .OR. surfl(id,isurfs) == idsint_l ) ) THEN 10375 10378 !-- correct source surface 10376 10379 local_pf(surfl(ix,isurflt),surfl(iy,isurflt),surfl(iz,isurflt)) = svf(k,isvf)
Note: See TracChangeset
for help on using the changeset viewer.