Changeset 46706c7 in flexpart.git
- Timestamp:
- Aug 31, 2016, 9:01:42 AM (8 years ago)
- Branches:
- master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie
- Children:
- d404d98
- Parents:
- 35fa90d (diff), 0f7835d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
src/boundcond_domainfill_mpi.f90
r7999df47 r0f7835d 232 232 233 233 do m=1,mmass 234 do ipart=minpart,maxpart 234 do ipart=minpart,maxpart_mpi 235 235 236 236 ! If a vacant storage space is found, attribute everything to this array element … … 331 331 endif 332 332 end do 333 if (ipart.gt.maxpart ) &333 if (ipart.gt.maxpart_mpi) & 334 334 stop 'boundcond_domainfill.f: too many particles required' 335 335 73 minpart=ipart+1 … … 464 464 465 465 do m=1,mmass 466 do ipart=minpart,maxpart 466 do ipart=minpart,maxpart_mpi 467 467 468 468 ! If a vacant storage space is found, attribute everything to this array element … … 562 562 endif 563 563 end do 564 if (ipart.gt.maxpart ) &564 if (ipart.gt.maxpart_mpi) & 565 565 stop 'boundcond_domainfill.f: too many particles required' 566 566 173 minpart=ipart+1 -
src/init_domainfill_mpi.f90
r7999df47 r0f7835d 305 305 306 306 307 ! Check whether numpart is really smaller than maxpart 308 !***************************************************** 309 310 if (numpart.gt.maxpart ) then307 ! Check whether numpart is really smaller than maxpart per process 308 !***************************************************************** 309 310 if (numpart.gt.maxpart_mpi) then 311 311 write(*,*) 'numpart too large: change source in init_atm_mass.f' 312 write(*,*) 'numpart: ',numpart,' maxpart: ',maxpart 312 write(*,*) 'numpart: ',numpart,' maxpart: ',maxpart_mpi 313 313 endif 314 314 -
src/mpi_mod.f90
r79abee9 r0f7835d 2444 2444 end subroutine write_data_dbg 2445 2445 2446 2447 subroutine set_fields_synthetic()2448 !*******************************************************************************2449 ! DESCRIPTION2450 ! Set all meteorological fields to synthetic (usually constant/homogeneous)2451 ! values.2452 ! Used for validation and error-checking2453 !2454 ! NOTE2455 ! This version uses asynchronious communications.2456 !2457 ! VARIABLES2458 !2459 !2460 !2461 !*******************************************************************************2462 use com_mod2463 2464 implicit none2465 2466 integer :: li=1, ui=2 ! wfmem indices (i.e, operate on entire field)2467 2468 if (.not.lmp_sync) ui=32469 2470 2471 ! Variables transferred at initialization only2472 !*********************************************2473 ! readclouds=readclouds_2474 oro(:,:)=0.02475 excessoro(:,:)=0.02476 lsm(:,:)=0.02477 xlanduse(:,:,:)=0.02478 ! wftime2479 ! numbwf2480 ! nmixz2481 ! height2482 2483 ! Time-varying fields:2484 uu(:,:,:,li:ui) = 10.02485 vv(:,:,:,li:ui) = 0.02486 uupol(:,:,:,li:ui) = 10.02487 vvpol(:,:,:,li:ui)=0.02488 ww(:,:,:,li:ui)=0.2489 tt(:,:,:,li:ui)=300.2490 rho(:,:,:,li:ui)=1.32491 drhodz(:,:,:,li:ui)=.02492 tth(:,:,:,li:ui)=0.02493 qvh(:,:,:,li:ui)=1.02494 qv(:,:,:,li:ui)=1.02495 2496 pv(:,:,:,li:ui)=1.02497 clouds(:,:,:,li:ui)=02498 2499 clwc(:,:,:,li:ui)=0.02500 ciwc(:,:,:,li:ui)=0.02501 2502 ! 2D fields2503 2504 cloudsh(:,:,li:ui)=02505 vdep(:,:,:,li:ui)=0.02506 ps(:,:,:,li:ui)=1.0e52507 sd(:,:,:,li:ui)=0.02508 tcc(:,:,:,li:ui)=0.02509 tt2(:,:,:,li:ui)=300.2510 td2(:,:,:,li:ui)=250.2511 lsprec(:,:,:,li:ui)=0.02512 convprec(:,:,:,li:ui)=0.02513 ustar(:,:,:,li:ui)=1.02514 wstar(:,:,:,li:ui)=1.02515 hmix(:,:,:,li:ui)=10000.2516 tropopause(:,:,:,li:ui)=10000.2517 oli(:,:,:,li:ui)=0.012518 2519 end subroutine set_fields_synthetic2520 2521 2446 end module mpi_mod -
src/timemanager_mpi.f90
r3b80e98 r0f7835d 275 275 if (mp_measure_time.and..not.(lmpreader.and.lmp_use_reader)) call mpif_mtime('getfields',1) 276 276 277 ! For validation and tests: call the function below to set all fields to simple278 ! homogeneous values279 ! if (mp_dev_mode) call set_fields_synthetic280 281 !*******************************************************************************282 283 277 if (lmpreader.and.nstop1.gt.1) stop 'NO METEO FIELDS AVAILABLE' 284 278 -
options/SPECIES/SPECIES_031
r341f4b7 r35fa90d 9 9 POHCCONST= 1.07E-11, 10 10 POHDCONST= 1203.00000 , 11 POHNCONST= 2.00000000 ,11 POHNCONST= 0.00000000 , 12 12 / -
src/par_mod.f90
r3b80e98 r6b3dad4 186 186 !************************************************** 187 187 188 integer,parameter :: maxpart=1000000 189 integer,parameter :: maxspec= 2188 integer,parameter :: maxpart=10000000 189 integer,parameter :: maxspec=4 190 190 real,parameter :: minmass=0.0001 191 191
Note: See TracChangeset
for help on using the changeset viewer.