Merge branch 'master' into maint-1.0

sfilippone · May 7, 2021 · a3a1dc5 · a3a1dc5
2 parents 12fc3dd + 6dddaaa
commit a3a1dc5
Show file tree

Hide file tree

Showing 63 changed files with 11 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -33,22 +33,22 @@ install: all
  mkdir -p $(INSTALL_SAMPLESDIR) && \
  mkdir -p $(INSTALL_SAMPLESDIR)/simple &&\
  mkdir -p $(INSTALL_SAMPLESDIR)/advanced && \
- (cd examples; /bin/cp -fr pdegen fileread $(INSTALL_SAMPLESDIR)/simple ) && \
- (cd tests; /bin/cp -fr pdegen fileread $(INSTALL_SAMPLESDIR)/advanced )
+ (cd samples/simple; /bin/cp -fr pdegen fileread $(INSTALL_SAMPLESDIR)/simple ) && \
+ (cd samples/advanced; /bin/cp -fr pdegen fileread $(INSTALL_SAMPLESDIR)/advanced )
 cleanlib:
  (cd lib; /bin/rm -f *.a *$(.mod) *$(.fh))
  (cd include; /bin/rm -f *.a *$(.mod) *$(.fh))
  (cd modules; /bin/rm -f *.a *$(.mod) *$(.fh))
 
 veryclean: cleanlib
  (cd amgprec; make veryclean)
- (cd examples/fileread; make clean)
- (cd examples/pdegen; make clean)
- (cd tests/fileread; make clean)
- (cd tests/pdegen; make clean)
+ (cd samples/simple/fileread; make clean)
+ (cd samples/simple/pdegen; make clean)
+ (cd samples/advanced/fileread; make clean)
+ (cd samples/advanced/pdegen; make clean)
 
 check: all
- make check -C tests/pdegen
+ make check -C samples/advanced/pdegen
 
 clean:
  (cd amgprec; make clean)
diff --git a/tests/fileread/Makefile → samples/advanced/fileread/Makefile b/tests/fileread/Makefile → samples/advanced/fileread/Makefile
@@ -1,4 +1,4 @@
-AMGDIR=../..
+AMGDIR=../../..
 AMGINCDIR=$(AMGDIR)/include
 include $(AMGINCDIR)/Make.inc.amg4psblas
 AMGMODDIR=$(AMGDIR)/modules

diff --git a/tests/fileread/amg_cf_sample.f90 → samples/advanced/fileread/amg_cf_sample.f90 b/tests/fileread/amg_cf_sample.f90 → samples/advanced/fileread/amg_cf_sample.f90
diff --git a/tests/fileread/amg_df_sample.f90 → samples/advanced/fileread/amg_df_sample.f90 b/tests/fileread/amg_df_sample.f90 → samples/advanced/fileread/amg_df_sample.f90
diff --git a/tests/fileread/amg_sf_sample.f90 → samples/advanced/fileread/amg_sf_sample.f90 b/tests/fileread/amg_sf_sample.f90 → samples/advanced/fileread/amg_sf_sample.f90
diff --git a/tests/fileread/amg_zf_sample.f90 → samples/advanced/fileread/amg_zf_sample.f90 b/tests/fileread/amg_zf_sample.f90 → samples/advanced/fileread/amg_zf_sample.f90
diff --git a/tests/fileread/data_input.f90 → samples/advanced/fileread/data_input.f90 b/tests/fileread/data_input.f90 → samples/advanced/fileread/data_input.f90
diff --git a/tests/fileread/runs/amg_cfs.inp → samples/advanced/fileread/runs/amg_cfs.inp b/tests/fileread/runs/amg_cfs.inp → samples/advanced/fileread/runs/amg_cfs.inp
diff --git a/tests/fileread/runs/amg_dfs.inp → samples/advanced/fileread/runs/amg_dfs.inp b/tests/fileread/runs/amg_dfs.inp → samples/advanced/fileread/runs/amg_dfs.inp
diff --git a/tests/fileread/runs/amg_mat.mtx → samples/advanced/fileread/runs/amg_mat.mtx b/tests/fileread/runs/amg_mat.mtx → samples/advanced/fileread/runs/amg_mat.mtx
diff --git a/tests/fileread/runs/amg_rhs.mtx → samples/advanced/fileread/runs/amg_rhs.mtx b/tests/fileread/runs/amg_rhs.mtx → samples/advanced/fileread/runs/amg_rhs.mtx
diff --git a/tests/fileread/runs/amg_sfs.inp → samples/advanced/fileread/runs/amg_sfs.inp b/tests/fileread/runs/amg_sfs.inp → samples/advanced/fileread/runs/amg_sfs.inp
diff --git a/tests/fileread/runs/amg_sol.mtx → samples/advanced/fileread/runs/amg_sol.mtx b/tests/fileread/runs/amg_sol.mtx → samples/advanced/fileread/runs/amg_sol.mtx
diff --git a/tests/fileread/runs/amg_zfs.inp → samples/advanced/fileread/runs/amg_zfs.inp b/tests/fileread/runs/amg_zfs.inp → samples/advanced/fileread/runs/amg_zfs.inp
diff --git a/tests/pdegen/Makefile → samples/advanced/pdegen/Makefile b/tests/pdegen/Makefile → samples/advanced/pdegen/Makefile
@@ -1,4 +1,4 @@
-AMGDIR=../..
+AMGDIR=../../..
 AMGINCDIR=$(AMGDIR)/include
 include $(AMGINCDIR)/Make.inc.amg4psblas
 AMGMODDIR=$(AMGDIR)/modules

