brought version of FVM solver that worked

Author: komahanb

src/OBJECTS

@@ -1,10 +1,4 @@
 objects= \
-interface_physics.o \
-interface_assembler.o \
-interface_algebraic_solver.o \
-interface_linear_solver.o \
-interface_nonlinear_solver.o \
-utils.o \
 class_string.o \
 class_file.o \
 class_set.o \
@@ -14,11 +8,8 @@ class_gmsh_loader.o \
 module_mesh_utils.o \
 class_mesh.o \
 class_assembler.o \
-<<<<<<< Updated upstream
-class_finite_volume_assembler.o \
 interface_linear_solver.o \
 class_conjugate_gradient.o \
 class_gauss_jacobi.o \
 class_gauss_seidel.o \
-class_sor.o \
-class_physics_unsteady_heat.o
+class_sor.o 

src/class_assembler.f90

@@ -1,24 +1,17 @@
-!=====================================================================!
-! Class that coodinates tasks of discretiztion, mesh and physics
-! 
-! Author: Komahan Boopathy
-!=====================================================================!
-
 module class_assembler
 
   ! import dependencies
   use iso_fortran_env, only : dp => REAL64
   use class_mesh, only : mesh
-  use interface_physics, only : physics
-
+  
   implicit none
 
   private
   public :: assembler
 
   !===================================================================!
-  ! Class responsible for matrix, right hand side assembly and
-  ! boundary conditions
+  ! Class responsible for matrix, right hand side assembly and boundary
+  ! conditions
   !===================================================================!
 
   type :: assembler
@@ -29,14 +22,15 @@ module class_assembler
      ! Mesh object
      ! type(mesh), pointer :: grid
      class(mesh)   , allocatable :: grid
-     
+     !class(physics), allocatable :: system(:) ! poisson on \Omega, dirichlet on dOmega1 , dirchlet dOmega3 , dirichlet, Neumann dOmega4 
+
      ! Number of state varibles 
      integer :: num_state_vars
 
      ! Flux vector
      real(dp), allocatable :: phi(:)
 
-     ! Matrix filters (used by classical iterations)
+     ! Matrix filters
      integer :: DIAGONAL       = 0
      integer :: LOWER_TRIANGLE = -1
      integer :: UPPER_TRIANGLE = 1
@@ -75,12 +69,13 @@ module class_assembler
 
   type(assembler) function construct(grid) result (this)
 
-    class(mesh)   , intent(in) :: grid
+    type(mesh), intent(in) :: grid
 
     print *, "constructing assembler"
 
     ! Set mesh
     allocate(this % grid, source  = grid)
+    call this % grid % to_string()
 
     ! Non symmetric jacobian
     this % symmetry = .true.
@@ -93,7 +88,6 @@ type(assembler) function construct(grid) result (this)
     allocate(this % phi(this % num_state_vars))
     this % phi = 0
 
-    ! Filters for matrix assembly (used by solvers)
     this % DIAGONAL       = 0
     this % LOWER_TRIANGLE = -1
     this % UPPER_TRIANGLE = 1
@@ -529,7 +523,7 @@ subroutine get_source(this, b)
     real(dp) , parameter :: phi_right  = 0.0d0
     real(dp) , parameter :: phi_top    = 0.0d0
     real(dp) , parameter :: phi_bottom = 0.0d0
-    real(dp) , parameter :: phib = 1.0d0
+    real(dp) , parameter :: phib = 0.0d0
 
 !!$    
 !!$    block

src/class_conjugate_gradient.f90

@@ -6,7 +6,7 @@
 module class_conjugate_gradient
 
   use iso_fortran_env         , only : dp => REAL64
-  use interface_linear_solver , only : abstract_linear_solver
+  use interface_linear_solver , only : linear_solver
   use class_assembler         , only : assembler
 
   implicit none
@@ -19,7 +19,7 @@ module class_conjugate_gradient
   ! Linear solver datatype
   !===================================================================!
 
-  type, extends(abstract_linear_solver) :: conjugate_gradient
+  type, extends(linear_solver) :: conjugate_gradient
 
      !type(assembler), pointer :: FVAssembler
      class(assembler), allocatable :: FVAssembler

src/class_gauss_seidel.f90

@@ -1,13 +1,13 @@
 !=====================================================================!
-! Conjugate Gradient linear solver class that uses the functionalities
-! of assembler class in the iterative solution process.
+! Conjugate Gradient linear solver class that uses the functionalities of assembler class 
+! in the iterative solution process.
 !=====================================================================!
 
 module class_gauss_seidel
 
-  use iso_fortran_env            , only : dp => REAL64
-  use interface_algebraic_solver , only : algebraic_solver
-  use class_assembler            , only : assembler
+  use iso_fortran_env         , only : dp => REAL64
+  use interface_linear_solver , only : linear_solver
+  use class_assembler         , only : assembler
 
   implicit none
 
@@ -19,7 +19,7 @@ module class_gauss_seidel
   ! Linear solver datatype
   !===================================================================!
 
