diff --git a/samples/advanced/pdegen/Makefile b/samples/advanced/pdegen/Makefile index 9a86d652..4154aaef 100644 --- a/samples/advanced/pdegen/Makefile +++ b/samples/advanced/pdegen/Makefile @@ -8,36 +8,37 @@ FINCLUDES=$(FMFLAG). $(FMFLAG)$(AMGMODDIR) $(FMFLAG)$(AMGINCDIR) $(PSBLAS_INCLUD LINKOPT= EXEDIR=./runs -DGEN2D=amg_d_pde2d_poisson_mod.o amg_d_pde2d_const_mod.o amg_d_pde2d_exp_mod.o \ +DGEN2D=amg_d_pde2d_poisson_mod.o amg_d_pde2d_exp_mod.o \ amg_d_pde2d_gauss_mod.o amg_d_pde2d_box_mod.o -DGEN3D=amg_d_pde3d_poisson_mod.o amg_d_pde3d_const_mod.o amg_d_pde3d_exp_mod.o \ +DGEN3D=amg_d_pde3d_poisson_mod.o amg_d_pde3d_exp_mod.o \ amg_d_pde3d_gauss_mod.o amg_d_pde3d_box_mod.o -SGEN2D=amg_s_pde2d_poisson_mod.o amg_s_pde2d_const_mod.o amg_s_pde2d_exp_mod.o \ +SGEN2D=amg_s_pde2d_poisson_mod.o amg_s_pde2d_exp_mod.o \ amg_s_pde2d_gauss_mod.o amg_s_pde2d_box_mod.o -SGEN3D=amg_s_pde3d_poisson_mod.o amg_s_pde3d_const_mod.o amg_s_pde3d_exp_mod.o \ +SGEN3D=amg_s_pde3d_poisson_mod.o amg_s_pde3d_exp_mod.o \ amg_s_pde3d_gauss_mod.o amg_s_pde3d_box_mod.o all: amg_s_pde3d amg_d_pde3d amg_s_pde2d amg_d_pde2d amg_d_pde3d: amg_d_pde3d.o amg_d_genpde_mod.o $(DGEN3D) data_input.o - $(FLINK) $(LINKOPT) amg_d_pde3d.o amg_d_genpde_mod.o $(DGEN3D) data_input.o -o amg_d_pde3d $(AMG_LIBS) $(PSBLAS_LIBS) $(LDLIBS) + $(FLINK) $(LINKOPT) amg_d_pde3d.o amg_d_genpde_mod.o $(DGEN3D) data_input.o \ + -o amg_d_pde3d $(AMG_LIBS) $(PSBLAS_LIBS) $(LDLIBS) /bin/mv amg_d_pde3d $(EXEDIR) amg_s_pde3d: amg_s_pde3d.o amg_s_genpde_mod.o $(SGEN3D) data_input.o - $(FLINK) $(LINKOPT) amg_s_pde3d.o amg_s_genpde_mod.o $(SGEN3D) data_input.o -o amg_s_pde3d $(AMG_LIBS) $(PSBLAS_LIBS) $(LDLIBS) + $(FLINK) $(LINKOPT) amg_s_pde3d.o amg_s_genpde_mod.o $(SGEN3D) data_input.o \ + -o amg_s_pde3d $(AMG_LIBS) $(PSBLAS_LIBS) $(LDLIBS) /bin/mv amg_s_pde3d $(EXEDIR) amg_d_pde2d: amg_d_pde2d.o amg_d_genpde_mod.o $(DGEN2D) data_input.o - $(FLINK) $(LINKOPT) amg_d_pde2d.o amg_d_genpde_mod.o $(DGEN2D) data_input.o -o amg_d_pde2d $(AMG_LIBS) $(PSBLAS_LIBS) $(LDLIBS) + $(FLINK) $(LINKOPT) amg_d_pde2d.o amg_d_genpde_mod.o $(DGEN2D) data_input.o \ + -o amg_d_pde2d $(AMG_LIBS) $(PSBLAS_LIBS) $(LDLIBS) /bin/mv amg_d_pde2d $(EXEDIR) amg_s_pde2d: amg_s_pde2d.o amg_s_genpde_mod.o $(SGEN2D) data_input.o - $(FLINK) $(LINKOPT) amg_s_pde2d.o amg_s_genpde_mod.o $(SGEN2D) data_input.o -o amg_s_pde2d $(AMG_LIBS) $(PSBLAS_LIBS) $(LDLIBS) + $(FLINK) $(LINKOPT) amg_s_pde2d.o amg_s_genpde_mod.o $(SGEN2D) data_input.o \ + -o amg_s_pde2d $(AMG_LIBS) $(PSBLAS_LIBS) $(LDLIBS) /bin/mv amg_s_pde2d $(EXEDIR) -amg_d_pde3d_rebld: amg_d_pde3d_rebld.o data_input.o - $(FLINK) $(LINKOPT) amg_d_pde3d_rebld.o data_input.o -o amg_d_pde3d_rebld $(AMG_LIBS) $(PSBLAS_LIBS) $(LDLIBS) - /bin/mv amg_d_pde3d_rebld $(EXEDIR) amg_d_pde3d.o amg_s_pde3d.o amg_d_pde2d.o amg_s_pde2d.o: data_input.o diff --git a/samples/advanced/pdegen/amg_d_pde2d.F90 b/samples/advanced/pdegen/amg_d_pde2d.F90 index 14b5e688..51e1c211 100644 --- a/samples/advanced/pdegen/amg_d_pde2d.F90 +++ b/samples/advanced/pdegen/amg_d_pde2d.F90 @@ -70,7 +70,6 @@ program amg_d_pde2d use psb_util_mod use data_input use amg_d_pde2d_poisson_mod - use amg_d_pde2d_const_mod use amg_d_pde2d_exp_mod use amg_d_pde2d_box_mod use amg_d_pde2d_gauss_mod @@ -254,19 +253,18 @@ program amg_d_pde2d call amg_gen_pde2d(ctxt,idim,a,b,x,desc_a,afmt,& & a1_poisson,a2_poisson,& & b1_poisson,b2_poisson,c_poisson,g_poisson,info) - case("CONST") - call amg_gen_pde2d(ctxt,idim,a,b,x,desc_a,afmt,& - & a1_const,a2_const,& - & b1_const,b2_const,c_const,g_const,info) case("EXP") call amg_gen_pde2d(ctxt,idim,a,b,x,desc_a,afmt,& - & a1_exp,a2_exp,b1_exp,b2_exp,c_exp,g_exp,info) + & a1_exp,a2_exp,& + & b1_exp,b2_exp,c_exp,g_exp,info) case("BOX") call amg_gen_pde2d(ctxt,idim,a,b,x,desc_a,afmt,& - & a1_box,a2_box,b1_box,b2_box,c_box,g_box,info) + & a1_box,a2_box,& + & b1_box,b2_box,c_box,g_box,info) case("GAUSS") call amg_gen_pde2d(ctxt,idim,a,b,x,desc_a,afmt,& - & a1_gauss,a2_gauss,b1_gauss,b2_gauss,c_gauss,g_gauss,info) + & a1_gauss,a2_gauss,& + & b1_gauss,b2_gauss,c_gauss,g_gauss,info) case default info=psb_err_from_subroutine_ ch_err='amg_gen_pdecoeff' diff --git a/samples/advanced/pdegen/amg_d_pde2d_const_mod.f90 b/samples/advanced/pdegen/amg_d_pde2d_const_mod.f90 deleted file mode 100644 index 36b0e11e..00000000 --- a/samples/advanced/pdegen/amg_d_pde2d_const_mod.f90 +++ /dev/null @@ -1,89 +0,0 @@ -! -! -! AMG4PSBLAS version 1.0 -! Algebraic Multigrid Package -! based on PSBLAS (Parallel Sparse BLAS version 3.7) -! -! (C) Copyright 2021 -! -! Salvatore Filippone -! Pasqua D'Ambra -! Fabio Durastante -! -! Redistribution and use in source and binary forms, with or without -! modification, are permitted provided that the following conditions -! are met: -! 1. Redistributions of source code must retain the above copyright -! notice, this list of conditions and the following disclaimer. -! 2. Redistributions in binary form must reproduce the above copyright -! notice, this list of conditions, and the following disclaimer in the -! documentation and/or other materials provided with the distribution. -! 3. The name of the AMG4PSBLAS group or the names of its contributors may -! not be used to endorse or promote products derived from this -! software without specific written permission. -! -! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -! TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -! PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AMG4PSBLAS GROUP OR ITS CONTRIBUTORS -! BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -! POSSIBILITY OF SUCH DAMAGE. -! -module amg_d_pde2d_const_mod - use psb_base_mod, only : psb_dpk_, dzero, done - real(psb_dpk_), save, private :: epsilon=done/80 -contains - subroutine pde_set_parm2d_const(dat) - real(psb_dpk_), intent(in) :: dat - epsilon = dat - end subroutine pde_set_parm2d_const - ! - ! functions parametrizing the differential equation - ! - function b1_const(x,y) - implicit none - real(psb_dpk_) :: b1_const - real(psb_dpk_), intent(in) :: x,y - b1_const = done/1.414_psb_dpk_ - end function b1_const - function b2_const(x,y) - implicit none - real(psb_dpk_) :: b2_const - real(psb_dpk_), intent(in) :: x,y - b2_const = done/1.414_psb_dpk_ - end function b2_const - function c_const(x,y) - implicit none - real(psb_dpk_) :: c_const - real(psb_dpk_), intent(in) :: x,y - c_const = dzero - end function c_const - function a1_const(x,y) - implicit none - real(psb_dpk_) :: a1_const - real(psb_dpk_), intent(in) :: x,y - a1_const=done*epsilon - end function a1_const - function a2_const(x,y) - implicit none - real(psb_dpk_) :: a2_const - real(psb_dpk_), intent(in) :: x,y - a2_const=done*epsilon - end function a2_const - function g_const(x,y) - implicit none - real(psb_dpk_) :: g_const - real(psb_dpk_), intent(in) :: x,y - g_const = dzero - if (x == done) then - g_const = done - else if (x == dzero) then - g_const = done - end if - end function g_const -end module amg_d_pde2d_const_mod diff --git a/samples/advanced/pdegen/amg_d_pde3d.F90 b/samples/advanced/pdegen/amg_d_pde3d.F90 index 51bb545c..97ae4a1f 100644 --- a/samples/advanced/pdegen/amg_d_pde3d.F90 +++ b/samples/advanced/pdegen/amg_d_pde3d.F90 @@ -71,7 +71,6 @@ program amg_d_pde3d use psb_util_mod use data_input use amg_d_pde3d_poisson_mod - use amg_d_pde3d_const_mod use amg_d_pde3d_exp_mod use amg_d_pde3d_box_mod use amg_d_pde3d_gauss_mod @@ -256,19 +255,18 @@ program amg_d_pde3d call amg_gen_pde3d(ctxt,idim,a,b,x,desc_a,afmt,& & a1_poisson,a2_poisson,a3_poisson,& & b1_poisson,b2_poisson,b3_poisson,c_poisson,g_poisson,info) - case("CONST") - call amg_gen_pde3d(ctxt,idim,a,b,x,desc_a,afmt,& - & a1_const,a2_const,a3_const,& - & b1_const,b2_const,b3_const,c_const,g_const,info) case("EXP") call amg_gen_pde3d(ctxt,idim,a,b,x,desc_a,afmt,& - & a1_exp,a2_exp,a3_exp,b1_exp,b2_exp,b3_exp,c_exp,g_exp,info) + & a1_exp,a2_exp,a3_exp,& + & b1_exp,b2_exp,b3_exp,c_exp,g_exp,info) case("BOX") call amg_gen_pde3d(ctxt,idim,a,b,x,desc_a,afmt,& - & a1_box,a2_box,a3_box,b1_box,b2_box,b3_box,c_box,g_box,info) + & a1_box,a2_box,a3_box,& + & b1_box,b2_box,b3_box,c_box,g_box,info) case("GAUSS") call amg_gen_pde3d(ctxt,idim,a,b,x,desc_a,afmt,& - & a1_gauss,a2_gauss,a3_gauss,b1_gauss,b2_gauss,b3_gauss,c_gauss,g_gauss,info) + & a1_gauss,a2_gauss,a3_gauss,& + & b1_gauss,b2_gauss,b3_gauss,c_gauss,g_gauss,info) case default info=psb_err_from_subroutine_ ch_err='amg_gen_pdecoeff' diff --git a/samples/advanced/pdegen/amg_d_pde3d_const_mod.f90 b/samples/advanced/pdegen/amg_d_pde3d_const_mod.f90 deleted file mode 100644 index 44c44b6f..00000000 --- a/samples/advanced/pdegen/amg_d_pde3d_const_mod.f90 +++ /dev/null @@ -1,101 +0,0 @@ -! -! -! AMG4PSBLAS version 1.0 -! Algebraic Multigrid Package -! based on PSBLAS (Parallel Sparse BLAS version 3.7) -! -! (C) Copyright 2021 -! -! Salvatore Filippone -! Pasqua D'Ambra -! Fabio Durastante -! -! Redistribution and use in source and binary forms, with or without -! modification, are permitted provided that the following conditions -! are met: -! 1. Redistributions of source code must retain the above copyright -! notice, this list of conditions and the following disclaimer. -! 2. Redistributions in binary form must reproduce the above copyright -! notice, this list of conditions, and the following disclaimer in the -! documentation and/or other materials provided with the distribution. -! 3. The name of the AMG4PSBLAS group or the names of its contributors may -! not be used to endorse or promote products derived from this -! software without specific written permission. -! -! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -! TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -! PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AMG4PSBLAS GROUP OR ITS CONTRIBUTORS -! BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -! POSSIBILITY OF SUCH DAMAGE. -! -module amg_d_pde3d_const_mod - use psb_base_mod, only : psb_dpk_, done, dzero - real(psb_dpk_), save, private :: epsilon=done/80 -contains - subroutine pde_set_parm3d_const(dat) - real(psb_dpk_), intent(in) :: dat - epsilon = dat - end subroutine pde_set_parm3d_const - ! - ! functions parametrizing the differential equation - ! - function b1_const(x,y,z) - implicit none - real(psb_dpk_) :: b1_const - real(psb_dpk_), intent(in) :: x,y,z - b1_const=done/sqrt(3.0_psb_dpk_) - end function b1_const - function b2_const(x,y,z) - implicit none - real(psb_dpk_) :: b2_const - real(psb_dpk_), intent(in) :: x,y,z - b2_const=done/sqrt(3.0_psb_dpk_) - end function b2_const - function b3_const(x,y,z) - implicit none - real(psb_dpk_) :: b3_const - real(psb_dpk_), intent(in) :: x,y,z - b3_const=dzero/sqrt(3.0_psb_dpk_) - end function b3_const - function c_const(x,y,z) - implicit none - real(psb_dpk_) :: c_const - real(psb_dpk_), intent(in) :: x,y,z - c_const=dzero - end function c_const - function a1_const(x,y,z) - implicit none - real(psb_dpk_) :: a1_const - real(psb_dpk_), intent(in) :: x,y,z - a1_const=epsilon - end function a1_const - function a2_const(x,y,z) - implicit none - real(psb_dpk_) :: a2_const - real(psb_dpk_), intent(in) :: x,y,z - a2_const=epsilon - end function a2_const - function a3_const(x,y,z) - implicit none - real(psb_dpk_) :: a3_const - real(psb_dpk_), intent(in) :: x,y,z - a3_const=epsilon - end function a3_const - function g_const(x,y,z) - implicit none - real(psb_dpk_) :: g_const - real(psb_dpk_), intent(in) :: x,y,z - g_const = dzero - if (x == done) then - g_const = done - else if (x == dzero) then - g_const = done - end if - end function g_const -end module amg_d_pde3d_const_mod diff --git a/samples/advanced/pdegen/amg_s_pde2d.F90 b/samples/advanced/pdegen/amg_s_pde2d.F90 index 6f5acb5c..07c38bad 100644 --- a/samples/advanced/pdegen/amg_s_pde2d.F90 +++ b/samples/advanced/pdegen/amg_s_pde2d.F90 @@ -70,7 +70,6 @@ program amg_s_pde2d use psb_util_mod use data_input use amg_s_pde2d_poisson_mod - use amg_s_pde2d_const_mod use amg_s_pde2d_exp_mod use amg_s_pde2d_box_mod use amg_s_pde2d_gauss_mod @@ -254,19 +253,18 @@ program amg_s_pde2d call amg_gen_pde2d(ctxt,idim,a,b,x,desc_a,afmt,& & a1_poisson,a2_poisson,& & b1_poisson,b2_poisson,c_poisson,g_poisson,info) - case("CONST") - call amg_gen_pde2d(ctxt,idim,a,b,x,desc_a,afmt,& - & a1_const,a2_const,& - & b1_const,b2_const,c_const,g_const,info) case("EXP") call amg_gen_pde2d(ctxt,idim,a,b,x,desc_a,afmt,& - & a1_exp,a2_exp,b1_exp,b2_exp,c_exp,g_exp,info) + & a1_exp,a2_exp,& + & b1_exp,b2_exp,c_exp,g_exp,info) case("BOX") call amg_gen_pde2d(ctxt,idim,a,b,x,desc_a,afmt,& - & a1_box,a2_box,b1_box,b2_box,c_box,g_box,info) + & a1_box,a2_box,& + & b1_box,b2_box,c_box,g_box,info) case("GAUSS") call amg_gen_pde2d(ctxt,idim,a,b,x,desc_a,afmt,& - & a1_gauss,a2_gauss,b1_gauss,b2_gauss,c_gauss,g_gauss,info) + & a1_gauss,a2_gauss,& + & b1_gauss,b2_gauss,c_gauss,g_gauss,info) case default info=psb_err_from_subroutine_ ch_err='amg_gen_pdecoeff' diff --git a/samples/advanced/pdegen/amg_s_pde2d_const_mod.f90 b/samples/advanced/pdegen/amg_s_pde2d_const_mod.f90 deleted file mode 100644 index 72d35187..00000000 --- a/samples/advanced/pdegen/amg_s_pde2d_const_mod.f90 +++ /dev/null @@ -1,89 +0,0 @@ -! -! -! AMG4PSBLAS version 1.0 -! Algebraic Multigrid Package -! based on PSBLAS (Parallel Sparse BLAS version 3.7) -! -! (C) Copyright 2021 -! -! Salvatore Filippone -! Pasqua D'Ambra -! Fabio Durastante -! -! Redistribution and use in source and binary forms, with or without -! modification, are permitted provided that the following conditions -! are met: -! 1. Redistributions of source code must retain the above copyright -! notice, this list of conditions and the following disclaimer. -! 2. Redistributions in binary form must reproduce the above copyright -! notice, this list of conditions, and the following disclaimer in the -! documentation and/or other materials provided with the distribution. -! 3. The name of the AMG4PSBLAS group or the names of its contributors may -! not be used to endorse or promote products derived from this -! software without specific written permission. -! -! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -! TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -! PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AMG4PSBLAS GROUP OR ITS CONTRIBUTORS -! BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -! POSSIBILITY OF SUCH DAMAGE. -! -module amg_s_pde2d_const_mod - use psb_base_mod, only : psb_spk_, szero, sone - real(psb_spk_), save, private :: epsilon=sone/80 -contains - subroutine pde_set_parm2d_const(dat) - real(psb_spk_), intent(in) :: dat - epsilon = dat - end subroutine pde_set_parm2d_const - ! - ! functions parametrizing the differential equation - ! - function b1_const(x,y) - implicit none - real(psb_spk_) :: b1_const - real(psb_spk_), intent(in) :: x,y - b1_const = sone/1.414_psb_spk_ - end function b1_const - function b2_const(x,y) - implicit none - real(psb_spk_) :: b2_const - real(psb_spk_), intent(in) :: x,y - b2_const = sone/1.414_psb_spk_ - end function b2_const - function c_const(x,y) - implicit none - real(psb_spk_) :: c_const - real(psb_spk_), intent(in) :: x,y - c_const = szero - end function c_const - function a1_const(x,y) - implicit none - real(psb_spk_) :: a1_const - real(psb_spk_), intent(in) :: x,y - a1_const=sone*epsilon - end function a1_const - function a2_const(x,y) - implicit none - real(psb_spk_) :: a2_const - real(psb_spk_), intent(in) :: x,y - a2_const=sone*epsilon - end function a2_const - function g_const(x,y) - implicit none - real(psb_spk_) :: g_const - real(psb_spk_), intent(in) :: x,y - g_const = szero - if (x == sone) then - g_const = sone - else if (x == szero) then - g_const = sone - end if - end function g_const -end module amg_s_pde2d_const_mod diff --git a/samples/advanced/pdegen/amg_s_pde3d.F90 b/samples/advanced/pdegen/amg_s_pde3d.F90 index bd4f1b61..0ae2bdc8 100644 --- a/samples/advanced/pdegen/amg_s_pde3d.F90 +++ b/samples/advanced/pdegen/amg_s_pde3d.F90 @@ -71,7 +71,6 @@ program amg_s_pde3d use psb_util_mod use data_input use amg_s_pde3d_poisson_mod - use amg_s_pde3d_const_mod use amg_s_pde3d_exp_mod use amg_s_pde3d_box_mod use amg_s_pde3d_gauss_mod @@ -256,19 +255,18 @@ program amg_s_pde3d call amg_gen_pde3d(ctxt,idim,a,b,x,desc_a,afmt,& & a1_poisson,a2_poisson,a3_poisson,& & b1_poisson,b2_poisson,b3_poisson,c_poisson,g_poisson,info) - case("CONST") - call amg_gen_pde3d(ctxt,idim,a,b,x,desc_a,afmt,& - & a1_const,a2_const,a3_const,& - & b1_const,b2_const,b3_const,c_const,g_const,info) case("EXP") call amg_gen_pde3d(ctxt,idim,a,b,x,desc_a,afmt,& - & a1_exp,a2_exp,a3_exp,b1_exp,b2_exp,b3_exp,c_exp,g_exp,info) + & a1_exp,a2_exp,a3_exp,& + & b1_exp,b2_exp,b3_exp,c_exp,g_exp,info) case("BOX") call amg_gen_pde3d(ctxt,idim,a,b,x,desc_a,afmt,& - & a1_box,a2_box,a3_box,b1_box,b2_box,b3_box,c_box,g_box,info) + & a1_box,a2_box,a3_box,& + & b1_box,b2_box,b3_box,c_box,g_box,info) case("GAUSS") call amg_gen_pde3d(ctxt,idim,a,b,x,desc_a,afmt,& - & a1_gauss,a2_gauss,a3_gauss,b1_gauss,b2_gauss,b3_gauss,c_gauss,g_gauss,info) + & a1_gauss,a2_gauss,a3_gauss,& + & b1_gauss,b2_gauss,b3_gauss,c_gauss,g_gauss,info) case default info=psb_err_from_subroutine_ ch_err='amg_gen_pdecoeff' diff --git a/samples/advanced/pdegen/amg_s_pde3d_const_mod.f90 b/samples/advanced/pdegen/amg_s_pde3d_const_mod.f90 deleted file mode 100644 index 34b6b130..00000000 --- a/samples/advanced/pdegen/amg_s_pde3d_const_mod.f90 +++ /dev/null @@ -1,101 +0,0 @@ -! -! -! AMG4PSBLAS version 1.0 -! Algebraic Multigrid Package -! based on PSBLAS (Parallel Sparse BLAS version 3.7) -! -! (C) Copyright 2021 -! -! Salvatore Filippone -! Pasqua D'Ambra -! Fabio Durastante -! -! Redistribution and use in source and binary forms, with or without -! modification, are permitted provided that the following conditions -! are met: -! 1. Redistributions of source code must retain the above copyright -! notice, this list of conditions and the following disclaimer. -! 2. Redistributions in binary form must reproduce the above copyright -! notice, this list of conditions, and the following disclaimer in the -! documentation and/or other materials provided with the distribution. -! 3. The name of the AMG4PSBLAS group or the names of its contributors may -! not be used to endorse or promote products derived from this -! software without specific written permission. -! -! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -! TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -! PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AMG4PSBLAS GROUP OR ITS CONTRIBUTORS -! BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -! POSSIBILITY OF SUCH DAMAGE. -! -module amg_s_pde3d_const_mod - use psb_base_mod, only : psb_spk_, sone, szero - real(psb_spk_), save, private :: epsilon=sone/80 -contains - subroutine pde_set_parm3d_const(dat) - real(psb_spk_), intent(in) :: dat - epsilon = dat - end subroutine pde_set_parm3d_const - ! - ! functions parametrizing the differential equation - ! - function b1_const(x,y,z) - implicit none - real(psb_spk_) :: b1_const - real(psb_spk_), intent(in) :: x,y,z - b1_const=sone/sqrt(3.0_psb_spk_) - end function b1_const - function b2_const(x,y,z) - implicit none - real(psb_spk_) :: b2_const - real(psb_spk_), intent(in) :: x,y,z - b2_const=sone/sqrt(3.0_psb_spk_) - end function b2_const - function b3_const(x,y,z) - implicit none - real(psb_spk_) :: b3_const - real(psb_spk_), intent(in) :: x,y,z - b3_const=szero/sqrt(3.0_psb_spk_) - end function b3_const - function c_const(x,y,z) - implicit none - real(psb_spk_) :: c_const - real(psb_spk_), intent(in) :: x,y,z - c_const=szero - end function c_const - function a1_const(x,y,z) - implicit none - real(psb_spk_) :: a1_const - real(psb_spk_), intent(in) :: x,y,z - a1_const=epsilon - end function a1_const - function a2_const(x,y,z) - implicit none - real(psb_spk_) :: a2_const - real(psb_spk_), intent(in) :: x,y,z - a2_const=epsilon - end function a2_const - function a3_const(x,y,z) - implicit none - real(psb_spk_) :: a3_const - real(psb_spk_), intent(in) :: x,y,z - a3_const=epsilon - end function a3_const - function g_const(x,y,z) - implicit none - real(psb_spk_) :: g_const - real(psb_spk_), intent(in) :: x,y,z - g_const = szero - if (x == sone) then - g_const = sone - else if (x == szero) then - g_const = sone - end if - end function g_const -end module amg_s_pde3d_const_mod diff --git a/samples/advanced/pdegen/runs/amg_pde2d.inp b/samples/advanced/pdegen/runs/amg_pde2d.inp index a7189d94..68b75e6d 100644 --- a/samples/advanced/pdegen/runs/amg_pde2d.inp +++ b/samples/advanced/pdegen/runs/amg_pde2d.inp @@ -1,7 +1,7 @@ %%%%%%%%%%% General arguments % Lines starting with % are ignored. CSR ! Storage format CSR COO JAD 0150 ! IDIM; domain size. Linear system size is IDIM**2 -POISSON ! PDECOEFF: POISSON, CONST, EXP, BOX, GAUSS +POISSON ! PDECOEFF: POISSON, EXP, BOX, GAUSS % ! Coefficients of the PDE CG ! Iterative method: % ! BiCGSTAB BiCGSTABL BiCG CG CGS FCG GCR RGMRES diff --git a/samples/advanced/pdegen/runs/amg_pde3d.inp b/samples/advanced/pdegen/runs/amg_pde3d.inp index aa820534..d3a7dbda 100644 --- a/samples/advanced/pdegen/runs/amg_pde3d.inp +++ b/samples/advanced/pdegen/runs/amg_pde3d.inp @@ -1,12 +1,12 @@ %%%%%%%%%%% General arguments % Lines starting with % are ignored. CSR ! Storage format CSR COO JAD 0150 ! IDIM; domain size. Linear system size is IDIM**3 -POISSON ! PDECOEFF: POISSON, CONST, EXP, BOX, GAUSS +POISSON ! PDECOEFF: POISSON, EXP, BOX, GAUSS % ! Coefficients of the PDE CG ! Iterative method: % ! BiCGSTAB BiCGSTABL BiCG CG CGS FCG GCR RGMRES 2 ! ISTOPC -00008 ! ITMAX +00500 ! ITMAX 1 ! ITRACE 30 ! IRST (restart for RGMRES and BiCGSTABL) 1.d-6 ! EPS