chore: attempt getter, setter for mimetic order

Author: joehellmers

src/matcha/mimetic_m.f90

@@ -9,11 +9,19 @@ module mimetic_m
   public :: mimetic_t
   public :: operator(.div.)
 
+
   type, extends(subdomain_t) :: mimetic_t
+    private
+  ! Interpolating weights
+    real, allocatable :: Q_(:)
+    real, allocatable :: P_(:)
+    integer :: mimetic_k_ = 2 ! Order 2, 4 or 6
   contains
+    procedure, pass(self) :: setOrder
     generic :: operator(.grad.) => gradient
     procedure, private :: gradient
-  end type
+    procedure mimetic_k
+ end type
 
   interface operator(.div.)
 
@@ -33,6 +41,18 @@ module function gradient(rhs) result(gradient_rhs)
       type(mimetic_t), allocatable :: gradient_rhs(:)
     end function
 
+    module subroutine setOrder(my_k, self)
+      implicit none
+      integer, intent(in) :: my_k
+      class(mimetic_t), intent(out) :: self
+    end subroutine
+ 
+    pure module function mimetic_k(self) result(my_k)
+      implicit none
+      class(mimetic_t), intent(in) :: self
+      real my_k
+    end function
+
   end interface
 
 end module

src/matcha/mimetic_s.f90

@@ -15,5 +15,13 @@
       allocate(gradient_rhs(3))
       call gradient_rhs%subdomain_t%define(side=1., boundary_val=0., internal_val=0., n=21)
     end procedure
- 
+
+    module procedure setOrder
+      self%mimetic_k_ = my_k
+    end procedure
+
+    module procedure mimetic_k
+      my_k = self%mimetic_k_
+    end procedure
+
 end submodule mimetic_s

test/mimetic_test_m.F90

@@ -39,14 +39,18 @@ function results() result(test_results)
 
 #if HAVE_MULTI_IMAGE_SUPPORT
     test_descriptions = [ &
-       test_description_t("the divergence of a gradient matching a Laplacian", div_grad_matches_laplacian) &
+       test_description_t("the divergence of a gradient matching a Laplacian - Multi-Image", div_grad_matches_laplacian) &
+       ,test_description_t("div test1 - Multi-Image", div_test1) &
     ]
 #else
     procedure(diagnosis_function_i), pointer :: div_grad_matches_laplacian_ptr
+    procedure(diagnosis_function_i), pointer :: div_test1_ptr
     div_grad_matches_laplacian_ptr => div_grad_matches_laplacian
+    div_test1_ptr => div_test1
 
     test_descriptions = [ &
-       test_description_t("the divergence of a gradient matching a Laplacian", div_grad_matches_laplacian_ptr) &
+       test_description_t("the divergence of a gradient matching a Laplacian - Non Mult-Image", div_grad_matches_laplacian_ptr) &
+       ,test_description_t("div test1 - Non Multi-Image", div_test1_ptr) &
     ]
 #endif
     test_results = test_descriptions%run()
@@ -57,6 +61,8 @@ function div_grad_matches_laplacian() result(test_diagnosis)
     real, parameter :: tolerance = 1.E-06
     type(mimetic_t) phi
 
+    ! For now I'll use n = order*2 + 1, = 5
+
     call phi%define(side=1., boundary_val=0., internal_val=0., n=21)
 
 #ifndef __GFORTRAN__
@@ -73,4 +79,33 @@ function div_grad_matches_laplacian() result(test_diagnosis)
 #endif
   end function
 
+  function div_test1() result(test_diagnosis)
+    type(test_diagnosis_t) test_diagnosis
+    real, parameter :: tolerance = 1.E-06
+    type(mimetic_t) phi
+    integer :: mimetic_k
+
+    call phi%define(side=1., boundary_val=0., internal_val=0., n=21)
+    !call phi%setOrder(my_k=2)
+    mimetic_k = phi%mimetic_k()
+    write (*,*) "mimetic_k = ", mimetic_k
+
+#ifndef __GFORTRAN__
+#else
+    block
+      type(mimetic_t) div_grad_phi, laplacian_phi
+      div_grad_phi = .div. (.grad. phi)
+      laplacian_phi = .laplacian. phi
+    end block
+#endif
+
+    test_diagnosis = test_diagnosis_t( &
+      test_passed = .true. &
+      ,diagnostics_string = "Test passed" &
+    )
+
+
+  end function
+
+
 end module mimetic_test_m