rfct(solution): encapsulate convergence params

autotest/test_par_gwf01.py

@@ -193,19 +193,8 @@ def get_model(idx, dir):
     return sim
 
 
-def build_petsc_db(exdir):
-    petsc_db_file = os.path.join(exdir, ".petscrc")
-    with open(petsc_db_file, "w") as petsc_file:
-        petsc_file.write("-ksp_type cg\n")
-        petsc_file.write("-pc_type bjacobi\n")
-        petsc_file.write("-sub_pc_type ilu\n")
-        petsc_file.write("-dvclose 10e-7\n")
-        petsc_file.write("-options_left no\n")
-
-
 def build_model(idx, exdir):
     sim = get_model(idx, exdir)
-    build_petsc_db(exdir)
     return sim, None
 
 

autotest/test_par_gwf02.py

@@ -215,18 +215,8 @@ def add_exchange_south_north(sim, name_south, name_north):
         filename=exg_filename
     )
 
-def build_petsc_db(exdir):
-    petsc_db_file = os.path.join(exdir, ".petscrc")
-    with open(petsc_db_file, 'w') as petsc_file:
-        petsc_file.write("-ksp_type cg\n")
-        petsc_file.write("-pc_type bjacobi\n")
-        petsc_file.write("-sub_pc_type ilu\n")
-        petsc_file.write(f"-dvclose {Decimal(hclose):.2E}\n")
-        petsc_file.write("-options_left no\n")
-
 def build_model(idx, exdir):
     sim = get_simulation(idx, exdir)
-    build_petsc_db(exdir)
     return sim, None
 
 def eval_model(sim):

autotest/test_par_gwf03.py

@@ -213,21 +213,8 @@ def add_exchange_south_north(sim, name_south, name_north, nlay, nrow, ncol):
         filename=exg_filename
     )
 
-def build_petsc_db(idx, exdir):
-    np = ncpus[idx]
-    petsc_db_file = os.path.join(exdir, ".petscrc")
-    with open(petsc_db_file, 'w') as petsc_file:
-        petsc_file.write("-ksp_type cg\n")
-        petsc_file.write("-pc_type bjacobi\n")
-        petsc_file.write("-sub_pc_type ilu\n")
-        petsc_file.write("-sub_pc_factor_levels 2\n")
-        petsc_file.write(f"-dvclose {Decimal(hclose):.2E}\n")
-        petsc_file.write(f"-nitermax {500}\n")
-        petsc_file.write("-options_left no\n")
-
 def build_model(idx, exdir):
     sim = get_simulation(idx, exdir)
-    build_petsc_db(idx, exdir)
     return sim, None
 
 def eval_model(sim):

autotest/test_par_gwf_idomain.py

@@ -16,21 +16,8 @@
 
 ex = ["par_idomain"]
 
-def build_petsc_db(idx, exdir):
-    from test_gwf_ifmod_idomain import hclose_check, max_inner_it
-    petsc_db_file = os.path.join(exdir, ".petscrc")
-    with open(petsc_db_file, 'w') as petsc_file:
-        petsc_file.write("-ksp_type bicg\n")
-        petsc_file.write("-pc_type bjacobi\n")
-        petsc_file.write("-sub_pc_type ilu\n")
-        petsc_file.write("-sub_pc_factor_levels 2\n")
-        petsc_file.write(f"-dvclose {Decimal(hclose_check):.2E}\n")
-        petsc_file.write(f"-nitermax {max_inner_it}\n")
-        petsc_file.write("-options_left no\n")
-
 def build_model(idx, exdir):
     from test_gwf_ifmod_idomain import build_model as build_model_ext
-    build_petsc_db(idx, exdir)
     sim, dummy = build_model_ext(idx, exdir)
     return sim, dummy
 

autotest/test_par_gwf_ims_csv.py

@@ -31,28 +31,12 @@ def update_ims(idx, ims):
     return
 
 
