improve factory

Author: szaghi

src/lib/abstract_objects/wenoof_alpha_object.F90

@@ -16,7 +16,7 @@ module wenoof_alpha_object
 public :: alpha_object
 public :: alpha_object_constructor
 
-type, extends(base_object_constructor) :: alpha_object_constructor
+type, extends(base_object_constructor), abstract :: alpha_object_constructor
   !< Abstract alpha (non linear weights) object constructor.
   contains
 endtype alpha_object_constructor

src/lib/abstract_objects/wenoof_base_object.F90

@@ -17,12 +17,14 @@ module wenoof_base_object
 
 real(RPP), parameter :: EPS_DEF=10._RPP**(-6) !< Small epsilon to avoid division by zero, default value.
 
-type :: base_object_constructor
+type, abstract :: base_object_constructor
   !< Abstract base object constructor.
   integer(I_P) :: S=0_I_P           !< Stencils dimension.
   logical      :: face_left=.true.  !< Activate left-face interpolation computation.
   logical      :: face_right=.true. !< Activate right-face interpolation computation.
   real(RPP)    :: eps=EPS_DEF       !< Small epsilon to avoid division by zero.
+  contains
+    procedure, pass(self) :: create => create_base_object_constructor
 endtype base_object_constructor
 
 type, abstract :: base_object
@@ -70,6 +72,25 @@ elemental subroutine destroy_interface(self)
 endinterface
 
 contains
+  ! base object constructor
+
+  ! public methods
+  subroutine create_base_object_constructor(self, S, face_left, face_right, eps)
+  !< Create alpha constructor.
+  class(base_object_constructor), intent(inout)        :: self       !< Constructor.
+  integer(I_P),                   intent(in)           :: S          !< Stencils dimension.
+  logical,                        intent(in), optional :: face_left  !< Activate left-face interpolations.
+  logical,                        intent(in), optional :: face_right !< Activate right-face interpolations.
+  real(RPP),                      intent(in), optional :: eps        !< Small epsilon to avoid division by zero.
+
+  self%S = S
+  if (present(face_left)) self%face_left = face_left
+  if (present(face_right)) self%face_right = face_right
+  if (present(eps)) self%eps = eps
+  endsubroutine create_base_object_constructor
+
+  ! base object
+
   ! public non overridable methods
   subroutine create_(self, constructor)
   !< Create object.

src/lib/abstract_objects/wenoof_beta_object.F90

@@ -14,7 +14,7 @@ module wenoof_beta_object
 public :: beta_object
 public :: beta_object_constructor
 
-type, extends(base_object_constructor) :: beta_object_constructor
+type, extends(base_object_constructor), abstract :: beta_object_constructor
   !< Abstract Beta coefficients object constructor.
 endtype beta_object_constructor
 

src/lib/abstract_objects/wenoof_interpolations_object.F90

@@ -14,7 +14,7 @@ module wenoof_interpolations_object
 public :: interpolations_object
 public :: interpolations_object_constructor
 
-type, extends(base_object_constructor) :: interpolations_object_constructor
+type, extends(base_object_constructor), abstract :: interpolations_object_constructor
   !< Abstract interpolations object constructor.
 endtype interpolations_object_constructor
 

src/lib/abstract_objects/wenoof_interpolator_object.F90

@@ -16,7 +16,7 @@ module wenoof_interpolator_object
 public :: interpolator_object
 public :: interpolator_object_constructor
 
-type, extends(base_object_constructor) :: interpolator_object_constructor
+type, extends(base_object_constructor), abstract :: interpolator_object_constructor
   !< Abstract interpolator object constructor.
   !<
   !< @note Every concrete WENO interpolator implementations must define their own constructor type.

src/lib/abstract_objects/wenoof_kappa_object.F90

@@ -14,7 +14,7 @@ module wenoof_kappa_object
 public :: kappa_object
 public :: kappa_object_constructor
 
-type, extends(base_object_constructor) :: kappa_object_constructor
+type, extends(base_object_constructor), abstract :: kappa_object_constructor
   !< Abstract kappa object constructor.
 endtype kappa_object_constructor
 

src/lib/concrete_objects/wenoof_alpha_rec_js.F90

@@ -6,9 +6,9 @@ module wenoof_alpha_rec_js
 !< Schemes*, Guang-Shan Jiang, Chi-Wang Shu, JCP, 1996, vol. 126, pp. 202--228, doi:10.1006/jcph.1996.0130.
 
 #ifdef r16p
-use penf, only: I_P, RPP=>R16P
+use penf, only: I_P, RPP=>R16P, str
 #else
-use penf, only: I_P, RPP=>R8P
+use penf, only: I_P, RPP=>R8P, str
 #endif
 use wenoof_alpha_object
 use wenoof_base_object
@@ -19,7 +19,6 @@ module wenoof_alpha_rec_js
 private
 public :: alpha_rec_js
 public :: alpha_rec_js_constructor
-public :: create_alpha_rec_js_constructor
 
 type, extends(alpha_object_constructor) :: alpha_rec_js_constructor
   !< Jiang-Shu alpha object constructor.
@@ -39,22 +38,6 @@ module wenoof_alpha_rec_js
 endtype alpha_rec_js
 
 contains
-  ! public non TBP
-  subroutine create_alpha_rec_js_constructor(S, constructor, face_left, face_right, eps)
-  !< Create alpha constructor.
-  integer(I_P),                                 intent(in)           :: S           !< Stencils dimension.
-  class(alpha_object_constructor), allocatable, intent(out)          :: constructor !< Constructor.
-  logical,                                      intent(in), optional :: face_left   !< Activate left-face interpolations.
-  logical,                                      intent(in), optional :: face_right  !< Activate right-face interpolations.
-  real(RPP),                                    intent(in), optional :: eps         !< Small epsilon to avoid division by zero.
-
-  allocate(alpha_rec_js_constructor :: constructor)
-  constructor%S = S
-  if (present(face_left)) constructor%face_left = face_left
-  if (present(face_right)) constructor%face_right = face_right
-  if (present(eps)) constructor%eps = eps
-  endsubroutine create_alpha_rec_js_constructor
-
   ! deferred public methods
   subroutine create(self, constructor)
   !< Create alpha.
