restore old heat_transfer for adios 1.x

Author: pnorbert

Tutorial/heat_transfer/Makefile

@@ -1,35 +1,81 @@
+include make.settings
+
+## Set ADIOS_DIR here or before doing make
+override ADIOS_FINC=-I${ADIOS_DIR}/include
+override ADIOS_FLIB=`${ADIOS_DIR}/bin/adios_config -l -f`
 
 default: 
-	@echo "Make targets at this level are for cleaning only:"
-	@echo "  clean-code  :  recursively delete objects and binaries"
-	@echo "  clean-data  :  recursively delete files created by the examples"
-	@echo "  distclean   :  clean-code and clean-data"
+	@echo "Make targets: fort hdf5 phdf5 adios1 adios2 noxml"
+	@echo "  fort:     build example with text output(io_fort.F90)"
+	@echo "  hdf5_a:   build example with HDF5, separate timesteps (io_hdf5_a.F90)"
+	@echo "  hdf5_b:   build example with HDF5, combined timesteps (io_hdf5_b.F90)"
+	@echo "  phdf5:    build example with Parallel HDF5  (io_phdf5.F90)"
+	@echo "  adios1:   build example with ADIOS  (io_adios_gpp.F90)"
+	@echo "  adios2:   build example with ADIOS  (io_adios.F90)"
+	@echo "  noxml:    build example with ADIOS  (io_adios_noxml.F90)"
 
 all: default
 help: default
 
-subdirs = simulation analysis stage_write
 
-clean-data:
-	rm -f *.o *.mod *.fh core.*
-	rm -f fort.* 
-	rm -f *.png minmax 
-	rm -rf *.bp *.bp.dir *.idx
-	rm -f *.h5
-	rm -f conf *.sst *.insitumpi
-	for dir in $(subdirs); do echo "Clean $${dir}"; (cd $${dir}; make clean-data); done
+io_hdf5_a.o : io_hdf5_a.F90 
+	${FC} ${FFLAGS} -c ${HDF5_FINC} $< 
+
+io_hdf5_b.o : io_hdf5_b.F90 
+	${FC} ${FFLAGS} -c ${HDF5_FINC} $< 
+
+io_phdf5.o : io_phdf5.F90 
+	${FC} ${FFLAGS} -c ${PHDF5_FINC} $< 
+
+gwrite_heat.fh: heat_transfer.xml
+	${ADIOS_DIR}/bin/gpp.py heat_transfer.xml
+	rm -f gread_heat.fh
+
+io_adios_gpp.o : gwrite_heat.fh io_adios_gpp.F90 
+	${FC} ${FFLAGS} -c ${ADIOS_FINC} io_adios_gpp.F90 
+
+io_adios.o : io_adios.F90 
+	${FC} ${FFLAGS} -c ${ADIOS_FINC} $< 
+
+io_adios_noxml.o : io_adios_noxml.F90 
+	${FC} ${FFLAGS} -c ${ADIOS_FINC} $< 
+
+%.o : %.F90 
+	${FC} ${FFLAGS} -c $< 
 
-clean-code:
+fort: heat_vars.o io_fort.o heat_transfer.o
+	${FC} ${FFLAGS} -o heat_transfer_fort $^ 
+
+hdf5_a: heat_vars.o io_hdf5_a.o heat_transfer.o
+	libtool --mode=link --tag=FC ${FC} ${FFLAGS} -o heat_transfer_hdf5_a $^ ${HDF5_FLIB} 
+
+hdf5_b: heat_vars.o io_hdf5_b.o heat_transfer.o
+	libtool --mode=link --tag=FC ${FC} ${FFLAGS} -o heat_transfer_hdf5_b $^ ${HDF5_FLIB} 
+
+phdf5: heat_vars.o io_phdf5.o heat_transfer.o
+	libtool --mode=link --tag=FC ${FC} ${FFLAGS} -o heat_transfer_phdf5 $^ ${PHDF5_FLIB} 
+
+adios1: heat_vars.o io_adios_gpp.o heat_transfer.o
+	${FC} ${FFLAGS} -o heat_transfer_adios1 $^ ${ADIOS_FLIB} 
+
+adios2: heat_vars.o io_adios.o heat_transfer.o
+	${FC} ${FFLAGS} -o heat_transfer_adios2 $^ ${ADIOS_FLIB} 
+
+noxml: heat_vars.o io_adios_noxml.o heat_transfer.o
+	${FC} ${FFLAGS} -o heat_transfer_noxml $^ ${ADIOS_FLIB} 
+
+clean:
 	rm -f *.o *.mod *.fh core.*
 	rm -f heat_transfer_fort 
