add intermediate abstract integrand tester

Author: szaghi

src/tests/tester/foodie_test_integrand_ladvection.f90

@@ -8,14 +8,15 @@ module foodie_test_integrand_ladvection
 use, intrinsic :: iso_fortran_env, only : stderr=>error_unit
 use flap, only : command_line_interface
 use foodie, only : integrand_object
+use foodie_test_integrand_tester_object, only : integrand_tester_object
 use penf, only : FR_P, I_P, R_P, str
 use wenoof, only : interpolator_object, wenoof_create
 
 implicit none
 private
 public :: integrand_ladvection
 
-type, extends(integrand_object) :: integrand_ladvection
+type, extends(integrand_tester_object) :: integrand_ladvection
    !< 1D linear advection field.
    !<
    !< It is a FOODIE integrand class concrete extension.
@@ -56,15 +57,15 @@ module foodie_test_integrand_ladvection
    class(interpolator_object), allocatable :: interpolator    !< WENO interpolator.
    contains
       ! auxiliary methods
-      procedure, pass(self), public :: destroy                       !< Destroy field.
-      procedure, pass(self), public :: dt => compute_dt              !< Compute the current time step, by means of CFL condition.
-      procedure, pass(self), public :: exact_solution                !< Return exact solution.
-      procedure, pass(self), public :: export_tecplot                !< Export integrand to Tecplot file.
-      procedure, pass(self), public :: output                        !< Extract integrand state field.
-      procedure, pass(self), public :: parse_cli                     !< Initialize from command line interface.
-      procedure, nopass,     public :: set_cli                       !< Set command line interface.
-      procedure, pass(self), public :: set_square_wave_initial_state !< Set initial state as a square wave.
-      ! public deferred methods
+      procedure, pass(self), public :: destroy          !< Destroy field.
+      procedure, pass(self), public :: dt => compute_dt !< Compute the current time step, by means of CFL condition.
+      procedure, pass(self), public :: exact_solution   !< Return exact solution.
+      procedure, pass(self), public :: output           !< Extract integrand state field.
+      ! integrand_tester_object deferred methods
+      procedure, pass(self), public :: export_tecplot !< Export integrand to Tecplot file.
+      procedure, pass(self), public :: parse_cli      !< Initialize from command line interface.
+      procedure, nopass,     public :: set_cli        !< Set command line interface.
+      ! integrand_object deferred methods
       procedure, pass(self), public :: integrand_dimension !< Return integrand dimension.
       procedure, pass(self), public :: t => dU_dt          !< Time derivative, residuals.
       ! operators
@@ -93,8 +94,9 @@ module foodie_test_integrand_ladvection
       ! procedure, pass(opr),  public :: integrand_multiply_real_scalar_fast !< `* real_scalar` fast operator.
       ! procedure, pass(opr),  public :: integrand_subtract_integrand_fast   !< `-` fast operator.
       ! private methods
-      procedure, pass(self), private :: impose_boundary_conditions !< Impose boundary conditions.
-      procedure, pass(self), private :: reconstruct_interfaces     !< Reconstruct interface states.
+      procedure, pass(self), private :: impose_boundary_conditions    !< Impose boundary conditions.
+      procedure, pass(self), private :: reconstruct_interfaces        !< Reconstruct interface states.
+      procedure, pass(self), private :: set_square_wave_initial_state !< Set initial state as a square wave.
 endtype integrand_ladvection
 
 contains
@@ -131,6 +133,15 @@ pure function exact_solution(self, u0, t) result(exact)
 
    endfunction exact_solution
 
+   pure function output(self) result(state)
+   !< Output the advection field state.
+   class(integrand_ladvection), intent(in) :: self     !< Advection field.
+   real(R_P), allocatable                  :: state(:) !< Advection state
+
+   state = self%u(1:self%Ni)
+   endfunction output
+
+   ! integrand_tester_object deferred methods
    subroutine export_tecplot(self, file_name, t, scheme, close_file)
    !< Export integrand to Tecplot file.
    class(integrand_ladvection), intent(in)           :: self            !< Advection field.
@@ -163,14 +174,6 @@ subroutine export_tecplot(self, file_name, t, scheme, close_file)
    endif
    endsubroutine export_tecplot
 
