Changeset 1241 for palm/trunk/SOURCE/time_integration.f90

Timestamp:

Oct 30, 2013 11:36:58 AM (10 years ago)

Author:

heinze

Message:

Nudging and large scale forcing from external file implemented

File:

• palm/trunk/SOURCE/time_integration.f90 (modified) (5 diffs)

palm/trunk/SOURCE/time_integration.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-!
+! Call of user_actions in order to determine sgs momentum fluxes
+! Generalize calc_mean_profile for wider use
+! Determine shf and qsws in dependence on data from LSF_DATA
+! Determine ug and vg in dependence on data from LSF_DATA
 !
 ! Former revisions:
@@ -165 +168 @@
     USE interaction_droplets_ptq_mod
     USE interfaces
+    USE ls_forcing_mod
     USE particle_attributes
     USE pegrid
@@ -223 +227 @@
 
 !
+!--    Determine ug, vg and w_subs in dependence on data from external file 
+!--    LSF_DATA
+       IF ( large_scale_forcing .AND. lsf_vert ) THEN
+           CALL ls_forcing_vert ( simulated_time )
+       ENDIF
+
+!
 !--    Execute the user-defined actions
        CALL user_actions( 'before_timestep' )
@@ -248 +259 @@
 !--          buoyancy terms (WARNING: only the respective last call of
 !--          calc_mean_profile defines the reference state!)
-             IF ( .NOT. neutral )  CALL calc_mean_profile( pt, 4 )
-             IF ( ocean         )  CALL calc_mean_profile( rho, 64 )
-             IF ( humidity      )  CALL calc_mean_profile( vpt, 44 )
+             IF ( .NOT. neutral )  CALL calc_mean_profile( pt, 4, 'time_int' )
+             IF ( ocean         )  CALL calc_mean_profile( rho, 64, 'time_int' )
+             IF ( humidity      )  CALL calc_mean_profile( vpt, 44, 'time_int' )
           ENDIF
 
@@ -566 +577 @@
                 CALL cpu_log( log_point(19), 'prandtl_fluxes', 'stop' )
              ENDIF
+
+!
+!--          Determine shf and qsws in dependence on data from external file 
+!--          LSF_DATA
+             IF ( ( large_scale_forcing .AND. lsf_surf ) .AND. &
+                 intermediate_timestep_count == intermediate_timestep_count_max )&
+             THEN
+                CALL ls_forcing_surf ( simulated_time )
+             ENDIF
+
 !
 !--          Compute the diffusion coefficients