Changeset 1960 for palm/trunk/SOURCE/surface_layer_fluxes_mod.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/surface_layer_fluxes_mod.f90 (modified) (7 diffs)

palm/trunk/SOURCE/surface_layer_fluxes_mod.f90

@@ -19 +19 @@
 ! Current revisions:
 ! ------------------
-!  
+! Treat humidity and passive scalar separately
 ! 
 ! Former revisions:
@@ -141 +141 @@
     USE arrays_3d,                                                             &
         ONLY:  e, kh, nr, nrs, nrsws, ol, pt, q, ql, qr, qrs, qrsws, qs, qsws, &
-               shf, ts, u, us, usws, v, vpt, vsws, zu, zw, z0, z0h, z0q
+               s, shf, ss, ssws, ts, u, us, usws, v, vpt, vsws, zu, zw, z0,    &
+               z0h, z0q
 
     USE cloud_parameters,                                                      &
@@ -152 +153 @@
 
     USE control_parameters,                                                    &
-        ONLY:  cloud_physics, constant_heatflux, constant_waterflux,           &
-               coupling_mode, g, humidity, ibc_e_b, ibc_pt_b,                  &
-               initializing_actions, kappa, intermediate_timestep_count,       &
+        ONLY:  cloud_physics, constant_heatflux, constant_scalarflux,          &
+               constant_waterflux, coupling_mode, g, humidity, ibc_e_b,        &
+               ibc_pt_b, initializing_actions, kappa,                          &
+               intermediate_timestep_count,                                    &
                intermediate_timestep_count_max, large_scale_forcing, lsf_surf, &
                message_string, microphysics_seifert, most_method, neutral,     &
@@ -859 +861 @@
 !
 !--    If required compute q*
-       IF ( humidity  .OR.  passive_scalar )  THEN
+       IF ( humidity )  THEN
           IF ( constant_waterflux )  THEN
 !
@@ -922 +924 @@
           ENDIF
        ENDIF
+       
+!
+!--    If required compute s*
+       IF ( passive_scalar )  THEN
+          IF ( constant_scalarflux )  THEN
+!
+!--          For a given water flux in the surface layer
+             !$OMP PARALLEL DO
+             !$acc kernels loop private( j )
+             DO  i = nxlg, nxrg
+                DO  j = nysg, nyng
+                   ss(j,i) = -ssws(j,i) / ( us(j,i) + 1E-30_wp )
+                ENDDO
+             ENDDO
+          ENDIF
+       ENDIF
 
 
@@ -1043 +1061 @@
 
 !
-!-- Compute the vertical water/scalar flux
-       IF (  .NOT.  constant_waterflux  .AND.  ( humidity  .OR.                &
-             passive_scalar )  .AND.  ( simulated_time <= skip_time_do_lsm     &
+!--    Compute the vertical water flux
+       IF (  .NOT.  constant_waterflux  .AND.  humidity  .AND.                 &
+             ( simulated_time <= skip_time_do_lsm                              &
             .OR.  .NOT.  land_surface ) )  THEN
           !$OMP PARALLEL DO
@@ -1057 +1075 @@
 
        ENDIF
+       
+!
+!--    Compute the vertical scalar flux
+       IF (  .NOT.  constant_scalarflux  .AND.  passive_scalar  .AND.          &
+             ( simulated_time <= skip_time_do_lsm                              &
+            .OR.  .NOT.  land_surface ) )  THEN
+          !$OMP PARALLEL DO
+          !$acc kernels loop independent present( qs, qsws, us )
+          DO  i = nxlg, nxrg
+             !$acc loop independent
+             DO  j = nysg, nyng
+                ssws(j,i) = -ss(j,i) * us(j,i)
+             ENDDO
+          ENDDO
+
+       ENDIF       
 
 !