- Timestamp:
- May 20, 2015, 2:45:16 PM (9 years ago)
- Branches:
- master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie
- Children:
- 478e9e6
- Parents:
- 6c2627f (diff), b724ea3 (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. - Location:
- src
- Files:
-
- 1 deleted
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
src/makefile
r5f9d14a r5f42c27 34 34 FLEXPART-GFS-MPI = FP_gfs_MPI 35 35 36 36 37 ## COMPILERS 37 38 F90 = /usr/bin/gfortran … … 50 51 51 52 ## 1) System libraries at NILU 52 #INCPATH1 = /usr/include53 INCPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/include53 INCPATH1 = /usr/include 54 #INCPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/include 54 55 LIBPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/lib 55 # 56 #LIBPATH2 = /usr/lib/x86_64-linux-gnu 56 57 57 58 ## 2) Home-made libraries 58 #INCPATH2 = ${HOME}/include 59 INCPATH2 = /homevip/flexpart/include 60 LIBPATH2 = /homevip/flexpart/lib 61 #INCPATH2 = ${HOME}/lib 62 63 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) -mtune=native $(FUSER) # -march=native 64 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 -Warray-bounds -Wall -fcheck=all $(FUSER) # -ffpe-trap=invalid,overflow,denormal,underflow,zero -fdump-core 59 # INCPATH1 = ${HOME}/include 60 INCPATH2 = /homevip/flexpart/include/ 61 LIBPATH2 = /homevip/flexpart/lib/ 62 # LIBPATH1 = ${HOME}/lib 63 64 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) -mtune=native -fuse-linker-plugin $(FUSER) # -march=native 65 66 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 -Warray-bounds -Wall -fcheck=all $(FUSER) # -ffpe-trap=invalid,overflow,denormal,underflow,zero -fdump-core 65 67 66 68 LDFLAGS = $(FFLAGS) -L$(LIBPATH1) -L$(LIBPATH2) $(LIBS) … … 188 190 %.o: %.mod 189 191 192 ecmwf: $(FLEXPART-ECMWF) 193 ecmwf: FC := $(F90) 194 190 195 ecmwf-mpi: $(FLEXPART-ECMWF-MPI) 191 196 ecmwf-mpi: FC := $(MPIF90) … … 196 201 ecmwf-mpi-dbg: FC := $(MPIF90) 197 202 198 ecmwf: $(FLEXPART-ECMWF)199 ecmwf: FC := $(F90)200 201 203 gfs: $(FLEXPART-GFS) 202 204 gfs: FC := $(F90) … … 207 209 #all: $(FLEXPART-ECMWF-MPI) 208 210 211 $(FLEXPART-ECMWF): $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_ECMWF) 212 +$(FC) -o $@ $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_ECMWF) $(LDFLAGS) 213 209 214 $(FLEXPART-ECMWF-MPI): $(MODOBJS) $(MPI_MODOBJS) $(OBJECTS) $(OBJECTS_MPI) $(OBJECTS_ECMWF_MPI) 210 215 +$(FC) -o $@ $(MODOBJS) $(MPI_MODOBJS) $(OBJECTS) $(OBJECTS_MPI) \ … … 216 221 +$(FC) -o $@ $(MODOBJS) $(MPI_MODOBJS) $(OBJECTS) $(OBJECTS_MPI) \ 217 222 $(OBJECTS_ECMWF_MPI) $(LDFLAGS) 218 219 $(FLEXPART-ECMWF): $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_ECMWF)220 +$(FC) -o $@ $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_ECMWF) $(LDFLAGS)221 223 222 224 $(FLEXPART-GFS): $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_GFS) -
src/readOHfield.f90
r5f42c27 rd7aab4b 72 72 ierr=nf_open(trim(thefile),NF_NOWRITE,nid) 73 73 if(ierr.ne.0) then 74 write (*,*) 'The OH field at: '//thefile// ' could not be opened' 75 write (*,*) 'please copy the OH fields there, or change the path in the' 76 write (*,*) 'COMMAND namelist!' 74 77 write(*,*) nf_strerror(ierr) 75 78 stop
Note: See TracChangeset
for help on using the changeset viewer.