Changeset 2582

Timestamp:

Oct 26, 2017 1:19:46 PM (7 years ago)

Author:

hellstea

Message:

pmc bugfix and gfortran workaround

Location:

palm/trunk/SOURCE

Files:

• pmc_interface_mod.f90 (modified) (3 diffs)
• urban_surface_mod.f90 (modified) (2 diffs)

palm/trunk/SOURCE/pmc_interface_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Resetting of e within buildings / topography in pmci_parent_datatrans removed
+! as unnecessary since e is not anterpolated, and as incorrect since it overran
+! the default Neumann condition (bc_e_b). 
+! 
+! 2359 2017-08-21 07:50:30Z hellstea
 ! A minor indexing error in pmci_init_loglaw_correction is corrected. 
 ! 
@@ -3640 +3645 @@
 
 !
-!--          Inside buildings/topography reset velocities and TKE back to zero.
-!--          Other scalars (pt, q, s, km, kh, p, sa, ...) are ignored at
+!--          Inside buildings/topography reset velocities back to zero.
+!--          Scalars (pt, q, s, km, kh, p, sa, ...) are ignored at
 !--          present, maybe revise later.
+!--          Resetting of e is removed as unnecessary since e is not 
+!--          anterpolated, and as incorrect since it overran the default 
+!--          Neumann condition (bc_e_b). 
              DO   i = nxlg, nxrg
                 DO   j = nysg, nyng
@@ -3652 +3660 @@
                       w(k,j,i)  = MERGE( w(k,j,i), 0.0_wp,                     &
                                          BTEST( wall_flags_0(k,j,i), 3 ) )
-                      e(k,j,i)  = MERGE( e(k,j,i), 0.0_wp,                     &
-                                         BTEST( wall_flags_0(k,j,i), 0 ) )
 !
 !--                TO_DO: zero setting of temperature within topography creates

palm/trunk/SOURCE/urban_surface_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Workaround for gnufortran compiler added in usm_calc_svf. CALL MPI_Win_allocate is
+! replaced by CALL MPI_Win_allocate_cptr if defined ( __gnufortran ). 
+! 
+! 2544 2017-10-13 18:09:32Z maronga
 ! Date and time quantities are now read from date_and_time_mod. Solar constant is
 ! read from radiation_model_mod
@@ -1923 +1927 @@
 !--             Argument X of function c_sizeof(X) needs arbitrary REAL(wp) value, set to 1.0_wp for now
                 size_lad_rma = c_sizeof(1.0_wp)*nnx*nny*nzu
-                CALL MPI_Win_allocate(size_lad_rma, c_sizeof(1.0_wp), minfo, comm2d, &
-                                        lad_s_rma_p, win_lad, ierr)
+
+#if defined( __gfortran )
+!
+!--             Workaround for the gfortran compiler.
+                CALL MPI_Win_allocate_cptr( size_lad_rma, wp, minfo, comm2d,    &
+                     lad_s_rma_p, win_lad, ierr )
+#else                
+                CALL MPI_Win_allocate( size_lad_rma, c_sizeof(1.0_wp), minfo,   &
+                     comm2d, lad_s_rma_p, win_lad, ierr )
+#endif
                 CALL c_f_pointer(lad_s_rma_p, lad_s_rma, (/ nzu, nny, nnx /))
                 usm_lad(nzub:, nys:, nxl:) => lad_s_rma(:,:,:)