-def build_petsc_db(exdir):
-    from test_par_gwf01 import hclose, ninner
-
-    petsc_db_file = os.path.join(exdir, ".petscrc")
-    with open(petsc_db_file, "w") as petsc_file:
-        petsc_file.write("-ksp_type cg\n")
-        petsc_file.write("-pc_type bjacobi\n")
-        petsc_file.write("-sub_pc_type ilu\n")
-        petsc_file.write("-sub_pc_factor_levels 2\n")
-        petsc_file.write(f"-dvclose {hclose}\n")
-        petsc_file.write(f"-nitermax {ninner}\n")
-        petsc_file.write("-options_left no\n")
-        # petsc_file.write("-log_view\n")
-
-
 def build_model(idx, exdir):
     from test_par_gwf01 import get_model as get_model_ext
     from test_par_gwf01 import ex as ex_ext
 
     sim = get_model_ext(idx, exdir)
     update_ims(idx, sim.get_solution_package(f"{ex_ext[idx]}.ims"))
-    build_petsc_db(exdir)
     return sim, None
 
 

autotest/test_par_gwf_newton.py

@@ -18,21 +18,8 @@
 
 ex = ["par_newton"]
 
-def build_petsc_db(idx, exdir):
-    from test_gwf_ifmod_newton import hclose_check, max_inner_it
-    petsc_db_file = os.path.join(exdir, ".petscrc")
-    with open(petsc_db_file, 'w') as petsc_file:
-        petsc_file.write("-ksp_type bicg\n")
-        petsc_file.write("-pc_type bjacobi\n")
-        petsc_file.write("-sub_pc_type ilu\n")
-        petsc_file.write("-sub_pc_factor_levels 2\n")
-        petsc_file.write(f"-dvclose {Decimal(hclose_check):.2E}\n")
-        petsc_file.write(f"-nitermax {max_inner_it}\n")
-        petsc_file.write("-options_left no\n")
-
 def build_model(idx, exdir):
     from test_gwf_ifmod_newton import build_model as build_model_ext
-    build_petsc_db(idx, exdir)
     sim, dummy = build_model_ext(idx, exdir)
     return sim, dummy
 

autotest/test_par_gwf_pakcc.py

@@ -20,24 +20,9 @@
 ex = ["par_uzf_3lay_1p", "par_uzf_3lay_2p"]
 
 
-def build_petsc_db(idx, exdir):
-    from test_gwf_uzf_gwet import hclose, ninner
-
-    petsc_db_file = os.path.join(exdir, ".petscrc")
-    with open(petsc_db_file, "w") as petsc_file:
-        petsc_file.write("-ksp_type bicg\n")
-        petsc_file.write("-pc_type bjacobi\n")
-        petsc_file.write("-sub_pc_type ilu\n")
-        petsc_file.write("-sub_pc_factor_levels 2\n")
-        petsc_file.write(f"-dvclose {Decimal(hclose):.2E}\n")
-        petsc_file.write(f"-nitermax {ninner}\n")
-        petsc_file.write("-options_left no\n")
-
-
 def build_model(idx, exdir):
     from test_gwf_uzf_gwet import build_model as build_model_ext
 
-    build_petsc_db(idx, exdir)
     sim, dummy = build_model_ext(idx, exdir)
     if idx == 1:
         sim.set_sim_path(exdir / "working")

autotest/test_par_gwf_rewet.py

@@ -15,21 +15,9 @@
 # with a serial 'refmodel'
 ex = ["par_rewet"]
 
-def build_petsc_db(idx, exdir):
-    from test_gwf_ifmod_rewet import hclose_check, max_inner_it
-    petsc_db_file = os.path.join(exdir, ".petscrc")
-    with open(petsc_db_file, 'w') as petsc_file:
-        petsc_file.write("-ksp_type bicg\n")
-        petsc_file.write("-pc_type bjacobi\n")
-        petsc_file.write("-sub_pc_type ilu\n")
-        petsc_file.write("-sub_pc_factor_levels 2\n")
-        petsc_file.write(f"-dvclose {Decimal(hclose_check):.2E}\n")
-        petsc_file.write(f"-nitermax {max_inner_it}\n")
-        petsc_file.write("-options_left no\n")
 
 def build_model(idx, exdir):
     from test_gwf_ifmod_rewet import build_model as build_model_ext
-    build_petsc_db(idx, exdir)
     sim, dummy = build_model_ext(idx, exdir)
     return sim, dummy
 

