Commits

Anonymous committed 6e8d3dd

PF: Init pf%outdir to "". Bump HDF5 version.

Comments (0)

Files changed (4)

Makefile.external

 # hdf5
 #
 
-HDF5 = hdf5-1.8.11
+HDF5 = hdf5-1.8.13
 HDF5_CONFIG = --enable-fortran --enable-parallel
 
 hdf5: $(HDF5).tar.gz

examples/mpi-navier-stokes/Makefile

 
 FFLAGS  += -O3 -I$(FFTW3)/include -I$(HDF5)/include -fopenmp
 CFLAGS  += -I$(FFTW3)/include -fopenmp
-LDFLAGS += -L$(FFTW3)/lib -lfftw3 -L$(HDF5)/include -lhdf5 -fopenmp -lstdc++ -lfftw3_omp
+LDFLAGS += -fopenmp -lstdc++ -ldl -lz -L$(FFTW3)/lib -lfftw3 -lfftw3_omp -L$(HDF5)/lib -lhdf5_fortran -lhdf5
 
 vpath %.cpp $(VPATHS)
 

examples/mpi-navier-stokes/src/main.f90

   call pf_pfasst_setup(pf)
 
   ! initialize advection/diffusion
+  if (len_trim(pf%outdir) == 0) pf%outdir = "."
+
   call carray4_create(q0, pf%levels(nlevs)%shape)
-  if (pf%rank == 0) then
-     print *, 'generating initial condition...'
-  end if
   ! call vortex_sheets(q0)
   ! call random_full(q0)
   call load(q0, 'full064_s990.h5')
   if (pf%rank == 0) then
      call dump(pf%outdir, 'initial.npy', q0)
-     print *, 'generating initial condition... done.'
   end if
 
   do l = 1, nlevs

src/pf_pfasst.f90

 
     if (present(nlevels)) pf%nlevels = nlevels
 
+    pf%outdir = ""
+
     ! gather some input from a file and command line
     read_cmd = .true.
     if (present(nocmd)) then