diff --git a/tests/pdegen/amg_d_genpde_mod.F90 → samples/advanced/pdegen/amg_d_genpde_mod.F90 b/tests/pdegen/amg_d_genpde_mod.F90 → samples/advanced/pdegen/amg_d_genpde_mod.F90
diff --git a/tests/pdegen/amg_d_pde2d.f90 → samples/advanced/pdegen/amg_d_pde2d.f90 b/tests/pdegen/amg_d_pde2d.f90 → samples/advanced/pdegen/amg_d_pde2d.f90
diff --git a/tests/pdegen/amg_d_pde2d_base_mod.f90 → .../advanced/pdegen/amg_d_pde2d_base_mod.f90 b/tests/pdegen/amg_d_pde2d_base_mod.f90 → .../advanced/pdegen/amg_d_pde2d_base_mod.f90
diff --git a/tests/pdegen/amg_d_pde2d_box_mod.f90 → ...s/advanced/pdegen/amg_d_pde2d_box_mod.f90 b/tests/pdegen/amg_d_pde2d_box_mod.f90 → ...s/advanced/pdegen/amg_d_pde2d_box_mod.f90
diff --git a/tests/pdegen/amg_d_pde2d_exp_mod.f90 → ...s/advanced/pdegen/amg_d_pde2d_exp_mod.f90 b/tests/pdegen/amg_d_pde2d_exp_mod.f90 → ...s/advanced/pdegen/amg_d_pde2d_exp_mod.f90
diff --git a/tests/pdegen/amg_d_pde3d.f90 → samples/advanced/pdegen/amg_d_pde3d.f90 b/tests/pdegen/amg_d_pde3d.f90 → samples/advanced/pdegen/amg_d_pde3d.f90
diff --git a/tests/pdegen/amg_d_pde3d_base_mod.f90 → .../advanced/pdegen/amg_d_pde3d_base_mod.f90 b/tests/pdegen/amg_d_pde3d_base_mod.f90 → .../advanced/pdegen/amg_d_pde3d_base_mod.f90
diff --git a/tests/pdegen/amg_d_pde3d_exp_mod.f90 → ...s/advanced/pdegen/amg_d_pde3d_exp_mod.f90 b/tests/pdegen/amg_d_pde3d_exp_mod.f90 → ...s/advanced/pdegen/amg_d_pde3d_exp_mod.f90
diff --git a/tests/pdegen/amg_d_pde3d_gauss_mod.f90 → ...advanced/pdegen/amg_d_pde3d_gauss_mod.f90 b/tests/pdegen/amg_d_pde3d_gauss_mod.f90 → ...advanced/pdegen/amg_d_pde3d_gauss_mod.f90
diff --git a/tests/pdegen/amg_s_genpde_mod.F90 → samples/advanced/pdegen/amg_s_genpde_mod.F90 b/tests/pdegen/amg_s_genpde_mod.F90 → samples/advanced/pdegen/amg_s_genpde_mod.F90
diff --git a/tests/pdegen/amg_s_pde2d.f90 → samples/advanced/pdegen/amg_s_pde2d.f90 b/tests/pdegen/amg_s_pde2d.f90 → samples/advanced/pdegen/amg_s_pde2d.f90
diff --git a/tests/pdegen/amg_s_pde2d_base_mod.f90 → .../advanced/pdegen/amg_s_pde2d_base_mod.f90 b/tests/pdegen/amg_s_pde2d_base_mod.f90 → .../advanced/pdegen/amg_s_pde2d_base_mod.f90
diff --git a/tests/pdegen/amg_s_pde2d_box_mod.f90 → ...s/advanced/pdegen/amg_s_pde2d_box_mod.f90 b/tests/pdegen/amg_s_pde2d_box_mod.f90 → ...s/advanced/pdegen/amg_s_pde2d_box_mod.f90
diff --git a/tests/pdegen/amg_s_pde2d_exp_mod.f90 → ...s/advanced/pdegen/amg_s_pde2d_exp_mod.f90 b/tests/pdegen/amg_s_pde2d_exp_mod.f90 → ...s/advanced/pdegen/amg_s_pde2d_exp_mod.f90
diff --git a/tests/pdegen/amg_s_pde3d.f90 → samples/advanced/pdegen/amg_s_pde3d.f90 b/tests/pdegen/amg_s_pde3d.f90 → samples/advanced/pdegen/amg_s_pde3d.f90
diff --git a/tests/pdegen/amg_s_pde3d_base_mod.f90 → .../advanced/pdegen/amg_s_pde3d_base_mod.f90 b/tests/pdegen/amg_s_pde3d_base_mod.f90 → .../advanced/pdegen/amg_s_pde3d_base_mod.f90
diff --git a/tests/pdegen/amg_s_pde3d_exp_mod.f90 → ...s/advanced/pdegen/amg_s_pde3d_exp_mod.f90 b/tests/pdegen/amg_s_pde3d_exp_mod.f90 → ...s/advanced/pdegen/amg_s_pde3d_exp_mod.f90
diff --git a/tests/pdegen/amg_s_pde3d_gauss_mod.f90 → ...advanced/pdegen/amg_s_pde3d_gauss_mod.f90 b/tests/pdegen/amg_s_pde3d_gauss_mod.f90 → ...advanced/pdegen/amg_s_pde3d_gauss_mod.f90
diff --git a/tests/pdegen/data_input.f90 → samples/advanced/pdegen/data_input.f90 b/tests/pdegen/data_input.f90 → samples/advanced/pdegen/data_input.f90
diff --git a/tests/pdegen/runs/amg_pde2d.inp → samples/advanced/pdegen/runs/amg_pde2d.inp b/tests/pdegen/runs/amg_pde2d.inp → samples/advanced/pdegen/runs/amg_pde2d.inp
diff --git a/tests/pdegen/runs/amg_pde3d.inp → samples/advanced/pdegen/runs/amg_pde3d.inp b/tests/pdegen/runs/amg_pde3d.inp → samples/advanced/pdegen/runs/amg_pde3d.inp
diff --git a/examples/fileread/Makefile → samples/simple/fileread/Makefile b/examples/fileread/Makefile → samples/simple/fileread/Makefile
@@ -1,4 +1,4 @@
-AMGDIR=../..
+AMGDIR=../../..
 AMGINCDIR=$(AMGDIR)/include
 include $(AMGINCDIR)/Make.inc.amg4psblas
 AMGMODDIR=$(AMGDIR)/modules

