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

Timestamp:

Mar 26, 2018 7:13:22 PM (6 years ago)

Author:

suehring

Message:

Synchronize parent and child model after initialization and spinup phase; Check for consistent setting of spinup times in parent and child model; remove obsolete masking of tendency arrays during initialization

File:

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

palm/trunk/SOURCE/init_3d_model.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Synchronize parent and child models after initialization.
+! Remove obsolete masking of topography grid points for Runge-Kutta weighted
+! tendency arrays.
+! 
+! 2920 2018-03-22 11:22:01Z kanani
 ! Add call for precalculating apparent solar positions (moh.hefny)
 ! 
@@ -492 +497 @@
     USE plant_canopy_model_mod,                                                &
         ONLY:  pcm_init
+
+    USE pmc_interface,                                                         &
+        ONLY:  nested_run
 
     USE radiation_model_mod,                                                   &
@@ -1832 +1840 @@
                    w(k,j,i)     = MERGE( w(k,j,i), 0.0_wp,                     &
                                          BTEST( wall_flags_0(k,j,i), 3 ) )
-                   tu_m(k,j,i)  = MERGE( tu_m(k,j,i), 0.0_wp,                  &
-                                         BTEST( wall_flags_0(k,j,i), 1 ) )
-                   tv_m(k,j,i)  = MERGE( tv_m(k,j,i), 0.0_wp,                  &
-                                         BTEST( wall_flags_0(k,j,i), 2 ) )
-                   tw_m(k,j,i)  = MERGE( tw_m(k,j,i), 0.0_wp,                  &
-                                         BTEST( wall_flags_0(k,j,i), 3 ) )
-                   tpt_m(k,j,i) = MERGE( tpt_m(k,j,i), 0.0_wp,                 &
-                                         BTEST( wall_flags_0(k,j,i), 0 ) )
                 ENDDO
              ENDDO
@@ -2565 +2565 @@
 !-- after call of user_init!
     CALL close_file( 13 )
+!
+!-- In case of nesting, put an barrier to assure that all parent and child 
+!-- domains finished initialization. 
+#if defined( __parallel )
+    IF ( nested_run )  CALL MPI_BARRIER( MPI_COMM_WORLD, ierr )
+#endif
+
 
     CALL location_message( 'leaving init_3d_model', .TRUE. )