Changeset 4028

Timestamp:

Jun 13, 2019 12:21:37 PM (5 years ago)

Author:

schwenkel

Message:

Further modularization of particle code components

Location:

palm/trunk/SOURCE

Files:

• init_3d_model.f90 (modified) (3 diffs)
• lagrangian_particle_model_mod.f90 (modified) (5 diffs)
• module_interface.f90 (modified) (3 diffs)

palm/trunk/SOURCE/init_3d_model.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Further modularization of particle code components
+! 
+! 4017 2019-06-06 12:16:46Z schwenkel
 ! Convert most location messages to debug messages to reduce output in
 ! job logfile to a minimum
@@ -815 +818 @@
                  q_3(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                           &
                  vpt_1(nzb:nzt+1,nysg:nyng,nxlg:nxrg) ) 
-
-       IF ( cloud_droplets )  THEN
-!
-!--       Liquid water content, change in liquid water content
-          ALLOCATE ( ql_1(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                      &
-                     ql_2(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-!
-!--       Real volume of particles (with weighting), volume of particles
-          ALLOCATE ( ql_v(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                      &
-                     ql_vp(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-       ENDIF
-
     ENDIF   
     
@@ -1054 +1045 @@
        q => q_1;  q_p => q_2;  tq_m => q_3
        vpt  => vpt_1
-       IF ( cloud_droplets )  THEN
-          ql   => ql_1
-          ql_c => ql_2
-       ENDIF
     ENDIF
     

palm/trunk/SOURCE/lagrangian_particle_model_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Further modularization of particle code components
+! 
+! 4020 2019-06-06 14:57:48Z schwenkel
 ! Removing submodules 
 ! 
@@ -162 +165 @@
     USE arrays_3d,                                                             &
         ONLY:  de_dx, de_dy, de_dz, dzw, zu, zw,  ql_c, ql_v, ql_vp, hyp,      &
-               pt, q, exner, ql, diss, e, u, v, w, km     
+               pt, q, exner, ql, diss, e, u, v, w, km, ql_1, ql_2     
  
     USE averaging,                                                             &
@@ -354 +357 @@
     PUBLIC lpm_parin,     &
            lpm_header,    &
+           lpm_init_arrays,&           
            lpm_init,      &
            lpm_actions,   &
@@ -386 +390 @@
     END INTERFACE lpm_header
     
+    INTERFACE lpm_init_arrays
+       MODULE PROCEDURE lpm_init_arrays
+    END INTERFACE lpm_init_arrays             
+ 
     INTERFACE lpm_init
        MODULE PROCEDURE lpm_init
@@ -829 +837 @@
 ! Description:
 ! ------------
+!> Initialize arrays for lpm
+!------------------------------------------------------------------------------!   
+ SUBROUTINE lpm_init_arrays
+ 
+    IF ( cloud_droplets )  THEN
+!
+!--    Liquid water content, change in liquid water content
+       ALLOCATE ( ql_1(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                      &
+                  ql_2(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
+!
+!--    Real volume of particles (with weighting), volume of particles
+       ALLOCATE ( ql_v(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                      &
+                     ql_vp(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
+    ENDIF
+    
+!
+!--    Initial assignment of the pointers    
+    IF ( cloud_droplets )  THEN
+       ql   => ql_1
+       ql_c => ql_2
+    ENDIF
+    
+ END SUBROUTINE lpm_init_arrays
+ 
+!------------------------------------------------------------------------------!
+! Description:
+! ------------
 !> Initialize Lagrangian particle model
 !------------------------------------------------------------------------------! 

palm/trunk/SOURCE/module_interface.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Further modularization of particle code components
+! 
+! 4017 2019-06-06 12:16:46Z schwenkel
 ! local_pf need INTENT(INOUT) attribute rather than INTENT(OUT). This is 
 ! because INTENT(OUT) sets the array to not-defined. Especially for outputs that
@@ -247 +250 @@
                lpm_header,                                                     &
                lpm_check_parameters,                                           &
+               lpm_init_arrays,                                                &                              
                lpm_init,                                                       &
                lpm_actions,                                                    &
@@ -880 +884 @@
     IF ( air_chemistry       )  CALL chem_init_arrays
     IF ( gust_module_enabled )  CALL gust_init_arrays
+    IF ( particle_advection  )  CALL lpm_init_arrays        
     IF ( land_surface        )  CALL lsm_init_arrays
     IF ( ocean_mode          )  CALL ocean_init_arrays