Changeset 63 for palm/trunk/SOURCE/prognostic_equations.f90

Timestamp:

Mar 13, 2007 3:52:49 AM (17 years ago)

Author:

raasch

Message:

preliminary changes concerning update of BC-scheme

File:

• palm/trunk/SOURCE/prognostic_equations.f90 (modified) (9 diffs)

palm/trunk/SOURCE/prognostic_equations.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! z0 removed from arguments in calls of diffusion_u/v/w
+! z0 removed from arguments in calls of diffusion_u/v/w,
+! subroutine names changed to .._noopt, .._cache, and .._vector
 !
 ! Former revisions:
@@ -63 +64 @@
 
     PRIVATE
-    PUBLIC prognostic_equations, prognostic_equations_fast, &
-           prognostic_equations_vec
-
-    INTERFACE prognostic_equations
-       MODULE PROCEDURE prognostic_equations
-    END INTERFACE prognostic_equations
-
-    INTERFACE prognostic_equations_fast
-       MODULE PROCEDURE prognostic_equations_fast
-    END INTERFACE prognostic_equations_fast
-
-    INTERFACE prognostic_equations_vec
-       MODULE PROCEDURE prognostic_equations_vec
-    END INTERFACE prognostic_equations_vec
+    PUBLIC prognostic_equations_noopt, prognostic_equations_cache, &
+           prognostic_equations_vector
+
+    INTERFACE prognostic_equations_noopt
+       MODULE PROCEDURE prognostic_equations_noopt
+    END INTERFACE prognostic_equations_noopt
+
+    INTERFACE prognostic_equations_cache
+       MODULE PROCEDURE prognostic_equations_cache
+    END INTERFACE prognostic_equations_cache
+
+    INTERFACE prognostic_equations_vector
+       MODULE PROCEDURE prognostic_equations_vector
+    END INTERFACE prognostic_equations_vector
 
 
@@ -82 +83 @@
 
 
- SUBROUTINE prognostic_equations
+ SUBROUTINE prognostic_equations_noopt
 
 !------------------------------------------------------------------------------!
@@ -615 +616 @@
 
 
- END SUBROUTINE prognostic_equations
-
-
- SUBROUTINE prognostic_equations_fast
+ END SUBROUTINE prognostic_equations_noopt
+
+
+ SUBROUTINE prognostic_equations_cache
 
 !------------------------------------------------------------------------------!
@@ -996 +997 @@
 
 
- END SUBROUTINE prognostic_equations_fast
-
-
- SUBROUTINE prognostic_equations_vec
+ END SUBROUTINE prognostic_equations_cache
+
+
+ SUBROUTINE prognostic_equations_vector
 
 !------------------------------------------------------------------------------!
@@ -1242 +1243 @@
 !
 !-- pt-tendency terms with communication
+    sat = tsc(1)
+    sbt = tsc(2)
     IF ( scalar_advec == 'bc-scheme' )  THEN
-!
-!--    Bott-Chlond scheme always uses Euler time step. Thus:
-       sat = 1.0
-       sbt = 1.0
+
+       IF ( timestep_scheme(1:5) /= 'runge' )  THEN
+!
+!--       Bott-Chlond scheme always uses Euler time step when leapfrog is
+!--       switched on. Thus:
+          sat = 1.0
+          sbt = 1.0
+       ENDIF
        tend = 0.0
        CALL advec_s_bc( pt, 'pt' )
     ELSE
-       sat = tsc(1)
-       sbt = tsc(2)
        IF ( tsc(2) /= 2.0  .AND.  scalar_advec == 'ups-scheme' )  THEN
           tend = 0.0
@@ -1340 +1345 @@
 !
 !--    Scalar/q-tendency terms with communication
+       sat = tsc(1)
+       sbt = tsc(2)
        IF ( scalar_advec == 'bc-scheme' )  THEN
-!
-!--       Bott-Chlond scheme always uses Euler time step. Thus:
-          sat = 1.0
-          sbt = 1.0
+
+          IF ( timestep_scheme(1:5) /= 'runge' )  THEN
+!
+!--          Bott-Chlond scheme always uses Euler time step when leapfrog is
+!--          switched on. Thus:
+             sat = 1.0
+             sbt = 1.0
+          ENDIF
           tend = 0.0
           CALL advec_s_bc( q, 'q' )
        ELSE
-          sat = tsc(1)
-          sbt = tsc(2)
           IF ( tsc(2) /= 2.0 )  THEN
              IF ( scalar_advec == 'ups-scheme' )  THEN
@@ -1438 +1447 @@
 !--    TKE-tendency terms with communication
        CALL production_e_init
+
+       sat = tsc(1)
+       sbt = tsc(2)
        IF ( .NOT. use_upstream_for_tke )  THEN
           IF ( scalar_advec == 'bc-scheme' )  THEN
-!
-!--          Bott-Chlond scheme always uses Euler time step. Thus:
-             sat = 1.0
-             sbt = 1.0
+
+             IF ( timestep_scheme(1:5) /= 'runge' )  THEN
+!
+!--             Bott-Chlond scheme always uses Euler time step when leapfrog is
+!--             switched on. Thus:
+                sat = 1.0
+                sbt = 1.0
+             ENDIF
              tend = 0.0
              CALL advec_s_bc( e, 'e' )
           ELSE
-             sat = tsc(1)
-             sbt = tsc(2)
              IF ( tsc(2) /= 2.0 )  THEN
                 IF ( scalar_advec == 'ups-scheme' )  THEN
@@ -1550 +1564 @@
 
 
- END SUBROUTINE prognostic_equations_vec
+ END SUBROUTINE prognostic_equations_vector