-  type, extends(algebraic_solver) :: gauss_seidel
+  type, extends(linear_solver) :: gauss_seidel
 
      !type(assembler), pointer :: FVAssembler
      class(assembler), allocatable :: FVAssembler

src/interface_algebraic_solver.f90

@@ -33,13 +33,13 @@ module interface_algebraic_solver
   !===================================================================!
 
   interface
-     subroutine solve_interface(this, system)
+     subroutine solve_interface(this, system, x)
        import algebraic_solver
        import assembler
        import dp
        class(algebraic_solver), intent(in)  :: this
        class(assembler)       , intent(in)  :: system
-       !real(dp), allocatable  , intent(out) :: x(:) ! maybe 2D for qdot
+       real(dp), allocatable  , intent(out) :: x(:) ! maybe 2D for qdot
      end subroutine solve_interface
   end interface
 

src/interface_linear_solver.f90

@@ -1,124 +1,46 @@
 !=====================================================================!
-! Abstract class for linear solvers to extend and provide iterate
-! method.
-! 
-! Author: Komahan Boopathy
+! Interface for linear solvers to implement.
 !=====================================================================!
 
 module interface_linear_solver
 
-  use iso_fortran_env           , only : dp => REAL64
-  use interface_algebraic_solver, only : algebraic_solver
-  use interface_assembler       , only : assembler
+  use iso_fortran_env , only : dp => REAL64
 
   implicit none
 
+  ! Expose only the linear solver interface
   private
   public :: linear_solver
 
   !===================================================================!
-  ! Abstract linear solver datatype
+  ! Linear solver datatype
   !===================================================================!
 
-  type, abstract, extends(algebraic_solver) :: linear_solver
-     
-     ! Tolerances and print control for iterative solvers
+  type, abstract :: linear_solver
+
      real(dp) :: max_tol
      integer  :: max_it
-     integer  :: print_level
-     
+
    contains
-     
-     ! Generic solve procedure
-     procedure :: solve
 
-     ! Iteration behavior is deferred (specific to the type of solver)
-     procedure(iterate_interface), deferred :: iterate
-     
+     ! type bound procedures
+     procedure(solve_interface), deferred :: solve
+
   end type linear_solver
 
   !===================================================================!
-  ! Interface for deferred iterate function 
+  ! Interface for multiple constructors
   !===================================================================!
 
   interface
-     subroutine iterate_interface(this, system, x)
+     subroutine solve_interface(this, x)
        import linear_solver
-       import assembler
        import dp
        class(linear_solver)  , intent(in)  :: this
-       class(assembler)      , intent(in)  :: system
        real(dp), allocatable , intent(out) :: x(:)
-     end subroutine iterate_interface
+     end subroutine solve_interface
   end interface
-
-contains
-
-  !===================================================================!
-  ! Iterative nonlinear solution A x = b(x)
-  !===================================================================!
 
-  subroutine solve(this, system)
-
-    class(linear_solver)   , intent(in)  :: this
-    class(assembler)       , intent(in)  :: system
-
-    ! Locals
-    real(dp), allocatable :: xold(:), ss(:)
-    real(dp) :: update_norm
-    integer  :: iter, num_inner_iters
-
-    ! Initial guess vector for the subspace is "b"
-    allocate(x(system % num_state_vars))
-    call system % get_source(x)
-    if (norm2(x) .lt. epsilon(1.0_dp)) then
-       print *, 'zero rhs? stopping'
-       error stop
-    end if
-
-    allocate(xold(system % num_state_vars))
-    allocate(ss(system % num_state_vars))
-
-    if (this % print_level .eq. -1) then
-       open(13, file='sor.res', action='write')
-       write(13,*) "iteration ", " residual"
-    end if
-
-    update_norm = huge(1.0d0); iter = 1;
-    outer_iterations: do while (update_norm .gt. this % max_tol)
-
-       xold = x
-
-       ! Inner iterations with CG (linear solver)
-       if ( iter .eq. 1) then
-          ss = 0.0d0
-          call this % iterate(system, x, ss, num_inner_iters)
-       else
-          call system % get_skew_source(ss, x)
-          call this % iterate(system, x, ss, num_inner_iters)
-       end if
-
-       update_norm = norm2(x - xold)
-       if (this % print_level .eq. -1) then
-          write(13, *) iter, update_norm
-       end if
-       if (this % print_level .gt. 0) then
-          print *, &
-               & "outer iter      ", iter, &
-               & "num_inner_iters ", num_inner_iters,  &
-               & "update norm     ", update_norm
-       end if
-       iter = iter + 1
-       
-    end do outer_iterations
-
-    if (this % print_level .eq. -1) then
-       close(13)
-    end if
-
-    deallocate(xold)
-    deallocate(ss)
+contains
 
-  end subroutine solve
-  
 end module interface_linear_solver

test/solve/test.f90

@@ -16,7 +16,7 @@ program test_mesh
 
   implicit none
 
-  character(len=*)     , parameter   :: filename = "../rectangle.msh"
+  character(len=*)     , parameter   :: filename = "../airfoil.msh"
   class(gmsh_loader)   , allocatable :: gmsh
   class(mesh)          , allocatable :: grid
   class(linear_solver) , allocatable :: solver