From 7201e511beaacda7d23341786dea34f88d8fbfca Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Sun, 23 Mar 2025 11:25:48 +0100 Subject: [PATCH] Renamed into test/pdegen, also in the C interface --- Makefile | 4 ++-- cbind/test/{pargen => pdegen}/Makefile | 17 ++++++----------- .../test/{pargen/ppdec.c => pdegen/pdegen3dc.c} | 0 .../runs/ppde.inp => pdegen/runs/pdegen3d.inp} | 0 test/pargen/runs/mach | 8 -------- test/{pargen => pdegen}/CMakeLists.txt | 0 test/{pargen => pdegen}/Makefile | 0 test/{pargen => pdegen}/psb_d_pde2d.F90 | 0 test/{pargen => pdegen}/psb_d_pde3d.F90 | 0 test/{pargen => pdegen}/psb_s_pde2d.F90 | 0 test/{pargen => pdegen}/psb_s_pde3d.F90 | 0 .../runs/ppde.inp => pdegen/runs/psb_pde3d.inp} | 2 +- 12 files changed, 9 insertions(+), 22 deletions(-) rename cbind/test/{pargen => pdegen}/Makefile (56%) rename cbind/test/{pargen/ppdec.c => pdegen/pdegen3dc.c} (100%) rename cbind/test/{pargen/runs/ppde.inp => pdegen/runs/pdegen3d.inp} (100%) delete mode 100644 test/pargen/runs/mach rename test/{pargen => pdegen}/CMakeLists.txt (100%) rename test/{pargen => pdegen}/Makefile (100%) rename test/{pargen => pdegen}/psb_d_pde2d.F90 (100%) rename test/{pargen => pdegen}/psb_d_pde3d.F90 (100%) rename test/{pargen => pdegen}/psb_s_pde2d.F90 (100%) rename test/{pargen => pdegen}/psb_s_pde3d.F90 (100%) rename test/{pargen/runs/ppde.inp => pdegen/runs/psb_pde3d.inp} (98%) diff --git a/Makefile b/Makefile index 34550195..c3b6b8f3 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ oaccld: oaccd based: $(MAKE) -C base objs precd: - $(MAKE) -C prec objs + $(MAKE) -C prec objs8 linslvd: $(MAKE) -C linsolve objs utild: @@ -62,7 +62,7 @@ install: all mkdir -p $(INSTALL_DOCSDIR) && \ $(INSTALL_DATA) README.md LICENSE $(INSTALL_DOCSDIR) 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 clean: cleanlib $(MAKE) -C base veryclean diff --git a/cbind/test/pargen/Makefile b/cbind/test/pdegen/Makefile similarity index 56% rename from cbind/test/pargen/Makefile rename to cbind/test/pdegen/Makefile index e1da6892..071f54b8 100644 --- a/cbind/test/pargen/Makefile +++ b/cbind/test/pdegen/Makefile @@ -17,17 +17,12 @@ PSB_LIBS=-lpsb_util -lpsb_linsolve -lpsb_prec -lpsb_base -L$(LIBDIR) EXEDIR=./runs -all: ppdec build +all: pdegen3dc -ppdec: ppdec.o - $(MPFC) ppdec.o -o ppdec $(PSBC_LIBS) $(PSB_LIBS) $(PSBLDLIBS) -lm -lgfortran - /bin/mv ppdec $(EXEDIR) +pdegen3dc: pdegen3dc.o + $(MPFC) pdegen3dc.o -o pdegen3dc $(PSBC_LIBS) $(PSB_LIBS) $(PSBLDLIBS) -lm -lgfortran + /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: $(MPFC) $(FCOPT) $(FINCLUDES) $(FDEFINES) -c $< @@ -36,11 +31,11 @@ build: build.o clean: - /bin/rm -f ppdec.o build.o $(EXEDIR)/ppdec + /bin/rm -f pdegen3dc.o $(EXEDIR)/pdegen3dc verycleanlib: (cd ../..; make veryclean) lib: (cd ../../; make library) tests: all - cd runs ; ./ppdec < ppde.inp + cd runs ; ./pdegen3dc < pdegen3d.inp diff --git a/cbind/test/pargen/ppdec.c b/cbind/test/pdegen/pdegen3dc.c similarity index 100% rename from cbind/test/pargen/ppdec.c rename to cbind/test/pdegen/pdegen3dc.c diff --git a/cbind/test/pargen/runs/ppde.inp b/cbind/test/pdegen/runs/pdegen3d.inp similarity index 100% rename from cbind/test/pargen/runs/ppde.inp rename to cbind/test/pdegen/runs/pdegen3d.inp diff --git a/test/pargen/runs/mach b/test/pargen/runs/mach deleted file mode 100644 index 60432829..00000000 --- a/test/pargen/runs/mach +++ /dev/null @@ -1,8 +0,0 @@ -localhost -localhost -localhost -localhost -localhost -localhost -localhost -localhost diff --git a/test/pargen/CMakeLists.txt b/test/pdegen/CMakeLists.txt similarity index 100% rename from test/pargen/CMakeLists.txt rename to test/pdegen/CMakeLists.txt diff --git a/test/pargen/Makefile b/test/pdegen/Makefile similarity index 100% rename from test/pargen/Makefile rename to test/pdegen/Makefile diff --git a/test/pargen/psb_d_pde2d.F90 b/test/pdegen/psb_d_pde2d.F90 similarity index 100% rename from test/pargen/psb_d_pde2d.F90 rename to test/pdegen/psb_d_pde2d.F90 diff --git a/test/pargen/psb_d_pde3d.F90 b/test/pdegen/psb_d_pde3d.F90 similarity index 100% rename from test/pargen/psb_d_pde3d.F90 rename to test/pdegen/psb_d_pde3d.F90 diff --git a/test/pargen/psb_s_pde2d.F90 b/test/pdegen/psb_s_pde2d.F90 similarity index 100% rename from test/pargen/psb_s_pde2d.F90 rename to test/pdegen/psb_s_pde2d.F90 diff --git a/test/pargen/psb_s_pde3d.F90 b/test/pdegen/psb_s_pde3d.F90 similarity index 100% rename from test/pargen/psb_s_pde3d.F90 rename to test/pdegen/psb_s_pde3d.F90 diff --git a/test/pargen/runs/ppde.inp b/test/pdegen/runs/psb_pde3d.inp similarity index 98% rename from test/pargen/runs/ppde.inp rename to test/pdegen/runs/psb_pde3d.inp index d28af007..a924677a 100644 --- a/test/pargen/runs/ppde.inp +++ b/test/pdegen/runs/psb_pde3d.inp @@ -2,7 +2,7 @@ BICGSTAB Iterative method BICGSTAB CGS BICG BICGSTABL RGMRES FCG CGR RICHARDSON BJAC Preconditioner NONE DIAG BJAC 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 2 Stopping criterion 1 2 0200 MAXIT