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

Timestamp:

Apr 7, 2016 12:01:39 PM (8 years ago)

Author:

maronga

Message:

further modularization of radiation model and plant canopy model

File:

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

palm/trunk/SOURCE/prognostic_equations.f90

@@ -19 +19 @@
 ! Current revisions:
 ! ------------------
-!
+! Renamed canopy model calls.
 ! 
 ! Former revisions:
@@ -284 +284 @@
 
     USE plant_canopy_model_mod,                                                &
-        ONLY:  cthf, plant_canopy, plant_canopy_model
+        ONLY:  cthf, plant_canopy, pcm_tendency
 
     USE production_e_mod,                                                      &
@@ -403 +403 @@
 !
 !--          Drag by plant canopy
-             IF ( plant_canopy )  CALL plant_canopy_model( i, j, 1 )
+             IF ( plant_canopy )  CALL pcm_tendency( i, j, 1 )
 
 !
@@ -462 +462 @@
 !
 !--          Drag by plant canopy
-             IF ( plant_canopy )  CALL plant_canopy_model( i, j, 2 )        
+             IF ( plant_canopy )  CALL pcm_tendency( i, j, 2 )        
 
 !
@@ -531 +531 @@
 !
 !--       Drag by plant canopy
-          IF ( plant_canopy )  CALL plant_canopy_model( i, j, 3 )
+          IF ( plant_canopy )  CALL pcm_tendency( i, j, 3 )
 
           CALL user_actions( i, j, 'w-tendency' )
@@ -586 +586 @@
 !--          Consideration of heat sources within the plant canopy
              IF ( plant_canopy  .AND.  cthf /= 0.0_wp )  THEN
-                CALL plant_canopy_model( i, j, 4 )
+                CALL pcm_tendency( i, j, 4 )
              ENDIF
 
@@ -720 +720 @@
 !
 !--          Sink or source of scalar concentration due to canopy elements
-             IF ( plant_canopy )  CALL plant_canopy_model( i, j, 5 )
+             IF ( plant_canopy )  CALL pcm_tendency( i, j, 5 )
 
 !
@@ -888 +888 @@
 !
 !--          Additional sink term for flows through plant canopies
-             IF ( plant_canopy )  CALL plant_canopy_model( i, j, 6 ) 
+             IF ( plant_canopy )  CALL pcm_tendency( i, j, 6 ) 
 
              CALL user_actions( i, j, 'e-tendency' )
@@ -982 +982 @@
 !
 !-- Drag by plant canopy
-    IF ( plant_canopy )  CALL plant_canopy_model( 1 )
+    IF ( plant_canopy )  CALL pcm_tendency( 1 )
 
 !
@@ -1058 +1058 @@
 !
 !-- Drag by plant canopy
-    IF ( plant_canopy )  CALL plant_canopy_model( 2 )
+    IF ( plant_canopy )  CALL pcm_tendency( 2 )
 
 !
@@ -1146 +1146 @@
 !
 !-- Drag by plant canopy
-    IF ( plant_canopy )  CALL plant_canopy_model( 3 )
+    IF ( plant_canopy )  CALL pcm_tendency( 3 )
 
     CALL user_actions( 'w-tendency' )
@@ -1235 +1235 @@
 !--    Consideration of heat sources within the plant canopy
        IF ( plant_canopy .AND. ( cthf /= 0.0_wp ) ) THEN
-          CALL plant_canopy_model( 4 )
+          CALL pcm_tendency( 4 )
        ENDIF
 
@@ -1433 +1433 @@
 !
 !--    Sink or source of scalar concentration due to canopy elements
-       IF ( plant_canopy ) CALL plant_canopy_model( 5 )
+       IF ( plant_canopy ) CALL pcm_tendency( 5 )
 
 !
@@ -1531 +1531 @@
 
           CALL diffusion_s( qr, qrsws, qrswst, wall_qrflux )
+
+          CALL user_actions( 'qr-tendency' )
 
 !
@@ -1703 +1705 @@
 !
 !--    Additional sink term for flows through plant canopies
-       IF ( plant_canopy )  CALL plant_canopy_model( 6 )
+       IF ( plant_canopy )  CALL pcm_tendency( 6 )
        CALL user_actions( 'e-tendency' )
 
@@ -1816 +1818 @@
 !
 !-- Drag by plant canopy
-    IF ( plant_canopy )  CALL plant_canopy_model( 1 )
+    IF ( plant_canopy )  CALL pcm_tendency( 1 )
 
 !
@@ -1883 +1885 @@
 !
 !-- Drag by plant canopy
-    IF ( plant_canopy )  CALL plant_canopy_model( 2 )
+    IF ( plant_canopy )  CALL pcm_tendency( 2 )
 
 !
@@ -1962 +1964 @@
 !
 !-- Drag by plant canopy
-    IF ( plant_canopy )  CALL plant_canopy_model( 3 )
+    IF ( plant_canopy )  CALL pcm_tendency( 3 )
 
     CALL user_actions( 'w-tendency' )
@@ -2043 +2045 @@
 !--    Consideration of heat sources within the plant canopy
        IF ( plant_canopy .AND. ( cthf /= 0.0_wp ) ) THEN
-          CALL plant_canopy_model( 4 )
+          CALL pcm_tendency( 4 )
        ENDIF
 
@@ -2213 +2215 @@
 !
 !--    Sink or source of scalar concentration due to canopy elements
-       IF ( plant_canopy ) CALL plant_canopy_model( 5 )
+       IF ( plant_canopy ) CALL pcm_tendency( 5 )
 
 !
@@ -2435 +2437 @@
 !
 !--    Additional sink term for flows through plant canopies
-       IF ( plant_canopy )  CALL plant_canopy_model( 6 )
+       IF ( plant_canopy )  CALL pcm_tendency( 6 )
        CALL user_actions( 'e-tendency' )