Renamed into test/pdegen, also in the C interface

fix-hash
Salvatore Filippone 1 year ago
parent 5b1d4fb9cd
commit 7201e511be

@ -33,7 +33,7 @@ oaccld: oaccd
based: based:
$(MAKE) -C base objs $(MAKE) -C base objs
precd: precd:
$(MAKE) -C prec objs $(MAKE) -C prec objs8
linslvd: linslvd:
$(MAKE) -C linsolve objs $(MAKE) -C linsolve objs
utild: utild:
@ -62,7 +62,7 @@ install: all
mkdir -p $(INSTALL_DOCSDIR) && \ mkdir -p $(INSTALL_DOCSDIR) && \
$(INSTALL_DATA) README.md LICENSE $(INSTALL_DOCSDIR) $(INSTALL_DATA) README.md LICENSE $(INSTALL_DOCSDIR)
mkdir -p $(INSTALL_SAMPLESDIR) && \ mkdir -p $(INSTALL_SAMPLESDIR) && \
/bin/cp -fr test/pargen test/fileread $(INSTALL_SAMPLESDIR) && \ /bin/cp -fr test/pdegen test/fileread $(INSTALL_SAMPLESDIR) && \
mkdir -p $(INSTALL_SAMPLESDIR)/cbind && /bin/cp -fr cbind/test/pargen/* $(INSTALL_SAMPLESDIR)/cbind mkdir -p $(INSTALL_SAMPLESDIR)/cbind && /bin/cp -fr cbind/test/pargen/* $(INSTALL_SAMPLESDIR)/cbind
clean: cleanlib clean: cleanlib
$(MAKE) -C base veryclean $(MAKE) -C base veryclean

@ -17,17 +17,12 @@ PSB_LIBS=-lpsb_util -lpsb_linsolve -lpsb_prec -lpsb_base -L$(LIBDIR)
EXEDIR=./runs EXEDIR=./runs
all: ppdec build all: pdegen3dc
ppdec: ppdec.o pdegen3dc: pdegen3dc.o
$(MPFC) ppdec.o -o ppdec $(PSBC_LIBS) $(PSB_LIBS) $(PSBLDLIBS) -lm -lgfortran $(MPFC) pdegen3dc.o -o pdegen3dc $(PSBC_LIBS) $(PSB_LIBS) $(PSBLDLIBS) -lm -lgfortran
/bin/mv ppdec $(EXEDIR) /bin/mv pdegen3dc $(EXEDIR)
build: build.o
$(MPFC) build.o -o build $(PSBC_LIBS) $(PSB_LIBS) $(PSBLDLIBS) -lm -lgfortran
/bin/mv build $(EXEDIR)
# \
# -lifcore -lifcoremt -lguide -limf -lirc -lintlc -lcxaguard -L/opt/intel/fc/10.0.023/lib/ -lm
.f90.o: .f90.o:
$(MPFC) $(FCOPT) $(FINCLUDES) $(FDEFINES) -c $< $(MPFC) $(FCOPT) $(FINCLUDES) $(FDEFINES) -c $<
@ -36,11 +31,11 @@ build: build.o
clean: clean:
/bin/rm -f ppdec.o build.o $(EXEDIR)/ppdec /bin/rm -f pdegen3dc.o $(EXEDIR)/pdegen3dc
verycleanlib: verycleanlib:
(cd ../..; make veryclean) (cd ../..; make veryclean)
lib: lib:
(cd ../../; make library) (cd ../../; make library)
tests: all tests: all
cd runs ; ./ppdec < ppde.inp cd runs ; ./pdegen3dc < pdegen3d.inp

@ -1,8 +0,0 @@
localhost
localhost
localhost
localhost
localhost
localhost
localhost
localhost

@ -2,7 +2,7 @@
BICGSTAB Iterative method BICGSTAB CGS BICG BICGSTABL RGMRES FCG CGR RICHARDSON BICGSTAB Iterative method BICGSTAB CGS BICG BICGSTABL RGMRES FCG CGR RICHARDSON
BJAC Preconditioner NONE DIAG BJAC BJAC Preconditioner NONE DIAG BJAC
CSR Storage format for matrix A: CSR COO CSR Storage format for matrix A: CSR COO
100 Domain size (acutal system is this**3 (pde3d) or **2 (pde2d) ) 100 Domain size (acutal system is this**3 (pde3d) )
3 Partition: 1 BLOCK 3 3D 3 Partition: 1 BLOCK 3 3D
2 Stopping criterion 1 2 2 Stopping criterion 1 2
0200 MAXIT 0200 MAXIT
Loading…
Cancel
Save