Changeset 5f42c27 in flexpart.git for src

Timestamp:

May 13, 2015, 1:42:50 PM (9 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:

598e9da

Parents:

fb0d416

Message:

Changed path to OH binaries

Location:

src

Files:

• FLEXPART.f90 (modified) (1 diff)
• FLEXPART_MPI.f90 (modified) (2 diffs)
• com_mod.f90 (modified) (2 diffs)
• makefile (modified) (6 diffs)
• mpi_mod.f90 (modified) (8 diffs)
• readOHfield.f90 (modified) (2 diffs)
• readcommand.f90 (modified) (3 diffs)
• readreleases.f90 (modified) (1 diff)
• timemanager.f90 (modified) (1 diff)

src/FLEXPART.f90

@@ -69 +69 @@
 
   ! FLEXPART version string
-  flexversion='Version 10.0pre  (2015-03-01)'
+  flexversion='Version 10.0beta (2015-05-01)'
   verbosity=0
 

src/FLEXPART_MPI.f90

@@ -77 +77 @@
 
   ! FLEXPART version string
-  flexversion='Ver. 10.0pre MPI (2015-03-01)'
+  flexversion='Ver. 10 Beta MPI (2015-05-01)'
   verbosity=0
 
@@ -337 +337 @@
 
   if (mp_measure_time) call mpif_mtime('iotime',0)
-! :DEV: was a bug here (all processes writing)?
   if (lroot) then ! MPI: this part root process only
 

src/com_mod.f90

@@ -26 +26 @@
   integer :: length(numpath+2*maxnests)
   character(len=256) :: pathfile, flexversion, arg1, arg2
+  character(len=256) :: ohfields_path
   
   ! path                    path names needed for trajectory model
@@ -32 +33 @@
   ! flexversion             version of flexpart
   ! arg                     input arguments from launch at command line
+  ! ohfields_path           path to binary files for OH fields
 
   !********************************************************

src/makefile

@@ -36 +36 @@
 
 ## COMPILERS
-#F90       = /usr/bin/gfortran
-F90       = ${HOME}/gcc-4.9.1/bin/gfortran
+F90       = /usr/bin/gfortran
+#F90      = ${HOME}/gcc-4.9.1/bin/gfortran
 #MPIF90    = ${HOME}/opt/bin/mpifort
 #MPIF90    = mpif90.mpich
-#MPIF90    = mpif90.openmpi
-MPIF90    = mpifort
+MPIF90    = mpif90.openmpi
+#MPIF90    = mpifort
 
 ## OPTIMIZATION LEVEL
@@ -51 +51 @@
 
 ## 1) System libraries at NILU
-# INCPATH1 = /usr/include
-# INCPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/include
-# LIBPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/lib
-# LIBPATH2 = /usr/lib/x86_64-linux-gnu
+INCPATH1 = /usr/include
+#INCPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/include
+LIBPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/lib
+#LIBPATH2 = /usr/lib/x86_64-linux-gnu
 
 ## 2) Home-made libraries
-INCPATH1  = ${HOME}/include
+# INCPATH1  = ${HOME}/include
 INCPATH2  = /homevip/flexpart/include/
 LIBPATH2 = /homevip/flexpart/lib/
-LIBPATH1 = ${HOME}/lib
-#LIBPATH2 = ${HOME}/lib 
+# LIBPATH1 = ${HOME}/lib
 
 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
@@ -191 +190 @@
 %.o: %.mod
 
+ecmwf: $(FLEXPART-ECMWF)
+ecmwf: FC := $(F90)
+
 ecmwf-mpi: $(FLEXPART-ECMWF-MPI)
 ecmwf-mpi: FC := $(MPIF90)
@@ -199 +201 @@
 ecmwf-mpi-dbg: FC := $(MPIF90)
 
-ecmwf: $(FLEXPART-ECMWF)
-ecmwf: FC := $(F90)
-
 gfs: $(FLEXPART-GFS)
 gfs: FC := $(F90)
@@ -210 +209 @@
 #all: $(FLEXPART-ECMWF-MPI)
 
+$(FLEXPART-ECMWF): $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_ECMWF)
+        +$(FC) -o $@ $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_ECMWF) $(LDFLAGS)
+
 $(FLEXPART-ECMWF-MPI): $(MODOBJS) $(MPI_MODOBJS) $(OBJECTS) $(OBJECTS_MPI) $(OBJECTS_ECMWF_MPI)
         +$(FC) -o $@ $(MODOBJS) $(MPI_MODOBJS) $(OBJECTS) $(OBJECTS_MPI) \
@@ -219 +221 @@
         +$(FC) -o $@ $(MODOBJS) $(MPI_MODOBJS) $(OBJECTS) $(OBJECTS_MPI) \
         $(OBJECTS_ECMWF_MPI) $(LDFLAGS)
-
-$(FLEXPART-ECMWF): $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_ECMWF)
-        +$(FC) -o $@ $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_ECMWF) $(LDFLAGS)
 
 $(FLEXPART-GFS): $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_GFS)

src/mpi_mod.f90

