Changeset 410 for palm/trunk/SOURCE/time_integration.f90

Timestamp:

Dec 4, 2009 5:05:40 PM (14 years ago)

Author:

letzel

Message:

• reintegrate branch letzel/masked_output into trunk; new funtionality: masked data output (not yet documented)

Location:

palm/trunk

Files:

• . (modified) (1 prop)
• SOURCE/time_integration.f90 (modified) (5 diffs)

palm/trunk/SOURCE/time_integration.f90

@@ -5 +5 @@
 ! -----------------
 ! Bugfix: exchange of ghost points for prho included
+!
+! Branch revisions:
+! -----------------
+! masked data output
 !
 ! Former revisions:
@@ -324 +328 @@
           time_do3d          = time_do3d        + dt_3d
        ENDIF
+       DO  mid = 1, masks
+          IF ( simulated_time >= skip_time_domask(mid) )  THEN
+             time_domask(mid)= time_domask(mid) + dt_3d
+          ENDIF
+       ENDDO
        time_dvrp          = time_dvrp        + dt_3d
        IF ( simulated_time >= skip_time_dosp )  THEN
@@ -399 +408 @@
 
 !
-!--    Sum-up 3d-arrays for later output of time-averaged data
+!--    Sum-up 3d-arrays for later output of time-averaged 2d/3d/masked data
        IF ( averaging_interval /= 0.0  .AND.                                &
             ( dt_data_output_av - time_do_av ) <= averaging_interval  .AND. &
@@ -495 +504 @@
 
 !
-!--    Output of time-averaged 2d/3d-data
+!--    masked data output
+       DO  mid = 1, masks
+          IF ( time_domask(mid) >= dt_domask(mid) )  THEN
+             CALL data_output_mask( 0 )
+             time_domask(mid) = MOD( time_domask(mid),  &
+                                     MAX( dt_domask(mid), dt_3d ) )
+          ENDIF
+       ENDDO
+
+!
+!--    Output of time-averaged 2d/3d/masked data
        IF ( time_do_av >= dt_data_output_av )  THEN
           CALL average_3d_data
@@ -502 +521 @@
           CALL data_output_2d( 'yz', 1 )
           CALL data_output_3d( 1 )
+          DO  mid = 1, masks
+             CALL data_output_mask( 1 )
+          ENDDO
           time_do_av = MOD( time_do_av, MAX( dt_data_output_av, dt_3d ) )
        ENDIF