Reorganization of boundaries EM

src/modules/mesh/moduleMesh.f90

@@ -969,33 +969,6 @@ MODULE moduleMesh
 
   end type boundaryEMGeneric
 
-  interface
-    module subroutine initDirichlet(self, config, object)
-      use json_module
-
-      class(boundaryEMGeneric), allocatable, intent(inout):: self
-      type(json_file), intent(inout):: config
-      character(:), allocatable, intent(in):: object
-
-    end subroutine initDirichlet
-
-    module subroutine initDirichletTime(self, config, object)
-      use json_module
-
-      class(boundaryEMGeneric), allocatable, intent(inout):: self
-      type(json_file), intent(inout):: config
-      character(:), allocatable, intent(in):: object
-
-    end subroutine initDirichletTime
-
-    module function boundaryEMName_to_Index(boundaryName) result(bp)
-      character(:), allocatable:: boundaryName
-      integer:: bp
-
-    end function boundaryEMName_to_Index
-
-  end interface
-
   abstract interface
     ! Apply boundary condition to the load vector for the Poission equation
     subroutine applyEM_interface(self, vectorF)
@@ -1025,6 +998,24 @@ MODULE moduleMesh
 
   END TYPE boundaryEMDirichlet
 
+  interface
+    module subroutine initDirichlet(self, config, object)
+      use json_module
+
+      class(boundaryEMGeneric), allocatable, intent(inout):: self
+      type(json_file), intent(inout):: config
+      character(:), allocatable, intent(in):: object
+
+    end subroutine initDirichlet
+
+    module subroutine applyDirichlet(self, vectorF)
+      class(boundaryEMDirichlet), intent(in):: self
+      real(8), intent(inout):: vectorF(:)
+
+    end subroutine applyDirichlet
+
+  end interface
+
   TYPE, EXTENDS(boundaryEMGeneric):: boundaryEMDirichletTime
     real(8):: potential
     real(8):: timeFactor
@@ -1036,11 +1027,14 @@ MODULE moduleMesh
   END TYPE boundaryEMDirichletTime
 
   interface
-    module subroutine applyDirichlet(self, vectorF)
-      class(boundaryEMDirichlet), intent(in):: self
-      real(8), intent(inout):: vectorF(:)
+    module subroutine initDirichletTime(self, config, object)
+      use json_module
 
-    end subroutine applyDirichlet
+      class(boundaryEMGeneric), allocatable, intent(inout):: self
+      type(json_file), intent(inout):: config
+      character(:), allocatable, intent(in):: object
+
+    end subroutine initDirichletTime
 
     module subroutine applyDirichletTime(self, vectorF)
       class(boundaryEMDirichletTime), intent(in):: self
@@ -1064,6 +1058,12 @@ MODULE moduleMesh
 
   ! Update the EM boundary models
   interface 
+    module function boundaryEMName_to_Index(boundaryName) result(bp)
+      character(:), allocatable:: boundaryName
+      integer:: bp
+
+    end function boundaryEMName_to_Index
+
     module subroutine boundariesEM_update()
 
     end subroutine boundariesEM_update