Merge branch 'dev' of git.nilu.no:flexpart/flexpart into dev

src/makefile

@@ -57,7 +57,7 @@ ifeq ($(gcc), 4.9)
 	INCPATH2  = ${ROOT_DIR}/include
 	LIBPATH1 = ${ROOT_DIR}/lib
 
-else ifeq ($(gcc), 5.4)
+else #ifeq ($(gcc), 5.4)
 # Compiled libraries under user ~flexpart, gfortran v5.4
 	ROOT_DIR = /homevip/flexpart/
 
@@ -68,14 +68,14 @@ else ifeq ($(gcc), 5.4)
 	INCPATH2  = /usr/include
 	LIBPATH1 = ${ROOT_DIR}/gcc-5.4.0/lib
 
-else
+#else
 # Default: System libraries at NILU, gfortran v4.6
-	F90       = /usr/bin/gfortran
-	MPIF90    = /usr/bin/mpif90.openmpi
+#	F90       = /usr/bin/gfortran
+#	MPIF90    = /usr/bin/mpif90.openmpi
 
-	INCPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/include
-	INCPATH2 = /usr/include
-	LIBPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/lib
+#	INCPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/include
+#	INCPATH2 = /usr/include
+#	LIBPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/lib
 endif
 
 

src/par_mod.f90

@@ -147,7 +147,7 @@ module par_mod
   
   ! ECMWF
 ! integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92,nxshift=359 ! 1.0 degree 92 level
-   integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138,nxshift=359 ! 1.0 degree 138 level
+  integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138,nxshift=359 ! 1.0 degree 138 level
 ! integer,parameter :: nxmax=721,nymax=361,nuvzmax=138,nwzmax=138,nzmax=138,nxshift=359  ! 0.5 degree 138 level
 !  integer,parameter :: nxmax=181,nymax=91,nuvzmax=92,nwzmax=92,nzmax=92,nxshift=0  ! CERA 2.0 degree 92 level
 
@@ -159,7 +159,7 @@ module par_mod
   ! Maximum dimensions of the nested input grids
   !*********************************************
 
-  integer,parameter :: maxnests=1,nxmaxn=451,nymaxn=426
+  integer,parameter :: maxnests=0,nxmaxn=0,nymaxn=0
 
   ! nxmax,nymax        maximum dimension of wind fields in x and y
   !                    direction, respectively
@@ -208,7 +208,7 @@ module par_mod
   !integer maxxgrid,maxygrid,maxzgrid,maxxgridn,maxygridn
   !integer,parameter :: maxxgrid=361,maxygrid=181,maxxgridn=0,maxygridn=0)
 
-  integer,parameter :: maxreceptor=200
+  integer,parameter :: maxreceptor=20
 
   ! maxreceptor             maximum number of receptor points
 
@@ -217,8 +217,8 @@ module par_mod
   ! Maximum number of particles, species, and similar
   !**************************************************
 
-  integer,parameter :: maxpart=30000000
-  integer,parameter :: maxspec=6
+  integer,parameter :: maxpart=100000
+  integer,parameter :: maxspec=1
 
   real,parameter :: minmass=0.0001
 
@@ -261,7 +261,7 @@ module par_mod
   ! Dimension of random number field
   !*********************************
 
-  integer,parameter :: maxrand=200000000
+  integer,parameter :: maxrand=1000000
 
   ! maxrand                 number of random numbers used