Changeset 8a65cb0 in flexpart.git for src/par_mod.f90

Timestamp:

Mar 2, 2015, 3:11:55 PM (9 years ago)

Author:

Espen Sollum ATMOS <espen@…>

Branches:

master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie

Children:

1d207bb

Parents:

60403cd

Message:

Added code, makefile for dev branch

File:

• src/par_mod.f90 (modified) (8 diffs)

src/par_mod.f90

@@ -37 +37 @@
 
   !****************************************************************
-  ! Parameter defining KIND parameter for "double precision"
+  ! Parameter defining KIND parameter for double/single precision
   !****************************************************************
 
   integer,parameter :: dp=selected_real_kind(P=15)
+  integer,parameter :: sp=selected_real_kind(6)
 
 
@@ -122 +123 @@
   
   !integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92 !FNL XF
-  !integer,parameter :: nxmax=361,nymax=181,nuvzmax=152,nwzmax=152,nzmax=152 !ECMWF new 
+  integer,parameter :: nxmax=361,nymax=181,nuvzmax=152,nwzmax=152,nzmax=152 !ECMWF new 
   !integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92 !ECMWF
   !integer,parameter :: nxmax=361,nymax=181,nuvzmax=26,nwzmax=26,nzmax=26
   !integer,parameter :: nxmax=721,nymax=361,nuvzmax=64,nwzmax=64,nzmax=64
-  integer,parameter :: nxmax=721,nymax=361,nuvzmax=138,nwzmax=138,nzmax=138 !ECMWF 0.5
   !integer,parameter :: nxmax=1201,nymax=235,nuvzmax=58,nwzmax=58,nzmax=58
 
   integer,parameter :: nxshift=359 ! for ECMWF
-  !integer,parameter :: nxshift=718 ! for ECMWF 0.5
-  !integer,parameter :: nxshift=0     ! for GFS or FNL (XF)
+  !integer,parameter :: nxshift=0     ! for GFS or FNL
 
   integer,parameter :: nconvlevmax = nuvzmax-1
@@ -157 +156 @@
 
   !integer,parameter :: maxnests=0, nxmaxn=0, nymaxn=0
-  integer,parameter :: maxnests=1,nxmaxn=361,nymaxn=351 !ECMWF
+  integer,parameter :: maxnests=1,nxmaxn=351,nymaxn=351 !ECMWF
+
   !integer,parameter :: maxnests=1, nxmaxn=201, nymaxn=161 ! FNL XF
   ! maxnests                maximum number of nested grids
@@ -200 +200 @@
   !**************************************************
 
-  integer,parameter :: maxpart=4000000
+  integer,parameter :: maxpart=50000000
+!  integer,parameter :: maxpart=60000000
+!  integer,parameter :: maxpart=120000000
   integer,parameter :: maxspec=1
-
 
   ! maxpart                 Maximum number of particles
   ! maxspec                 Maximum number of chemical species per release
+
 
   ! maxpoint is also set dynamically during runtime
@@ -214 +216 @@
   ! ---------
   integer,parameter :: maxwf=50000, maxtable=1000, numclass=13, ni=11
+  !integer,parameter :: numwfmem=2 ! Serial version/MPI with 2 fields
+  integer,parameter :: numwfmem=3 ! MPI with 3 fields
 
   ! maxwf                   maximum number of wind fields to be used for simulation
@@ -220 +224 @@
   ! numclass                Number of landuse classes available to FLEXPART
   ! ni                      Number of diameter classes of particles
+  ! numwfmem                Number of windfields kept in memory. 2 for serial
+  !                         version, 2 or 3 for MPI version
 
   !**************************************************************************
@@ -238 +244 @@
   !*********************************
 
-  integer,parameter :: maxrand=2000000
+  integer,parameter :: maxrand=120000000
+!  integer,parameter :: maxrand=2000000
+!  integer,parameter :: maxrand=20
 
   ! maxrand                 number of random numbers used
-
+  
 
   !*****************************************************
@@ -268 +276 @@
 !******************************************************
 
-    !  integer icmv
-    !  parameter(icmv=-9999)
-      integer,parameter ::  icmv=-9999
+  integer,parameter ::  icmv=-9999
 
 ! Parameters for testing