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

Probes were not working properly

Browse source 
Issue in the output of probes and in the detection of particles inside
the velocity grid.
This commit is contained in:
Jorge Gonzalez 2023-02-23 08:18:46 +01:00
commit 2ee6c1764e
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/moduleProbe.f90
View file

@ -95,7 +95,7 @@ MODULE moduleProbe
!Maximum radius !Maximum radius
!TODO: Make this an input parameter !TODO: Make this an input parameter
self%maxR = 1.D-1/L_ref self%maxR = 1.D0
!Init the probe lock !Init the probe lock
CALL OMP_INIT_LOCK(self%lock) CALL OMP_INIT_LOCK(self%lock)
@ -110,6 +110,8 @@ MODULE moduleProbe
INTEGER, INTENT(out):: i, j, k INTEGER, INTENT(out):: i, j, k
LOGICAL, INTENT(out):: inside LOGICAL, INTENT(out):: inside
inside = .TRUE.
i = FLOOR((vp(1) - self%vi(1))/self%vrange(1)*(REAL(self%nv(1) - 1)) + 1.D0) i = FLOOR((vp(1) - self%vi(1))/self%vrange(1)*(REAL(self%nv(1) - 1)) + 1.D0)
IF (i >= self%nv(1) .OR. i < 1) inside = .FALSE. IF (i >= self%nv(1) .OR. i < 1) inside = .FALSE.
j = FLOOR((vp(2) - self%vj(1))/self%vrange(2)*(REAL(self%nv(2) - 1)) + 1.D0) j = FLOOR((vp(2) - self%vj(1))/self%vrange(2)*(REAL(self%nv(2) - 1)) + 1.D0)
@ -198,7 +200,7 @@ MODULE moduleProbe
WRITE(tstring, iterationFormat) t WRITE(tstring, iterationFormat) t
WRITE(pstring, "(I3.3)") self%id WRITE(pstring, "(I3.3)") self%id
fileName='OUTPUT_' // tstring// '_f_' // pstring // '.dat' fileName='Probe_' // tstring// '_f_' // pstring // '.dat'
WRITE(*, "(6X,A15,A)") "Creating file: ", fileName WRITE(*, "(6X,A15,A)") "Creating file: ", fileName
OPEN (10, file = path // folder // '/' // fileName) OPEN (10, file = path // folder // '/' // fileName)
WRITE(10, "(A1, 1X, A)") "# ", self%species%name WRITE(10, "(A1, 1X, A)") "# ", self%species%name
@ -268,7 +270,7 @@ MODULE moduleProbe
DO i = 1, nProbes DO i = 1, nProbes
probe(i)%f = 0.D0 probe(i)%f = 0.D0
probe(i)%update = MOD(t, probe(i)%every) == 0 .OR. t == tFinal probe(i)%update = MOD(t, probe(i)%every) == 0 .OR. t == tFinal .OR. t == tInitial
END DO END DO

3
src/modules/solver/moduleSolver.f90
View file

@ -523,6 +523,8 @@ MODULE moduleSolver
END IF END IF
CALL outputProbes(t)
counterOutput = counterOutput + 1 counterOutput = counterOutput + 1
IF (counterOutput >= triggerOutput .OR. & IF (counterOutput >= triggerOutput .OR. &
t == tFinal .OR. t == tInitial) THEN t == tFinal .OR. t == tInitial) THEN
@ -530,7 +532,6 @@ MODULE moduleSolver
!Resets output counter !Resets output counter
counterOutput=0 counterOutput=0
CALL outputProbes(t)
CALL mesh%printOutput(t) CALL mesh%printOutput(t)
IF (ASSOCIATED(meshForMCC)) CALL meshForMCC%printColl(t) IF (ASSOCIATED(meshForMCC)) CALL meshForMCC%printColl(t)
CALL mesh%printEM(t) CALL mesh%printEM(t)