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

palm/trunk/SOURCE/netcdf_interface_mod.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! Move the control parameter "salsa" from salsa_mod to control_parameters 
+! (M. Kurppa)
 ! 
 ! Former revisions:
@@ -646 +647 @@
                message_string, mid, ntdim_2d_xy, ntdim_2d_xz,                  &
                ntdim_2d_yz, ntdim_3d, nz_do3d, ocean_mode, plant_canopy,       &
-               run_description_header, section, simulated_time,                &
+               run_description_header, salsa, section, simulated_time,         &
                simulated_time_at_begin, skip_time_data_output_av,              &
                skip_time_do2d_xy, skip_time_do2d_xz, skip_time_do2d_yz,        &
@@ -684 +685 @@
      
     USE salsa_mod,                                                             &
-        ONLY:  salsa, salsa_define_netcdf_grid             
+        ONLY:  salsa_define_netcdf_grid            
 
     USE spectra_mod,                                                           &
@@ -1147 +1148 @@
                       CALL salsa_define_netcdf_grid( domask(mid,av,i), found,  &
                                                      grid_x, grid_y, grid_z )
-                   ENDIF                  
+                   ENDIF                                   
 !
 !--                Now check for user-defined quantities
@@ -1910 +1911 @@
                                                      grid_y, grid_z )
                    ENDIF                 
-                   
+!                   
 !--                Check for user-defined quantities
                    IF ( .NOT. found )  THEN
@@ -2856 +2857 @@
                                                          grid_z )
                          ENDIF
-                         
+
 !
 !--                      Check for SALSA quantities
@@ -3758 +3759 @@
                                                             grid_z )
                       ENDIF
-                      
 !
 !--                   Check for SALSA quantities
@@ -4618 +4618 @@
                                                             grid_z )
                       ENDIF
-                      
 !
 !--                   Check for SALSA quantities