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

Timestamp:

Oct 26, 2015 4:17:44 PM (9 years ago)

Author:

maronga

Message:

various bugfixes and modifications of the atmosphere-land-surface-radiation interaction. Completely re-written routine to calculate surface fluxes (surface_layer_fluxes.f90) that replaces prandtl_fluxes. Minor formatting corrections and renamings

File:

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

palm/trunk/SOURCE/prognostic_equations.f90

@@ -14 +14 @@
 ! PALM. If not, see <http://www.gnu.org/licenses/>.
 !
-! Copyright 1997-2014 Leibniz Universitaet Hannover
+! Copyright 1997-2015 Leibniz Universitaet Hannover
 !--------------------------------------------------------------------------------!
 !
 ! Current revisions:
 ! ------------------
-! 
+! Added optional model spin-up without radiation / land surface model calls.
+! Formatting corrections.
 ! 
 ! Former revisions:
@@ -286 +287 @@
 
     USE radiation_model_mod,                                                   &
-        ONLY:  radiation, radiation_scheme, radiation_tendency
+        ONLY:  radiation, radiation_scheme, radiation_tendency,                &
+               skip_time_do_radiation
 
     USE statistics,                                                            &
@@ -410 +412 @@
 !
 !--          Nudging
-             IF ( nudging )  CALL nudge( i, j, simulated_time, 'u' ) 
+             IF ( nudging )  CALL nudge( i, j, simulated_time, 'u' )
 
              CALL user_actions( i, j, 'u-tendency' )
@@ -469 +471 @@
 !
 !--          Nudging
-             IF ( nudging )  CALL nudge( i, j, simulated_time, 'v' ) 
+             IF ( nudging )  CALL nudge( i, j, simulated_time, 'v' )
 
              CALL user_actions( i, j, 'v-tendency' )
@@ -610 +612 @@
 !
 !--          If required, add tendency due to radiative heating/cooling
-             IF ( radiation .AND. radiation_scheme == 'rrtmg' )  THEN
+             IF ( radiation .AND. radiation_scheme == 'rrtmg' .AND.            &
+                  simulated_time > skip_time_do_radiation )  THEN
                 CALL radiation_tendency ( i, j, tend )
              ENDIF
@@ -718 +721 @@
              ENDIF
              CALL diffusion_s( i, j, q, qsws, qswst, wall_qflux )
-     
+
 !
 !--          If required compute decrease of total water content due to
@@ -724 +727 @@
              IF ( cloud_physics  .AND.  icloud_scheme == 1  .AND.              &
                   precipitation )  THEN
-                CALL calc_precipitation( i, j )             
-             ENDIF
+                CALL calc_precipitation( i, j )
+             ENDIF
+
 !
 !--          Sink or source of scalar concentration due to canopy elements
@@ -1009 +1013 @@
 !
 !-- Nudging
-    IF ( nudging )  CALL nudge( simulated_time, 'u' ) 
+    IF ( nudging )  CALL nudge( simulated_time, 'u' )
 
     CALL user_actions( 'u-tendency' )
@@ -1085 +1089 @@
 !
 !-- Nudging
-    IF ( nudging )  CALL nudge( simulated_time, 'v' ) 
+    IF ( nudging )  CALL nudge( simulated_time, 'v' )
 
     CALL user_actions( 'v-tendency' )
@@ -1274 +1278 @@
 !
 !--    If required, add tendency due to radiative heating/cooling
-       IF ( radiation .AND. radiation_scheme == 'rrtmg' )  THEN
-          CALL radiation_tendency ( tend )
+       IF ( radiation .AND. radiation_scheme == 'rrtmg' .AND.                  &
+            simulated_time > skip_time_do_radiation )  THEN
+            CALL radiation_tendency ( tend )
        ENDIF
 
@@ -1859 +1864 @@
 !
 !-- Nudging
-    IF ( nudging )  CALL nudge( simulated_time, 'u' ) 
+    IF ( nudging )  CALL nudge( simulated_time, 'u' )
 
     CALL user_actions( 'u-tendency' )
@@ -1926 +1931 @@
 !
 !-- Nudging
-    IF ( nudging )  CALL nudge( simulated_time, 'v' ) 
+    IF ( nudging )  CALL nudge( simulated_time, 'v' )
 
     CALL user_actions( 'v-tendency' )
@@ -2096 +2101 @@
        ENDIF
 
+       IF ( radiation .AND. radiation_scheme == 'rrtmg' .AND.                  &
+            simulated_time > skip_time_do_radiation )  THEN
+            CALL radiation_tendency ( tend )
+       ENDIF
+
        CALL user_actions( 'pt-tendency' )