Changeset 2320 for palm/trunk/SOURCE/init_3d_model.f90

Timestamp:

Jul 21, 2017 12:47:43 PM (7 years ago)

Author:

suehring

Message:

large-scale forcing and nudging modularized

File:

• palm/trunk/SOURCE/init_3d_model.f90 (modified) (4 diffs)

palm/trunk/SOURCE/init_3d_model.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularize large-scale forcing and nudging
+! 
+! 2292 2017-06-20 09:51:42Z schwenkel
 ! Implementation of new microphysic scheme: cloud_scheme = 'morrison' 
 ! includes two more prognostic equations for cloud drop concentration (nc)  
@@ -372 +375 @@
         ONLY:  lsm_init, lsm_init_arrays
   
-    USE ls_forcing_mod
+    USE lsf_nudging_mod,                                                       &
+        ONLY:  lsf_init, ls_forcing_surf, nudge_init 
 
     USE microphysics_mod,                                                      &
@@ -956 +960 @@
 
 !
+!-- Initialize nudging if required
+    IF ( nudging )  THEN
+       CALL nudge_init
+    ENDIF
+
+!
+!-- Initialize reading of large scale forcing from external file - if required
+    IF ( large_scale_forcing )  THEN
+       CALL lsf_init
+    ENDIF
+
+!
 !-- Allocate arrays containing the RK coefficient for calculation of 
 !-- perturbation pressure and turbulent fluxes. At this point values are
@@ -1092 +1108 @@
 
           CALL location_message( 'initializing with constant profiles', .FALSE. )
-!
-!--       Overwrite initial profiles in case of nudging
-          IF ( nudging )  THEN
-             pt_init = ptnudge(:,1)
-             u_init  = unudge(:,1)
-             v_init  = vnudge(:,1)
-             IF ( humidity  )  THEN ! is passive_scalar correct???
-                q_init = qnudge(:,1)
-             ENDIF
-
-             WRITE( message_string, * ) 'Initial profiles of u, v and ',       &
-                 'scalars from NUDGING_DATA are used.'
-             CALL message( 'init_3d_model', 'PA0370', 0, 0, 0, 6, 0 )
-          ENDIF
-
 !
 !--       Overwrite initial profiles in case of synthetic turbulence generator