Changeset d8eed02 in flexpart.git

Timestamp:

Sep 13, 2017, 10:36:25 AM (7 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:

dd6a4aa

Parents:

5b34509

Message:

Minor edits

Location:

src

Files:

• FLEXPART.f90 (modified) (1 diff)
• FLEXPART_MPI.f90 (modified) (1 diff)
• calcmatrix.f90 (modified) (1 diff)
• gridcheck_gfs.f90 (modified) (1 diff)
• makefile (modified) (1 diff)
• par_mod.f90 (modified) (3 diffs)
• timemanager_mpi.f90 (modified) (3 diffs)

src/FLEXPART.f90

@@ -82 +82 @@
   ! FLEXPART version string
   flexversion_major = '10' ! Major version number, also used for species file names
-  flexversion='Version '//trim(flexversion_major)//'.1beta (2016-11-02)'
+  flexversion='Version '//trim(flexversion_major)//'.2beta (2017-08-01)'
   verbosity=0
 

src/FLEXPART_MPI.f90

@@ -92 +92 @@
   ! FLEXPART version string
   flexversion_major = '10' ! Major version number, also used for species file names
-  flexversion='Ver. '//trim(flexversion_major)//'.1beta MPI (2016-11-02)'
+  flexversion='Ver. '//trim(flexversion_major)//'.2beta MPI (2017-08-01)'
   verbosity=0
 

src/calcmatrix.f90

@@ -100 +100 @@
     do kk=1,nconvlev
       fmassfrac(k,kk)=0.
-    enddo
-  enddo
+    end do
+  end do
 
 

src/gridcheck_gfs.f90

@@ -231 +231 @@
        yaux2in,iret)
   call grib_check(iret,gribFunction,gribErrorMsg)
+
+  ! Fix for flexpart.eu ticket #48
+  if (xaux2in.lt.0) xaux2in = 359.0
 
   xaux1=xaux1in

src/makefile

@@ -81 +81 @@
 LIBS = -lgrib_api_f90 -lgrib_api -lm -ljasper -lnetcdff # -fopenmp
 
-FFLAGS   = -I$(INCPATH1) -I$(INCPATH2) -O$(O_LEV) -g -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -fmessage-length=0 -flto=jobserver -O$(O_LEV) $(FUSER)  #-Warray-bounds -fcheck=all # -march=native
-
-DBGFLAGS = -I$(INCPATH1) -I$(INCPATH2) -O$(O_LEV_DBG) -g3 -ggdb3 -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -fmessage-length=0 -flto=jobserver -O$(O_LEV_DBG) -fbacktrace   -Wall  -fdump-core $(FUSER)  #  -ffpe-trap=invalid,overflow,denormal,underflow,zero  -Warray-bounds -fcheck=all
-
-LDFLAGS  = $(FFLAGS) -L$(LIBPATH1) $(LIBS) #-L$(LIBPATH2)
+FFLAGS   = -I$(INCPATH1) -I$(INCPATH2) -O$(O_LEV) -g -cpp -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -fmessage-length=0 -flto=jobserver -O$(O_LEV) $(FUSER)  #-Warray-bounds -fcheck=all # -march=native
+
+DBGFLAGS = -I$(INCPATH1) -I$(INCPATH2) -O$(O_LEV_DBG) -g3 -ggdb3 -cpp -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -fmessage-length=0 -flto=jobserver -O$(O_LEV_DBG) -fbacktrace   -Wall  -fdump-core $(FUSER)  #  -ffpe-trap=invalid,overflow,denormal,underflow,zero  -Warray-bounds -fcheck=all
+
+LDFLAGS  = $(FFLAGS) -L$(LIBPATH1) -Wl,-rpath,$(LIBPATH1) $(LIBS) #-L$(LIBPATH2)
 LDDEBUG  = $(DBGFLAGS) -L$(LIBPATH1) $(LIBS) #-L$(LIBPATH2)
 

src/par_mod.f90

@@ -142 +142 @@
   
 !  integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92 !ECMWF new 
-!  integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138 !ECMWF new 
-
-  integer,parameter :: nxmax=181,nymax=91,nuvzmax=138,nwzmax=138,nzmax=138 !ECMWF new 
+  integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138 !ECMWF new 
+
+!  integer,parameter :: nxmax=181,nymax=91,nuvzmax=138,nwzmax=138,nzmax=138 !ECMWF new 
 
 !  INTEGER,PARAMETER :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138 !NCEP data
 
-!  !integer,parameter :: nxshift=359  ! for ECMWF
-!  integer,parameter :: nxshift=0     ! for GFS
-!  integer,parameter :: nxmax=15,nymax=15,nuvzmax=140,nwzmax=140,nzmax=140
 !  integer,parameter :: nxshift=359  ! for ECMWF
   integer,parameter :: nxshift=0     ! for GFS
@@ -158 +155 @@
   !*********************************************
 
-  integer,parameter :: maxnests=0,nxmaxn=451,nymaxn=226
+  integer,parameter :: maxnests=1,nxmaxn=451,nymaxn=226
 
   ! nxmax,nymax        maximum dimension of wind fields in x and y
@@ -293 +290 @@
   integer,parameter ::  icmv=-9999
 
-! Parameters for testing
-!*******************************************
-!  integer :: verbosity=0
 
 end module par_mod

src/timemanager_mpi.f90

@@ -86 +86 @@
 ! xtra1(maxpart), ytra1(maxpart), ztra1(maxpart) =                           *
 !                    spatial positions of trajectories                       *
+! metdata_format     format of metdata (ecmwf/gfs)                           *
 !                                                                            *
 ! Constants:                                                                 *
@@ -106 +107 @@
   implicit none
 
+  integer :: metdata_format
   logical :: reqv_state=.false. ! .true. if waiting for a MPI_Irecv to complete
   integer :: j,ks,kp,l,n,itime=0,nstop,nstop1,memstat=0
@@ -349 +351 @@
         write (*,*) 'timemanager> call convmix -- forward'
       endif
-      call convmix(itime)
+      call convmix(itime,metdata_format)
     endif