Changeset 3582 for palm/trunk/SOURCE/init_masks.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)
• init_masks.f90 (modified) (3 diffs)

palm/trunk/SOURCE/init_masks.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Move the control parameter "salsa" from salsa_mod to control_parameters 
+! (M. Kurppa)
 ! 
 ! Former revisions:
@@ -173 +174 @@
                mask_x_loop, mask_xyz_dimension, mask_y, mask_y_loop, mask_z,   &
                mask_z_loop, max_masks,  message_string, mid,                   &
-               passive_scalar, ocean_mode, varnamelength
+               passive_scalar, ocean_mode, salsa, varnamelength
 
     USE grid_variables,                                                        &
@@ -190 +191 @@
 
     USE pegrid  
-
+    
     USE radiation_model_mod,                                                   &
         ONLY:  radiation, radiation_check_data_output
         
     USE salsa_mod,                                                             &
-        ONLY:  salsa, salsa_check_data_output 
+        ONLY:  salsa_check_data_output 
 
     IMPLICIT NONE