autotest/test_par_gwf_xt3d02.py

@@ -15,21 +15,8 @@
 # with a serial 'refmodel' in case of XT3D
 ex = ["par_xt3d02"]
 
-def build_petsc_db(idx, exdir):
-    from test_gwf_ifmod_xt3d02 import hclose_check, max_inner_it
-    petsc_db_file = os.path.join(exdir, ".petscrc")
-    with open(petsc_db_file, 'w') as petsc_file:
-        petsc_file.write("-ksp_type bicg\n")
-        petsc_file.write("-pc_type bjacobi\n")
-        petsc_file.write("-sub_pc_type ilu\n")
-        petsc_file.write("-sub_pc_factor_levels 2\n")
-        petsc_file.write(f"-dvclose {Decimal(hclose_check):.2E}\n")
-        petsc_file.write(f"-nitermax {max_inner_it}\n")
-        petsc_file.write("-options_left no\n")
-
 def build_model(idx, exdir):
     from test_gwf_ifmod_xt3d02 import build_model as build_model_ext
-    build_petsc_db(idx, exdir)
     sim, dummy = build_model_ext(idx, exdir)
     return sim, dummy
 

make/makefile

@@ -5,36 +5,36 @@ include ./makedefaults
 
 # Define the source file directories
 SOURCEDIR1=../src
-SOURCEDIR2=../src/Exchange
-SOURCEDIR3=../src/Model
-SOURCEDIR4=../src/Model/Geometry
-SOURCEDIR5=../src/Model/TransportModel
+SOURCEDIR2=../src/Model
+SOURCEDIR3=../src/Model/TransportModel
+SOURCEDIR4=../src/Model/GroundWaterFlow
+SOURCEDIR5=../src/Model/Geometry
 SOURCEDIR6=../src/Model/ModelUtilities
-SOURCEDIR7=../src/Model/Connection
-SOURCEDIR8=../src/Model/GroundWaterTransport
-SOURCEDIR9=../src/Model/GroundWaterFlow
-SOURCEDIR10=../src/Distributed
-SOURCEDIR11=../src/Solution
-SOURCEDIR12=../src/Solution/PETSc
-SOURCEDIR13=../src/Solution/LinearMethods
-SOURCEDIR14=../src/Timing
-SOURCEDIR15=../src/Utilities
-SOURCEDIR16=../src/Utilities/TimeSeries
-SOURCEDIR17=../src/Utilities/Libraries
-SOURCEDIR18=../src/Utilities/Libraries/rcm
-SOURCEDIR19=../src/Utilities/Libraries/sparsekit
-SOURCEDIR20=../src/Utilities/Libraries/sparskit2
-SOURCEDIR21=../src/Utilities/Libraries/blas
-SOURCEDIR22=../src/Utilities/Libraries/daglib
-SOURCEDIR23=../src/Utilities/Idm
-SOURCEDIR24=../src/Utilities/Idm/selector
-SOURCEDIR25=../src/Utilities/Idm/mf6blockfile
-SOURCEDIR26=../src/Utilities/Matrix
-SOURCEDIR27=../src/Utilities/Vector
-SOURCEDIR28=../src/Utilities/Observation
-SOURCEDIR29=../src/Utilities/OutputControl
-SOURCEDIR30=../src/Utilities/Memory
-SOURCEDIR31=../src/Utilities/ArrayRead
+SOURCEDIR7=../src/Model/GroundWaterTransport
+SOURCEDIR8=../src/Model/Connection
+SOURCEDIR9=../src/Distributed
+SOURCEDIR10=../src/Utilities
+SOURCEDIR11=../src/Utilities/Idm
+SOURCEDIR12=../src/Utilities/Idm/mf6blockfile
+SOURCEDIR13=../src/Utilities/Idm/selector
+SOURCEDIR14=../src/Utilities/Vector
+SOURCEDIR15=../src/Utilities/Matrix
+SOURCEDIR16=../src/Utilities/Observation
+SOURCEDIR17=../src/Utilities/ArrayRead
+SOURCEDIR18=../src/Utilities/OutputControl
+SOURCEDIR19=../src/Utilities/Libraries
+SOURCEDIR20=../src/Utilities/Libraries/blas
+SOURCEDIR21=../src/Utilities/Libraries/rcm
+SOURCEDIR22=../src/Utilities/Libraries/sparsekit
+SOURCEDIR23=../src/Utilities/Libraries/sparskit2
+SOURCEDIR24=../src/Utilities/Libraries/daglib
+SOURCEDIR25=../src/Utilities/Memory
+SOURCEDIR26=../src/Utilities/TimeSeries
+SOURCEDIR27=../src/Timing
+SOURCEDIR28=../src/Solution
+SOURCEDIR29=../src/Solution/PETSc
+SOURCEDIR30=../src/Solution/LinearMethods
+SOURCEDIR31=../src/Exchange
 
 VPATH = \
 ${SOURCEDIR1} \
