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

Timestamp:

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

Author:

suehring

Message:

Merge branch salsa with trunk

Location:

palm/trunk/SOURCE

Files:

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

palm/trunk/SOURCE/data_output_2d.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! Move the control parameter "salsa" from salsa_mod to control_parameters 
+! (M. Kurppa)
 ! 
 ! Former revisions:
@@ -294 +295 @@
                ibc_uv_b, io_blocks, io_group, land_surface, message_string,    &
                ntdim_2d_xy, ntdim_2d_xz, ntdim_2d_yz,                          &
-               ocean_mode, psolver, section, simulated_time,                   &
+               ocean_mode, psolver, salsa, section, simulated_time,            &
                time_since_reference_point
 
@@ -334 +335 @@
    
     USE salsa_mod,                                                             &
-        ONLY:  salsa, salsa_data_output_2d    
+        ONLY:  salsa_data_output_2d    
 
     USE surface_mod,                                                           &
@@ -1353 +1354 @@
                 
                 IF ( .NOT. found  .AND.  salsa )  THEN
-                   CALL salsa_data_output_2d( av, do2d(av,ivar), found, grid,    &
-                                              mode, local_pf, two_d )
+                   CALL salsa_data_output_2d( av, do2d(av,ivar), found, grid,  &
+                                              mode, local_pf, two_d, nzb_do,   &
+                                              nzt_do)
                 ENDIF