diff --git a/examples/fileread/amg_cexample_1lev.f90 → ...les/simple/fileread/amg_cexample_1lev.f90 b/examples/fileread/amg_cexample_1lev.f90 → ...les/simple/fileread/amg_cexample_1lev.f90
diff --git a/examples/fileread/amg_cexample_ml.f90 → samples/simple/fileread/amg_cexample_ml.f90 b/examples/fileread/amg_cexample_ml.f90 → samples/simple/fileread/amg_cexample_ml.f90
diff --git a/examples/fileread/amg_dexample_1lev.f90 → ...les/simple/fileread/amg_dexample_1lev.f90 b/examples/fileread/amg_dexample_1lev.f90 → ...les/simple/fileread/amg_dexample_1lev.f90
diff --git a/examples/fileread/amg_dexample_ml.f90 → samples/simple/fileread/amg_dexample_ml.f90 b/examples/fileread/amg_dexample_ml.f90 → samples/simple/fileread/amg_dexample_ml.f90
diff --git a/examples/fileread/amg_sexample_1lev.f90 → ...les/simple/fileread/amg_sexample_1lev.f90 b/examples/fileread/amg_sexample_1lev.f90 → ...les/simple/fileread/amg_sexample_1lev.f90
diff --git a/examples/fileread/amg_sexample_ml.f90 → samples/simple/fileread/amg_sexample_ml.f90 b/examples/fileread/amg_sexample_ml.f90 → samples/simple/fileread/amg_sexample_ml.f90
diff --git a/examples/fileread/amg_zexample_1lev.f90 → ...les/simple/fileread/amg_zexample_1lev.f90 b/examples/fileread/amg_zexample_1lev.f90 → ...les/simple/fileread/amg_zexample_1lev.f90
diff --git a/examples/fileread/amg_zexample_ml.f90 → samples/simple/fileread/amg_zexample_ml.f90 b/examples/fileread/amg_zexample_ml.f90 → samples/simple/fileread/amg_zexample_ml.f90
diff --git a/examples/fileread/data_input.f90 → samples/simple/fileread/data_input.f90 b/examples/fileread/data_input.f90 → samples/simple/fileread/data_input.f90
diff --git a/examples/fileread/runs/1lev.inp → samples/simple/fileread/runs/1lev.inp b/examples/fileread/runs/1lev.inp → samples/simple/fileread/runs/1lev.inp
diff --git a/examples/fileread/runs/ml.inp → samples/simple/fileread/runs/ml.inp b/examples/fileread/runs/ml.inp → samples/simple/fileread/runs/ml.inp
diff --git a/examples/fileread/runs/mld_mat.mtx → samples/simple/fileread/runs/mld_mat.mtx b/examples/fileread/runs/mld_mat.mtx → samples/simple/fileread/runs/mld_mat.mtx
diff --git a/examples/fileread/runs/mld_rhs.mtx → samples/simple/fileread/runs/mld_rhs.mtx b/examples/fileread/runs/mld_rhs.mtx → samples/simple/fileread/runs/mld_rhs.mtx
diff --git a/examples/fileread/runs/mld_sol.mtx → samples/simple/fileread/runs/mld_sol.mtx b/examples/fileread/runs/mld_sol.mtx → samples/simple/fileread/runs/mld_sol.mtx
diff --git a/examples/pdegen/Makefile → samples/simple/pdegen/Makefile b/examples/pdegen/Makefile → samples/simple/pdegen/Makefile
@@ -1,4 +1,4 @@
-AMGDIR=../..
+AMGDIR=../../..
 AMGINCDIR=$(AMGDIR)/include
 include $(AMGINCDIR)/Make.inc.amg4psblas
 AMGMODDIR=$(AMGDIR)/modules

