Changeset 2696 for palm/trunk/SOURCE/sor.f90

Timestamp:

Dec 14, 2017 5:12:51 PM (6 years ago)

Author:

kanani

Message:

Merge of branch palm4u into trunk

Location:

palm/trunk

Files:

• . (modified) (1 prop)
• SOURCE (modified) (1 prop)
• SOURCE/sor.f90 (modified) (5 diffs)

palm/trunk/SOURCE/sor.f90

@@ -1 +1 @@
 !> @file sor.f90
 !------------------------------------------------------------------------------!
-! This file is part of PALM.
+! This file is part of the PALM model system.
 !
 ! PALM is free software: you can redistribute it and/or modify it under the
@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! - Large-scale forcing implemented (MS)
+! 
+! 2101 2017-01-05 16:42:31Z suehring
 !
 ! 2037 2016-10-26 11:15:40Z knoop
@@ -75 +78 @@
 
     USE control_parameters,                                                    &
-        ONLY:  bc_lr_cyc, bc_ns_cyc, ibc_p_b, ibc_p_t, inflow_l, inflow_n,     &
-               inflow_r, inflow_s, nest_bound_l, nest_bound_n, nest_bound_r,   &
-               nest_bound_s, n_sor, omega_sor, outflow_l, outflow_n,           &
-               outflow_r, outflow_s
+        ONLY:  bc_lr_cyc, bc_ns_cyc, force_bound_l, force_bound_n,             &
+               force_bound_r, force_bound_s, ibc_p_b, ibc_p_t, inflow_l,       &
+               inflow_n, inflow_r, inflow_s, nest_bound_l, nest_bound_n,       &
+               nest_bound_r, nest_bound_s, n_sor, omega_sor, outflow_l,        &
+               outflow_n, outflow_r, outflow_s
 
     IMPLICIT NONE
@@ -167 +171 @@
 !--    Horizontal (Neumann) boundary conditions in case of non-cyclic boundaries
        IF ( .NOT. bc_lr_cyc )  THEN
-          IF ( inflow_l .OR. outflow_l .OR. nest_bound_l )  p(:,:,nxl-1) = p(:,:,nxl)
-          IF ( inflow_r .OR. outflow_r .OR. nest_bound_r )  p(:,:,nxr+1) = p(:,:,nxr)
+          IF ( inflow_l      .OR.  outflow_l  .OR.                                 &
+               nest_bound_l  .OR.  force_bound_l )  p(:,:,nxl-1) = p(:,:,nxl)
+          IF ( inflow_r      .OR.  outflow_r  .OR.                                 &
+               nest_bound_r  .OR.  force_bound_r )  p(:,:,nxr+1) = p(:,:,nxr)
        ENDIF
        IF ( .NOT. bc_ns_cyc )  THEN
-          IF ( inflow_n .OR. outflow_n .OR. nest_bound_n )  p(:,nyn+1,:) = p(:,nyn,:)
-          IF ( inflow_s .OR. outflow_s .OR. nest_bound_s )  p(:,nys-1,:) = p(:,nys,:)
+          IF ( inflow_n      .OR.  outflow_n  .OR.                                 &
+               nest_bound_n  .OR.  force_bound_n )  p(:,nyn+1,:) = p(:,nyn,:)
+          IF ( inflow_s      .OR.  outflow_s  .OR.                                 &
+               nest_bound_s  .OR.  force_bound_s )  p(:,nys-1,:) = p(:,nys,:)
        ENDIF
 
@@ -229 +237 @@
 !--    Horizontal (Neumann) boundary conditions in case of non-cyclic boundaries
        IF ( .NOT. bc_lr_cyc )  THEN
-          IF ( inflow_l .OR. outflow_l .OR. nest_bound_l )  p(:,:,nxl-1) = p(:,:,nxl)
-          IF ( inflow_r .OR. outflow_r .OR. nest_bound_r )  p(:,:,nxr+1) = p(:,:,nxr)
+          IF ( inflow_l      .OR.  outflow_l  .OR.                             &
+               nest_bound_l  .OR.  force_bound_l )  p(:,:,nxl-1) = p(:,:,nxl)
+          IF ( inflow_r      .OR.  outflow_r  .OR.                             &
+               nest_bound_r  .OR.  force_bound_r )  p(:,:,nxr+1) = p(:,:,nxr)
        ENDIF
        IF ( .NOT. bc_ns_cyc )  THEN
-          IF ( inflow_n .OR. outflow_n .OR. nest_bound_n )  p(:,nyn+1,:) = p(:,nyn,:)
-          IF ( inflow_s .OR. outflow_s .OR. nest_bound_s )  p(:,nys-1,:) = p(:,nys,:)
+          IF ( inflow_n      .OR.  outflow_n  .OR.                             &
+               nest_bound_n  .OR.  force_bound_n )  p(:,nyn+1,:) = p(:,nyn,:)
+          IF ( inflow_s      .OR.  outflow_s  .OR.                             &
+               nest_bound_s  .OR.  force_bound_s )  p(:,nys-1,:) = p(:,nys,:)
        ENDIF