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

Small modification in input for initial case.

Browse source 
Names have been simplified. User manual updated accordingly.
This commit is contained in:
Jorge Gonzalez 2021-04-15 09:47:19 +02:00
commit f20cb35fc5
3 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
doc/user-manual/fpakc_UserManual.pdf
View file

Binary file not shown.

20
doc/user-manual/fpakc_UserManual.tex
View file

@ -633,13 +633,13 @@ make
Determines initial values for the species.
Required values are:
\begin{itemize}
\item \textbf{speciesName}: Character.
Name of species as defined in the object \textbf{species}.
\item \textbf{initialState}: Character.
Output file from previous run used as an initial state for the species.
The file format must be the same as in \textbf{geometry.meshType}
Initial particles are assumed to have a Maxwellian distribution.
File must be located at \textbf{output.path}.
\item \textbf{species}: Character.
Name of species as defined in the object \textbf{species}.
\item \textbf{file}: Character.
Output file from previous run used as an initial state for the species.
The file format must be the same as in \textbf{geometry.meshType}
Initial particles are assumed to have a Maxwellian distribution.
File must be located at \textbf{output.path}.
\end{itemize}
\end{itemize}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@ -661,8 +661,8 @@ make
Each object in the array is defined by:
\begin{itemize}
\item \textbf{species\_i}, \textbf{species\_j}: Character.
Define the two species involved in the collision processes.
Order is indiferent.
Define the two species involved in the collision processes.
Order is indiferent.
\item \textbf{cTypes}: Object.
Array.
Defines all the collisions between \textbf{species\_i} and \textbf{species\_j}.
@ -671,7 +671,7 @@ make
\item \textbf{type}: Character.
Collision type.
Accepted values are \textbf{elastic}, \textbf{chargeExchange}, \textbf{ionization} and \textbf{recombination}.
Please refer to Sec. \ref{ssec:collisions} for a description of the different collision types.
Please refer to Sec.~\ref{ssec:collisions} for a description of the different collision types.
\item \textbf{crossSection}: Character.
File in \textbf{interactions.folderCollisions} that contains the cross section data as a 1D table of relative energy (in $\unit{eV}$) and cross section (in $\unit{m^-2}$).
\item \textbf{energyThreshold}: Real.

12
src/modules/moduleInput.f90
View file

@ -10,6 +10,7 @@ MODULE moduleInput
USE moduleErrors
USE moduleBoundary
USE moduleInject
USE moduleOutput
IMPLICIT NONE
CHARACTER(:), ALLOCATABLE, INTENT(in):: inputFile
@ -68,6 +69,9 @@ MODULE moduleInput
CALL readParallel(config)
CALL checkStatus(config, "readParallel")
!If everything is correct, creates the output folder
CALL EXECUTE_COMMAND_LINE('mkdir ' // path // folder )
END SUBROUTINE readConfig
!Checks the status of the JSON case file and, if failed, exits the execution.
@ -218,6 +222,7 @@ MODULE moduleInput
!Read initial state for species
CALL verboseError('Reading Initial state...')
CALL readInitial(config)
CALL checkStatus(config, "readInitial")
END SUBROUTINE readCase
@ -262,9 +267,9 @@ MODULE moduleInput
DO i = 1, nInitial
WRITE(iString, '(I2)') i
object = 'case.initial(' // iString // ')'
CALL config%get(object // '.speciesName', spName, found)
CALL config%get(object // '.species', spName, found)
sp = speciesName2Index(spName)
CALL config%get(object // '.initialState', spFile, found)
CALL config%get(object // '.file', spFile, found)
!Reads node values at the nodes
filename = path // spFile
CALL mesh%readInitial(sp, filename, density, velocity, temperature)
@ -419,9 +424,6 @@ MODULE moduleInput
folder = folder // date_now(1:4) // '-' // date_now(5:6) // '-' // date_now(7:8) // '_' &
// time_now(1:2) // '.' // time_now(3:4) // '.' // time_now(5:6)
!Creates the folder
CALL EXECUTE_COMMAND_LINE('mkdir ' // path // folder )
CALL config%get(object // '.cpuTime', timeOutput, found)
CALL config%get(object // '.numColl', collOutput, found)
CALL config%get(object // '.EMField', emOutput, found)