-   pure function output(self) result(state)
-   !< Output the advection field state.
-   class(integrand_ladvection), intent(in) :: self     !< Advection field.
-   real(R_P), allocatable                  :: state(:) !< Advection state
-
-   state = self%u(1:self%Ni)
-   endfunction output
-
    subroutine parse_cli(self, cli)
    !< Initialize from command line interface.
    class(integrand_ladvection),  intent(inout) :: self          !< Advection field.
@@ -218,7 +221,7 @@ subroutine set_cli(cli)
                 def='square_wave', choices='square_wave')
    endsubroutine set_cli
 
-   ! ADT integrand deferred methods
+   ! integrand_object deferred methods
    function dU_dt(self, t) result(dState_dt)
    !< Time derivative of advection field, the residuals function.
    class(integrand_ladvection), intent(in)           :: self                         !< Advection field.

src/tests/tester/foodie_test_integrand_oscillation.f90

@@ -5,13 +5,14 @@ module foodie_test_integrand_oscillation
 
 use flap, only : command_line_interface
 use foodie, only : integrand_object
+use foodie_test_integrand_tester_object, only : integrand_tester_object
 use penf, only : FR_P, R_P, I_P, str
 
 implicit none
 private
 public :: integrand_oscillation
 
-type, extends(integrand_object) :: integrand_oscillation
+type, extends(integrand_tester_object) :: integrand_oscillation
    !< The oscillation equations field.
    !<
    !< It is a FOODIE integrand class concrete extension.
@@ -50,12 +51,13 @@ module foodie_test_integrand_oscillation
       ! auxiliary methods
       procedure, pass(self), public :: amplitude_phase !< Return amplitude and phase of the oscillation.
       procedure, pass(self), public :: exact_solution  !< Return exact solution.
-      procedure, pass(self), public :: export_tecplot  !< Export integrand to Tecplot file.
       procedure, pass(self), public :: initialize      !< Initialize integrand.
       procedure, pass(self), public :: output          !< Extract integrand state field.
-      procedure, pass(self), public :: parse_cli       !< Initialize from command line interface.
-      procedure, nopass,     public :: set_cli         !< Set command line interface.
-      ! public deferred methods
+      ! integrand_tester_object deferred methods
+      procedure, pass(self), public :: export_tecplot !< Export integrand to Tecplot file.
+      procedure, pass(self), public :: parse_cli      !< Initialize from command line interface.
+      procedure, nopass,     public :: set_cli        !< Set command line interface.
+      ! integrand_object deferred methods
       procedure, pass(self), public :: integrand_dimension !< Return integrand dimension.
       procedure, pass(self), public :: t => dU_dt          !< Time derivative, residuals.
       ! operators
@@ -106,6 +108,26 @@ pure function exact_solution(self, t) result(exact)
    exact(2) = self%U0(1) * sin(self%f * t) + self%U0(2) * cos(self%f * t)
    endfunction exact_solution
 
+   pure subroutine initialize(self, U0, frequency)
+   !< Initialize integrand.
+   class(integrand_oscillation), intent(inout) :: self      !< Integrand.
+   real(R_P),                    intent(in)    :: U0(1:2)   !< Initial state.
+   real(R_P),                    intent(in)    :: frequency !< Frequency of oscillation.
+
+   self%U = U0
+   self%f = frequency
+   self%U0 = U0
+   endsubroutine initialize
+
+   pure function output(self) result(state)
+   !< Extract integrand state field.
+   class(integrand_oscillation), intent(in) :: self       !< Integrand.
+   real(R_P)                                :: state(1:2) !< State.
+
+   state = self%U
+   endfunction output
+
+   ! integrand_tester_object deferred methods
    subroutine export_tecplot(self, file_name, t, scheme, close_file)
    !< Export integrand to Tecplot file.
    class(integrand_oscillation), intent(in)           :: self            !< Advection field.
@@ -138,30 +160,10 @@ subroutine export_tecplot(self, file_name, t, scheme, close_file)
    endif
    endsubroutine export_tecplot
 
