Ignore:
Timestamp:
Dec 4, 2009 5:05:40 PM (12 years ago)
Author:
letzel
Message:
  • reintegrate branch letzel/masked_output into trunk; new funtionality: masked data output (not yet documented)
Location:
palm/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk

    • Property svn:mergeinfo set to False
      /palm/branches/letzel/masked_output296-409
  • palm/trunk/SOURCE/time_integration.f90

    r398 r410  
    55! -----------------
    66! Bugfix: exchange of ghost points for prho included
     7!
     8! Branch revisions:
     9! -----------------
     10! masked data output
    711!
    812! Former revisions:
     
    324328          time_do3d          = time_do3d        + dt_3d
    325329       ENDIF
     330       DO  mid = 1, masks
     331          IF ( simulated_time >= skip_time_domask(mid) )  THEN
     332             time_domask(mid)= time_domask(mid) + dt_3d
     333          ENDIF
     334       ENDDO
    326335       time_dvrp          = time_dvrp        + dt_3d
    327336       IF ( simulated_time >= skip_time_dosp )  THEN
     
    399408
    400409!
    401 !--    Sum-up 3d-arrays for later output of time-averaged data
     410!--    Sum-up 3d-arrays for later output of time-averaged 2d/3d/masked data
    402411       IF ( averaging_interval /= 0.0  .AND.                                &
    403412            ( dt_data_output_av - time_do_av ) <= averaging_interval  .AND. &
     
    495504
    496505!
    497 !--    Output of time-averaged 2d/3d-data
     506!--    masked data output
     507       DO  mid = 1, masks
     508          IF ( time_domask(mid) >= dt_domask(mid) )  THEN
     509             CALL data_output_mask( 0 )
     510             time_domask(mid) = MOD( time_domask(mid),  &
     511                                     MAX( dt_domask(mid), dt_3d ) )
     512          ENDIF
     513       ENDDO
     514
     515!
     516!--    Output of time-averaged 2d/3d/masked data
    498517       IF ( time_do_av >= dt_data_output_av )  THEN
    499518          CALL average_3d_data
     
    502521          CALL data_output_2d( 'yz', 1 )
    503522          CALL data_output_3d( 1 )
     523          DO  mid = 1, masks
     524             CALL data_output_mask( 1 )
     525          ENDDO
    504526          time_do_av = MOD( time_do_av, MAX( dt_data_output_av, dt_3d ) )
    505527       ENDIF
Note: See TracChangeset for help on using the changeset viewer.