Changes in / [7d02c2f:91ce5e7] in flexpart.git

Location:

src

Files:

• makefile (modified) (2 diffs)
• par_mod.f90 (modified) (5 diffs)

src/makefile

@@ -58 +58 @@
         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/
@@ -69 +69 @@
         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
-
-        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
+#       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
 endif
 

src/par_mod.f90

@@ -148 +148 @@
   ! 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
@@ -160 +160 @@
   !*********************************************
 
-  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
@@ -209 +209 @@
   !integer,parameter :: maxxgrid=361,maxygrid=181,maxxgridn=0,maxygridn=0)
 
-  integer,parameter :: maxreceptor=200
+  integer,parameter :: maxreceptor=20
 
   ! maxreceptor             maximum number of receptor points
@@ -218 +218 @@
   !**************************************************
 
-  integer,parameter :: maxpart=30000000
-  integer,parameter :: maxspec=6
+  integer,parameter :: maxpart=100000
+  integer,parameter :: maxspec=1
 
   real,parameter :: minmass=0.0001
@@ -262 +262 @@
   !*********************************
 
-  integer,parameter :: maxrand=200000000
+  integer,parameter :: maxrand=1000000
 
   ! maxrand                 number of random numbers used