Changeset 1557 for palm/trunk/SOURCE/check_parameters.f90

Timestamp:

Mar 5, 2015 4:43:04 PM (9 years ago)

Author:

suehring

Message:

Enable monotone advection for scalars in combination with fifth-order scheme using monotonic limiter.

File:

• palm/trunk/SOURCE/check_parameters.f90 (modified) (7 diffs)

palm/trunk/SOURCE/check_parameters.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Added checks for monotonic limiter
 ! 
 ! Former revisions:
@@ -605 +605 @@
     IF ( topography /= 'flat' )  THEN
        action = ' '
-       IF ( scalar_advec /= 'pw-scheme' .AND. scalar_advec /= 'ws-scheme')  THEN
+       IF ( scalar_advec /= 'pw-scheme' .AND. scalar_advec /= 'ws-scheme'     &
+      .AND. scalar_advec /= 'ws-scheme-mono' )  THEN
           WRITE( action, '(A,A)' )  'scalar_advec = ', scalar_advec
        ENDIF
@@ -751 +752 @@
        CALL message( 'check_parameters', 'PA0022', 1, 2, 0, 6, 0 )
     ENDIF
-    IF ( ( momentum_advec == 'ws-scheme' .OR.  scalar_advec == 'ws-scheme' )   &
+    IF ( ( momentum_advec == 'ws-scheme' .OR.  scalar_advec == 'ws-scheme'     &
+           .OR. scalar_advec == 'ws-scheme-mono' )                             &
            .AND. ( timestep_scheme == 'euler' .OR.                             &
                    timestep_scheme == 'runge-kutta-2' ) )                      &
@@ -761 +763 @@
     ENDIF
     IF ( scalar_advec /= 'pw-scheme'  .AND.  scalar_advec /= 'ws-scheme' .AND. &
-         scalar_advec /= 'bc-scheme' )                                         &
+         scalar_advec /= 'ws-scheme-mono' .AND. scalar_advec /= 'bc-scheme' )  &
     THEN
        message_string = 'unknown advection scheme: scalar_advec = "' // &
@@ -776 +778 @@
 
     IF ( use_sgs_for_particles  .AND.  .NOT. use_upstream_for_tke .AND.        &
-         scalar_advec /= 'ws-scheme' )  THEN
+         ( scalar_advec /= 'ws-scheme' .OR.                                    &
+           scalar_advec /= 'ws-scheme-mono' )                                  &
+       )  THEN
        use_upstream_for_tke = .TRUE.
        message_string = 'use_upstream_for_tke set .TRUE. because ' //          &
@@ -792 +796 @@
 !
 !-- Set LOGICAL switches to enhance performance
-    IF ( momentum_advec == 'ws-scheme' )    ws_scheme_mom = .TRUE.
-    IF ( scalar_advec   == 'ws-scheme'   )  ws_scheme_sca = .TRUE.
+    IF ( momentum_advec == 'ws-scheme' )       ws_scheme_mom = .TRUE.
+    IF ( scalar_advec   == 'ws-scheme' .OR.                                   &
+         scalar_advec   == 'ws-scheme-mono' )  ws_scheme_sca = .TRUE.
+    IF ( scalar_advec   == 'ws-scheme-mono' )  monotonic_adjustment = .TRUE.
+
 
 !
@@ -1707 +1714 @@
           CALL message( 'check_parameters', 'PA0051', 1, 2, 0, 6, 0 )
        ENDIF
-       IF ( momentum_advec /= 'pw-scheme' .AND. &
-            momentum_advec /= 'ws-scheme')  THEN
+       IF ( scalar_advec /= 'pw-scheme' .AND.                                 &
+          ( scalar_advec /= 'ws-scheme' .OR.                                  &
+            scalar_advec /= 'ws-scheme-mono' )                                &
+          )  THEN
+
           message_string = 'non-cyclic lateral boundaries do not allow ' // &
                            'momentum_advec = "' // TRIM( momentum_advec ) // '"'
           CALL message( 'check_parameters', 'PA0052', 1, 2, 0, 6, 0 )
        ENDIF
-       IF ( scalar_advec /= 'pw-scheme' .AND. &
-            scalar_advec /= 'ws-scheme' )  THEN
+       IF ( scalar_advec /= 'pw-scheme' .AND.                                  &
+          ( scalar_advec /= 'ws-scheme' .OR.                                   &
+            scalar_advec /= 'ws-scheme-mono' )                                 &
+          )  THEN
           message_string = 'non-cyclic lateral boundaries do not allow ' // &
                            'scalar_advec = "' // TRIM( scalar_advec ) // '"'