JGonzalez/fpakc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Now the deferred apply is pass and I made some generic boundaries to use internally

Browse source
This commit is contained in:
Jorge Gonzalez 2026-02-10 17:22:56 +01:00
commit c1b6cf1b31
2 changed files with 216 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

81
src/modules/mesh/moduleMesh.f90
View file

@ -590,7 +590,7 @@ MODULE moduleMesh
character(:), allocatable:: name character(:), allocatable:: name
contains contains
procedure, pass:: init => initBoundary procedure, pass:: init => initBoundary
procedure(boundary_interface), deferred, nopass:: apply procedure(boundary_interface), deferred, pass:: apply
END TYPE boundaryGeneric END TYPE boundaryGeneric
@ -607,13 +607,13 @@ MODULE moduleMesh
end interface end interface
abstract interface abstract interface
subroutine boundary_interface(edge, part, self) subroutine boundary_interface(self, edge, part)
use moduleSpecies use moduleSpecies
import boundaryGeneric, meshEdge import boundaryGeneric, meshEdge
class(boundaryGeneric), intent(in):: self
class(meshEdge), intent(inout):: edge class(meshEdge), intent(inout):: edge
class(particle), intent(inout):: part class(particle), intent(inout):: part
class(boundaryGeneric), optional, intent(in):: self
end subroutine end subroutine
@ -622,28 +622,28 @@ MODULE moduleMesh
!Reflecting boundary !Reflecting boundary
TYPE, PUBLIC, EXTENDS(boundaryGeneric):: boundaryReflection TYPE, PUBLIC, EXTENDS(boundaryGeneric):: boundaryReflection
CONTAINS CONTAINS
procedure, nopass:: apply => reflection procedure, pass:: apply => reflection
END TYPE boundaryReflection END TYPE boundaryReflection
!Absorption boundary !Absorption boundary
TYPE, PUBLIC, EXTENDS(boundaryGeneric):: boundaryAbsorption TYPE, PUBLIC, EXTENDS(boundaryGeneric):: boundaryAbsorption
CONTAINS CONTAINS
procedure, nopass:: apply => absorption procedure, pass:: apply => absorption
END TYPE boundaryAbsorption END TYPE boundaryAbsorption
!Transparent boundary !Transparent boundary
TYPE, PUBLIC, EXTENDS(boundaryGeneric):: boundaryTransparent TYPE, PUBLIC, EXTENDS(boundaryGeneric):: boundaryTransparent
CONTAINS CONTAINS
procedure, nopass:: apply => transparent procedure, pass:: apply => transparent
END TYPE boundaryTransparent END TYPE boundaryTransparent
!Symmetry axis !Symmetry axis
TYPE, PUBLIC, EXTENDS(boundaryGeneric):: boundaryAxis TYPE, PUBLIC, EXTENDS(boundaryGeneric):: boundaryAxis
CONTAINS CONTAINS
procedure, nopass:: apply => axis procedure, pass:: apply => axis
END TYPE boundaryAxis END TYPE boundaryAxis
@ -652,7 +652,7 @@ MODULE moduleMesh
!Thermal velocity of the wall: square root(Wall temperature X specific heat) !Thermal velocity of the wall: square root(Wall temperature X specific heat)
REAL(8):: vTh REAL(8):: vTh
CONTAINS CONTAINS
procedure, nopass:: apply => wallTemperature procedure, pass:: apply => wallTemperature
END TYPE boundaryWallTemperature END TYPE boundaryWallTemperature
@ -666,7 +666,7 @@ MODULE moduleMesh
REAL(8):: eThreshold REAL(8):: eThreshold
REAL(8):: deltaV REAL(8):: deltaV
CONTAINS CONTAINS
procedure, nopass:: apply => ionization procedure, pass:: apply => ionization
END TYPE boundaryIonization END TYPE boundaryIonization
@ -675,80 +675,99 @@ MODULE moduleMesh
real(8):: alpha ! Reflection parameter real(8):: alpha ! Reflection parameter
integer, allocatable:: edges(:) !Array with edges integer, allocatable:: edges(:) !Array with edges
contains contains
procedure, nopass:: apply => quasiNeutrality procedure, pass:: apply => quasiNeutrality
end type boundaryQuasiNeutrality end type boundaryQuasiNeutrality
!Wrapper for boundary types (one per species) !Wrapper for boundary types (one per species)
interface interface
module subroutine pointBoundaryFunction(edge, s) module subroutine reflection(self, edge, part)
class(meshEdge), intent(inout):: edge
integer, intent(in):: s !Species index
end subroutine pointBoundaryFunction
module subroutine reflection(edge, part, self)
use moduleSpecies use moduleSpecies
class(boundaryReflection), intent(in):: self
class(meshEdge), intent(inout):: edge class(meshEdge), intent(inout):: edge
class(particle), intent(inout):: part class(particle), intent(inout):: part
class(boundaryGeneric), optional, intent(in):: self
end subroutine reflection end subroutine reflection
module subroutine absorption(edge, part, self) module subroutine absorption(self, edge, part)
use moduleSpecies use moduleSpecies
class(boundaryAbsorption), intent(in):: self
class(meshEdge), intent(inout):: edge class(meshEdge), intent(inout):: edge
class(particle), intent(inout):: part class(particle), intent(inout):: part
class(boundaryGeneric), optional, intent(in):: self
end subroutine absorption end subroutine absorption
module subroutine transparent(edge, part, self) module subroutine transparent(self, edge, part)
use moduleSpecies use moduleSpecies
class(boundaryTransparent), intent(in):: self
class(meshEdge), intent(inout):: edge class(meshEdge), intent(inout):: edge
class(particle), intent(inout):: part class(particle), intent(inout):: part
class(boundaryGeneric), optional, intent(in):: self
end subroutine transparent end subroutine transparent
module subroutine axis(edge, part, self) module subroutine axis(self, edge, part)
use moduleSpecies use moduleSpecies
class(boundaryAxis), intent(in):: self
class(meshEdge), intent(inout):: edge class(meshEdge), intent(inout):: edge
class(particle), intent(inout):: part class(particle), intent(inout):: part
class(boundaryGeneric), optional, intent(in):: self
end subroutine axis end subroutine axis
module subroutine wallTemperature(edge, part, self) module subroutine wallTemperature(self, edge, part)
use moduleSpecies use moduleSpecies
class(boundaryWallTemperature), intent(in):: self
class(meshEdge), intent(inout):: edge class(meshEdge), intent(inout):: edge
class(particle), intent(inout):: part class(particle), intent(inout):: part
class(boundaryGeneric), optional, intent(in):: self
end subroutine wallTemperature end subroutine wallTemperature
module subroutine ionization(edge, part, self) module subroutine ionization(self, edge, part)
use moduleSpecies use moduleSpecies
class(boundaryIonization), intent(in):: self
class(meshEdge), intent(inout):: edge class(meshEdge), intent(inout):: edge
class(particle), intent(inout):: part class(particle), intent(inout):: part
class(boundaryGeneric), optional, intent(in):: self
end subroutine ionization end subroutine ionization
module subroutine quasiNeutrality(edge, part, self) module subroutine quasiNeutrality(self, edge, part)
use moduleSpecies
class(boundaryQuasiNeutrality), intent(in):: self
class(meshEdge), intent(inout):: edge
class(particle), intent(inout):: part
end subroutine quasiNeutrality
! Generic basic boundary conditions to use internally in the code
module subroutine genericReflection(edge, part)
use moduleSpecies use moduleSpecies
class(meshEdge), intent(inout):: edge class(meshEdge), intent(inout):: edge
class(particle), intent(inout):: part class(particle), intent(inout):: part
class(boundaryGeneric), optional, intent(in):: self
end subroutine quasiNeutrality end subroutine genericReflection
module subroutine genericAbsorption(edge, part)
use moduleSpecies
class(meshEdge), intent(inout):: edge
class(particle), intent(inout):: part
end subroutine genericAbsorption
module subroutine genericTransparent(edge, part)
use moduleSpecies
class(meshEdge), intent(inout):: edge
class(particle), intent(inout):: part
end subroutine genericTransparent
end interface end interface

