Changeset 2638 for palm/trunk/SOURCE

Timestamp:

Nov 23, 2017 12:44:23 PM (7 years ago)

Author:

raasch

Message:

bugfix for cases with constant top momentumflux

Location:

palm/trunk/SOURCE

Files:

• diffusion_u.f90 (modified) (3 diffs)
• diffusion_v.f90 (modified) (3 diffs)
• surface_mod.f90 (modified) (3 diffs)

palm/trunk/SOURCE/diffusion_u.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! bugfix for constant top momentumflux
+! 
+! 2233 2017-05-30 18:08:54Z suehring
 !
 ! 2232 2017-05-30 17:47:52Z suehring
@@ -328 +331 @@
 !
 !--          Add momentum flux at model top
-             IF ( use_top_fluxes )  THEN
+             IF ( use_top_fluxes  .AND.  constant_top_momentumflux )  THEN
                 surf_s = surf_def_h(2)%start_index(j,i)
                 surf_e = surf_def_h(2)%end_index(j,i)
@@ -550 +553 @@
 !
 !--    Add momentum flux at model top
-       IF ( use_top_fluxes )  THEN
+       IF ( use_top_fluxes  .AND.  constant_top_momentumflux )  THEN
           surf_s = surf_def_h(2)%start_index(j,i)
           surf_e = surf_def_h(2)%end_index(j,i)

palm/trunk/SOURCE/diffusion_v.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! bugfix for constant top momentumflux
+! 
+! 2233 2017-05-30 18:08:54Z suehring
 !
 ! 2232 2017-05-30 17:47:52Z suehring
@@ -316 +319 @@
 !
 !--          Add momentum flux at model top
-             IF ( use_top_fluxes )  THEN
+             IF ( use_top_fluxes  .AND.  constant_top_momentumflux )  THEN
                 surf_s = surf_def_h(2)%start_index(j,i)
                 surf_e = surf_def_h(2)%end_index(j,i)
@@ -538 +541 @@
 !
 !--    Add momentum flux at model top
-       IF ( use_top_fluxes )  THEN
+       IF ( use_top_fluxes  .AND.  constant_top_momentumflux )  THEN
           surf_s = surf_def_h(2)%start_index(j,i)
           surf_e = surf_def_h(2)%end_index(j,i)

palm/trunk/SOURCE/surface_mod.f90

@@ -18 +18 @@
 !
 !------------------------------------------------------------------------------!
+!
 ! Current revisions:
 ! ------------------
@@ -25 +26 @@
 ! -----------------
 ! $Id$
+! bugfix for constant top momentumflux
+! 
+! 2575 2017-10-24 09:57:58Z maronga
 ! Pavement parameterization revised
 ! 
@@ -1543 +1547 @@
 !
 !--          Top momentum fluxes
-             surf%usws(num_h) = top_momentumflux_u *                           &
+             IF ( constant_top_momentumflux )  THEN
+                surf%usws(num_h) = top_momentumflux_u *                        &
                                             momentumflux_input_conversion(nzt+1)
-             surf%vsws(num_h) = top_momentumflux_v *                           &
+                surf%vsws(num_h) = top_momentumflux_v *                        &
                                             momentumflux_input_conversion(nzt+1)
+             ENDIF
 !
 !--          Increment surface indices