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

Issue reading EM field

Browse source 
Fixed an issue reading the EM field from input file.
This commit is contained in:
Jorge Gonzalez 2021-10-18 10:29:45 +02:00
commit f9dcd181c8
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/modules/moduleInput.f90
View file

@ -172,7 +172,7 @@ MODULE moduleInput
CHARACTER(:), ALLOCATABLE:: object CHARACTER(:), ALLOCATABLE:: object
!simulation final and initial times in [t] !simulation final and initial times in [t]
REAL(8):: finalTime, initialTime REAL(8):: finalTime, initialTime
CHARACTER(:), ALLOCATABLE:: pusherType, EMType, WSType CHARACTER(:), ALLOCATABLE:: pusherType, WSType
INTEGER:: nTau, nSolver INTEGER:: nTau, nSolver
INTEGER:: i INTEGER:: i
CHARACTER(2):: iString CHARACTER(2):: iString
@ -221,15 +221,6 @@ MODULE moduleInput
END DO END DO
!Gets the solver for the electromagnetic field
CALL config%get(object // '.EMSolver', EMType, found)
CALL solver%initEM(EMType)
SELECT CASE(EMType)
CASE("Electrostatic")
CALL readEMBoundary(config)
END SELECT
!Gest the non-analogue scheme !Gest the non-analogue scheme
CALL config%get(object // '.WeightingScheme', WSType, found) CALL config%get(object // '.WeightingScheme', WSType, found)
CALL solver%initWS(WSType) CALL solver%initWS(WSType)
@ -809,12 +800,13 @@ MODULE moduleInput
USE moduleErrors USE moduleErrors
USE moduleOutput USE moduleOutput
USE moduleRefParam USE moduleRefParam
USE moduleSolver
USE json_module USE json_module
IMPLICIT NONE IMPLICIT NONE
TYPE(json_file), INTENT(inout):: config TYPE(json_file), INTENT(inout):: config
LOGICAL:: found LOGICAL:: found
CHARACTER(:), ALLOCATABLE:: meshFormat, meshFile CHARACTER(:), ALLOCATABLE:: meshFormat, meshFile, EMType
REAL(8):: volume REAL(8):: volume
!Firstly, indicates if a specific mesh for MC collisions is being use !Firstly, indicates if a specific mesh for MC collisions is being use
@ -906,6 +898,16 @@ MODULE moduleInput
END IF END IF
!Gest EM solver
CALL config%get('case.EMSolver', EMType, found)
CALL solver%initEM(EMType)
SELECT CASE(EMType)
CASE("Electrostatic")
!Reads BC
CALL readEMBoundary(config)
END SELECT
END SUBROUTINE readGeometry END SUBROUTINE readGeometry
SUBROUTINE readProbes(config) SUBROUTINE readProbes(config)