Changeset 2c967c1 in flexpart.git

Timestamp:

Oct 14, 2015, 7:37:08 AM (9 years ago)

Author:

Ignacio Pisso <Ignacio.Pisso@…>

Children:

dd21a0e

Parents:

17bfbe1

Message:

fix conflict after pulling dev version over unsaved changes on laptop conf. Run preliminary tests on Yosemite

Location:

src

Files:

• makefile.laptop (modified) (1 diff)
• par_mod.f90 (modified) (3 diffs)

src/makefile.laptop

@@ -11 +11 @@
 #FFLAGS   =   -O2 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
 
-#options for Lion
-#libs_dir=/Users/ignacio_in_EBCRPA/flexpart/libs/
+#options for Lion/Mavericks/Yosemite``
 libs_dir=/Users/ignacio/flexpart/libs/
-INCPATH  = $(libs_dir)/grib_api-1.12.3_dir/include
-LIBPATH1 = $(libs_dir)/grib_api-1.12.3_dir/lib
+INCPATH  = $(libs_dir)/grib_api-1.13.1_dir_gfortran_5.1/include
+LIBPATH1 = $(libs_dir)/grib_api-1.13.1_dir_gfortran_5.1/lib
 LIBPATH2 = $(libs_dir)/jasper_dir/lib
 

src/par_mod.f90

@@ -121 +121 @@
   !*********************************************
   
-  !integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92 !FNL XF
+  !integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92 !ECMWF 91 levels
+  integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138 !ECMWF 137 levels
+  !integer,parameter :: nxmax=721,nymax=361,nuvzmax=138,nwzmax=138,nzmax=138 !ECMWF 0.5 137 levels
+  !integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92 !FNL
+
   !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
 
@@ -156 +158 @@
   !*********************************************
 
-  !integer,parameter :: maxnests=0, nxmaxn=0, nymaxn=0
-  integer,parameter :: maxnests=1,nxmaxn=361,nymaxn=351 !ECMWF
+  integer,parameter :: maxnests=0, nxmaxn=0, nymaxn=0
+  !integer,parameter :: maxnests=1,nxmaxn=361,nymaxn=351 !ECMWF
   !integer,parameter :: maxnests=1, nxmaxn=201, nymaxn=161 ! FNL XF
   ! maxnests                maximum number of nested grids
@@ -200 +202 @@
   !**************************************************
 
-  integer,parameter :: maxpart=4000000
-  integer,parameter :: maxspec=6
+  integer,parameter :: maxpart=1000000
+  integer,parameter :: maxspec=1