@@ -117 +117 @@
   logical, parameter :: mp_dbg_out = .false.
   logical, parameter :: mp_time_barrier=.true.
-  logical, parameter :: mp_measure_time=.true. 
+  logical, parameter :: mp_measure_time=.false. 
 
 ! for measuring CPU/Wall time
@@ -139 +139 @@
   real(dp) :: mp_conccalc_time_beg, mp_conccalc_time_end, mp_conccalc_time_total=0.
   real(dp) :: mp_total_wtime_beg, mp_total_wtime_end, mp_total_wtime_total=0.
+  real(dp) :: mp_vt_wtime_beg, mp_vt_wtime_end, mp_vt_wtime_total
+  real(sp) :: mp_vt_time_beg, mp_vt_time_end, mp_vt_time_total
 
 ! dat_lun           logical unit number for i/o
@@ -418 +420 @@
 
 
-
 ! redefine numpart as 'numpart per process' throughout the code
 !**************************************************************
@@ -438 +439 @@
 
     integer :: i
-
-
-!***********************************************************************
-
 
 ! Time for MPI communications
@@ -1734 +1731 @@
     end if
 
-
     if ((WETDEP).and.(ldirect.gt.0)) then
       call MPI_Reduce(wetgriduncn, wetgriduncn0, grid_size2d, mp_pp, MPI_SUM, id_root, &
@@ -1852 +1848 @@
         mp_io_time_total = mp_io_time_total + (mp_io_time_end - &
              & mp_io_time_beg)
+      end if
+
+    case ('verttransform')
+      if (imode.eq.0) then
+        mp_vt_wtime_beg = mpi_wtime()
+        call cpu_time(mp_vt_time_beg)
+      else
+        mp_vt_wtime_end = mpi_wtime()
+        call cpu_time(mp_vt_time_end)
+
+        mp_vt_wtime_total = mp_vt_wtime_total + (mp_vt_wtime_end - &
+             & mp_vt_wtime_beg)
+        mp_vt_time_total = mp_vt_time_total + (mp_vt_time_end - &
+             & mp_vt_time_beg)
       end if
 
@@ -1956 +1966 @@
           write(*,FMT='(A60,TR1,F9.2)') 'TOTAL WALL TIME FOR CONCCALC:',&
                & mp_conccalc_time_total
+          ! write(*,FMT='(A60,TR1,F9.2)') 'TOTAL WALL TIME FOR VERTTRANSFORM:',&
+          !      & mp_vt_wtime_total
+          ! write(*,FMT='(A60,TR1,F9.2)') 'TOTAL CPU TIME FOR VERTTRANSFORM:',&
+          !      & mp_vt_time_total
 ! NB: the 'flush' function is possibly a gfortran-specific extension
           call flush()
@@ -2021 +2035 @@
     subroutine write_data_dbg(array_in, array_name, tstep, ident)
 !***********************************************************************
-! Write one-dimensional arrays to disk (for debugging purposes)
+! Write one-dimensional arrays to file (for debugging purposes)
 !***********************************************************************
       implicit none 

src/readOHfield.f90

@@ -68 +68 @@
     ! open netcdf file
     write(mm,fmt='(i2.2)') m
-    thefile=trim(path(1))//'OH_FIELDS/'//'geos-chem.OH.2005'//mm//'01.nc'
+!    thefile=trim(path(1))//'OH_FIELDS/'//'geos-chem.OH.2005'//mm//'01.nc'
+    thefile=trim(ohfields_path)//'OH_FIELDS/'//'geos-chem.OH.2005'//mm//'01.nc'
     ierr=nf_open(trim(thefile),NF_NOWRITE,nid)
     if(ierr.ne.0) then
@@ -162 +163 @@
 
   ! open netcdf file
-  thefile=trim(path(1))//'OH_FIELDS/jrate_average.nc'
+!  thefile=trim(path(1))//'OH_FIELDS/jrate_average.nc'
+  thefile=trim(ohfields_path)//'OH_FIELDS/jrate_average.nc'
   ierr=nf_open(trim(thefile),NF_NOWRITE,nid)
   if(ierr.ne.0) then

src/readcommand.f90

@@ -111 +111 @@
   lnetcdfout, &
   surf_only, &
-  cblflag
+  cblflag, &
+  ohfields_path
 
   ! Presetting namelist command
@@ -143 +144 @@
   surf_only=0 
   cblflag=0
+  ohfields_path="../../flexin/"
 
   ! Open the command file and read user options
@@ -232 +234 @@
     if (old) call skplin(3,unitcommand)  !added by mc
     read(unitcommand,*) cblflag          !added by mc
+
     close(unitcommand)
 

src/readreleases.f90

@@ -385 +385 @@
     if (ohcconst(i).gt.0.) then
       OHREA=.true.
-      write (*,*) 'OHreaction switched on: ',ohcconst(i),i
+      if (lroot) write (*,*) 'OHreaction switched on: ',ohcconst(i),i
     endif
 

src/timemanager.f90

@@ -657 +657 @@
   if (linit_cond.ge.1) call initial_cond_output(itime)   ! dump initial cond. field
 
-  close(104)
+  !close(104)
 
   ! De-allocate memory and end