@@ -87,13 +70,16 @@ pure subroutine compute(self, beta, kappa)
 
   pure function description(self) result(string)
   !< Return alpha string-descripition.
-  class(alpha_rec_js), intent(in) :: self   !< Alpha coefficient.
-  character(len=:), allocatable   :: string !< String-description.
+  class(alpha_rec_js), intent(in) :: self             !< Alpha coefficient.
+  character(len=:), allocatable   :: string           !< String-description.
+  character(len=1), parameter     :: nl=new_line('a') !< New line char.
 
-#ifndef DEBUG
-  ! error stop in pure procedure is a F2015 feature not yet supported in debug mode
-  error stop 'alpha_rec_js%description to be implemented, do not use!'
-#endif
+  string = '    Jiang-Shu alpha coefficients for reconstructor:'//nl
+  string = string//'      - S   = '//trim(str(self%S))//nl
+  string = string//'      - f1  = '//trim(str(self%f1))//nl
+  string = string//'      - f2  = '//trim(str(self%f2))//nl
+  string = string//'      - ff  = '//trim(str(self%ff))//nl
+  string = string//'      - eps = '//trim(str(self%eps))
   endfunction description
 
   elemental subroutine destroy(self)

src/lib/concrete_objects/wenoof_beta_rec_js.F90

@@ -19,7 +19,6 @@ module wenoof_beta_rec_js
 private
 public :: beta_rec_js
 public :: beta_rec_js_constructor
-public :: create_beta_rec_js_constructor
 
 type, extends(beta_object_constructor) :: beta_rec_js_constructor
   !< Jiang-Shu and Gerolymos-Senechal-Vallet beta object constructor.
@@ -43,20 +42,6 @@ module wenoof_beta_rec_js
 endtype beta_rec_js
 
 contains
-  ! public non TBP procedures
-  subroutine create_beta_rec_js_constructor(S, constructor, face_left, face_right)
-  !< Create beta constructor.
-  integer(I_P),                                intent(in)           :: S           !< Stencils dimension.
-  class(beta_object_constructor), allocatable, intent(out)          :: constructor !< Constructor.
-  logical,                                     intent(in), optional :: face_left   !< Activate left-face interpolations.
-  logical,                                     intent(in), optional :: face_right  !< Activate right-face interpolations.
-
-  allocate(beta_rec_js_constructor :: constructor)
-  constructor%S = S
-  if (present(face_left)) constructor%face_left = face_left
-  if (present(face_right)) constructor%face_right = face_right
-  endsubroutine create_beta_rec_js_constructor
-
   ! public deferred methods
   subroutine create(self, constructor)
   !< Create beta.

src/lib/concrete_objects/wenoof_interpolations_rec_js.F90

@@ -19,7 +19,6 @@ module wenoof_interpolations_rec_js
 private
 public :: interpolations_rec_js
 public :: interpolations_rec_js_constructor
-public :: create_interpolations_rec_js_constructor
 
 type, extends(interpolations_object_constructor) :: interpolations_rec_js_constructor
   !< Jiang-Shu (Lagrange) interpolations object for derivative reconstruction constructor.
@@ -43,20 +42,6 @@ module wenoof_interpolations_rec_js
 endtype interpolations_rec_js
 
 contains
-  ! public non TBP procedures
-  subroutine create_interpolations_rec_js_constructor(S, constructor, face_left, face_right)
-  !< Create interpolations constructor.
-  integer(I_P),                                          intent(in)           :: S           !< Stencils dimension.
-  class(interpolations_object_constructor), allocatable, intent(out)          :: constructor !< Constructor.
-  logical,                                               intent(in), optional :: face_left   !< Activate left-face interpolations.
-  logical,                                               intent(in), optional :: face_right  !< Activate right-face interpolations.
-
-  allocate(interpolations_rec_js_constructor :: constructor)
-  constructor%S = S
-  if (present(face_left)) constructor%face_left = face_left
-  if (present(face_right)) constructor%face_right = face_right
-  endsubroutine create_interpolations_rec_js_constructor
-
   ! public deferred methods
   subroutine create(self, constructor)
   !< Create interpolations.

src/lib/concrete_objects/wenoof_kappa_rec_js.F90

@@ -19,7 +19,6 @@ module wenoof_kappa_rec_js
 private
 public :: kappa_rec_js
 public :: kappa_rec_js_constructor
-public :: create_kappa_rec_js_constructor
 
 type, extends(kappa_object_constructor) :: kappa_rec_js_constructor
   !< Jiang-Shu and Gerolymos-Senechal-Vallet optimal kappa object constructor.
@@ -41,16 +40,6 @@ module wenoof_kappa_rec_js
 endtype kappa_rec_js
 
 contains
-  ! public non TBP procedures
-  subroutine create_kappa_rec_js_constructor(S, constructor)
-  !< Create kappa constructor.
-  integer(I_P),                                intent(in)   :: S           !< Stencils dimension.
-  class(kappa_object_constructor), allocatable, intent(out) :: constructor !< Constructor.
-
-  allocate(kappa_rec_js_constructor :: constructor)
-  constructor%S = S
-  endsubroutine create_kappa_rec_js_constructor
-
   ! deferred public methods
   subroutine create(self, constructor)
   !< Create kappa.