diff --git a/examples/pdegen/amg_dexample_1lev.f90 → samples/simple/pdegen/amg_dexample_1lev.f90 b/examples/pdegen/amg_dexample_1lev.f90 → samples/simple/pdegen/amg_dexample_1lev.f90
diff --git a/examples/pdegen/amg_dexample_ml.f90 → samples/simple/pdegen/amg_dexample_ml.f90 b/examples/pdegen/amg_dexample_ml.f90 → samples/simple/pdegen/amg_dexample_ml.f90
diff --git a/examples/pdegen/amg_dpde_mod.f90 → samples/simple/pdegen/amg_dpde_mod.f90 b/examples/pdegen/amg_dpde_mod.f90 → samples/simple/pdegen/amg_dpde_mod.f90
diff --git a/examples/pdegen/amg_sexample_1lev.f90 → samples/simple/pdegen/amg_sexample_1lev.f90 b/examples/pdegen/amg_sexample_1lev.f90 → samples/simple/pdegen/amg_sexample_1lev.f90
diff --git a/examples/pdegen/amg_sexample_ml.f90 → samples/simple/pdegen/amg_sexample_ml.f90 b/examples/pdegen/amg_sexample_ml.f90 → samples/simple/pdegen/amg_sexample_ml.f90
diff --git a/examples/pdegen/amg_spde_mod.f90 → samples/simple/pdegen/amg_spde_mod.f90 b/examples/pdegen/amg_spde_mod.f90 → samples/simple/pdegen/amg_spde_mod.f90
diff --git a/examples/pdegen/data_input.f90 → samples/simple/pdegen/data_input.f90 b/examples/pdegen/data_input.f90 → samples/simple/pdegen/data_input.f90
diff --git a/examples/pdegen/runs/1lev.inp → samples/simple/pdegen/runs/1lev.inp b/examples/pdegen/runs/1lev.inp → samples/simple/pdegen/runs/1lev.inp
diff --git a/examples/pdegen/runs/ml.inp → samples/simple/pdegen/runs/ml.inp b/examples/pdegen/runs/ml.inp → samples/simple/pdegen/runs/ml.inp
diff --git a/examples/pdegen/runs/script.pbs → samples/simple/pdegen/runs/script.pbs b/examples/pdegen/runs/script.pbs → samples/simple/pdegen/runs/script.pbs
diff --git a/examples/pdegen/runs/script1lev.pbs → samples/simple/pdegen/runs/script1lev.pbs b/examples/pdegen/runs/script1lev.pbs → samples/simple/pdegen/runs/script1lev.pbs