-	rm -f heat_transfer_adios1 heat_transfer_adios1_gpp heat_transfer_adios1_noxml
-	rm -f heat_transfer_adios2  heat_transfer_noxml
+	rm -f heat_transfer_adios1 heat_transfer_adios2  heat_transfer_noxml
 	rm -f heat_transfer_hdf5_a heat_transfer_hdf5_b heat_transfer_phdf5
-	for dir in $(subdirs); do echo "Clean $${dir}"; (cd $${dir}; make clean-code); done
-
-distclean: clean-code clean-data
-
 
+distclean: clean
+	rm -f fort.* 
+	rm -f *.png minmax 
+	rm -rf *.bp *.bp.dir *.idx
+	rm -f *.h5
+	rm -f conf
 
 
 

Tutorial/heat_transfer/README

@@ -1,27 +1,18 @@
-2D Heat Transfer example 
+2D Heat Transfer example
 Fortran 90 code, 2D array with 2D decomposition
 
 1. Build
 --------
 Edit make.settings 
 - compiler and compiler options
-- ADIOS 2.x installation directory
-- optionally 
-   ADIOS 1.x installation directory
-   Parallel HDF5 installation directory
+- ADIOS installation directory
 
-$ cd simulation
-$ make adios2
-$ cd ..
-
-$ cd analysis
-$ make adios2 steps2
-$ cd ..
+$ make adios
 
 2. Run
 -------
 
-$ ./simulation heat_transfer_adios2
+$ ./heat_transfer 
  Usage: heat_transfer  output  N  M   nx  ny   steps iterations
  output: name of output file
  N:      number of processes in X dimension
@@ -31,7 +22,7 @@ $ ./simulation heat_transfer_adios2
  steps:  the total number of steps to output
  iterations: one step consist of this many iterations
 
-$ mpirun -np 12 simulation/heat_transfer_adios2 heat  4 3    40 50   6 500
+$ mpirun -np 12 ./heat_transfer_adios1 heat  4 3    40 50   6 500
 
 will perform the calculation 
 - on 12 processes 
@@ -40,10 +31,8 @@ will perform the calculation
 - producing an output of 6 steps stored in heat.bp 
 
 $ bpls -l heat.bp T
-  integer  gndx  scalar = 160
-  double   T     6*{150, 160} = -0.263389 / 2.9984 / null  / null 
-  integer  gndy  scalar = 150
-  double   dT    6*{150, 160} = -0.000847309 / 0.00227756 / null  / null
+  double   T            6*{150, 160} = 0.000212009 / 999.47 / 442.536 / 318.995 
+  double   dT           6*{150, 160} = 6.27403e-06 / 0.720097 / 0.135503 / 0.115625
 
 $ ./plot_heat.sh heat.bp
 $ eog . 
@@ -52,31 +41,16 @@ $ eog .
 ---------------
 Staging demos
 ---------------
-
 A 100 output step on less processes, with more computation between steps. 
-In adios2.xml, use "SST" for engine of the io group "heat"
-
-In two terminal windows:
-
-$ mpirun -n 4 simulation/heat_transfer_adios2 heat 2 2 300 300 100 600
-$ mpirun -n 2 analysis/heat_read_steps2 heat.bp
-
-or 
-
-$ mpirun -n 4 simulation/heat_transfer_adios2 heat 2 2 300 300 100 600
-$ mpirun -n 2 /opt/adios2/bin/adios2_reorganize heat.bp staged.bp SST "" BPFile "" 2 1
-
-
---- With ADIOS 1.x using heat_transfer_adios1 binary ---
 
-If output method in adios1.xml is FLEXPATH, 
+If output method in heat_transfer.xml is FLEXPATH, 
 you need two terminals. Run the staging reader-writer in one terminal and
 the simulation in another terminal. The order of startup does not matter.
 
 $ mpirun -np 2 stage_write/stage_write heat.bp staged.bp FLEXPATH "" MPI "" 2
 $ mpirun -np 4 ./heat_transfer_adios2 heat 2 2 300 300 100 600
 
-If output method in adios1.xml is DATASPACES, 
+If output method in heat_transfer.xml is DATASPACES, 
 you need three terminals. 
 Run the DataSpaces server first in one terminal and tell the app 
 the number of servers and clients.