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

Timestamp:

Apr 28, 2014 12:40:45 PM (11 years ago)

Author:

heinze

Message:

Upper boundary conditions for pt and q in case of nudging adjusted

File:

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

palm/trunk/SOURCE/prognostic_equations.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! Change order of calls for scalar prognostic quantities: 
+! ls_advec -> nudging -> subsidence since initial profiles 
 ! 
 ! Former revisions:
@@ -559 +560 @@
 
 !
+!--          Nudging
+             IF ( nudging )  CALL nudge( i, j, simulated_time, 'pt' ) 
+
+!
 !--          If required, compute effect of large-scale subsidence/ascent
              IF ( large_scale_subsidence  .AND.                                &
@@ -564 +569 @@
                 CALL subsidence( i, j, tend, pt, pt_init, 2 )
              ENDIF
-
-!
-!--          Nudging
-             IF ( nudging )  CALL nudge( i, j, simulated_time, 'pt' ) 
 
              CALL user_actions( i, j, 'pt-tendency' )
@@ -691 +692 @@
 
 !
+!--          Nudging
+             IF ( nudging )  CALL nudge( i, j, simulated_time, 'q' ) 
+
+!
 !--          If required compute influence of large-scale subsidence/ascent
              IF ( large_scale_subsidence  .AND.                                &
@@ -696 +701 @@
                 CALL subsidence( i, j, tend, q, q_init, 3 )
              ENDIF
-
-!
-!--          Nudging
-             IF ( nudging )  CALL nudge( i, j, simulated_time, 'q' ) 
 
              CALL user_actions( i, j, 'q-tendency' )
@@ -1213 +1214 @@
 
 !
+!--    Nudging
+       IF ( nudging )  CALL nudge( simulated_time, 'pt' ) 
+
+!
 !--    If required compute influence of large-scale subsidence/ascent
        IF ( large_scale_subsidence  .AND.                                      &
@@ -1218 +1223 @@
           CALL subsidence( tend, pt, pt_init, 2 )
        ENDIF
-
-!
-!--    Nudging
-       IF ( nudging )  CALL nudge( simulated_time, 'pt' ) 
 
        CALL user_actions( 'pt-tendency' )
@@ -1410 +1411 @@
 
 !
+!--    Nudging
+       IF ( nudging )  CALL nudge( simulated_time, 'q' ) 
+
+!
 !--    If required compute influence of large-scale subsidence/ascent
        IF ( large_scale_subsidence  .AND.                                      &
@@ -1415 +1420 @@
          CALL subsidence( tend, q, q_init, 3 )
        ENDIF
-
-!
-!--    Nudging
-       IF ( nudging )  CALL nudge( simulated_time, 'q' ) 
 
        CALL user_actions( 'q-tendency' )
@@ -2028 +2029 @@
 
 !
+!--    Nudging
+       IF ( nudging )  CALL nudge( simulated_time, 'pt' ) 
+
+!
 !--    If required compute influence of large-scale subsidence/ascent
        IF ( large_scale_subsidence  .AND.                                      &
@@ -2033 +2038 @@
           CALL subsidence( tend, pt, pt_init, 2 )
        ENDIF
-
-!
-!--    Nudging
-       IF ( nudging )  CALL nudge( simulated_time, 'pt' ) 
 
        CALL user_actions( 'pt-tendency' )
@@ -2199 +2200 @@
 
 !
+!--    Nudging
+       IF ( nudging )  CALL nudge( simulated_time, 'q' ) 
+
+!
 !--    If required compute influence of large-scale subsidence/ascent
        IF ( large_scale_subsidence  .AND.                                      &
@@ -2204 +2209 @@
          CALL subsidence( tend, q, q_init, 3 )
        ENDIF
-
-!
-!--    Nudging
-       IF ( nudging )  CALL nudge( simulated_time, 'q' ) 
 
        CALL user_actions( 'q-tendency' )