mirror of
https://github.com/sfilippone/psblas3.git
synced 2026-10-20 04:42:08 +00:00
Merge origin/development into communication_v2
Realign communication_v2 with the latest development (10 commits, including the
GMRES refactor and the stopping-criterion change), keeping the communication_v2
work intact.
Conflict resolution:
- base/modules/Makefile (veryclean): keep communication_v2's '/bin/rm -f *.h'.
- linsolve/impl/psb_{c,d,s,z}rgmres.f90: keep development's variable
declaration (itmax_, naux), consistent with development's refactored GMRES
body which references itmax_.
This commit is contained in:
@@ -196,7 +196,7 @@ auxil/psi_acx_mod.o auxil/psi_alcx_mod.o auxil/psi_lcx_mod.o \
|
||||
auxil/psb_string_mod.o auxil/psb_i2_realloc_mod.o auxil/psb_m_realloc_mod.o auxil/psb_e_realloc_mod.o \
|
||||
auxil/psb_s_realloc_mod.o \
|
||||
auxil/psb_d_realloc_mod.o auxil/psb_c_realloc_mod.o auxil/psb_z_realloc_mod.o \
|
||||
desc/psb_desc_const_mod.o psi_penv_mod.o: psb_const_mod.o
|
||||
desc/psb_desc_const_mod.o penv/psi_penv_mod.o: psb_const_mod.o
|
||||
|
||||
comm/comm_schemes/psb_comm_schemes_mod.o: psb_const_mod.o
|
||||
|
||||
@@ -463,4 +463,4 @@ clean:
|
||||
/bin/rm -f $(MODULES) $(OBJS) $(MPFOBJS) *$(.mod)
|
||||
|
||||
veryclean: clean
|
||||
/bin/rm -f *.h
|
||||
/bin/rm -f *.h
|
||||
|
||||
@@ -685,7 +685,7 @@ contains
|
||||
integer(psb_ipk_) :: info
|
||||
|
||||
info = 0
|
||||
if (psb_is_asb_desc(desc)) &
|
||||
if (desc%is_asb()) &
|
||||
& call desc%indxmap%set_state(psb_desc_ovl_asb_)
|
||||
|
||||
end subroutine psb_cd_set_ovl_asb
|
||||
|
||||
Reference in New Issue
Block a user