From a430b106968d8955248fac4a9f815cb5d9bcf791 Mon Sep 17 00:00:00 2001 From: Dharini Balachandran Date: Thu, 13 Feb 2025 13:41:01 +0100 Subject: [PATCH] Refactor gfilloverlap parameter in tests --- ...4C_linear_solver_preconditioner_ifpack.cpp | 30 +++++++++---------- src/inpar/4C_inpar_solver.cpp | 12 -------- tests/input_files/constr2D_MPC_angle.dat | 2 +- tests/input_files/constr2D_MPC_dist.dat | 2 +- tests/input_files/constr3D_NormComp_STI.dat | 2 +- tests/input_files/elch_RCE_rotsymm_pbc.dat | 2 +- ...pbc_NP_genalpha_calcInitDt_calcInitPot.dat | 2 -- ...twoEqu_genalpha_calcInitDt_calcInitPot.dat | 2 +- .../elch_gaussian_hill_pbc_genalpha.dat | 2 +- .../input_files/elch_natconv_enc_pde_elim.dat | 4 +-- ...ch_pper_secondary_current_distribution.dat | 2 +- .../f2_drivencavity32x32_Re1000_stat.dat | 2 +- .../f2_kimmoin25x25_oseen_instat.dat | 2 +- .../f3_beltrami_4x4x4_hdg_lagrange.dat | 2 +- .../f3_beltrami_4x4x4_hdg_legendre.dat | 2 +- .../f3_beltrami_8x8_meshtying_ale.dat | 2 +- .../f3_beltrami_8x8_meshtying_ale_euler.dat | 2 +- .../f3_beltrami_8x8_meshtying_bmat_merged.dat | 2 +- .../f3_beltrami_8x8_meshtying_smat.dat | 2 +- ...beltrami_8x8_meshtying_smat_velcoupled.dat | 2 +- .../f3_beltrami_sphere_hdg_legendre.dat | 2 +- .../f3_channel_meshtying_DCmaster.dat | 2 +- tests/input_files/f3_channel_mixedhybrid.dat | 2 +- tests/input_files/f3_drivencavity_stat.dat | 2 +- .../f3_drivencavity_stat_recongradL2.dat | 2 +- .../input_files/f3_forced_hit_geogen_hdg.dat | 2 +- ..._kimmoin_stat_24x24x1_wedge15_pseudo2D.dat | 2 +- tests/input_files/f3_nurbs27_AfGenAlpha.dat | 2 +- .../f3_periodic_hill_w_forcing_24x12x12.dat | 2 +- .../input_files/f3_turbinflow_doublechan.dat | 2 +- tests/input_files/fpsi_ofsiinterface.dat | 2 +- tests/input_files/fsi_ow3D_mtr_drt.dat | 6 ++-- ...rained-mixture-cyl-aniso-impl-nofibdir.dat | 2 +- .../levelset_gaussian_hill_pbc.dat | 2 +- tests/input_files/locsys2D.dat | 2 +- .../poro_2D_scatra_ecm_reaction.dat | 2 +- .../input_files/poro_3D_scatra_mono_hex8.dat | 2 +- .../input_files/poro_3D_scatra_part_hex8.dat | 2 +- tests/input_files/porofluidmulti_2D_quad4.dat | 2 +- ...fluidmulti_2D_quad4_4_fluids_1_volfrac.dat | 2 +- ...lti_2D_quad4_linebased_artery_coupling.dat | 2 +- ...idmulti_2D_quad4_nodal_artery_coupling.dat | 2 +- tests/input_files/porofluidmulti_3D_hex8.dat | 2 +- tests/input_files/porofluidmulti_3D_tet4.dat | 2 +- .../poromultielastscatra_2D_quad4_part.dat | 2 +- ...ultielastscatra_2D_quad4_part_reaction.dat | 2 +- ...ltielastscatra_2D_quad4_poromulti_mono.dat | 2 +- .../poromultielastscatra_2D_quad4_tumor.dat | 2 +- ..._acinus_of_3Exponential_alveolar_ducts.dat | 2 +- ..._acinus_of_3Exponential_alveolar_ducts.dat | 2 +- .../input_files/scatra_gaussian_hill_pbc.dat | 2 +- .../scatra_gaussian_hill_pbc_gena_cons.dat | 2 +- .../scatra_gaussian_hill_pbc_genalpha.dat | 2 +- .../scatra_graetz_problem_system.dat | 4 +-- .../scatra_graetz_problem_system_ost.dat | 4 +-- ...atra_pper_primary_current_distribution.dat | 2 +- .../input_files/scatra_transport_neumann.dat | 2 +- .../scatra_transport_neumann_lin.dat | 2 +- .../scatra_transport_neumann_local.dat | 2 +- .../sohex8_easmild_locsys3D_new_struc.dat | 2 +- .../sosh8_lin_bending_patchtest.dat | 2 +- tests/input_files/w1q9_dyn_rot_drt_gena.dat | 2 +- tests/input_files/xff_beltrami_Div.dat | 2 +- tests/input_files/xff_beltrami_MomMom.dat | 2 +- tests/input_files/xff_beltrami_TesTes.dat | 2 +- .../xff_beltrami_TesTes_NIT_embedded_evp.dat | 2 +- ...IT_embedded_hk_ele_vol_div_by_ele_surf.dat | 2 +- ..._TesTes_NIT_embedded_hk_vol_equivalent.dat | 2 +- tests/input_files/xff_channel_simple_stat.dat | 2 +- ..._instat_nitemb_xfemgp_emb_layer_dens_5.dat | 2 +- ..._nitemb_xfemgp_emb_layer_dens_5_newost.dat | 2 +- ...immoin_15x15_stat_mhcs_edgeb_gp_dens_1.dat | 2 +- ...immoin_15x15_stat_mhcs_edgeb_gp_dens_5.dat | 2 +- ..._kimmoin_15x15_stat_mhvs_xfemgp_dens_1.dat | 2 +- ..._kimmoin_15x15_stat_mhvs_xfemgp_dens_5.dat | 2 +- ..._stat_nitemb_edgeb_gp_emb_layer_dens_5.dat | 2 +- ...mb_edgeb_gp_emb_layer_dens_5_OneDofset.dat | 2 +- ..._15x15_stat_nitemb_edgeb_gp_evp_dens_1.dat | 2 +- ..._15x15_stat_nitemb_edgeb_gp_evp_dens_5.dat | 2 +- ...immoin_15x15_stat_nitx_edgeb_gp_dens_1.dat | 2 +- ...immoin_15x15_stat_nitx_edgeb_gp_dens_5.dat | 2 +- ..._shear_flow_2D_instat_initialfield_OST.dat | 2 +- .../xff_shear_flow_2D_instat_neumann.dat | 2 +- ...Nitsche_alesided_inflowaveraged_dens_7.dat | 2 +- ...at_neum_moredofs_circ_Nitsche_alesided.dat | 2 +- ...s_circ_Nitsche_alesided_inflowaveraged.dat | 2 +- ...stat_neum_moredofs_circ_Nitsche_xsided.dat | 2 +- ...t_neum_moredofs_circ_Nitsche_xsidedDiv.dat | 2 +- ...irc_Nitsche_xsided_inflowstab_onesided.dat | 2 +- .../xff_shear_flow_2D_stat_neumann.dat | 2 +- .../xff_shear_flow_2D_stat_neumann_hex20.dat | 2 +- ...f_shear_flow_2D_stat_neumann_hex20_Div.dat | 2 +- ...ow_2D_stat_neumann_inflowstab_onesided.dat | 2 +- ...flow_2D_stat_neumann_moredofset_circle.dat | 2 +- ...r_flow_2D_stat_neumann_moredofset_quad.dat | 2 +- tests/input_files/xff_shear_flow_stat.dat | 2 +- .../input_files/xff_stat_cylinder_testcut.dat | 2 +- .../xfluid_comp_struct_EOS_touched_cut.dat | 2 +- ..._comp_struct_EOS_touched_cut_OneDofset.dat | 2 +- ...d_kimmoin_stat_40x40x1_wedge6_levelset.dat | 2 +- .../xfluid_stat_sliver_cut_instat.dat | 2 +- .../xfluid_stat_sliver_cut_instatDiv.dat | 2 +- .../xfluid_stat_sliver_cut_instat_EOS_GP.dat | 2 +- tests/input_files/xml/Ifpack.xml | 17 ----------- tests/input_files/xml/ifpack.xml | 7 +++++ 105 files changed, 126 insertions(+), 152 deletions(-) delete mode 100644 tests/input_files/xml/Ifpack.xml create mode 100644 tests/input_files/xml/ifpack.xml diff --git a/src/core/linear_solver/src/preconditioner/4C_linear_solver_preconditioner_ifpack.cpp b/src/core/linear_solver/src/preconditioner/4C_linear_solver_preconditioner_ifpack.cpp index bc8132807b4..d7eab3e6401 100644 --- a/src/core/linear_solver/src/preconditioner/4C_linear_solver_preconditioner_ifpack.cpp +++ b/src/core/linear_solver/src/preconditioner/4C_linear_solver_preconditioner_ifpack.cpp @@ -7,9 +7,12 @@ #include "4C_linear_solver_preconditioner_ifpack.hpp" +#include "4C_comm_utils.hpp" #include "4C_linalg_blocksparsematrix.hpp" #include "4C_utils_exceptions.hpp" +#include + FOUR_C_NAMESPACE_OPEN //------------------------------------------------------------------------------ @@ -18,7 +21,6 @@ Core::LinearSolver::IFPACKPreconditioner::IFPACKPreconditioner( Teuchos::ParameterList& ifpacklist, Teuchos::ParameterList& solverlist) : ifpacklist_(ifpacklist), solverlist_(solverlist) { - return; } //------------------------------------------------------------------------------ @@ -44,21 +46,20 @@ void Core::LinearSolver::IFPACKPreconditioner::setup(bool create, Epetra_Operato pmatrix_ = std::make_shared(*A_crs); - Teuchos::ParameterList& inverseList = ifpacklist_.sublist("IFPACK Parameters"); - - std::string xmlFileName = inverseList.get("IFPACK_XML_FILE"); + std::string xmlFileName = ifpacklist_.get("IFPACK_XML_FILE"); if (xmlFileName == "none") FOUR_C_THROW("IFPACK_XML_FILE parameter not set!"); - Teuchos::RCP ifpack_params = - Teuchos::make_rcp(); - auto comm = pmatrix_->getRowMap()->getComm(); - Teuchos::updateParametersFromXmlFileAndBroadcast(xmlFileName, ifpack_params.ptr(), *comm); + Teuchos::ParameterList ifpack_params; + + auto comm = Core::Communication::to_teuchos_comm( + Core::Communication::unpack_epetra_comm(pmatrix_->Comm())); - // get the type of ifpack preconditioner from solver parameter list - /*std::string prectype = solverlist_.get("Preconditioner Type", "ILU"); - const int overlap = ifpacklist_.get("IFPACKOVERLAP", 0);*/ + Teuchos::updateParametersFromXmlFileAndBroadcast( + xmlFileName, Teuchos::Ptr(&ifpack_params), *comm); + + auto prectype = ifpack_params.get("Preconditioner type"); + auto overlap = ifpack_params.get("Overlap"); - // create the preconditioner Ifpack Factory; prec_ = std::shared_ptr(Factory.Create(prectype, pmatrix_.get(), overlap)); @@ -66,12 +67,9 @@ void Core::LinearSolver::IFPACKPreconditioner::setup(bool create, Epetra_Operato if (!prec_) FOUR_C_THROW("Creation of IFPACK preconditioner of type '%s' failed.", prectype.c_str()); - // setup - prec_->SetParameters(ifpacklist_); + prec_->SetParameters(ifpack_params); prec_->Initialize(); prec_->Compute(); - - return; } } diff --git a/src/inpar/4C_inpar_solver.cpp b/src/inpar/4C_inpar_solver.cpp index 258a935659f..c248000f936 100644 --- a/src/inpar/4C_inpar_solver.cpp +++ b/src/inpar/4C_inpar_solver.cpp @@ -64,18 +64,6 @@ namespace Inpar::SOLVER "IFPACK_XML_FILE", "none", "xml file defining any IFPACK options", &list); } - /*{ - Core::Utils::int_parameter("IFPACKOVERLAP", 0, - "The amount of overlap used for the ifpack \"ilu\" preconditioner.", &list); - - Core::Utils::int_parameter("IFPACKGFILL", 0, - "The amount of fill allowed for an internal \"ilu\" preconditioner.", &list); - - std::vector ifpack_combine_valid_input = {"Add", "Insert", "Zero"}; - Core::Utils::string_parameter("IFPACKCOMBINE", "Add", - "Combine mode for Ifpack Additive Schwarz", &list, ifpack_combine_valid_input); - }*/ - // Iterative solver options { Core::Utils::int_parameter("AZITER", 1000, diff --git a/tests/input_files/constr2D_MPC_angle.dat b/tests/input_files/constr2D_MPC_angle.dat index 65c1e1d2d88..f01c7198584 100644 --- a/tests/input_files/constr2D_MPC_angle.dat +++ b/tests/input_files/constr2D_MPC_angle.dat @@ -28,7 +28,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 0 AZSOLVE GMRES diff --git a/tests/input_files/constr2D_MPC_dist.dat b/tests/input_files/constr2D_MPC_dist.dat index db08f7008ec..a07c8718267 100644 --- a/tests/input_files/constr2D_MPC_dist.dat +++ b/tests/input_files/constr2D_MPC_dist.dat @@ -60,7 +60,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 0 AZSOLVE GMRES diff --git a/tests/input_files/constr3D_NormComp_STI.dat b/tests/input_files/constr3D_NormComp_STI.dat index 81d99fb203a..c1987345cc0 100644 --- a/tests/input_files/constr3D_NormComp_STI.dat +++ b/tests/input_files/constr3D_NormComp_STI.dat @@ -60,7 +60,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 0 AZSOLVE GMRES diff --git a/tests/input_files/elch_RCE_rotsymm_pbc.dat b/tests/input_files/elch_RCE_rotsymm_pbc.dat index 99480b427af..dd4ba306d76 100644 --- a/tests/input_files/elch_RCE_rotsymm_pbc.dat +++ b/tests/input_files/elch_RCE_rotsymm_pbc.dat @@ -79,7 +79,7 @@ AZTOL 1.0E-10 AZCONV AZ_r0 AZITER 100 AZSUB 40 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 1.0 DENSITY 1.0 MAT 2 MAT_ion DIFFUSIVITY 0.00072 VALENCE 2.0 diff --git a/tests/input_files/elch_gaussian_hill_pbc_NP_genalpha_calcInitDt_calcInitPot.dat b/tests/input_files/elch_gaussian_hill_pbc_NP_genalpha_calcInitDt_calcInitPot.dat index 224fe13eb1d..7fae8bb408b 100644 --- a/tests/input_files/elch_gaussian_hill_pbc_NP_genalpha_calcInitDt_calcInitPot.dat +++ b/tests/input_files/elch_gaussian_hill_pbc_NP_genalpha_calcInitDt_calcInitPot.dat @@ -54,12 +54,10 @@ AZOUTPUT 0 AZSOLVE GMRES AZPREC ILU AZREUSE 20 -//IFPACKGFILL 0 AZTOL 1.0E-10 AZCONV AZ_r0 AZITER 500 AZSUB 200 -//IFPACKOVERLAP 0 IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS MAT 1 MAT_ion DIFFUSIVITY 0.0006666666666 VALENCE +0.0 diff --git a/tests/input_files/elch_gaussian_hill_pbc_Newman_twoEqu_genalpha_calcInitDt_calcInitPot.dat b/tests/input_files/elch_gaussian_hill_pbc_Newman_twoEqu_genalpha_calcInitDt_calcInitPot.dat index 1302bb1410e..06918e8f8a4 100644 --- a/tests/input_files/elch_gaussian_hill_pbc_Newman_twoEqu_genalpha_calcInitDt_calcInitPot.dat +++ b/tests/input_files/elch_gaussian_hill_pbc_Newman_twoEqu_genalpha_calcInitDt_calcInitPot.dat @@ -68,7 +68,7 @@ AZTOL 1.0E-10 AZCONV AZ_r0 AZITER 500 AZSUB 200 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS MAT 1 MAT_elchmat NUMDOF 2 NUMSCAL 1 NUMPHASE 1 PHASEIDS 2 MAT 2 MAT_elchphase EPSILON 1.0 TORTUOSITY 1.0 NUMMAT 1 MATIDS 3 diff --git a/tests/input_files/elch_gaussian_hill_pbc_genalpha.dat b/tests/input_files/elch_gaussian_hill_pbc_genalpha.dat index 28b54e02fdd..8fe33234fe9 100644 --- a/tests/input_files/elch_gaussian_hill_pbc_genalpha.dat +++ b/tests/input_files/elch_gaussian_hill_pbc_genalpha.dat @@ -61,7 +61,7 @@ AZTOL 1.0E-10 AZCONV AZ_r0 AZITER 500 AZSUB 200 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS MAT 1 MAT_ion DIFFUSIVITY 0.0006666666666 VALENCE +0.0 MAT 2 MAT_ion DIFFUSIVITY 0.0005 VALENCE +1.0 DENSIFICATION 0.0 ELIM_DIFFUSIVITY 0.001 ELIM_VALENCE -1.0 diff --git a/tests/input_files/elch_natconv_enc_pde_elim.dat b/tests/input_files/elch_natconv_enc_pde_elim.dat index 997afe08073..fa342f7e025 100644 --- a/tests/input_files/elch_natconv_enc_pde_elim.dat +++ b/tests/input_files/elch_natconv_enc_pde_elim.dat @@ -100,7 +100,7 @@ IFPACKGFILL 0 AZTOL 1.0E-10 AZITER 1000 AZSUB 25 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZCONV AZ_r0 --------------------------------------------------------------------SOLVER 2 NAME Fluid_Solver @@ -114,7 +114,7 @@ AZTOL 1.0E-10 AZCONV AZ_r0 AZITER 1000 AZSUB 25 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 1e-2 DENSITY 1.0 MAT 2 MAT_ion DIFFUSIVITY 5e-6 VALENCE 1.0 DENSIFICATION 0.5 diff --git a/tests/input_files/elch_pper_secondary_current_distribution.dat b/tests/input_files/elch_pper_secondary_current_distribution.dat index a33ee917c78..26a6843d410 100644 --- a/tests/input_files/elch_pper_secondary_current_distribution.dat +++ b/tests/input_files/elch_pper_secondary_current_distribution.dat @@ -75,7 +75,7 @@ IFPACKGFILL 0 AZTOL 1.0E-10 AZITER 1000 AZSUB 25 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZCONV AZ_r0 -------------------------------------------------------------------MATERIALS MAT 1 MAT_matlist LOCAL No NUMMAT 2 MATIDS 2 3 diff --git a/tests/input_files/f2_drivencavity32x32_Re1000_stat.dat b/tests/input_files/f2_drivencavity32x32_Re1000_stat.dat index bd019b53d8c..e0f1f922215 100644 --- a/tests/input_files/f2_drivencavity32x32_Re1000_stat.dat +++ b/tests/input_files/f2_drivencavity32x32_Re1000_stat.dat @@ -70,7 +70,7 @@ IFPACKGFILL 0 AZTOL 1.0E-7 AZITER 1000 AZSUB 25 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml //AZCONV AZ_r0 ----------------------------------------------DESIGN POINT DIRICH CONDITIONS // DOBJECT FLAG FLAG FLAG FLAG FLAG FLAG VAL VAL VAL VAL VAL VAL CURVE CURVE CURVE CURVE CURVE CURVE diff --git a/tests/input_files/f2_kimmoin25x25_oseen_instat.dat b/tests/input_files/f2_kimmoin25x25_oseen_instat.dat index 4853e8885dd..7c5eec0f40e 100644 --- a/tests/input_files/f2_kimmoin25x25_oseen_instat.dat +++ b/tests/input_files/f2_kimmoin25x25_oseen_instat.dat @@ -66,7 +66,7 @@ AZTOL 1.0E-14 AZCONV AZ_r0 AZITER 1000 AZSUB 1000 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 0.0001 DENSITY 1.0 GAMMA 1.0 ----------------------------------------------------------------------FUNCT1 // adapt the rhs function diff --git a/tests/input_files/f3_beltrami_4x4x4_hdg_lagrange.dat b/tests/input_files/f3_beltrami_4x4x4_hdg_lagrange.dat index b60c5c326f2..0960c43f1bd 100644 --- a/tests/input_files/f3_beltrami_4x4x4_hdg_lagrange.dat +++ b/tests/input_files/f3_beltrami_4x4x4_hdg_lagrange.dat @@ -53,7 +53,7 @@ TOL_PRES_INC 1e-04 SOLVER Belos AZSOLVE GMRES AZPREC ILU -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml IFPACKGFILL 0 IFPACKCOMBINE Add AZSUB 100 diff --git a/tests/input_files/f3_beltrami_4x4x4_hdg_legendre.dat b/tests/input_files/f3_beltrami_4x4x4_hdg_legendre.dat index dfe0d37b039..8c922e65a46 100644 --- a/tests/input_files/f3_beltrami_4x4x4_hdg_legendre.dat +++ b/tests/input_files/f3_beltrami_4x4x4_hdg_legendre.dat @@ -52,7 +52,7 @@ TOL_PRES_INC 1e-04 SOLVER Belos AZSOLVE GMRES AZPREC ILU -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml IFPACKGFILL 0 IFPACKCOMBINE Add AZSUB 100 diff --git a/tests/input_files/f3_beltrami_8x8_meshtying_ale.dat b/tests/input_files/f3_beltrami_8x8_meshtying_ale.dat index 604ced69d9b..bab677d8564 100644 --- a/tests/input_files/f3_beltrami_8x8_meshtying_ale.dat +++ b/tests/input_files/f3_beltrami_8x8_meshtying_ale.dat @@ -88,7 +88,7 @@ AZSOLVE GMRES AZPREC ILU AZREUSE 0 IFPACKGFILL 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZTOL 1.0E-9 AZCONV AZ_r0 AZITER 1000 diff --git a/tests/input_files/f3_beltrami_8x8_meshtying_ale_euler.dat b/tests/input_files/f3_beltrami_8x8_meshtying_ale_euler.dat index 8bd4494c07e..2841007d9c1 100644 --- a/tests/input_files/f3_beltrami_8x8_meshtying_ale_euler.dat +++ b/tests/input_files/f3_beltrami_8x8_meshtying_ale_euler.dat @@ -88,7 +88,7 @@ AZSOLVE GMRES AZPREC ILU AZREUSE 0 IFPACKGFILL 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZTOL 1.0E-9 AZCONV AZ_r0 AZITER 1000 diff --git a/tests/input_files/f3_beltrami_8x8_meshtying_bmat_merged.dat b/tests/input_files/f3_beltrami_8x8_meshtying_bmat_merged.dat index 9b464764ec9..52089158ade 100644 --- a/tests/input_files/f3_beltrami_8x8_meshtying_bmat_merged.dat +++ b/tests/input_files/f3_beltrami_8x8_meshtying_bmat_merged.dat @@ -73,7 +73,7 @@ AZSOLVE GMRES AZPREC ILU AZREUSE 0 IFPACKGFILL 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZTOL 1.0E-9 AZCONV AZ_r0 AZITER 1000 diff --git a/tests/input_files/f3_beltrami_8x8_meshtying_smat.dat b/tests/input_files/f3_beltrami_8x8_meshtying_smat.dat index a144d65ca5a..e03485c2098 100644 --- a/tests/input_files/f3_beltrami_8x8_meshtying_smat.dat +++ b/tests/input_files/f3_beltrami_8x8_meshtying_smat.dat @@ -80,7 +80,7 @@ AZSOLVE GMRES AZPREC ILU AZREUSE 0 IFPACKGFILL 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZTOL 1.0E-9 AZCONV AZ_r0 AZITER 1000 diff --git a/tests/input_files/f3_beltrami_8x8_meshtying_smat_velcoupled.dat b/tests/input_files/f3_beltrami_8x8_meshtying_smat_velcoupled.dat index 2985cf24775..ce43e86e2d3 100644 --- a/tests/input_files/f3_beltrami_8x8_meshtying_smat_velcoupled.dat +++ b/tests/input_files/f3_beltrami_8x8_meshtying_smat_velcoupled.dat @@ -74,7 +74,7 @@ AZSOLVE GMRES AZPREC ILU AZREUSE 0 IFPACKGFILL 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZTOL 1.0E-9 AZCONV AZ_r0 AZITER 1000 diff --git a/tests/input_files/f3_beltrami_sphere_hdg_legendre.dat b/tests/input_files/f3_beltrami_sphere_hdg_legendre.dat index e4c57bc417c..2c701b57921 100644 --- a/tests/input_files/f3_beltrami_sphere_hdg_legendre.dat +++ b/tests/input_files/f3_beltrami_sphere_hdg_legendre.dat @@ -52,7 +52,7 @@ TOL_PRES_INC 1e-04 SOLVER Belos AZSOLVE GMRES AZPREC ILU -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml IFPACKGFILL 0 IFPACKCOMBINE Add AZSUB 100 diff --git a/tests/input_files/f3_channel_meshtying_DCmaster.dat b/tests/input_files/f3_channel_meshtying_DCmaster.dat index c3713b4b705..e5e2abf948e 100644 --- a/tests/input_files/f3_channel_meshtying_DCmaster.dat +++ b/tests/input_files/f3_channel_meshtying_DCmaster.dat @@ -84,7 +84,7 @@ AZSOLVE GMRES AZPREC ILU AZREUSE 5 IFPACKGFILL 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZTOL 1.0E-9 AZCONV AZ_r0 AZITER 1000 diff --git a/tests/input_files/f3_channel_mixedhybrid.dat b/tests/input_files/f3_channel_mixedhybrid.dat index 2e6d7ce092c..0991fd941d1 100644 --- a/tests/input_files/f3_channel_mixedhybrid.dat +++ b/tests/input_files/f3_channel_mixedhybrid.dat @@ -74,7 +74,7 @@ AZTOL 1.0E-4 AZCONV AZ_r0 AZITER 1000 AZSUB 40 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 0.0001472 DENSITY 1.0 GAMMA 1.0 ----------------------------------------------------------------------FUNCT1 diff --git a/tests/input_files/f3_drivencavity_stat.dat b/tests/input_files/f3_drivencavity_stat.dat index fd4f3200725..057f34ebda8 100644 --- a/tests/input_files/f3_drivencavity_stat.dat +++ b/tests/input_files/f3_drivencavity_stat.dat @@ -65,7 +65,7 @@ AZTOL 1.0E-8 AZCONV AZ_r0 AZPREC ILU IFPACKGFILL 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZOUTPUT 0 AZREUSE 0 ----------------------------------------------DESIGN POINT DIRICH CONDITIONS diff --git a/tests/input_files/f3_drivencavity_stat_recongradL2.dat b/tests/input_files/f3_drivencavity_stat_recongradL2.dat index 4a5864278d9..5f807a08bdb 100644 --- a/tests/input_files/f3_drivencavity_stat_recongradL2.dat +++ b/tests/input_files/f3_drivencavity_stat_recongradL2.dat @@ -73,7 +73,7 @@ IFPACKGFILL 5 AZTOL 1.0E-17 AZITER 1500 AZSUB 100 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZCONV AZ_r0 --------------------------------------------------------------------SOLVER 2 NAME L2_Fluid_Solver diff --git a/tests/input_files/f3_forced_hit_geogen_hdg.dat b/tests/input_files/f3_forced_hit_geogen_hdg.dat index 44534e45b10..01ed4156f7c 100644 --- a/tests/input_files/f3_forced_hit_geogen_hdg.dat +++ b/tests/input_files/f3_forced_hit_geogen_hdg.dat @@ -71,7 +71,7 @@ AZTOL 1.0E-10 AZCONV AZ_r0 AZITER 1000 AZSUB 80 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 0.01 DENSITY 1.0 ----------------------------------------------------------RESULT DESCRIPTION diff --git a/tests/input_files/f3_kimmoin_stat_24x24x1_wedge15_pseudo2D.dat b/tests/input_files/f3_kimmoin_stat_24x24x1_wedge15_pseudo2D.dat index 13bf5a4179a..a0756161a38 100644 --- a/tests/input_files/f3_kimmoin_stat_24x24x1_wedge15_pseudo2D.dat +++ b/tests/input_files/f3_kimmoin_stat_24x24x1_wedge15_pseudo2D.dat @@ -80,7 +80,7 @@ AZTOL 1.0E-13 AZCONV AZ_r0 AZITER 1000 AZSUB 1000 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 0.0001 DENSITY 1.0 GAMMA 1.0 ----------------------------------------------------------------------FUNCT1 diff --git a/tests/input_files/f3_nurbs27_AfGenAlpha.dat b/tests/input_files/f3_nurbs27_AfGenAlpha.dat index f3fc8f331e5..03411244ab4 100644 --- a/tests/input_files/f3_nurbs27_AfGenAlpha.dat +++ b/tests/input_files/f3_nurbs27_AfGenAlpha.dat @@ -21,7 +21,7 @@ AZSOLVE GMRES AZPREC ILU AZREUSE 5 IFPACKGFILL 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZTOL 1.0E-7 AZCONV AZ_r0 AZITER 1000 diff --git a/tests/input_files/f3_periodic_hill_w_forcing_24x12x12.dat b/tests/input_files/f3_periodic_hill_w_forcing_24x12x12.dat index c08c285e04a..985605d5767 100644 --- a/tests/input_files/f3_periodic_hill_w_forcing_24x12x12.dat +++ b/tests/input_files/f3_periodic_hill_w_forcing_24x12x12.dat @@ -90,7 +90,7 @@ AZTOL 1.0E-20 AZCONV AZ_r0 AZITER 1000 AZSUB 40 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml ----------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 0.0000182 DENSITY 0.000001225 -------------------------------------------------------------FUNCT1 diff --git a/tests/input_files/f3_turbinflow_doublechan.dat b/tests/input_files/f3_turbinflow_doublechan.dat index f1fde361276..d5021792f06 100644 --- a/tests/input_files/f3_turbinflow_doublechan.dat +++ b/tests/input_files/f3_turbinflow_doublechan.dat @@ -88,7 +88,7 @@ AZCONV AZ_r0 AZITER 1000 AZSUB 40 IFPACKGFILL 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml IFPACKCOMBINE Add -------------------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 1.0 DENSITY 1.0 GAMMA 1.0 diff --git a/tests/input_files/fpsi_ofsiinterface.dat b/tests/input_files/fpsi_ofsiinterface.dat index ff38906444a..513e1b1bdf3 100644 --- a/tests/input_files/fpsi_ofsiinterface.dat +++ b/tests/input_files/fpsi_ofsiinterface.dat @@ -222,7 +222,7 @@ NAME ALE_Solver SOLVER UMFPACK AZSOLVE GMRES AZPREC ILU -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml IFPACKGFILL 0 IFPACKCOMBINE Add AZSUB 50 diff --git a/tests/input_files/fsi_ow3D_mtr_drt.dat b/tests/input_files/fsi_ow3D_mtr_drt.dat index 76a9a72ebdc..ce6428c2579 100644 --- a/tests/input_files/fsi_ow3D_mtr_drt.dat +++ b/tests/input_files/fsi_ow3D_mtr_drt.dat @@ -110,7 +110,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 0 AZSOLVE GMRES @@ -123,7 +123,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 0 AZSOLVE GMRES @@ -136,7 +136,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 0 AZSOLVE GMRES diff --git a/tests/input_files/homogenized-constrained-mixture-cyl-aniso-impl-nofibdir.dat b/tests/input_files/homogenized-constrained-mixture-cyl-aniso-impl-nofibdir.dat index 2ec4d2ae234..74896041077 100644 --- a/tests/input_files/homogenized-constrained-mixture-cyl-aniso-impl-nofibdir.dat +++ b/tests/input_files/homogenized-constrained-mixture-cyl-aniso-impl-nofibdir.dat @@ -80,7 +80,7 @@ GEOMETRY full SOLVER UMFPACK AZSOLVE GMRES AZPREC ILU -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml IFPACKGFILL 0 IFPACKCOMBINE Add AZSUB 5000 diff --git a/tests/input_files/levelset_gaussian_hill_pbc.dat b/tests/input_files/levelset_gaussian_hill_pbc.dat index 7e0fa42dda7..79e9dda1e09 100644 --- a/tests/input_files/levelset_gaussian_hill_pbc.dat +++ b/tests/input_files/levelset_gaussian_hill_pbc.dat @@ -66,7 +66,7 @@ IFPACKGFILL 0 AZTOL 1.0E-9 AZITER 1000 AZSUB 40 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZCONV AZ_r0 -------------------------------------------------------------------MATERIALS //MAT 1 MAT_scatra DIFFUSIVITY 0.0033333333333 // Pe_e = 1 diff --git a/tests/input_files/locsys2D.dat b/tests/input_files/locsys2D.dat index cb6ce22d8b4..31a9f881ac8 100644 --- a/tests/input_files/locsys2D.dat +++ b/tests/input_files/locsys2D.dat @@ -51,7 +51,7 @@ AZTOL 1.0E-8 AZCONV AZ_noscaled AZITER 1000 AZSUB 40 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml ----------------------------------------------DESIGN POINT DIRICH CONDITIONS // DOBJECT FLAG FLAG FLAG FLAG FLAG FLAG VAL VAL VAL VAL VAL VAL CURVE CURVE CURVE CURVE CURVE CURVE DPOINT 2 diff --git a/tests/input_files/poro_2D_scatra_ecm_reaction.dat b/tests/input_files/poro_2D_scatra_ecm_reaction.dat index 5e44bd24857..5333b90c69f 100644 --- a/tests/input_files/poro_2D_scatra_ecm_reaction.dat +++ b/tests/input_files/poro_2D_scatra_ecm_reaction.dat @@ -177,7 +177,7 @@ AZTOL 1.0E-9 AZCONV AZ_r0 AZITER 1000 AZSUB 40 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml --------------------------------------------------------CLONING MATERIAL MAP SRC_FIELD structure SRC_MAT 1 TAR_FIELD porofluid TAR_MAT 4 SRC_FIELD structure SRC_MAT 1 TAR_FIELD scatra TAR_MAT 5 diff --git a/tests/input_files/poro_3D_scatra_mono_hex8.dat b/tests/input_files/poro_3D_scatra_mono_hex8.dat index 3f2d3b80d62..f98365f7d4e 100644 --- a/tests/input_files/poro_3D_scatra_mono_hex8.dat +++ b/tests/input_files/poro_3D_scatra_mono_hex8.dat @@ -124,7 +124,7 @@ AZTOL 1.0E-9 AZCONV AZ_r0 AZITER 1000 AZSUB 40 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml --------------------------------------------------------CLONING MATERIAL MAP SRC_FIELD structure SRC_MAT 1 TAR_FIELD porofluid TAR_MAT 4 SRC_FIELD structure SRC_MAT 1 TAR_FIELD scatra TAR_MAT 5 diff --git a/tests/input_files/poro_3D_scatra_part_hex8.dat b/tests/input_files/poro_3D_scatra_part_hex8.dat index f19d26ae83b..670858f986a 100644 --- a/tests/input_files/poro_3D_scatra_part_hex8.dat +++ b/tests/input_files/poro_3D_scatra_part_hex8.dat @@ -113,7 +113,7 @@ AZTOL 1.0E-9 AZCONV AZ_r0 AZITER 1000 AZSUB 40 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml --------------------------------------------------------CLONING MATERIAL MAP SRC_FIELD structure SRC_MAT 1 TAR_FIELD porofluid TAR_MAT 4 SRC_FIELD structure SRC_MAT 1 TAR_FIELD scatra TAR_MAT 5 diff --git a/tests/input_files/porofluidmulti_2D_quad4.dat b/tests/input_files/porofluidmulti_2D_quad4.dat index 8ac4ac6a947..3d187ef2dc0 100644 --- a/tests/input_files/porofluidmulti_2D_quad4.dat +++ b/tests/input_files/porofluidmulti_2D_quad4.dat @@ -45,7 +45,7 @@ IFPACKGFILL 0 AZTOL 1.0E-6 AZITER 60 AZSUB 25 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZCONV AZ_r0 -------------------------------------------------------------------MATERIALS MAT 1 MAT_FluidPoroMultiPhase LOCAL No PERMEABILITY 1.0 NUMMAT 4 MATIDS 10 11 12 13 NUMFLUIDPHASES_IN_MULTIPHASEPORESPACE 4 diff --git a/tests/input_files/porofluidmulti_2D_quad4_4_fluids_1_volfrac.dat b/tests/input_files/porofluidmulti_2D_quad4_4_fluids_1_volfrac.dat index aa4b7b625bb..951c6e92e4f 100644 --- a/tests/input_files/porofluidmulti_2D_quad4_4_fluids_1_volfrac.dat +++ b/tests/input_files/porofluidmulti_2D_quad4_4_fluids_1_volfrac.dat @@ -45,7 +45,7 @@ IFPACKGFILL 0 AZTOL 1.0E-6 AZITER 60 AZSUB 25 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZCONV AZ_r0 -------------------------------------------------------------------MATERIALS MAT 1 MAT_FluidPoroMultiPhase LOCAL No PERMEABILITY 1.0 NUMMAT 6 MATIDS 10 11 12 13 14 15 NUMFLUIDPHASES_IN_MULTIPHASEPORESPACE 4 diff --git a/tests/input_files/porofluidmulti_2D_quad4_linebased_artery_coupling.dat b/tests/input_files/porofluidmulti_2D_quad4_linebased_artery_coupling.dat index c9a945cecba..640c6d2e75f 100644 --- a/tests/input_files/porofluidmulti_2D_quad4_linebased_artery_coupling.dat +++ b/tests/input_files/porofluidmulti_2D_quad4_linebased_artery_coupling.dat @@ -66,7 +66,7 @@ IFPACKGFILL 0 AZTOL 1.0E-6 AZITER 60 AZSUB 25 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZCONV AZ_r0 -------------------------------------------------------------------MATERIALS MAT 1 MAT_FluidPoroMultiPhase LOCAL No PERMEABILITY 1.0 NUMMAT 5 MATIDS 10 11 12 13 14 NUMFLUIDPHASES_IN_MULTIPHASEPORESPACE 3 diff --git a/tests/input_files/porofluidmulti_2D_quad4_nodal_artery_coupling.dat b/tests/input_files/porofluidmulti_2D_quad4_nodal_artery_coupling.dat index f063e8bc378..802cf4a9a57 100644 --- a/tests/input_files/porofluidmulti_2D_quad4_nodal_artery_coupling.dat +++ b/tests/input_files/porofluidmulti_2D_quad4_nodal_artery_coupling.dat @@ -63,7 +63,7 @@ IFPACKGFILL 0 AZTOL 1.0E-6 AZITER 60 AZSUB 25 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZCONV AZ_r0 -------------------------------------------------------------------MATERIALS MAT 1 MAT_FluidPoroMultiPhase LOCAL No PERMEABILITY 1.0 NUMMAT 5 MATIDS 10 11 12 13 14 NUMFLUIDPHASES_IN_MULTIPHASEPORESPACE 3 diff --git a/tests/input_files/porofluidmulti_3D_hex8.dat b/tests/input_files/porofluidmulti_3D_hex8.dat index 1067295acdc..1220e28e928 100644 --- a/tests/input_files/porofluidmulti_3D_hex8.dat +++ b/tests/input_files/porofluidmulti_3D_hex8.dat @@ -45,7 +45,7 @@ IFPACKGFILL 0 AZTOL 1.0E-6 AZITER 60 AZSUB 25 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZCONV AZ_r0 -------------------------------------------------------------------MATERIALS MAT 1 MAT_FluidPoroMultiPhase LOCAL No PERMEABILITY 1.0 NUMMAT 4 MATIDS 10 11 12 13 NUMFLUIDPHASES_IN_MULTIPHASEPORESPACE 4 diff --git a/tests/input_files/porofluidmulti_3D_tet4.dat b/tests/input_files/porofluidmulti_3D_tet4.dat index 3ca5126ca87..cf2da0a4844 100644 --- a/tests/input_files/porofluidmulti_3D_tet4.dat +++ b/tests/input_files/porofluidmulti_3D_tet4.dat @@ -45,7 +45,7 @@ IFPACKGFILL 0 AZTOL 1.0E-6 AZITER 60 AZSUB 25 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZCONV AZ_r0 -------------------------------------------------------------------MATERIALS MAT 1 MAT_FluidPoroMultiPhase LOCAL No PERMEABILITY 1.0 NUMMAT 4 MATIDS 10 11 12 13 NUMFLUIDPHASES_IN_MULTIPHASEPORESPACE 4 diff --git a/tests/input_files/poromultielastscatra_2D_quad4_part.dat b/tests/input_files/poromultielastscatra_2D_quad4_part.dat index eb6af0a5ccb..cec9aa24faf 100644 --- a/tests/input_files/poromultielastscatra_2D_quad4_part.dat +++ b/tests/input_files/poromultielastscatra_2D_quad4_part.dat @@ -73,7 +73,7 @@ IFPACKGFILL 0 AZTOL 1.0E-6 AZITER 60 AZSUB 25 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZCONV AZ_r0 -------------------------------------------------------------------MATERIALS MAT 1 MAT_FluidPoroMultiPhase LOCAL No PERMEABILITY 1.0 NUMMAT 4 MATIDS 10 11 12 13 NUMFLUIDPHASES_IN_MULTIPHASEPORESPACE 4 diff --git a/tests/input_files/poromultielastscatra_2D_quad4_part_reaction.dat b/tests/input_files/poromultielastscatra_2D_quad4_part_reaction.dat index 12fb36db71f..686fda9d971 100644 --- a/tests/input_files/poromultielastscatra_2D_quad4_part_reaction.dat +++ b/tests/input_files/poromultielastscatra_2D_quad4_part_reaction.dat @@ -73,7 +73,7 @@ IFPACKGFILL 0 AZTOL 1.0E-6 AZITER 60 AZSUB 25 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZCONV AZ_r0 -------------------------------------------------------------------MATERIALS MAT 1 MAT_FluidPoroMultiPhaseReactions LOCAL No PERMEABILITY 1.0 NUMMAT 4 MATIDS 10 11 12 13 NUMFLUIDPHASES_IN_MULTIPHASEPORESPACE 4 NUMREAC 1 REACIDS 14 diff --git a/tests/input_files/poromultielastscatra_2D_quad4_poromulti_mono.dat b/tests/input_files/poromultielastscatra_2D_quad4_poromulti_mono.dat index 7eceb647f3e..9cd5a4d5a76 100644 --- a/tests/input_files/poromultielastscatra_2D_quad4_poromulti_mono.dat +++ b/tests/input_files/poromultielastscatra_2D_quad4_poromulti_mono.dat @@ -73,7 +73,7 @@ IFPACKGFILL 0 AZTOL 1.0E-6 AZITER 60 AZSUB 25 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZCONV AZ_r0 -------------------------------------------------------------------MATERIALS MAT 1 MAT_FluidPoroMultiPhase LOCAL No PERMEABILITY 1000.0 NUMMAT 4 MATIDS 10 11 12 13 NUMFLUIDPHASES_IN_MULTIPHASEPORESPACE 4 diff --git a/tests/input_files/poromultielastscatra_2D_quad4_tumor.dat b/tests/input_files/poromultielastscatra_2D_quad4_tumor.dat index ab2a24b3dfd..0e478e87a15 100644 --- a/tests/input_files/poromultielastscatra_2D_quad4_tumor.dat +++ b/tests/input_files/poromultielastscatra_2D_quad4_tumor.dat @@ -85,7 +85,7 @@ IFPACKGFILL 0 AZTOL 1.0E-6 AZITER 60 AZSUB 25 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZCONV AZ_r0 -------------------------------------------------------------------MATERIALS MAT 1 MAT_FluidPoroMultiPhaseReactions LOCAL No PERMEABILITY 1.8e-7 NUMMAT 2 MATIDS 11 12 NUMFLUIDPHASES_IN_MULTIPHASEPORESPACE 2 NUMREAC 1 REACIDS 20 diff --git a/tests/input_files/red_airway_2_acinus_of_3Exponential_alveolar_ducts.dat b/tests/input_files/red_airway_2_acinus_of_3Exponential_alveolar_ducts.dat index 2539860b60c..cb332ab73f2 100644 --- a/tests/input_files/red_airway_2_acinus_of_3Exponential_alveolar_ducts.dat +++ b/tests/input_files/red_airway_2_acinus_of_3Exponential_alveolar_ducts.dat @@ -28,7 +28,7 @@ IFPACKGFILL 0 AZTOL 1.0E-8 AZITER 1000 AZSUB 25 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZCONV AZ_r0 -------------------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 0.00001523 DENSITY 0.000001176 GAMMA 1.0 diff --git a/tests/input_files/red_airway_acinus_of_3Exponential_alveolar_ducts.dat b/tests/input_files/red_airway_acinus_of_3Exponential_alveolar_ducts.dat index 30f1fe1c51d..11af6de6862 100644 --- a/tests/input_files/red_airway_acinus_of_3Exponential_alveolar_ducts.dat +++ b/tests/input_files/red_airway_acinus_of_3Exponential_alveolar_ducts.dat @@ -28,7 +28,7 @@ IFPACKGFILL 0 AZTOL 1.0E-8 AZITER 1000 AZSUB 25 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZCONV AZ_r0 -------------------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 0.00001523 DENSITY 0.000001176 GAMMA 1.0 diff --git a/tests/input_files/scatra_gaussian_hill_pbc.dat b/tests/input_files/scatra_gaussian_hill_pbc.dat index a443ee12dd9..840c3dca304 100644 --- a/tests/input_files/scatra_gaussian_hill_pbc.dat +++ b/tests/input_files/scatra_gaussian_hill_pbc.dat @@ -49,7 +49,7 @@ IFPACKGFILL 0 AZTOL 1.0E-9 AZITER 1000 AZSUB 40 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZCONV AZ_r0 -------------------------------------------------------------------MATERIALS MAT 1 MAT_scatra DIFFUSIVITY 0.0033333333333 diff --git a/tests/input_files/scatra_gaussian_hill_pbc_gena_cons.dat b/tests/input_files/scatra_gaussian_hill_pbc_gena_cons.dat index c2983e048dc..3d078659f45 100644 --- a/tests/input_files/scatra_gaussian_hill_pbc_gena_cons.dat +++ b/tests/input_files/scatra_gaussian_hill_pbc_gena_cons.dat @@ -50,7 +50,7 @@ IFPACKGFILL 0 AZTOL 1.0E-9 AZITER 1000 AZSUB 40 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZCONV AZ_r0 -------------------------------------------------------------------MATERIALS MAT 1 MAT_scatra DIFFUSIVITY 0.0033333333333 diff --git a/tests/input_files/scatra_gaussian_hill_pbc_genalpha.dat b/tests/input_files/scatra_gaussian_hill_pbc_genalpha.dat index bcf1b7cae44..4f6239c799e 100644 --- a/tests/input_files/scatra_gaussian_hill_pbc_genalpha.dat +++ b/tests/input_files/scatra_gaussian_hill_pbc_genalpha.dat @@ -53,7 +53,7 @@ IFPACKGFILL 0 AZTOL 1.0E-9 AZITER 1000 AZSUB 40 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZCONV AZ_r0 -------------------------------------------------------------------MATERIALS MAT 1 MAT_scatra DIFFUSIVITY 0.0033333333333 diff --git a/tests/input_files/scatra_graetz_problem_system.dat b/tests/input_files/scatra_graetz_problem_system.dat index 5dc633671c7..ca1d43149b5 100644 --- a/tests/input_files/scatra_graetz_problem_system.dat +++ b/tests/input_files/scatra_graetz_problem_system.dat @@ -92,7 +92,7 @@ IFPACKGFILL 0 AZTOL 1.0E-7 AZITER 1000 AZSUB 25 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZCONV AZ_r0 --------------------------------------------------------------------SOLVER 2 NAME Fluid_Solver @@ -106,7 +106,7 @@ AZTOL 1.0E-7 AZCONV AZ_r0 AZITER 1000 AZSUB 25 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 0.001 DENSITY 1.0 MAT 2 MAT_scatra DIFFUSIVITY 0.001 diff --git a/tests/input_files/scatra_graetz_problem_system_ost.dat b/tests/input_files/scatra_graetz_problem_system_ost.dat index 5d460307000..c0931be31ee 100644 --- a/tests/input_files/scatra_graetz_problem_system_ost.dat +++ b/tests/input_files/scatra_graetz_problem_system_ost.dat @@ -91,7 +91,7 @@ IFPACKGFILL 0 AZTOL 1.0E-7 AZITER 1000 AZSUB 25 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZCONV AZ_r0 --------------------------------------------------------------------SOLVER 2 NAME Fluid_Solver @@ -105,7 +105,7 @@ AZTOL 1.0E-7 AZCONV AZ_r0 AZITER 1000 AZSUB 25 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 0.001 DENSITY 1.0 MAT 2 MAT_scatra DIFFUSIVITY 0.001 diff --git a/tests/input_files/scatra_pper_primary_current_distribution.dat b/tests/input_files/scatra_pper_primary_current_distribution.dat index d967f073b48..8194656de7a 100644 --- a/tests/input_files/scatra_pper_primary_current_distribution.dat +++ b/tests/input_files/scatra_pper_primary_current_distribution.dat @@ -45,7 +45,7 @@ IFPACKGFILL 0 AZTOL 1.0E-10 AZITER 1000 AZSUB 25 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZCONV AZ_r0 -------------------------------------------------------------------MATERIALS MAT 1 MAT_scatra DIFFUSIVITY 1.0 diff --git a/tests/input_files/scatra_transport_neumann.dat b/tests/input_files/scatra_transport_neumann.dat index 501eea7aec6..03fbd5c018e 100644 --- a/tests/input_files/scatra_transport_neumann.dat +++ b/tests/input_files/scatra_transport_neumann.dat @@ -80,7 +80,7 @@ AZSOLVE GMRES AZSUB 300 AZTOL 1e-08 IFPACKGFILL 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml IFPACKCOMBINE Add SOLVER UMFPACK -------------------------------------------------------------------MATERIALS diff --git a/tests/input_files/scatra_transport_neumann_lin.dat b/tests/input_files/scatra_transport_neumann_lin.dat index a6b87a33a0d..f69a2fa7e85 100644 --- a/tests/input_files/scatra_transport_neumann_lin.dat +++ b/tests/input_files/scatra_transport_neumann_lin.dat @@ -81,7 +81,7 @@ AZSOLVE GMRES AZSUB 300 AZTOL 1e-08 IFPACKGFILL 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml IFPACKCOMBINE Add SOLVER UMFPACK -------------------------------------------------------------------MATERIALS diff --git a/tests/input_files/scatra_transport_neumann_local.dat b/tests/input_files/scatra_transport_neumann_local.dat index aee9c28fe05..8f1e5d84bf6 100644 --- a/tests/input_files/scatra_transport_neumann_local.dat +++ b/tests/input_files/scatra_transport_neumann_local.dat @@ -80,7 +80,7 @@ AZSOLVE GMRES AZSUB 300 AZTOL 1e-08 IFPACKGFILL 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml IFPACKCOMBINE Add SOLVER UMFPACK -------------------------------------------------------------------MATERIALS diff --git a/tests/input_files/sohex8_easmild_locsys3D_new_struc.dat b/tests/input_files/sohex8_easmild_locsys3D_new_struc.dat index 0159c55fe5e..62a51e7d6d7 100644 --- a/tests/input_files/sohex8_easmild_locsys3D_new_struc.dat +++ b/tests/input_files/sohex8_easmild_locsys3D_new_struc.dat @@ -57,7 +57,7 @@ AZTOL 1.0E-8 AZCONV AZ_noscaled AZITER 1000 AZSUB 40 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml ----------------------------------------------DESIGN POINT DIRICH CONDITIONS // DOBJECT FLAG FLAG FLAG FLAG FLAG FLAG VAL VAL VAL VAL VAL VAL CURVE CURVE CURVE CURVE CURVE CURVE DPOINT 4 diff --git a/tests/input_files/sosh8_lin_bending_patchtest.dat b/tests/input_files/sosh8_lin_bending_patchtest.dat index 094a8712308..30d96f3c85a 100644 --- a/tests/input_files/sosh8_lin_bending_patchtest.dat +++ b/tests/input_files/sosh8_lin_bending_patchtest.dat @@ -133,7 +133,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 0 AZSOLVE GMRES diff --git a/tests/input_files/w1q9_dyn_rot_drt_gena.dat b/tests/input_files/w1q9_dyn_rot_drt_gena.dat index 0cb41b99331..7845b9622cb 100644 --- a/tests/input_files/w1q9_dyn_rot_drt_gena.dat +++ b/tests/input_files/w1q9_dyn_rot_drt_gena.dat @@ -54,7 +54,7 @@ AZTOL 1.0E-8 AZCONV AZ_noscaled AZITER 1000 AZSUB 40 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml ----------------------------------------------DESIGN POINT DIRICH CONDITIONS // DOBJECT FLAG FLAG FLAG FLAG FLAG FLAG VAL VAL VAL VAL VAL VAL CURVE CURVE CURVE CURVE CURVE CURVE DPOINT 1 diff --git a/tests/input_files/xff_beltrami_Div.dat b/tests/input_files/xff_beltrami_Div.dat index 9f50c143569..aa0a58b77e8 100644 --- a/tests/input_files/xff_beltrami_Div.dat +++ b/tests/input_files/xff_beltrami_Div.dat @@ -53,7 +53,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xff_beltrami_MomMom.dat b/tests/input_files/xff_beltrami_MomMom.dat index c5027f52a3c..be79475aa4b 100644 --- a/tests/input_files/xff_beltrami_MomMom.dat +++ b/tests/input_files/xff_beltrami_MomMom.dat @@ -52,7 +52,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xff_beltrami_TesTes.dat b/tests/input_files/xff_beltrami_TesTes.dat index 3b928076053..3911ef82eaf 100644 --- a/tests/input_files/xff_beltrami_TesTes.dat +++ b/tests/input_files/xff_beltrami_TesTes.dat @@ -52,7 +52,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xff_beltrami_TesTes_NIT_embedded_evp.dat b/tests/input_files/xff_beltrami_TesTes_NIT_embedded_evp.dat index 21306cb3412..77f0b86eb3f 100644 --- a/tests/input_files/xff_beltrami_TesTes_NIT_embedded_evp.dat +++ b/tests/input_files/xff_beltrami_TesTes_NIT_embedded_evp.dat @@ -52,7 +52,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xff_beltrami_TesTes_NIT_embedded_hk_ele_vol_div_by_ele_surf.dat b/tests/input_files/xff_beltrami_TesTes_NIT_embedded_hk_ele_vol_div_by_ele_surf.dat index 9e89aa74875..0871f4dc421 100644 --- a/tests/input_files/xff_beltrami_TesTes_NIT_embedded_hk_ele_vol_div_by_ele_surf.dat +++ b/tests/input_files/xff_beltrami_TesTes_NIT_embedded_hk_ele_vol_div_by_ele_surf.dat @@ -52,7 +52,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xff_beltrami_TesTes_NIT_embedded_hk_vol_equivalent.dat b/tests/input_files/xff_beltrami_TesTes_NIT_embedded_hk_vol_equivalent.dat index f9381cf9919..b1efa780ab4 100644 --- a/tests/input_files/xff_beltrami_TesTes_NIT_embedded_hk_vol_equivalent.dat +++ b/tests/input_files/xff_beltrami_TesTes_NIT_embedded_hk_vol_equivalent.dat @@ -52,7 +52,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xff_channel_simple_stat.dat b/tests/input_files/xff_channel_simple_stat.dat index 21b1b50d78b..b60c2d5e9e3 100644 --- a/tests/input_files/xff_channel_simple_stat.dat +++ b/tests/input_files/xff_channel_simple_stat.dat @@ -55,7 +55,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xff_kimmoin_15x15_instat_nitemb_xfemgp_emb_layer_dens_5.dat b/tests/input_files/xff_kimmoin_15x15_instat_nitemb_xfemgp_emb_layer_dens_5.dat index f17e97f8efc..c48ff54d1e1 100644 --- a/tests/input_files/xff_kimmoin_15x15_instat_nitemb_xfemgp_emb_layer_dens_5.dat +++ b/tests/input_files/xff_kimmoin_15x15_instat_nitemb_xfemgp_emb_layer_dens_5.dat @@ -92,7 +92,7 @@ AZTOL 1.0E-08 AZCONV AZ_r0 AZITER 1000 AZSUB 1000 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 0.005 DENSITY 5.0 GAMMA 1.0 ----------------------------------------------------------------------FUNCT1 diff --git a/tests/input_files/xff_kimmoin_15x15_instat_nitemb_xfemgp_emb_layer_dens_5_newost.dat b/tests/input_files/xff_kimmoin_15x15_instat_nitemb_xfemgp_emb_layer_dens_5_newost.dat index 9e946256cf8..abd19886890 100644 --- a/tests/input_files/xff_kimmoin_15x15_instat_nitemb_xfemgp_emb_layer_dens_5_newost.dat +++ b/tests/input_files/xff_kimmoin_15x15_instat_nitemb_xfemgp_emb_layer_dens_5_newost.dat @@ -95,7 +95,7 @@ AZTOL 1.0E-08 AZCONV AZ_r0 AZITER 1000 AZSUB 1000 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 0.005 DENSITY 5.0 GAMMA 1.0 ----------------------------------------------------------------------FUNCT1 diff --git a/tests/input_files/xff_kimmoin_15x15_stat_mhcs_edgeb_gp_dens_1.dat b/tests/input_files/xff_kimmoin_15x15_stat_mhcs_edgeb_gp_dens_1.dat index d84f9e8c912..5243902a355 100644 --- a/tests/input_files/xff_kimmoin_15x15_stat_mhcs_edgeb_gp_dens_1.dat +++ b/tests/input_files/xff_kimmoin_15x15_stat_mhcs_edgeb_gp_dens_1.dat @@ -92,7 +92,7 @@ AZTOL 1.0E-08 AZCONV AZ_r0 AZITER 1000 AZSUB 1000 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 0.01 DENSITY 1.0 GAMMA 1.0 ----------------------------------------------------------------------FUNCT1 diff --git a/tests/input_files/xff_kimmoin_15x15_stat_mhcs_edgeb_gp_dens_5.dat b/tests/input_files/xff_kimmoin_15x15_stat_mhcs_edgeb_gp_dens_5.dat index 307455a87bb..949a61b818b 100644 --- a/tests/input_files/xff_kimmoin_15x15_stat_mhcs_edgeb_gp_dens_5.dat +++ b/tests/input_files/xff_kimmoin_15x15_stat_mhcs_edgeb_gp_dens_5.dat @@ -94,7 +94,7 @@ AZTOL 1.0E-08 AZCONV AZ_r0 AZITER 1000 AZSUB 1000 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 0.5 DENSITY 5.0 GAMMA 1.0 MAT 2 MAT_Struct_StVenantKirchhoff YOUNG 100000000000.0 NUE 0.0 DENS 0.0 diff --git a/tests/input_files/xff_kimmoin_15x15_stat_mhvs_xfemgp_dens_1.dat b/tests/input_files/xff_kimmoin_15x15_stat_mhvs_xfemgp_dens_1.dat index 15e478ed025..22fe512f3ec 100644 --- a/tests/input_files/xff_kimmoin_15x15_stat_mhvs_xfemgp_dens_1.dat +++ b/tests/input_files/xff_kimmoin_15x15_stat_mhvs_xfemgp_dens_1.dat @@ -96,7 +96,7 @@ AZTOL 1.0E-08 AZCONV AZ_r0 AZITER 1000 AZSUB 1000 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 0.4 DENSITY 1.0 GAMMA 1.0 ----------------------------------------------------------------------FUNCT1 diff --git a/tests/input_files/xff_kimmoin_15x15_stat_mhvs_xfemgp_dens_5.dat b/tests/input_files/xff_kimmoin_15x15_stat_mhvs_xfemgp_dens_5.dat index b733d4c17c9..bf485df8665 100644 --- a/tests/input_files/xff_kimmoin_15x15_stat_mhvs_xfemgp_dens_5.dat +++ b/tests/input_files/xff_kimmoin_15x15_stat_mhvs_xfemgp_dens_5.dat @@ -92,7 +92,7 @@ AZTOL 1.0E-08 AZCONV AZ_r0 AZITER 1000 AZSUB 1000 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 0.5 DENSITY 5.0 GAMMA 1.0 ----------------------------------------------------------------------FUNCT1 diff --git a/tests/input_files/xff_kimmoin_15x15_stat_nitemb_edgeb_gp_emb_layer_dens_5.dat b/tests/input_files/xff_kimmoin_15x15_stat_nitemb_edgeb_gp_emb_layer_dens_5.dat index c48598ddcd8..f9e7a0c4360 100644 --- a/tests/input_files/xff_kimmoin_15x15_stat_nitemb_edgeb_gp_emb_layer_dens_5.dat +++ b/tests/input_files/xff_kimmoin_15x15_stat_nitemb_edgeb_gp_emb_layer_dens_5.dat @@ -95,7 +95,7 @@ AZTOL 1.0E-08 AZCONV AZ_r0 AZITER 1000 AZSUB 1000 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 0.5 DENSITY 5.0 GAMMA 1.0 MAT 2 MAT_Struct_StVenantKirchhoff YOUNG 100000000000.0 NUE 0.0 DENS 0.0 diff --git a/tests/input_files/xff_kimmoin_15x15_stat_nitemb_edgeb_gp_emb_layer_dens_5_OneDofset.dat b/tests/input_files/xff_kimmoin_15x15_stat_nitemb_edgeb_gp_emb_layer_dens_5_OneDofset.dat index a7cba95b817..56b4622228a 100644 --- a/tests/input_files/xff_kimmoin_15x15_stat_nitemb_edgeb_gp_emb_layer_dens_5_OneDofset.dat +++ b/tests/input_files/xff_kimmoin_15x15_stat_nitemb_edgeb_gp_emb_layer_dens_5_OneDofset.dat @@ -97,7 +97,7 @@ AZTOL 1.0E-08 AZCONV AZ_r0 AZITER 1000 AZSUB 1000 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 0.5 DENSITY 5.0 GAMMA 1.0 MAT 2 MAT_Struct_StVenantKirchhoff YOUNG 100000000000.0 NUE 0.0 DENS 0.0 diff --git a/tests/input_files/xff_kimmoin_15x15_stat_nitemb_edgeb_gp_evp_dens_1.dat b/tests/input_files/xff_kimmoin_15x15_stat_nitemb_edgeb_gp_evp_dens_1.dat index 009e48f6c57..3cbf89e470d 100644 --- a/tests/input_files/xff_kimmoin_15x15_stat_nitemb_edgeb_gp_evp_dens_1.dat +++ b/tests/input_files/xff_kimmoin_15x15_stat_nitemb_edgeb_gp_evp_dens_1.dat @@ -94,7 +94,7 @@ AZTOL 1.0E-08 AZCONV AZ_r0 AZITER 1000 AZSUB 1000 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 0.1 DENSITY 1.0 GAMMA 1.0 MAT 2 MAT_Struct_StVenantKirchhoff YOUNG 100000000000.0 NUE 0.0 DENS 0.0 diff --git a/tests/input_files/xff_kimmoin_15x15_stat_nitemb_edgeb_gp_evp_dens_5.dat b/tests/input_files/xff_kimmoin_15x15_stat_nitemb_edgeb_gp_evp_dens_5.dat index 99f5fe11ee4..501e46bca9f 100644 --- a/tests/input_files/xff_kimmoin_15x15_stat_nitemb_edgeb_gp_evp_dens_5.dat +++ b/tests/input_files/xff_kimmoin_15x15_stat_nitemb_edgeb_gp_evp_dens_5.dat @@ -95,7 +95,7 @@ AZTOL 1.0E-08 AZCONV AZ_r0 AZITER 1000 AZSUB 1000 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 0.5 DENSITY 5.0 GAMMA 1.0 MAT 2 MAT_Struct_StVenantKirchhoff YOUNG 100000000000.0 NUE 0.0 DENS 0.0 diff --git a/tests/input_files/xff_kimmoin_15x15_stat_nitx_edgeb_gp_dens_1.dat b/tests/input_files/xff_kimmoin_15x15_stat_nitx_edgeb_gp_dens_1.dat index f0f47cb235f..fb6818db90d 100644 --- a/tests/input_files/xff_kimmoin_15x15_stat_nitx_edgeb_gp_dens_1.dat +++ b/tests/input_files/xff_kimmoin_15x15_stat_nitx_edgeb_gp_dens_1.dat @@ -95,7 +95,7 @@ AZTOL 1.0E-08 AZCONV AZ_r0 AZITER 1000 AZSUB 1000 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 0.1 DENSITY 1.0 GAMMA 1.0 MAT 2 MAT_Struct_StVenantKirchhoff YOUNG 100000000000.0 NUE 0.0 DENS 0.0 diff --git a/tests/input_files/xff_kimmoin_15x15_stat_nitx_edgeb_gp_dens_5.dat b/tests/input_files/xff_kimmoin_15x15_stat_nitx_edgeb_gp_dens_5.dat index 123fd18e1b4..2eb1746d647 100644 --- a/tests/input_files/xff_kimmoin_15x15_stat_nitx_edgeb_gp_dens_5.dat +++ b/tests/input_files/xff_kimmoin_15x15_stat_nitx_edgeb_gp_dens_5.dat @@ -95,7 +95,7 @@ AZTOL 1.0E-08 AZCONV AZ_r0 AZITER 1000 AZSUB 1000 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS MAT 1 MAT_fluid DYNVISCOSITY 0.5 DENSITY 5.0 GAMMA 1.0 MAT 2 MAT_Struct_StVenantKirchhoff YOUNG 100000000000.0 NUE 0.0 DENS 0.0 diff --git a/tests/input_files/xff_shear_flow_2D_instat_initialfield_OST.dat b/tests/input_files/xff_shear_flow_2D_instat_initialfield_OST.dat index 3f11cec904d..217a71e1cde 100644 --- a/tests/input_files/xff_shear_flow_2D_instat_initialfield_OST.dat +++ b/tests/input_files/xff_shear_flow_2D_instat_initialfield_OST.dat @@ -62,7 +62,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xff_shear_flow_2D_instat_neumann.dat b/tests/input_files/xff_shear_flow_2D_instat_neumann.dat index 124bae9b717..75c73f8f7fa 100644 --- a/tests/input_files/xff_shear_flow_2D_instat_neumann.dat +++ b/tests/input_files/xff_shear_flow_2D_instat_neumann.dat @@ -52,7 +52,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xff_shear_flow_2D_stat_bf_Nitsche_alesided_inflowaveraged_dens_7.dat b/tests/input_files/xff_shear_flow_2D_stat_bf_Nitsche_alesided_inflowaveraged_dens_7.dat index 939bd33cd16..a94605f4705 100644 --- a/tests/input_files/xff_shear_flow_2D_stat_bf_Nitsche_alesided_inflowaveraged_dens_7.dat +++ b/tests/input_files/xff_shear_flow_2D_stat_bf_Nitsche_alesided_inflowaveraged_dens_7.dat @@ -69,7 +69,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xff_shear_flow_2D_stat_neum_moredofs_circ_Nitsche_alesided.dat b/tests/input_files/xff_shear_flow_2D_stat_neum_moredofs_circ_Nitsche_alesided.dat index 36e2ae29408..45010ecd659 100644 --- a/tests/input_files/xff_shear_flow_2D_stat_neum_moredofs_circ_Nitsche_alesided.dat +++ b/tests/input_files/xff_shear_flow_2D_stat_neum_moredofs_circ_Nitsche_alesided.dat @@ -53,7 +53,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xff_shear_flow_2D_stat_neum_moredofs_circ_Nitsche_alesided_inflowaveraged.dat b/tests/input_files/xff_shear_flow_2D_stat_neum_moredofs_circ_Nitsche_alesided_inflowaveraged.dat index fa8df944437..d9d4e2efe9c 100644 --- a/tests/input_files/xff_shear_flow_2D_stat_neum_moredofs_circ_Nitsche_alesided_inflowaveraged.dat +++ b/tests/input_files/xff_shear_flow_2D_stat_neum_moredofs_circ_Nitsche_alesided_inflowaveraged.dat @@ -53,7 +53,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xff_shear_flow_2D_stat_neum_moredofs_circ_Nitsche_xsided.dat b/tests/input_files/xff_shear_flow_2D_stat_neum_moredofs_circ_Nitsche_xsided.dat index 6ddc7230aec..1fe3e342620 100644 --- a/tests/input_files/xff_shear_flow_2D_stat_neum_moredofs_circ_Nitsche_xsided.dat +++ b/tests/input_files/xff_shear_flow_2D_stat_neum_moredofs_circ_Nitsche_xsided.dat @@ -53,7 +53,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xff_shear_flow_2D_stat_neum_moredofs_circ_Nitsche_xsidedDiv.dat b/tests/input_files/xff_shear_flow_2D_stat_neum_moredofs_circ_Nitsche_xsidedDiv.dat index 3ba75963926..70182449180 100644 --- a/tests/input_files/xff_shear_flow_2D_stat_neum_moredofs_circ_Nitsche_xsidedDiv.dat +++ b/tests/input_files/xff_shear_flow_2D_stat_neum_moredofs_circ_Nitsche_xsidedDiv.dat @@ -57,7 +57,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xff_shear_flow_2D_stat_neum_moredofs_circ_Nitsche_xsided_inflowstab_onesided.dat b/tests/input_files/xff_shear_flow_2D_stat_neum_moredofs_circ_Nitsche_xsided_inflowstab_onesided.dat index 8ee73a45f4f..6430b1dc469 100644 --- a/tests/input_files/xff_shear_flow_2D_stat_neum_moredofs_circ_Nitsche_xsided_inflowstab_onesided.dat +++ b/tests/input_files/xff_shear_flow_2D_stat_neum_moredofs_circ_Nitsche_xsided_inflowstab_onesided.dat @@ -53,7 +53,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xff_shear_flow_2D_stat_neumann.dat b/tests/input_files/xff_shear_flow_2D_stat_neumann.dat index 132e1fe056c..7b07f02294b 100644 --- a/tests/input_files/xff_shear_flow_2D_stat_neumann.dat +++ b/tests/input_files/xff_shear_flow_2D_stat_neumann.dat @@ -60,7 +60,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xff_shear_flow_2D_stat_neumann_hex20.dat b/tests/input_files/xff_shear_flow_2D_stat_neumann_hex20.dat index 810ff3ea742..9e10fe48aaf 100644 --- a/tests/input_files/xff_shear_flow_2D_stat_neumann_hex20.dat +++ b/tests/input_files/xff_shear_flow_2D_stat_neumann_hex20.dat @@ -51,7 +51,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xff_shear_flow_2D_stat_neumann_hex20_Div.dat b/tests/input_files/xff_shear_flow_2D_stat_neumann_hex20_Div.dat index ef1e87902c2..7cb055cbca5 100644 --- a/tests/input_files/xff_shear_flow_2D_stat_neumann_hex20_Div.dat +++ b/tests/input_files/xff_shear_flow_2D_stat_neumann_hex20_Div.dat @@ -51,7 +51,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xff_shear_flow_2D_stat_neumann_inflowstab_onesided.dat b/tests/input_files/xff_shear_flow_2D_stat_neumann_inflowstab_onesided.dat index b0ffc5034f3..030113e55d9 100644 --- a/tests/input_files/xff_shear_flow_2D_stat_neumann_inflowstab_onesided.dat +++ b/tests/input_files/xff_shear_flow_2D_stat_neumann_inflowstab_onesided.dat @@ -63,7 +63,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xff_shear_flow_2D_stat_neumann_moredofset_circle.dat b/tests/input_files/xff_shear_flow_2D_stat_neumann_moredofset_circle.dat index b2047ff958e..9d7aadda7db 100644 --- a/tests/input_files/xff_shear_flow_2D_stat_neumann_moredofset_circle.dat +++ b/tests/input_files/xff_shear_flow_2D_stat_neumann_moredofset_circle.dat @@ -53,7 +53,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xff_shear_flow_2D_stat_neumann_moredofset_quad.dat b/tests/input_files/xff_shear_flow_2D_stat_neumann_moredofset_quad.dat index edd4b30d360..f8bafb3731b 100644 --- a/tests/input_files/xff_shear_flow_2D_stat_neumann_moredofset_quad.dat +++ b/tests/input_files/xff_shear_flow_2D_stat_neumann_moredofset_quad.dat @@ -53,7 +53,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xff_shear_flow_stat.dat b/tests/input_files/xff_shear_flow_stat.dat index 3de889f7430..b3ebd58f5dd 100644 --- a/tests/input_files/xff_shear_flow_stat.dat +++ b/tests/input_files/xff_shear_flow_stat.dat @@ -54,7 +54,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 0 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xff_stat_cylinder_testcut.dat b/tests/input_files/xff_stat_cylinder_testcut.dat index d16893013d0..6d499981b59 100644 --- a/tests/input_files/xff_stat_cylinder_testcut.dat +++ b/tests/input_files/xff_stat_cylinder_testcut.dat @@ -86,7 +86,7 @@ AZTOL 1.0E-08 AZCONV AZ_r0 AZITER 1000 AZSUB 1000 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml ----------------------------------------------------------------XFEM GENERAL VOLUME_GAUSS_POINTS_BY DirectDivergence ------------------------------------------------XFLUID DYNAMIC/STABILIZATION diff --git a/tests/input_files/xfluid_comp_struct_EOS_touched_cut.dat b/tests/input_files/xfluid_comp_struct_EOS_touched_cut.dat index 8e4df4b3f82..01f4618e25b 100644 --- a/tests/input_files/xfluid_comp_struct_EOS_touched_cut.dat +++ b/tests/input_files/xfluid_comp_struct_EOS_touched_cut.dat @@ -75,7 +75,7 @@ AZTOL 1.0E-013 AZCONV AZ_r0 AZITER 1000 AZSUB 1000 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml ----------------------------------------------------------------XFEM GENERAL GMSH_DEBUG_OUT no GMSH_SOL_OUT no diff --git a/tests/input_files/xfluid_comp_struct_EOS_touched_cut_OneDofset.dat b/tests/input_files/xfluid_comp_struct_EOS_touched_cut_OneDofset.dat index 4f773c7bdfa..8bb802f74cb 100644 --- a/tests/input_files/xfluid_comp_struct_EOS_touched_cut_OneDofset.dat +++ b/tests/input_files/xfluid_comp_struct_EOS_touched_cut_OneDofset.dat @@ -75,7 +75,7 @@ AZTOL 1.0E-013 AZCONV AZ_r0 AZITER 1000 AZSUB 1000 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml ----------------------------------------------------------------XFEM GENERAL GMSH_DEBUG_OUT no GMSH_SOL_OUT no diff --git a/tests/input_files/xfluid_kimmoin_stat_40x40x1_wedge6_levelset.dat b/tests/input_files/xfluid_kimmoin_stat_40x40x1_wedge6_levelset.dat index 9bcb973f64b..6855d9a0597 100644 --- a/tests/input_files/xfluid_kimmoin_stat_40x40x1_wedge6_levelset.dat +++ b/tests/input_files/xfluid_kimmoin_stat_40x40x1_wedge6_levelset.dat @@ -112,7 +112,7 @@ AZTOL 1.0E-13 AZCONV AZ_r0 AZITER 1000 AZSUB 1000 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml --------------------------------------------------------------------SOLVER 2 NAME Scatra_Solver SOLVER UMFPACK diff --git a/tests/input_files/xfluid_stat_sliver_cut_instat.dat b/tests/input_files/xfluid_stat_sliver_cut_instat.dat index eb8cc74433b..0a29ca1590e 100644 --- a/tests/input_files/xfluid_stat_sliver_cut_instat.dat +++ b/tests/input_files/xfluid_stat_sliver_cut_instat.dat @@ -84,7 +84,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 1 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xfluid_stat_sliver_cut_instatDiv.dat b/tests/input_files/xfluid_stat_sliver_cut_instatDiv.dat index e2c68a3cca4..e9956065462 100644 --- a/tests/input_files/xfluid_stat_sliver_cut_instatDiv.dat +++ b/tests/input_files/xfluid_stat_sliver_cut_instatDiv.dat @@ -86,7 +86,7 @@ AZCONV AZ_r0 IFPACKGFILL 0 AZITER 1000 AZOUTPUT 1 -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml AZPREC ILU AZREUSE 4 AZSOLVE GMRES diff --git a/tests/input_files/xfluid_stat_sliver_cut_instat_EOS_GP.dat b/tests/input_files/xfluid_stat_sliver_cut_instat_EOS_GP.dat index 9b3a927fdfa..689a0636a1e 100644 --- a/tests/input_files/xfluid_stat_sliver_cut_instat_EOS_GP.dat +++ b/tests/input_files/xfluid_stat_sliver_cut_instat_EOS_GP.dat @@ -96,7 +96,7 @@ AZTOL 1.0E-08 AZCONV AZ_r0 AZITER 1000 //AZSUB 150 // size of krylov space for gmres -IFPACKOVERLAP 0 +IFPACK_XML_FILE xml/ifpack.xml -------------------------------------------------------------------MATERIALS // MAT_fluid MAT 1 MAT_fluid DYNVISCOSITY 0.1 DENSITY 1.0 GAMMA 1.0 diff --git a/tests/input_files/xml/Ifpack.xml b/tests/input_files/xml/Ifpack.xml deleted file mode 100644 index 1a1ceca864f..00000000000 --- a/tests/input_files/xml/Ifpack.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - Add - Insert - Zero - - - \ No newline at end of file diff --git a/tests/input_files/xml/ifpack.xml b/tests/input_files/xml/ifpack.xml new file mode 100644 index 00000000000..fa128192c01 --- /dev/null +++ b/tests/input_files/xml/ifpack.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file