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

Timestamp:

May 26, 2016 2:44:07 PM (8 years ago)

Author:

witha

Message:

Merged branch/forwind into trunk

Location:

palm/trunk

Files:

• . (modified) (1 prop)
• SOURCE (modified) (1 prop)
• SOURCE/prognostic_equations.f90 (modified) (12 diffs)

palm/trunk/SOURCE/prognostic_equations.f90

@@ -28 +28 @@
 ! Module renamed (removed _mod)
 ! 
-! 
 ! 1850 2016-04-08 13:29:27Z maronga
 ! Module renamed
-! 
 ! 
 ! 1826 2016-04-07 12:01:39Z maronga
@@ -38 +36 @@
 ! 1822 2016-04-07 07:49:42Z hoffmann
 ! Kessler microphysics scheme moved to microphysics.
+
+! 1819 2016-04-06 21:05:15Z witha
+! Added calls for wind turbine model
 !
 ! 1757 2016-02-22 15:49:32Z maronga
@@ -313 +314 @@
         ONLY:  user_actions
 
+    USE wind_turbine_model_mod,                                                &
+        ONLY:  wind_turbine, wtm_tendencies
+
 
     PRIVATE
@@ -428 +432 @@
              IF ( nudging )  CALL nudge( i, j, simulated_time, 'u' )
 
+!
+!--          Forces by wind turbines
+             IF ( wind_turbine )  CALL wtm_tendencies( i, j, 1 )
+
              CALL user_actions( i, j, 'u-tendency' )
 !
@@ -487 +495 @@
              IF ( nudging )  CALL nudge( i, j, simulated_time, 'v' )
 
+!
+!--          Forces by wind turbines
+             IF ( wind_turbine )  CALL wtm_tendencies( i, j, 2 )
+
              CALL user_actions( i, j, 'v-tendency' )
 !
@@ -543 +555 @@
 !--       Drag by plant canopy
           IF ( plant_canopy )  CALL pcm_tendency( i, j, 3 )
+
+!
+!--       Forces by wind turbines
+          IF ( wind_turbine )  CALL wtm_tendencies( i, j, 3 )
 
           CALL user_actions( i, j, 'w-tendency' )
@@ -1011 +1027 @@
     IF ( nudging )  CALL nudge( simulated_time, 'u' )
 
+!
+!-- Forces by wind turbines
+    IF ( wind_turbine )  CALL wtm_tendencies( 1 )
+
     CALL user_actions( 'u-tendency' )
 
@@ -1087 +1107 @@
     IF ( nudging )  CALL nudge( simulated_time, 'v' )
 
+!
+!-- Forces by wind turbines
+    IF ( wind_turbine )  CALL wtm_tendencies( 2 )
+
     CALL user_actions( 'v-tendency' )
 
@@ -1158 +1182 @@
 !-- Drag by plant canopy
     IF ( plant_canopy )  CALL pcm_tendency( 3 )
+
+!
+!-- Forces by wind turbines
+    IF ( wind_turbine )  CALL wtm_tendencies( 3 )
 
     CALL user_actions( 'w-tendency' )
@@ -1847 +1875 @@
     IF ( nudging )  CALL nudge( simulated_time, 'u' )
 
+!
+!-- Forces by wind turbines
+    IF ( wind_turbine )  CALL wtm_tendencies( 1 )
+
     CALL user_actions( 'u-tendency' )
 
@@ -1914 +1946 @@
     IF ( nudging )  CALL nudge( simulated_time, 'v' )
 
+!
+!-- Forces by wind turbines
+    IF ( wind_turbine )  CALL wtm_tendencies( 2 )
+
     CALL user_actions( 'v-tendency' )
 
@@ -1976 +2012 @@
 !-- Drag by plant canopy
     IF ( plant_canopy )  CALL pcm_tendency( 3 )
+
+!
+!-- Forces by wind turbines
+    IF ( wind_turbine )  CALL wtm_tendencies( 3 )
 
     CALL user_actions( 'w-tendency' )