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

Separating CPU time output from Data outut to allow better analysis.

Browse source
This commit is contained in:
Jorge Gonzalez 2020-12-07 17:58:33 +01:00
commit 7152a232fe
6 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
runs/1D_Cathode/input.json
View file

@ -2,7 +2,7 @@
{ {
"output": { "output": {
"path": "./runs/1D_Cathode/", "path": "./runs/1D_Cathode/",
"trigger": 100, "triggerOutput": 100,
"cpuTime": false, "cpuTime": false,
"numColl": false, "numColl": false,
"EMField": true "EMField": true
@ -26,7 +26,7 @@
], ],
"boundaryEM": [ "boundaryEM": [
{"name": "Cathode", "type": "dirichlet", "potential": 0.0, "physicalSurface": 1}, {"name": "Cathode", "type": "dirichlet", "potential": 0.0, "physicalSurface": 1},
{"name": "Infinite", "type": "dirichlet", "potential": 600.0, "physicalSurface": 2} {"name": "Infinite", "type": "dirichlet", "potential": 100.0, "physicalSurface": 2}
], ],
"inject": [ "inject": [
{"name": "Cathode Electron", "species": "Electron", "flow": 9.0e-5, "units": "A", "v": 27500.0, "T": [2500.0, 2500.0, 2500.0], "n": [ 1, 0, 0], "physicalSurface": 1} {"name": "Cathode Electron", "species": "Electron", "flow": 9.0e-5, "units": "A", "v": 27500.0, "T": [2500.0, 2500.0, 2500.0], "n": [ 1, 0, 0], "physicalSurface": 1}

5
runs/ALPHIE_Grid/input.json
View file

@ -1,8 +1,9 @@
{ {
"output": { "output": {
"path": "./runs/ALPHIE_Grid/", "path": "./runs/ALPHIE_Grid/",
"trigger": 500, "triggerOutput": 500,
"cpuTime": false, "triggerCPUTime": 1,
"cpuTime": true,
"numColl": false, "numColl": false,
"EMField": true "EMField": true
}, },

2
runs/cylFlow/input.json
View file

@ -1,7 +1,7 @@
{ {
"output": { "output": {
"path": "./runs/cylFlow/", "path": "./runs/cylFlow/",
"trigger": 10, "triggerOutput": 10,
"cpuTime": true, "cpuTime": true,
"numColl": false "numColl": false
}, },

9
src/modules/moduleInput.f95
View file

@ -193,7 +193,7 @@ MODULE moduleInput
object = 'output' object = 'output'
CALL config%get(object // '.path', path, found) CALL config%get(object // '.path', path, found)
CALL config%get(object // '.trigger', triggerOutput, found) CALL config%get(object // '.triggerOutput', triggerOutput, found)
IF (.NOT. found) THEN IF (.NOT. found) THEN
triggerOutput = 100 triggerOutput = 100
CALL warningError('Using default trigger for output file of 100 iterations') CALL warningError('Using default trigger for output file of 100 iterations')
@ -211,6 +211,13 @@ MODULE moduleInput
CALL config%get(object // '.numColl', collOutput, found) CALL config%get(object // '.numColl', collOutput, found)
CALL config%get(object // '.EMField', emOutput, found) CALL config%get(object // '.EMField', emOutput, found)
CALL config%get(object // '.triggerCPUTime', triggerCPUTime, found)
IF (.NOT. found) THEN
triggerCPUTime = triggerOutput
IF (timeOutput) CALL warningError('No triggerCPUTime found, using same vale as triggerOutput')
END IF
END SUBROUTINE readOutput END SUBROUTINE readOutput
!Reads information about the case species !Reads information about the case species

3
src/modules/moduleOutput.f95
View file

@ -22,7 +22,8 @@ MODULE moduleOutput
CHARACTER(:), ALLOCATABLE:: path CHARACTER(:), ALLOCATABLE:: path
CHARACTER(:), ALLOCATABLE:: folder CHARACTER(:), ALLOCATABLE:: folder
INTEGER:: triggerOutput, counterOutput INTEGER:: triggerOutput, counterOutput = 0
INTEGER:: triggerCPUTime, counterCPUTime = 0
LOGICAL:: timeOutput = .FALSE. LOGICAL:: timeOutput = .FALSE.
LOGICAL:: collOutput = .FALSE. LOGICAL:: collOutput = .FALSE.
LOGICAL:: emOutput = .FALSE. LOGICAL:: emOutput = .FALSE.

16
src/modules/moduleSolver.f95
View file

@ -555,15 +555,14 @@ MODULE moduleSolver
INTEGER, INTENT(in):: t INTEGER, INTENT(in):: t
counterOutput=counterOutput+1 counterOutput = counterOutput + 1
IF (counterOutput>=triggerOutput .OR. & IF (counterOutput >= triggerOutput .OR. &
t == tmax .OR. t == 0) THEN t == tmax .OR. t == 0) THEN
!Resets output counter !Resets output counter
counterOutput=0 counterOutput=0
CALL mesh%printOutput(t) CALL mesh%printOutput(t)
CALL printTime(t, t == 0)
CALL mesh%printColl(t) CALL mesh%printColl(t)
CALL mesh%printEM(t) CALL mesh%printEM(t)
WRITE(*, "(5X,A21,I10,A1,I10)") "t/tmax: ", t, "/", tmax WRITE(*, "(5X,A21,I10,A1,I10)") "t/tmax: ", t, "/", tmax
@ -584,6 +583,17 @@ MODULE moduleSolver
END IF END IF
counterCPUTime = counterCPUTime + 1
IF (counterCPUTime >= triggerCPUTime .OR. &
t == tmax .OR. t == 0) THEN
!Reset CPU Time counter
counterCPUTime = 0
CALL printTime(t, t == 0)
END IF
END SUBROUTINE doOutput END SUBROUTINE doOutput