Changeset 7f9db1f in flexpart.git for src

Timestamp:

Dec 2, 2015, 11:42:02 AM (8 years ago)

Author:

Espen Sollum ATMOS <eso@…>

Branches:

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

Children:

88d8c3d

Parents:

de7afbd (diff), 02d4810 (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.

Message:

Merge branch 'espen' into dev

Location:

src

Files:

• makefile (modified) (2 diffs)
• par_mod.f90 (modified) (1 diff)
• pathnames (modified) (1 diff)

src/makefile

@@ -49 +49 @@
         INCPATH2  = ${ROOT_DIR}/include
         LIBPATH1 = ${ROOT_DIR}/lib
-#       LIBPATH2 = ${ROOT_DIR}/gcc-4.9.1/lib
-#       LIBPATH2 = /lib
+
 else
 # Default: System libraries at NILU, gfortran v4.6
@@ -59 +58 @@
         INCPATH2 = /usr/include
         LIBPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/lib
-#       LIBPATH2 = /usr/lib/x86_64-linux-gnu
 endif
 

src/par_mod.f90

@@ -213 +213 @@
 !  integer,parameter :: maxpart=60000000
 !  integer,parameter :: maxpart=120000000
-  integer,parameter :: maxspec=1
+  integer,parameter :: maxspec=6
 
   ! maxpart                 Maximum number of particles

src/pathnames

@@ -1 +1 @@
 ../options/
-../out_clwc_leo/
+../output/
 /
-/xnilu_wrk/flex_wrk/zhg/ECMWF_CLWC/Availables
+/xnilu_wrk/flex_wrk/WIND_FIELDS/AVAILABLE_ECMWF_OPER_fields_global/
 ============================================
-
-../options_nikos_backwards/
-/xnilu_wrk/flex_wrk/WIND_FIELDS/AVAILABLE_ECMWF_OPER_fields_global
-/xnilu_wrk/flex_wrk/WIND_FIELDS/NCEP/2010_data_05/AVAILABLE