-   pure subroutine initialize(self, U0, frequency)
-   !< Initialize integrand.
-   class(integrand_oscillation), intent(inout) :: self      !< Integrand.
-   real(R_P),                    intent(in)    :: U0(1:2)   !< Initial state.
-   real(R_P),                    intent(in)    :: frequency !< Frequency of oscillation.
-
-   self%U = U0
-   self%f = frequency
-   self%U0 = U0
-   endsubroutine initialize
-
-   pure function output(self) result(state)
-   !< Extract integrand state field.
-   class(integrand_oscillation), intent(in) :: self       !< Integrand.
-   real(R_P)                                :: state(1:2) !< State.
-
-   state = self%U
-   endfunction output
-
    subroutine parse_cli(self, cli)
    !< Initialize from command line interface.
-   class(integrand_oscillation), intent(inout) :: self          !< Advection field.
-   type(command_line_interface), intent(inout) :: cli           !< Command line interface handler.
-   character(99)                               :: initial_state !< Initial state.
+   class(integrand_oscillation), intent(inout) :: self !< Advection field.
+   type(command_line_interface), intent(inout) :: cli  !< Command line interface handler.
 
    call cli%get(switch='-f', val=self%f, error=cli%error) ; if (cli%error/=0) stop
    call cli%get(switch='-U0', val=self%U0, error=cli%error) ; if (cli%error/=0) stop
@@ -176,7 +178,7 @@ subroutine set_cli(cli)
    call cli%add(switch='--U0', switch_ab='-U0', nargs='2', help='initial state', required=.false., def='0.0 1.0', act='store')
    endsubroutine set_cli
 
-   ! deferred methods
+   ! integrand_object deferred methods
    pure function integrand_dimension(self)
    !< return integrand dimension.
    class(integrand_oscillation), intent(in) :: self                !< integrand.

src/tests/tester/foodie_test_integrand_tester_object.f90

@@ -0,0 +1,51 @@
+!< Define [[integrand_tester_object]], the abstract tester integrand.
+
+module foodie_test_integrand_tester_object
+!< Define [[integrand_tester_object]], the abstract tester integrand.
+
+use flap, only : command_line_interface
+use foodie, only : integrand_object
+use penf, only : FR_P, R_P, I_P, str
+
+implicit none
+private
+public :: integrand_tester_object
+
+type, abstract, extends(integrand_object) :: integrand_tester_object
+   !< The abstract tester integrand.
+   !<
+   !< This abstract provided some auxiliary methods useful for the tester machinery.
+   contains
+      ! auxiliary methods
+      procedure(export_tecplot_interface), pass(self), deferred :: export_tecplot  !< Export integrand to Tecplot file.
+      procedure(parse_cli_interface),      pass(self), deferred :: parse_cli       !< Initialize from command line interface.
+      procedure(set_cli_interface),        nopass,     deferred :: set_cli         !< Set command line interface.
+endtype integrand_tester_object
+
+abstract interface
+   !< Abstract interfaces of [[integrand_tester_object]] class.
+   subroutine export_tecplot_interface(self, file_name, t, scheme, close_file)
+   !< Export integrand to Tecplot file.
+   import :: integrand_tester_object, R_P
+   class(integrand_tester_object), intent(in)           :: self       !< Advection field.
+   character(*),                   intent(in), optional :: file_name  !< File name.
+   real(R_P),                      intent(in), optional :: t          !< Time.
+   character(*),                   intent(in), optional :: scheme     !< Scheme used to integrate integrand.
+   logical,                        intent(in), optional :: close_file !< Flag for closing file.
+   endsubroutine export_tecplot_interface
+
+   subroutine parse_cli_interface(self, cli)
+   !< Initialize from command line interface.
+   import :: command_line_interface, integrand_tester_object
+   class(integrand_tester_object), intent(inout) :: self !< Advection field.
+   type(command_line_interface),   intent(inout) :: cli  !< Command line interface handler.
+   endsubroutine parse_cli_interface
+
+   subroutine set_cli_interface(cli)
+   !< Set command line interface.
+   import :: command_line_interface
+   type(command_line_interface), intent(inout) :: cli !< Command line interface handler.
+   endsubroutine set_cli_interface
+endinterface
+endmodule foodie_test_integrand_tester_object
+