src/modules/init/moduleInput.f90

@@ -829,30 +829,18 @@ MODULE moduleInput
         IF (nTypes /= nSpecies) CALL criticalError('Not enough boundary types defined in ' // object, 'readBoundary')
         ALLOCATE(boundary(i)%bTypes(1:nSpecies))
         DO s = 1, nSpecies
-          associate(bound => boundary(i)%bTypes(s)%obj)
           WRITE(sString,'(i2)') s
           object = 'boundary(' // TRIM(iString) // ').bTypes(' // TRIM(sString) // ')'
           CALL config%get(object // '.type', bType, found)
           SELECT CASE(bType)
           CASE('reflection')
-              ALLOCATE(boundaryReflection:: bound)
+            ALLOCATE(boundaryReflection:: boundary(i)%bTypes(s)%obj)
 
           CASE('absorption')
-              ALLOCATE(boundaryAbsorption:: bound)
+            ALLOCATE(boundaryAbsorption:: boundary(i)%bTypes(s)%obj)
 
           CASE('transparent')
-              ALLOCATE(boundaryTransparent:: bound)
+            ALLOCATE(boundaryTransparent:: boundary(i)%bTypes(s)%obj)
-
-            CASE('axis')
-              ALLOCATE(boundaryAxis:: bound)
-
-            CASE('wallTemperature')
-              CALL config%get(object // '.temperature', Tw, found)
-              IF (.NOT. found) CALL criticalError("temperature not found for wallTemperature boundary type", 'readBoundary')
-              CALL config%get(object // '.specificHeat', cw, found)
-              IF (.NOT. found) CALL criticalError("specificHeat not found for wallTemperature boundary type", 'readBoundary')
-
-              CALL initWallTemperature(bound, Tw, cw)
 
           CASE('ionization')
             !Neutral parameters
@@ -882,25 +870,31 @@ MODULE moduleInput
             CALL config%get(object // '.electronSecondary', electronSecondary, found)
             electronSecondaryID = speciesName2Index(electronSecondary)
             IF (found) THEN
-                CALL initIonization(bound, species(s)%obj%m, m0, n0, v0, T0, &
+              CALL initIonization(boundary(i)%bTypes(s)%obj, species(s)%obj%m, m0, n0, v0, T0, &
                                                              speciesID, effTime, crossSection, eThreshold,electronSecondaryID)
 
             ELSE
-                CALL initIonization(bound, species(s)%obj%m, m0, n0, v0, T0, &
+              CALL initIonization(boundary(i)%bTypes(s)%obj, species(s)%obj%m, m0, n0, v0, T0, &
                                                              speciesID, effTime, crossSection, eThreshold)
 
             END IF
 
-            case('outflowAdaptive')
+          CASE('wallTemperature')
-              allocate(boundaryOutflowAdaptive:: bound)
+            CALL config%get(object // '.temperature', Tw, found)
+            IF (.NOT. found) CALL criticalError("temperature not found for wallTemperature boundary type", 'readBoundary')
+            CALL config%get(object // '.specificHeat', cw, found)
+            IF (.NOT. found) CALL criticalError("specificHeat not found for wallTemperature boundary type", 'readBoundary')
+
+            CALL initWallTemperature(boundary(i)%bTypes(s)%obj, Tw, cw)
+
+          CASE('axis')
+            ALLOCATE(boundaryAxis:: boundary(i)%bTypes(s)%obj)
 
           CASE DEFAULT
             CALL criticalError('Boundary type ' // bType // ' undefined', 'readBoundary')
 
           END SELECT
 
-          end associate
-
         END DO
 
       END DO

src/modules/mesh/1DCart/moduleMesh1DCart.f90

@@ -104,6 +104,7 @@ MODULE moduleMesh1DCart
       USE moduleSpecies
       USE moduleBoundary
       USE moduleErrors
+      USE moduleRefParam, ONLY: L_ref
       IMPLICIT NONE
 
       CLASS(meshEdge1DCart), INTENT(out):: self

src/modules/mesh/2DCart/moduleMesh2DCart.f90

@@ -144,6 +144,7 @@ MODULE moduleMesh2DCart
       USE moduleSpecies
       USE moduleBoundary
       USE moduleErrors
+      USE moduleRefParam, ONLY: L_ref
       IMPLICIT NONE
 
       CLASS(meshEdge2DCart), INTENT(out):: self
@@ -163,7 +164,7 @@ MODULE moduleMesh2DCart
       r2 = self%n2%getCoordinates()
       self%x  = (/r1(1), r2(1)/)
       self%y  = (/r1(2), r2(2)/)
-      self%surface = SQRT((self%x(2) - self%x(1))**2 + (self%y(2) - self%y(1))**2)
+      self%surface = SQRT((self%x(2) - self%x(1))**2 + (self%y(2) - self%y(1))**2) / L_ref
       !Normal vector
       self%normal = (/ -(self%y(2)-self%y(1)), &
                          self%x(2)-self%x(1) , &
@@ -558,6 +559,7 @@ MODULE moduleMesh2DCart
 
     !Compute element volume
     PURE SUBROUTINE volumeQuad(self)
+      USE moduleRefParam, ONLY: L_ref
       IMPLICIT NONE
 
       CLASS(meshCell2DCartQuad), INTENT(inout):: self

src/modules/mesh/moduleMeshBoundary.f90

@@ -218,37 +218,6 @@ MODULE moduleMeshBoundary
 
     END SUBROUTINE ionization
 
-    subroutine outflowAdaptive(edge, part)
-      use moduleRandom
-      use moduleRefParam, only: v_ref
-      implicit none
-
-      class(meshEdge), intent(inout):: edge
-      class(particle), intent(inout):: part
-      real(8):: v_cut
-
-      v_cut = 2.d0 * 40.d3/v_ref !This will be the drag velocity of the ions in the future
-
-      select type(bound => edge%boundary%bTypes(part%species%n)%obj)
-      type is(boundaryOutflowAdaptive)
-        if (dot_product(part%v,-edge%normal) > v_cut) then
-          ! print *,part%v(1), v_cut
-          ! part%v = part%v + v_cut*edge%normal
-          part%v(1) = part%v(1) - v_cut
-          ! print *,part%v(1)
-          call reflection(edge, part)
-          ! print *,part%v(1)
-          ! print *
-
-        else
-          call transparent(edge, part)
-
-        end if
-
-      end select
-
-    end subroutine outflowAdaptive
-
     !Points the boundary function to specific type
     SUBROUTINE pointBoundaryFunction(edge, s)
       USE moduleErrors
@@ -267,17 +236,14 @@ MODULE moduleMeshBoundary
       TYPE IS(boundaryTransparent)
         edge%fBoundary(s)%apply => transparent
 
-      TYPE IS(boundaryAxis)
-        edge%fBoundary(s)%apply => symmetryAxis
-
       TYPE IS(boundaryWallTemperature)
         edge%fBoundary(s)%apply => wallTemperature
 
       TYPE IS(boundaryIonization)
         edge%fBoundary(s)%apply => ionization
 
-      type is(boundaryOutflowAdaptive)
+      TYPE IS(boundaryAxis)
-        edge%fBoundary(s)%apply => outflowAdaptive
+        edge%fBoundary(s)%apply => symmetryAxis
 
       CLASS DEFAULT
         CALL criticalError("Boundary type not defined in this geometry", 'pointBoundaryFunction')

src/modules/moduleBoundary.f90

@@ -56,7 +56,6 @@ MODULE moduleBoundary
   !Boundary for quasi-neutral outflow adjusting reflection coefficient
   type, public, extends(boundaryGeneric):: boundaryOutflowAdaptive
     real(8):: outflowCurrent
-    real(8):: reflectionFraction
     contains
 
   end type boundaryOutflowAdaptive

src/modules/moduleInject.f90

@@ -387,10 +387,10 @@ MODULE moduleInject
 
           partInj(n)%v = 0.D0
 
-          do while(dot_product(partInj(n)%v, direction) <= 0.d0)
           partInj(n)%v = self%vMod*direction +  (/ self%v(1)%obj%randomVel(), &
                                                    self%v(2)%obj%randomVel(), &
                                                    self%v(3)%obj%randomVel() /)
+
           !If injecting a no-drift distribution and velocity is negative, reflect
           if ((self%vMod == 0.D0) .and. &
               (dot_product(direction, partInj(n)%v) < 0.D0)) then
@@ -398,8 +398,6 @@ MODULE moduleInject
 
           end if
 
-          end do
-
           !Obtain natural coordinates of particle in cell
           partInj(n)%Xi = mesh%cells(partInj(n)%cell)%obj%phy2log(partInj(n)%r)
           !Push new particle with the minimum time step