Changeset 2582 for palm/trunk/SOURCE


Ignore:
Timestamp:
Oct 26, 2017 1:19:46 PM (4 years ago)
Author:
hellstea
Message:

pmc bugfix and gfortran workaround

Location:
palm/trunk/SOURCE
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/pmc_interface_mod.f90

    r2359 r2582  
    2626! -----------------
    2727! $Id$
     28! Resetting of e within buildings / topography in pmci_parent_datatrans removed
     29! as unnecessary since e is not anterpolated, and as incorrect since it overran
     30! the default Neumann condition (bc_e_b).
     31!
     32! 2359 2017-08-21 07:50:30Z hellstea
    2833! A minor indexing error in pmci_init_loglaw_correction is corrected.
    2934!
     
    36403645
    36413646!
    3642 !--          Inside buildings/topography reset velocities and TKE back to zero.
    3643 !--          Other scalars (pt, q, s, km, kh, p, sa, ...) are ignored at
     3647!--          Inside buildings/topography reset velocities back to zero.
     3648!--          Scalars (pt, q, s, km, kh, p, sa, ...) are ignored at
    36443649!--          present, maybe revise later.
     3650!--          Resetting of e is removed as unnecessary since e is not
     3651!--          anterpolated, and as incorrect since it overran the default
     3652!--          Neumann condition (bc_e_b).
    36453653             DO   i = nxlg, nxrg
    36463654                DO   j = nysg, nyng
     
    36523660                      w(k,j,i)  = MERGE( w(k,j,i), 0.0_wp,                     &
    36533661                                         BTEST( wall_flags_0(k,j,i), 3 ) )
    3654                       e(k,j,i)  = MERGE( e(k,j,i), 0.0_wp,                     &
    3655                                          BTEST( wall_flags_0(k,j,i), 0 ) )
    36563662!
    36573663!--                TO_DO: zero setting of temperature within topography creates
  • palm/trunk/SOURCE/urban_surface_mod.f90

    r2544 r2582  
    2626! -----------------
    2727! $Id$
     28! Workaround for gnufortran compiler added in usm_calc_svf. CALL MPI_Win_allocate is
     29! replaced by CALL MPI_Win_allocate_cptr if defined ( __gnufortran ).
     30!
     31! 2544 2017-10-13 18:09:32Z maronga
    2832! Date and time quantities are now read from date_and_time_mod. Solar constant is
    2933! read from radiation_model_mod
     
    19231927!--             Argument X of function c_sizeof(X) needs arbitrary REAL(wp) value, set to 1.0_wp for now
    19241928                size_lad_rma = c_sizeof(1.0_wp)*nnx*nny*nzu
    1925                 CALL MPI_Win_allocate(size_lad_rma, c_sizeof(1.0_wp), minfo, comm2d, &
    1926                                         lad_s_rma_p, win_lad, ierr)
     1929
     1930#if defined( __gfortran )
     1931!
     1932!--             Workaround for the gfortran compiler.
     1933                CALL MPI_Win_allocate_cptr( size_lad_rma, wp, minfo, comm2d,    &
     1934                     lad_s_rma_p, win_lad, ierr )
     1935#else               
     1936                CALL MPI_Win_allocate( size_lad_rma, c_sizeof(1.0_wp), minfo,   &
     1937                     comm2d, lad_s_rma_p, win_lad, ierr )
     1938#endif
    19271939                CALL c_f_pointer(lad_s_rma_p, lad_s_rma, (/ nzu, nny, nnx /))
    19281940                usm_lad(nzub:, nys:, nxl:) => lad_s_rma(:,:,:)
Note: See TracChangeset for help on using the changeset viewer.