134
src/modules/mesh/moduleMesh@boundary.f90
View file

@ -1,21 +1,6 @@
!moduleMeshBoundary: Boundary functions for the mesh edges !moduleMeshBoundary: Boundary functions for the mesh edges
submodule(moduleMesh) boundary submodule(moduleMesh) boundary
CONTAINS contains
! FUNCTION getBoundaryId(physicalSurface) RESULT(id)
! IMPLICIT NONE
! INTEGER:: physicalSurface
! INTEGER:: id
! INTEGER:: i
! id = 0
! DO i = 1, nBoundary
! IF (physicalSurface == boundariesParticle(i)%obj%physicalSurface) id = boundariesParticle(i)%obj%n
! END DO
! END FUNCTION getBoundaryId
module subroutine initBoundary(self, config, object) module subroutine initBoundary(self, config, object)
use json_module use json_module
use moduleRefParam, only: m_ref use moduleRefParam, only: m_ref
@ -185,14 +170,14 @@ submodule(moduleMesh) boundary
end subroutine initQuasiNeutrality end subroutine initQuasiNeutrality
module SUBROUTINE reflection(edge, part, self) module SUBROUTINE reflection(self, edge, part)
USE moduleCaseParam USE moduleCaseParam
USE moduleSpecies USE moduleSpecies
IMPLICIT NONE IMPLICIT NONE
class(boundaryReflection), intent(in):: self
CLASS(meshEdge), INTENT(inout):: edge CLASS(meshEdge), INTENT(inout):: edge
CLASS(particle), INTENT(inout):: part CLASS(particle), INTENT(inout):: part
class(boundaryGeneric), optional, intent(in):: self
!rp = intersection between particle and edge !rp = intersection between particle and edge
!rpp = final position of particle !rpp = final position of particle
!vpp = final velocity of particle !vpp = final velocity of particle
@ -212,14 +197,14 @@ submodule(moduleMesh) boundary
END SUBROUTINE reflection END SUBROUTINE reflection
!Absoption in a surface !Absoption in a surface
SUBROUTINE absorption(edge, part, self) SUBROUTINE absorption(self, edge, part)
USE moduleCaseParam USE moduleCaseParam
USE moduleSpecies USE moduleSpecies
IMPLICIT NONE IMPLICIT NONE
class(boundaryAbsorption), intent(in):: self
CLASS(meshEdge), INTENT(inout):: edge CLASS(meshEdge), INTENT(inout):: edge
CLASS(particle), INTENT(inout):: part CLASS(particle), INTENT(inout):: part
class(boundaryGeneric), optional, intent(in):: self
REAL(8):: rpp(1:3) !Position of particle projected to the edge REAL(8):: rpp(1:3) !Position of particle projected to the edge
REAL(8):: d !Distance from particle to edge REAL(8):: d !Distance from particle to edge
@ -249,13 +234,13 @@ submodule(moduleMesh) boundary
END SUBROUTINE absorption END SUBROUTINE absorption
!Transparent boundary condition !Transparent boundary condition
SUBROUTINE transparent(edge, part, self) SUBROUTINE transparent(self, edge, part)
USE moduleSpecies USE moduleSpecies
IMPLICIT NONE IMPLICIT NONE
class(boundaryTransparent), intent(in):: self
CLASS(meshEdge), INTENT(inout):: edge CLASS(meshEdge), INTENT(inout):: edge
CLASS(particle), INTENT(inout):: part CLASS(particle), INTENT(inout):: part
class(boundaryGeneric), optional, intent(in):: self
!Removes particle from domain !Removes particle from domain
part%n_in = .FALSE. part%n_in = .FALSE.
@ -265,46 +250,42 @@ submodule(moduleMesh) boundary
!Symmetry axis. Reflects particles. !Symmetry axis. Reflects particles.
!Although this function should never be called, it is set as a reflective boundary !Although this function should never be called, it is set as a reflective boundary
!to properly deal with possible particles reaching a corner and selecting this boundary. !to properly deal with possible particles reaching a corner and selecting this boundary.
SUBROUTINE symmetryAxis(edge, part, self) SUBROUTINE symmetryAxis(self, edge, part)
USE moduleSpecies USE moduleSpecies
IMPLICIT NONE IMPLICIT NONE
class(boundaryAxis), intent(in):: self
CLASS(meshEdge), INTENT(inout):: edge CLASS(meshEdge), INTENT(inout):: edge
CLASS(particle), INTENT(inout):: part CLASS(particle), INTENT(inout):: part
class(boundaryGeneric), optional, intent(in):: self
CALL reflection(edge, part) CALL genericReflection(edge, part)
END SUBROUTINE symmetryAxis END SUBROUTINE symmetryAxis
!Wall with temperature !Wall with temperature
SUBROUTINE wallTemperature(edge, part, self) SUBROUTINE wallTemperature(self, edge, part)
USE moduleSpecies USE moduleSpecies
USE moduleRandom USE moduleRandom
IMPLICIT NONE IMPLICIT NONE
class(boundaryWallTemperature), intent(in):: self
CLASS(meshEdge), INTENT(inout):: edge CLASS(meshEdge), INTENT(inout):: edge
CLASS(particle), INTENT(inout):: part CLASS(particle), INTENT(inout):: part
class(boundaryGeneric), optional, intent(in):: self
INTEGER:: i INTEGER:: i
select type(self)
type is(boundaryWallTemperature)
!Modifies particle velocity according to wall temperature !Modifies particle velocity according to wall temperature
DO i = 1, 3 DO i = 1, 3
part%v(i) = part%v(i) + self%vTh*randomMaxwellian() part%v(i) = part%v(i) + self%vTh*randomMaxwellian()
END DO END DO
CALL reflection(edge, part) CALL genericReflection(edge, part)
end select
END SUBROUTINE wallTemperature END SUBROUTINE wallTemperature
!Ionization surface: an electron will pass through the surface !Ionization surface: an electron will pass through the surface
! and create an ion-electron pair based on a neutral background ! and create an ion-electron pair based on a neutral background
SUBROUTINE ionization(edge, part, self) SUBROUTINE ionization(self, edge, part)
USE moduleList USE moduleList
USE moduleSpecies USE moduleSpecies
USE moduleMesh USE moduleMesh
@ -313,9 +294,9 @@ submodule(moduleMesh) boundary
USE moduleMath USE moduleMath
IMPLICIT NONE IMPLICIT NONE
class(boundaryIonization), intent(in):: self
CLASS(meshEdge), INTENT(inout):: edge CLASS(meshEdge), INTENT(inout):: edge
CLASS(particle), INTENT(inout):: part CLASS(particle), INTENT(inout):: part
class(boundaryGeneric), optional, intent(in):: self
REAL(8):: vRel, eRel, mRel !relative velocity, energy and mass REAL(8):: vRel, eRel, mRel !relative velocity, energy and mass
INTEGER:: nIonizations !Number of ionizations based on eRel INTEGER:: nIonizations !Number of ionizations based on eRel
REAL(8):: pIonization !Probability of ionization of each event REAL(8):: pIonization !Probability of ionization of each event
@ -324,8 +305,6 @@ submodule(moduleMesh) boundary
TYPE(particle), POINTER:: newElectron TYPE(particle), POINTER:: newElectron
TYPE(particle), POINTER:: newIon TYPE(particle), POINTER:: newIon
select type(self)
type is(boundaryIonization)
mRel = reducedMass(self%m0, part%species%m) mRel = reducedMass(self%m0, part%species%m)
vRel = SUM(DABS(part%v-self%v0)) vRel = SUM(DABS(part%v-self%v0))
eRel = mRel*vRel**2*5.D-1 eRel = mRel*vRel**2*5.D-1
@ -401,17 +380,15 @@ submodule(moduleMesh) boundary
!Removes ionizing electron regardless the number of pair created !Removes ionizing electron regardless the number of pair created
part%n_in = .FALSE. part%n_in = .FALSE.
end select
END SUBROUTINE ionization END SUBROUTINE ionization
subroutine quasiNeutrality(edge, part, self) subroutine quasiNeutrality(self, edge, part)
use moduleRandom use moduleRandom
implicit none implicit none
class(boundaryQuasiNeutrality), intent(in):: self
class(meshEdge), intent(inout):: edge class(meshEdge), intent(inout):: edge
class(particle), intent(inout):: part class(particle), intent(inout):: part
class(boundaryGeneric), optional, intent(in):: self
real(8), allocatable:: density(:) real(8), allocatable:: density(:)
class(meshCell), pointer:: cell class(meshCell), pointer:: cell
real(8):: EF_dir real(8):: EF_dir
@ -427,50 +404,51 @@ submodule(moduleMesh) boundary
end if end if
if (random() <= alpha) then if (random() <= alpha) then
call reflection(edge, part) call genericReflection(edge, part)
else else
call transparent(edge, part) call genericTransparent(edge, part)
end if end if
end subroutine quasiNeutrality end subroutine quasiNeutrality
! !Points the boundary function to specific type ! Generic boundary conditions for internal use
! module SUBROUTINE pointBoundaryFunction(edge, s) module subroutine genericReflection(edge, part)
! USE moduleErrors use moduleCaseParam
! IMPLICIT NONE use moduleSpecies
! implicit none
! CLASS(meshEdge), INTENT(inout):: edge
! INTEGER, INTENT(in):: s !Species index class(meshEdge), intent(inout):: edge
! class(particle), intent(inout):: part
! SELECT TYPE(obj => edge%boundary%bTypes(s)%obj) !rp = intersection between particle and edge
! TYPE IS(boundaryAbsorption) !rpp = final position of particle
! edge%fBoundary(s)%apply => absorption !vpp = final velocity of particle
! real(8), dimension(1:3):: rp, vpp
! TYPE IS(boundaryReflection)
! edge%fBoundary(s)%apply => reflection !Reflect particle velocity
! vpp = part%v - 2.D0*dot_product(part%v, edge%normal)*edge%normal
! TYPE IS(boundaryTransparent) part%v = vpp
! edge%fBoundary(s)%apply => transparent
! rp = edge%intersection(part%r)
! TYPE IS(boundaryAxis)
! edge%fBoundary(s)%apply => symmetryAxis part%r = 2.D0*(rp - part%r) + part%r
!
! TYPE IS(boundaryWallTemperature) !particle is assumed to be inside
! edge%fBoundary(s)%apply => wallTemperature part%n_in = .TRUE.
!
! TYPE IS(boundaryIonization) end subroutine genericReflection
! edge%fBoundary(s)%apply => ionization
! subroutine genericTransparent(edge, part)
! type is(boundaryQuasiNeutrality) use moduleSpecies
! edge%fBoundary(s)%apply => quasiNeutrality implicit none
!
! CLASS DEFAULT class(meshEdge), intent(inout):: edge
! CALL criticalError("Boundary type not defined", 'pointBoundaryFunction') class(particle), intent(inout):: part
!
! END SELECT !Removes particle from domain
! part%n_in = .FALSE.
! END SUBROUTINE pointBoundaryFunction
end subroutine genericTransparent
end submodule boundary end submodule boundary