Changeset 1365 for palm/trunk/SOURCE/prognostic_equations.f90

Timestamp:

Apr 22, 2014 3:03:56 PM (11 years ago)

Author:

boeske

Message:

large scale forcing enabled

File:

• palm/trunk/SOURCE/prognostic_equations.f90 (modified) (10 diffs)

palm/trunk/SOURCE/prognostic_equations.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! Calls of ls_advec for large scale advection added, 
+! subroutine subsidence is only called if use_subsidence_tendencies = .F.,
+! new argument ls_index added to the calls of subsidence
+! +ls_index
 ! 
 ! Former revisions:
@@ -143 +146 @@
                dp_level_ind_b, dp_smooth_factor, dpdxy, dt_3d, humidity,       &
                icloud_scheme, inflow_l, intermediate_timestep_count,           &
-               intermediate_timestep_count_max, large_scale_subsidence,        &
-               neutral, nudging, ocean, outflow_l, outflow_s, passive_scalar,  &
-               plant_canopy, precipitation, prho_reference, prho_reference,    &
-               prho_reference, pt_reference, pt_reference, pt_reference,       &
-               radiation, scalar_advec, scalar_advec, simulated_time,          &
-               sloping_surface, timestep_scheme, tsc, use_upstream_for_tke,    &
+               intermediate_timestep_count_max, large_scale_forcing,           &
+               large_scale_subsidence, neutral, nudging, ocean, outflow_l,     &
+               outflow_s, passive_scalar, plant_canopy, precipitation,         &
+               prho_reference, prho_reference, prho_reference, pt_reference,   &
+               pt_reference, pt_reference, radiation, scalar_advec,            &
+               scalar_advec, simulated_time, sloping_surface, timestep_scheme, &
+               tsc, use_subsidence_tendencies, use_upstream_for_tke,           &
                use_upstream_for_tke, use_upstream_for_tke, wall_heatflux,      &
                wall_nrflux, wall_qflux, wall_qflux, wall_qflux, wall_qrflux,   &
@@ -222 +226 @@
 
     USE kinds
+
+    USE ls_forcing_mod,                                                        &
+        ONLY:  ls_advec
 
     USE microphysics_mod,                                                      &
@@ -307 +314 @@
           i_omp_start = i 
        ENDIF
- 
+
        DO  j = nys, nyn
 !
@@ -537 +544 @@
 
 !
+!--          Large scale advection
+             IF ( large_scale_forcing )  THEN
+                CALL ls_advec( i, j, simulated_time, 'pt' )
+             ENDIF     
+
+!
 !--          If required, compute effect of large-scale subsidence/ascent
-             IF ( large_scale_subsidence )  THEN
-                CALL subsidence( i, j, tend, pt, pt_init )
+             IF ( large_scale_subsidence  .AND.                                &
+                  .NOT. use_subsidence_tendencies )  THEN
+                CALL subsidence( i, j, tend, pt, pt_init, 2 )
              ENDIF
 
@@ -662 +676 @@
 
 !
+!--          Large scale advection
+             IF ( large_scale_forcing )  THEN
+                CALL ls_advec( i, j, simulated_time, 'q' )
+             ENDIF
+
+!
 !--          If required compute influence of large-scale subsidence/ascent
-             IF ( large_scale_subsidence )  THEN
-                CALL subsidence( i, j, tend, q, q_init )
+             IF ( large_scale_subsidence  .AND.                                &
+                  .NOT. use_subsidence_tendencies )  THEN
+                CALL subsidence( i, j, tend, q, q_init, 3 )
              ENDIF
 
@@ -1177 +1198 @@
 
 !
+!--    Large scale advection
+       IF ( large_scale_forcing )  THEN
+          CALL ls_advec( simulated_time, 'pt' )
+       ENDIF
+
+!
 !--    If required compute influence of large-scale subsidence/ascent
-       IF ( large_scale_subsidence )  THEN
-          CALL subsidence( tend, pt, pt_init )
+       IF ( large_scale_subsidence  .AND.                                      &
+            .NOT. use_subsidence_tendencies )  THEN
+          CALL subsidence( tend, pt, pt_init, 2 )
        ENDIF
 
@@ -1365 +1393 @@
 !--    Sink or source of scalar concentration due to canopy elements
        IF ( plant_canopy ) CALL plant_canopy_model( 5 )
-       
+
+!
+!--    Large scale advection
+       IF ( large_scale_forcing )  THEN
+          CALL ls_advec( simulated_time, 'q' )
+       ENDIF
+
 !
 !--    If required compute influence of large-scale subsidence/ascent
-       IF ( large_scale_subsidence )  THEN
-         CALL subsidence( tend, q, q_init )
+       IF ( large_scale_subsidence  .AND.                                      &
+            .NOT. use_subsidence_tendencies )  THEN
+         CALL subsidence( tend, q, q_init, 3 )
        ENDIF
 
@@ -1978 +2013 @@
 
 !
+!--    Large scale advection
+       IF ( large_scale_forcing )  THEN
+          CALL ls_advec( simulated_time, 'pt' )
+       ENDIF
+
+!
 !--    If required compute influence of large-scale subsidence/ascent
-       IF ( large_scale_subsidence )  THEN
-          CALL subsidence( tend, pt, pt_init )
+       IF ( large_scale_subsidence  .AND.                                      &
+            .NOT. use_subsidence_tendencies )  THEN
+          CALL subsidence( tend, pt, pt_init, 2 )
        ENDIF
 
@@ -2142 +2184 @@
 
 !
+!--    Large scale advection
+       IF ( large_scale_forcing )  THEN
+          CALL ls_advec( simulated_time, 'q' )
+       ENDIF
+
+!
 !--    If required compute influence of large-scale subsidence/ascent
-       IF ( large_scale_subsidence )  THEN
-         CALL subsidence( tend, q, q_init )
+       IF ( large_scale_subsidence  .AND.                                      &
+            .NOT. use_subsidence_tendencies )  THEN
+         CALL subsidence( tend, q, q_init, 3 )
        ENDIF