Changeset 2178 for palm

Timestamp:

Mar 17, 2017 11:07:39 AM (8 years ago)

Author:

hellstea

Message:

Nesting bugfixes

Location:

palm/trunk/SOURCE

Files:

• check_parameters.f90 (modified) (2 diffs)
• init_pegrid.f90 (modified) (1 diff)
• palm.f90 (modified) (3 diffs)
• time_integration.f90 (modified) (1 diff)

palm/trunk/SOURCE/check_parameters.f90

@@ -3603 +3603 @@
           dist_nxl    = MAX( inflow_disturbance_begin, nxl )
           dist_nxr(1) = MIN( inflow_disturbance_end, nxr )
+       ELSEIF ( bc_lr == 'nested' )  THEN
+          dist_nxl = MAX( inflow_disturbance_begin, nxl )
        ENDIF
        IF ( bc_ns == 'dirichlet/radiation' )  THEN
@@ -3610 +3612 @@
           dist_nys    = MAX( inflow_disturbance_begin, nys )
           dist_nyn(1) = MIN( inflow_disturbance_end, nyn )
+       ELSEIF ( bc_ns == 'nested' )  THEN
+          dist_nys = MAX( inflow_disturbance_begin, nys )
        ENDIF
     ELSE

palm/trunk/SOURCE/init_pegrid.f90

@@ -261 +261 @@
        numproc_sqr = SQRT( REAL( numprocs, KIND=wp ) )
        pdims(1)    = MAX( numproc_sqr , 1 )
-       DO  WHILE ( MOD( numprocs , pdims(1) ) /= 0 )
+       pdims(2) = numprocs / pdims(1)
+       DO  WHILE ( MOD( numprocs , pdims(1) ) /= 0  .OR.                        &
+              MOD( nx+1, pdims(1) ) /= 0  .OR.                                  &
+              MOD( ny+1, pdims(2) ) /= 0 ) 
           pdims(1) = pdims(1) - 1
+          pdims(2) = numprocs / pdims(1)
        ENDDO
-       pdims(2) = numprocs / pdims(1)
 
     ELSEIF ( npex /= -1  .AND.  npey /= -1 )  THEN

palm/trunk/SOURCE/palm.f90

@@ -161 +161 @@
 
     USE control_parameters,                                                    &
-        ONLY:  constant_diffusion, coupling_char, coupling_mode,               &
+        ONLY:  cloud_physics, constant_diffusion, coupling_char, coupling_mode,&
                do2d_at_begin, do3d_at_begin, humidity, initializing_actions,   &
                io_blocks, io_group,                                            &
-               large_scale_forcing, message_string, nest_domain, neutral,      &
+               large_scale_forcing, message_string, microphysics_seifert,      &
+               nest_domain, neutral,                                           &
                nudging, passive_scalar, simulated_time, simulated_time_chr,    &
                urban_surface,                                                  &
@@ -203 +204 @@
     USE pmc_interface,                                                         &
         ONLY:  cpl_id, nested_run, pmci_child_initialize, pmci_init,           &
-               pmci_modelconfiguration, pmci_parent_initialize
+               pmci_modelconfiguration, pmci_parent_initialize,                &
+               pmci_ensure_nest_mass_conservation
 
     USE radiation_model_mod,                                                   &
@@ -352 +354 @@
 !--       Send initial condition data from parent to children
           CALL pmci_parent_initialize
-       END IF
 !
 !--    Exchange_horiz is needed after the nest initialization
-       IF ( nest_domain )  THEN
-          CALL exchange_horiz( u, nbgp )
-          CALL exchange_horiz( v, nbgp )
-          CALL exchange_horiz( w, nbgp )
-          IF ( .NOT. neutral )  THEN
-             CALL exchange_horiz( pt, nbgp )
+          IF ( nest_domain )  THEN
+             CALL exchange_horiz( u, nbgp )
+             CALL exchange_horiz( v, nbgp )
+             CALL exchange_horiz( w, nbgp )
+             IF ( .NOT. neutral )  THEN
+                CALL exchange_horiz( pt, nbgp )
+             ENDIF
+             IF ( .NOT. constant_diffusion )  CALL exchange_horiz( e, nbgp )
+             IF ( humidity )  THEN
+                CALL exchange_horiz( q, nbgp )
+                IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+!                   CALL exchange_horiz( qc, nbgp )
+                   CALL exchange_horiz( qr, nbgp ) 
+!                   CALL exchange_horiz( nc, nbgp )
+                   CALL exchange_horiz( nr, nbgp )
+                ENDIF
+             ENDIF
+             IF ( passive_scalar )  CALL exchange_horiz( s, nbgp )
+
+             CALL pmci_ensure_nest_mass_conservation
+             CALL pres
           ENDIF
-          IF ( .NOT. constant_diffusion )  CALL exchange_horiz( e, nbgp )
-          IF ( humidity       )  CALL exchange_horiz( q, nbgp )
-          IF ( passive_scalar )  CALL exchange_horiz( s, nbgp )
        ENDIF
 

palm/trunk/SOURCE/time_integration.f90

@@ -676 +676 @@
                    CALL disturb_field( nzb_u_inner, tend, u )
                    CALL disturb_field( nzb_v_inner, tend, v )
-                ELSEIF ( .NOT. bc_lr_cyc  .OR.  .NOT. bc_ns_cyc )  THEN
+                ELSEIF ( ( .NOT. bc_lr_cyc  .OR.  .NOT. bc_ns_cyc )            &
+                     .AND. .NOT. nest_domain )  THEN
 !
 !--                Runs with a non-cyclic lateral wall need perturbations