Changeset 978 for palm/trunk/SOURCE/poismg.f90

Timestamp:

Aug 9, 2012 8:28:32 AM (12 years ago)

Author:

fricke

Message:

merge fricke branch back into trunk

Location:

palm/trunk

Files:

• . (modified) (1 prop)
• SOURCE (modified) (1 prop)
• SOURCE/poismg.f90 (modified) (7 diffs)

palm/trunk/SOURCE/poismg.f90

@@ -7 +7 @@
 ! Current revisions:
 ! -----------------
-! 
+! bc_lr/ns_dirneu/neudir added
+!
 !
 ! Former revisions:
@@ -1229 +1230 @@
 !--       outflow conditions have to be used on all PEs after the switch,
 !--       because then they have the total domain.
-          IF ( bc_lr_dirrad )  THEN
+          IF ( bc_lr_dirrad .OR. bc_lr_dirneu )  THEN
              inflow_l  = .TRUE.
              inflow_r  = .FALSE.
              outflow_l = .FALSE.
              outflow_r = .TRUE.
-          ELSEIF ( bc_lr_raddir )  THEN
+          ELSEIF ( bc_lr_raddir .OR. bc_lr_neudir )  THEN
              inflow_l  = .FALSE.
              inflow_r  = .TRUE.
@@ -1241 +1242 @@
           ENDIF
 
-          IF ( bc_ns_dirrad )  THEN
+          IF ( bc_ns_dirrad .OR. bc_ns_dirneu )  THEN
              inflow_n  = .TRUE.
              inflow_s  = .FALSE.
              outflow_n = .FALSE.
              outflow_s = .TRUE.
-          ELSEIF ( bc_ns_raddir )  THEN
+          ELSEIF ( bc_ns_raddir .OR. bc_ns_neudir )  THEN
              inflow_n  = .FALSE.
              inflow_s  = .TRUE.
@@ -1316 +1317 @@
 
           IF ( pleft == MPI_PROC_NULL )  THEN
-             IF ( bc_lr_dirrad )  THEN
+             IF ( bc_lr_dirrad .OR. bc_lr_dirneu )  THEN
                 inflow_l  = .TRUE.
-             ELSEIF ( bc_lr_raddir )  THEN
+             ELSEIF ( bc_lr_raddir .OR. bc_lr_neudir )  THEN
                 outflow_l = .TRUE.
              ENDIF
@@ -1324 +1325 @@
 
           IF ( pright == MPI_PROC_NULL )  THEN
-             IF ( bc_lr_dirrad )  THEN
+             IF ( bc_lr_dirrad .OR. bc_lr_dirneu )  THEN
                 outflow_r = .TRUE.
-             ELSEIF ( bc_lr_raddir )  THEN
+             ELSEIF ( bc_lr_raddir .OR. bc_lr_neudir )  THEN
                 inflow_r  = .TRUE.
              ENDIF
@@ -1332 +1333 @@
 
           IF ( psouth == MPI_PROC_NULL )  THEN
-             IF ( bc_ns_dirrad )  THEN
+             IF ( bc_ns_dirrad .OR. bc_ns_dirneu )  THEN
                 outflow_s = .TRUE.
-             ELSEIF ( bc_ns_raddir )  THEN
+             ELSEIF ( bc_ns_raddir .OR. bc_ns_neudir )  THEN
                 inflow_s  = .TRUE.
              ENDIF
@@ -1340 +1341 @@
 
           IF ( pnorth == MPI_PROC_NULL )  THEN
-             IF ( bc_ns_dirrad )  THEN
+             IF ( bc_ns_dirrad .OR. bc_ns_dirneu )  THEN
                 inflow_n  = .TRUE.
-             ELSEIF ( bc_ns_raddir )  THEN
+             ELSEIF ( bc_ns_raddir .OR. bc_ns_neudir )  THEN
                 outflow_n = .TRUE.
              ENDIF