Changeset 1960 for palm/trunk/SOURCE/read_var_list.f90

Timestamp:

Jul 12, 2016 4:34:24 PM (8 years ago)

Author:

suehring

Message:

Separate balance equations for humidity and passive_scalar

File:

• palm/trunk/SOURCE/read_var_list.f90 (modified) (7 diffs)

palm/trunk/SOURCE/read_var_list.f90

@@ -19 +19 @@
 ! Current revisions:
 ! ------------------
-! 
+! Separate humidity and passive scalar
+! Remove unused variables from ONLY list
 !
 ! Former revisions:
@@ -175 +176 @@
     USE arrays_3d,                                                             &
         ONLY:  inflow_damping_factor, mean_inflow_profiles, pt_init,           &
-               q_init, ref_state, sa_init, u_init, ug, v_init, vg
+               q_init, ref_state, s_init, sa_init, u_init, ug, v_init, vg
 
     USE control_parameters
@@ -292 +293 @@
        ALLOCATE( ug(0:nz+1), u_init(0:nz+1), vg(0:nz+1),                       &
                  v_init(0:nz+1), pt_init(0:nz+1), q_init(0:nz+1),              &
-                 ref_state(0:nz+1), sa_init(0:nz+1),                           &
+                 ref_state(0:nz+1), s_init(0:nz+1), sa_init(0:nz+1),           &
                  hom(0:nz+1,2,pr_palm+max_pr_user,0:statistic_regions),        &
                  hom_sum(0:nz+1,pr_palm+max_pr_user,0:statistic_regions) )
@@ -486 +487 @@
           CASE ( 'mean_inflow_profiles' )
              IF ( .NOT. ALLOCATED( mean_inflow_profiles ) )  THEN
-                ALLOCATE( mean_inflow_profiles(0:nz+1,6) )
+                ALLOCATE( mean_inflow_profiles(0:nz+1,7) )
              ENDIF
              READ ( 13 )  mean_inflow_profiles
@@ -597 +598 @@
           CASE ( 'run_coupled' )
              READ ( 13 )  run_coupled
+          CASE ( 's_init' )
+             READ ( 13 )  s_init
+          CASE ( 's_surface' )
+             READ ( 13 )  s_surface
+          CASE ( 's_surface_initial_change' )
+             READ ( 13 )  s_surface_initial_change
+          CASE ( 's_vertical_gradient' )
+             READ ( 13 )  s_vertical_gradient
+          CASE ( 's_vertical_gradient_level' )
+             READ ( 13 )  s_vertical_gradient_level
+          CASE ( 's_vertical_gradient_level_ind' )
+             READ ( 13 )  s_vertical_gradient_level_ind 
           CASE ( 'sa_init' )
              READ ( 13 )  sa_init
@@ -617 +630 @@
           CASE ( 'surface_waterflux' )
              READ ( 13 )  surface_waterflux      
-          CASE ( 's_surface' )
-             READ ( 13 )  s_surface
-          CASE ( 's_surface_initial_change' )
-             READ ( 13 )  s_surface_initial_change
-          CASE ( 's_vertical_gradient' )
-             READ ( 13 )  s_vertical_gradient
-          CASE ( 's_vertical_gradient_level' )
-             READ ( 13 )  s_vertical_gradient_level
           CASE ( 'time_coupling' )
              READ ( 13 )  time_coupling
@@ -789 +794 @@
 
     USE arrays_3d,                                                             &
-        ONLY:  inflow_damping_factor, mean_inflow_profiles, pt_init,           &
-               q_init, ref_state, sa_init, u_init, ug, v_init, vg
+        ONLY:  inflow_damping_factor, mean_inflow_profiles, ref_state, ug, vg
 
     USE control_parameters