Changeset 0f7835d in flexpart.git


Ignore:
Timestamp:
Aug 3, 2016, 3:02:42 PM (8 years ago)
Author:
Espen Sollum ATMOS <eso@…>
Branches:
master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie
Children:
861805a, 93786a1
Parents:
f28aa0a
Message:

Changed a variable in domain-filling option (MPI). Deleted an unused function from mpi_mod.f90

Location:
src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • src/boundcond_domainfill_mpi.f90

    r7999df47 r0f7835d  
    232232
    233233        do m=1,mmass
    234           do ipart=minpart,maxpart
     234          do ipart=minpart,maxpart_mpi
    235235
    236236  ! If a vacant storage space is found, attribute everything to this array element
     
    331331            endif
    332332          end do
    333           if (ipart.gt.maxpart) &
     333          if (ipart.gt.maxpart_mpi) &
    334334               stop 'boundcond_domainfill.f: too many particles required'
    33533573        minpart=ipart+1
     
    464464
    465465        do m=1,mmass
    466           do ipart=minpart,maxpart
     466          do ipart=minpart,maxpart_mpi
    467467
    468468  ! If a vacant storage space is found, attribute everything to this array element
     
    562562            endif
    563563          end do
    564           if (ipart.gt.maxpart) &
     564          if (ipart.gt.maxpart_mpi) &
    565565               stop 'boundcond_domainfill.f: too many particles required'
    566566173       minpart=ipart+1
  • src/init_domainfill_mpi.f90

    r7999df47 r0f7835d  
    305305
    306306
    307 ! Check whether numpart is really smaller than maxpart
    308 !*****************************************************
    309 
    310   if (numpart.gt.maxpart) then
     307! Check whether numpart is really smaller than maxpart per process
     308!*****************************************************************
     309
     310  if (numpart.gt.maxpart_mpi) then
    311311    write(*,*) 'numpart too large: change source in init_atm_mass.f'
    312     write(*,*) 'numpart: ',numpart,' maxpart: ',maxpart
     312    write(*,*) 'numpart: ',numpart,' maxpart: ',maxpart_mpi
    313313  endif
    314314
  • src/mpi_mod.f90

    r79abee9 r0f7835d  
    24442444    end subroutine write_data_dbg
    24452445
    2446 
    2447   subroutine set_fields_synthetic()
    2448 !*******************************************************************************
    2449 ! DESCRIPTION
    2450 !   Set all meteorological fields to synthetic (usually constant/homogeneous)
    2451 !   values.
    2452 !   Used for validation and error-checking
    2453 !
    2454 ! NOTE
    2455 !   This version uses asynchronious communications.
    2456 !
    2457 ! VARIABLES
    2458 !   
    2459 !
    2460 !
    2461 !*******************************************************************************
    2462     use com_mod
    2463 
    2464     implicit none
    2465 
    2466     integer :: li=1, ui=2 ! wfmem indices (i.e, operate on entire field)
    2467 
    2468     if (.not.lmp_sync) ui=3
    2469 
    2470 
    2471 ! Variables transferred at initialization only
    2472 !*********************************************
    2473 !    readclouds=readclouds_
    2474     oro(:,:)=0.0
    2475     excessoro(:,:)=0.0
    2476     lsm(:,:)=0.0
    2477     xlanduse(:,:,:)=0.0
    2478 !    wftime
    2479 !    numbwf
    2480 !    nmixz
    2481 !    height
    2482 
    2483 ! Time-varying fields:
    2484     uu(:,:,:,li:ui) = 10.0
    2485     vv(:,:,:,li:ui) = 0.0
    2486     uupol(:,:,:,li:ui) = 10.0
    2487     vvpol(:,:,:,li:ui)=0.0
    2488     ww(:,:,:,li:ui)=0.
    2489     tt(:,:,:,li:ui)=300.
    2490     rho(:,:,:,li:ui)=1.3
    2491     drhodz(:,:,:,li:ui)=.0
    2492     tth(:,:,:,li:ui)=0.0
    2493     qvh(:,:,:,li:ui)=1.0
    2494     qv(:,:,:,li:ui)=1.0
    2495 
    2496     pv(:,:,:,li:ui)=1.0
    2497     clouds(:,:,:,li:ui)=0
    2498 
    2499     clwc(:,:,:,li:ui)=0.0
    2500     ciwc(:,:,:,li:ui)=0.0
    2501  
    2502 ! 2D fields
    2503 
    2504     cloudsh(:,:,li:ui)=0
    2505     vdep(:,:,:,li:ui)=0.0
    2506     ps(:,:,:,li:ui)=1.0e5
    2507     sd(:,:,:,li:ui)=0.0
    2508     tcc(:,:,:,li:ui)=0.0
    2509     tt2(:,:,:,li:ui)=300.
    2510     td2(:,:,:,li:ui)=250.
    2511     lsprec(:,:,:,li:ui)=0.0
    2512     convprec(:,:,:,li:ui)=0.0
    2513     ustar(:,:,:,li:ui)=1.0
    2514     wstar(:,:,:,li:ui)=1.0
    2515     hmix(:,:,:,li:ui)=10000.
    2516     tropopause(:,:,:,li:ui)=10000.
    2517     oli(:,:,:,li:ui)=0.01
    2518  
    2519   end subroutine set_fields_synthetic
    2520 
    25212446end module mpi_mod
  • src/timemanager_mpi.f90

    r3b80e98 r0f7835d  
    275275    if (mp_measure_time.and..not.(lmpreader.and.lmp_use_reader)) call mpif_mtime('getfields',1)
    276276
    277 ! For validation and tests: call the function below to set all fields to simple
    278 ! homogeneous values
    279 !    if (mp_dev_mode) call set_fields_synthetic
    280 
    281 !*******************************************************************************
    282 
    283277    if (lmpreader.and.nstop1.gt.1) stop 'NO METEO FIELDS AVAILABLE'
    284278
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG