Changeset 3582 for palm/trunk/SOURCE/data_output_3d.f90

Timestamp:

Nov 29, 2018 7:16:36 PM (6 years ago)

Author:

suehring

Message:

Merge branch salsa with trunk

Location:

palm/trunk/SOURCE

Files:

• . (modified) (1 prop)
• data_output_3d.f90 (modified) (4 diffs)

palm/trunk/SOURCE/data_output_3d.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
-! 
+! Move the control parameter "salsa" from salsa_mod to control_parameters 
+! (M. Kurppa)
+!
 ! Former revisions:
 ! -----------------
@@ -254 +255 @@
                io_blocks, io_group, land_surface, message_string,              &
                ntdim_3d, nz_do3d,  ocean_mode, plant_canopy,                   &
-               psolver, simulated_time, time_since_reference_point,            &
+               psolver, salsa, simulated_time, time_since_reference_point,     &
                urban_surface, varnamelength
 
@@ -302 +303 @@
                
     USE salsa_mod,                                                             &
-        ONLY:  salsa, salsa_data_output_3d     
+        ONLY:  salsa_data_output_3d     
 
     USE turbulence_closure_mod,                                                &
@@ -791 +792 @@
 !--          SALSA output
              IF ( .NOT. found  .AND.  salsa )  THEN
-                CALL salsa_data_output_3d( av, do3d(av,ivar), found, local_pf )
+                CALL salsa_data_output_3d( av, do3d(av,ivar), found, local_pf, &
+                                           nzb_do, nzt_do )
                 resorted = .TRUE.
              ENDIF