@@ -206,6 +206,8 @@ $(OBJDIR)/gwf3vsc8.o \
 $(OBJDIR)/GwfNpfOptions.o \
 $(OBJDIR)/InterfaceMap.o \
 $(OBJDIR)/SeqVector.o \
+$(OBJDIR)/ImsLinearSettings.o \
+$(OBJDIR)/ConvergenceSummary.o \
 $(OBJDIR)/CellWithNbrs.o \
 $(OBJDIR)/NumericalExchange.o \
 $(OBJDIR)/gwf3uzf8.o \

msvs/mf6core.vfproj

@@ -212,19 +212,26 @@
 		<File RelativePath="..\src\Solution\LinearMethods\ims8linear.f90"/>
 		<File RelativePath="..\src\Solution\LinearMethods\ims8misc.f90"/>
 		<File RelativePath="..\src\Solution\LinearMethods\ims8reordering.f90"/>
+		<File RelativePath="..\src\Solution\LinearMethods\ImsLinearSettings.f90"/>
 		<File RelativePath="..\src\Solution\LinearMethods\ImsLinearSolver.f90"/></Filter>
 		<Filter Name="PETSc">
 		<File RelativePath="..\src\Solution\PETSc\PetscConvergence.F90">
 			<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true"/>
 			<FileConfiguration Name="Release|x64" ExcludedFromBuild="true"/>
 			<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true"/>
 			<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true"/></File>
+		<File RelativePath="..\src\Solution\PETSc\PetscImsPreconditioner.F90">
+			<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true"/>
+			<FileConfiguration Name="Release|x64" ExcludedFromBuild="true"/>
+			<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true"/>
+			<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true"/></File>
 		<File RelativePath="..\src\Solution\PETSc\PetscSolver.F90">
 			<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true"/>
 			<FileConfiguration Name="Release|x64" ExcludedFromBuild="true"/>
 			<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true"/>
 			<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true"/></File></Filter>
 		<File RelativePath="..\src\Solution\BaseSolution.f90"/>
+		<File RelativePath="..\src\Solution\ConvergenceSummary.f90"/>
 		<File RelativePath="..\src\Solution\ExplicitSolution.f90"/>
 		<File RelativePath="..\src\Solution\LinearSolverBase.f90"/>
 		<File RelativePath="..\src\Solution\LinearSolverFactory.F90">

pymake/excludefiles.txt

@@ -1,5 +1,6 @@
-../src/Solution/PETSc/PetscSolver.F90
 ../src/Solution/PETSc/PetscConvergence.F90
+../src/Solution/PETSc/PetscImsPreconditioner.F90
+../src/Solution/PETSc/PetscSolver.F90
 ../src/Solution/ParallelSolution.f90
 ../src/Utilities/Matrix/PetscMatrix.F90
 ../src/Utilities/Vector/PetscVector.F90

src/Distributed/MpiRunControl.F90

@@ -59,7 +59,6 @@ subroutine mpi_ctrl_start(this)
 
     inquire (file=petsc_db_file, exist=petsc_db_exists)
     if (.not. petsc_db_exists) then
-      write (*, *) 'WARNING. PETSc database file not found: '//petsc_db_file
       call PetscInitialize(PETSC_NULL_CHARACTER, ierr)
       CHKERRQ(ierr)
     else