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

Small bugfix when testing examples

Browse source 
While testing the examples distributed with the code, a few errors were
found and fixed, mostly related with the K matrix in 1D geometry and
reading values from initial conditions for species.
This commit is contained in:
Jorge Gonzalez 2023-01-07 10:47:18 +01:00
commit 1c5b887a6d
4 changed files with 25 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
runs/1D_Cathode/inputRad.json
View file

@ -31,10 +31,10 @@
]} ]}
], ],
"boundaryEM": [ "boundaryEM": [
{"name": "Cathode", "type": "dirichlet", "potential": 0.0, "physicalSurface": 1} {"name": "Cathode", "type": "dirichlet", "potential": 0.0, "physicalSurface": 1}
], ],
"inject": [ "inject": [
{"name": "Plasma Cat e", "species": "Electron", "flow": 2.64e-2, "units": "A", "v": 180000.0, "T": [ 2300.0, 2300.0, 2300.0], {"name": "Plasma Cat e", "species": "Electron", "flow": 2.64e-5, "units": "A", "v": 180000.0, "T": [ 2300.0, 2300.0, 2300.0],
"velDist": ["Maxwellian", "Maxwellian", "Maxwellian"], "n": [ 1, 0, 0], "physicalSurface": 1} "velDist": ["Maxwellian", "Maxwellian", "Maxwellian"], "n": [ 1, 0, 0], "physicalSurface": 1}
], ],
"solver": { "solver": {

47
src/modules/init/moduleInput.f90
View file

@ -331,7 +331,8 @@ MODULE moduleInput
REAL(8), ALLOCATABLE, DIMENSION(:,:):: velocity REAL(8), ALLOCATABLE, DIMENSION(:,:):: velocity
INTEGER, ALLOCATABLE, DIMENSION(:):: nodes INTEGER, ALLOCATABLE, DIMENSION(:):: nodes
INTEGER:: nNodes INTEGER:: nNodes
REAL(8), ALLOCATABLE, DIMENSION(:):: source, fPsi REAL(8), ALLOCATABLE, DIMENSION(:):: sourceScalar
REAL(8), ALLOCATABLE, DIMENSION(:,:):: sourceArray
!Density at the volume centroid !Density at the volume centroid
REAL(8):: densityCen REAL(8):: densityCen
!Mean velocity and temperature at particle position !Mean velocity and temperature at particle position
@ -361,14 +362,10 @@ MODULE moduleInput
!Density at centroid of cell !Density at centroid of cell
nNodes = mesh%cells(e)%obj%nNodes nNodes = mesh%cells(e)%obj%nNodes
nodes = mesh%cells(e)%obj%getNodes(nNodes) nodes = mesh%cells(e)%obj%getNodes(nNodes)
ALLOCATE(fPsi(1:nNodes)) ALLOCATE(sourceScalar(1:nNodes))
fPsi = mesh%cells(e)%obj%fPsi((/0.D0, 0.D0, 0.D0/), nNodes) ALLOCATE(sourceArray(1:nNodes, 1:3))
ALLOCATE(source(1:nNodes)) sourceScalar = density(nodes)
DO j = 1, nNodes densityCen = mesh%cells(e)%obj%gatherF((/ 0.D0, 0.D0, 0.D0 /), nNodes, sourceScalar)
source(j) = density(nodes(j))
END DO
densityCen = DOT_PRODUCT(fPsi, source)
!Calculate number of particles !Calculate number of particles
nNewPart = INT(densityCen * (mesh%cells(e)%obj%volume*Vol_ref) / species(sp)%obj%weight) nNewPart = INT(densityCen * (mesh%cells(e)%obj%volume*Vol_ref) / species(sp)%obj%weight)
@ -380,37 +377,23 @@ MODULE moduleInput
partNew%r = mesh%cells(e)%obj%randPos() partNew%r = mesh%cells(e)%obj%randPos()
partNew%Xi = mesh%cells(e)%obj%phy2log(partNew%r) partNew%Xi = mesh%cells(e)%obj%phy2log(partNew%r)
!Get mean velocity at particle position !Get mean velocity at particle position
fPsi = mesh%cells(e)%obj%fPsi(partNew%Xi, nNodes) sourceArray(:,1) = velocity((nodes), 1)
DO j = 1, nNodes sourceArray(:,2) = velocity((nodes), 2)
source(j) = velocity(nodes(j), 1) sourceArray(:,3) = velocity((nodes), 3)
END DO
velocityXi(1) = DOT_PRODUCT(fPsi, source)
DO j = 1, nNodes
source(j) = velocity(nodes(j), 2)
END DO
velocityXi(2) = DOT_PRODUCT(fPsi, source)
DO j = 1, nNodes
source(j) = velocity(nodes(j), 3)
END DO
velocityXi(3) = DOT_PRODUCT(fPsi, source)
velocityXi = mesh%cells(e)%obj%gatherF(partNew%Xi, nNodes, sourceArray)
velocityXi = velocityXi / v_ref velocityXi = velocityXi / v_ref
!Get temperature at particle position !Get temperature at particle position
DO j = 1, nNodes sourceScalar = temperature(nodes)
source(j) = temperature(nodes(j)) temperatureXi = mesh%cells(e)%obj%gatherF(partNew%Xi, nNodes, sourceScalar)
END DO
temperatureXi = DOT_PRODUCT(fPsi, source)
temperatureXi = temperatureXi / T_ref temperatureXi = temperatureXi / T_ref
vTh = DSQRT(temperatureXi / species(sp)%obj%m) vTh = DSQRT(temperatureXi / species(sp)%obj%m)
partNew%v(1) = velocityXi(1) + vTh*randomMaxwellian() partNew%v(1) = velocityXi(1) + vTh*randomMaxwellian()
partNew%v(2) = velocityXi(2) + vTh*randomMaxwellian() partNew%v(2) = velocityXi(2) + vTh*randomMaxwellian()
partNew%v(3) = velocityXi(3) + vTh*randomMaxwellian() partNew%v(3) = velocityXi(3) + vTh*randomMaxwellian()
partNew%vol = e partNew%vol = e
IF (doubleMesh) THEN IF (doubleMesh) THEN
partNew%volColl = findCellBrute(meshColl, partNew%r) partNew%volColl = findCellBrute(meshColl, partNew%r)
@ -419,7 +402,9 @@ MODULE moduleInput
partNew%volColl = partNew%vol partNew%volColl = partNew%vol
END IF END IF
partNew%n_in = .TRUE. partNew%n_in = .TRUE.
partNew%weight = species(sp)%obj%weight partNew%weight = species(sp)%obj%weight
!Assign particle to temporal list of particles !Assign particle to temporal list of particles
@ -434,7 +419,7 @@ MODULE moduleInput
END DO END DO
DEALLOCATE(source) DEALLOCATE(sourceScalar, sourceArray)
END DO END DO

6
src/modules/mesh/1DCart/moduleMesh1DCart.f90
View file

@ -324,7 +324,7 @@ MODULE moduleMesh1DCart
REAL(8):: Xi(1:3) REAL(8):: Xi(1:3)
REAL(8):: dPsi(1:3, 1:2) REAL(8):: dPsi(1:3, 1:2)
REAL(8):: pDer(1:3, 1:3) REAL(8):: pDer(1:3, 1:3)
REAL(8):: invJ(1:3,1:3), detJ REAL(8):: invJ(1:3, 1:3), detJ
INTEGER:: l INTEGER:: l
localK = 0.D0 localK = 0.D0
@ -337,8 +337,8 @@ MODULE moduleMesh1DCart
pDer = self%partialDer(2, dPsi) pDer = self%partialDer(2, dPsi)
detJ = self%detJac(pDer) detJ = self%detJac(pDer)
invJ = self%invJac(pDer) invJ = self%invJac(pDer)
localK = localK + MATMUL(RESHAPE(MATMUL(invJ,dPsi), (/ 2, 1/)), & localK = localK + MATMUL(TRANSPOSE(MATMUL(invJ,dPsi)), &
RESHAPE(MATMUL(invJ,dPsi), (/ 1, 2/)))* & MATMUL(invJ,dPsi))* &
wSeg(l)/detJ wSeg(l)/detJ
END DO END DO

8
src/modules/mesh/1DRad/moduleMesh1DRad.f90
View file

@ -326,7 +326,7 @@ MODULE moduleMesh1DRad
REAL(8):: dPsi(1:3, 1:2) REAL(8):: dPsi(1:3, 1:2)
REAL(8):: pDer(1:3, 1:3) REAL(8):: pDer(1:3, 1:3)
REAL(8):: r REAL(8):: r
REAL(8):: invJ(1:3,1:3), detJ REAL(8):: invJ(1:3, 1:3), detJ
INTEGER:: l INTEGER:: l
localK = 0.D0 localK = 0.D0
@ -339,9 +339,9 @@ MODULE moduleMesh1DRad
pDer = self%partialDer(2, dPsi) pDer = self%partialDer(2, dPsi)
detJ = self%detJac(pDer) detJ = self%detJac(pDer)
invJ = self%invJac(pDer) invJ = self%invJac(pDer)
r = self%gatherF(Xi, 4, self%r) r = self%gatherF(Xi, 2, self%r)
localK = localK + MATMUL(RESHAPE(MATMUL(invJ,dPsi), (/ 2, 1/)), & localK = localK + MATMUL(TRANSPOSE(MATMUL(invJ,dPsi)), &
RESHAPE(MATMUL(invJ,dPsi), (/ 1, 2/)))* & MATMUL(invJ,dPsi))* &
r*wSeg(l)/detJ r*wSeg(l)/detJ
END DO END DO