Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
e2048c1
cheanged some paths/directories
malamast Nov 30, 2023
dd8116d
added a test.sh file.
malamast Dec 13, 2023
592b229
I have coupled the Collisional-Radiative Model for Ar with the GlowDi…
malamast Jan 3, 2024
de16173
prepare for runs on HPC. I made a few new folders.
malamast Jan 5, 2024
abf52f4
Path hackery
trevilo Jul 11, 2025
d427b0b
We changed the BE method by fixing the jacobian and calculating the j…
malamast Jan 13, 2024
47000d4
I have converted the code to enable execution on GPUs via CuPy. This …
malamast Jan 26, 2024
c1c4566
I wrote my own version of trapz function where I replaced sum with np…
malamast Jan 29, 2024
59d3c0f
minor changes
malamast Feb 2, 2024
49b01d0
Just a commit before we branch to multiprocessing.
malamast Feb 7, 2024
82c7782
This was the main branch before separating temperature dependent rate…
malamast Mar 1, 2024
397d300
I'm clipping the temperature as Te(Te<Tg)=Tg. At some point, Te recei…
malamast Mar 5, 2024
1feac76
Before adding Juan's latest changes to the 6species model
malamast Mar 8, 2024
8f4bc9e
After adding Juan's changes
malamast Mar 8, 2024
9ad0681
some changes to clip the huge values of electron mobility and diffusi…
malamast Mar 28, 2024
82e8e04
Before I do some changes to the CR model and some cleaning up.
malamast Apr 3, 2024
8671b4e
I have added the capability to read Bolsig+ EEDFs. I do a 2D interpol…
malamast Apr 19, 2024
c74b492
Included radiation losses in the model. The Tg now increases only by …
malamast Apr 23, 2024
9ee0566
Added files to run Bolsig+ and produce files for EEDFs and transport …
malamast Apr 23, 2024
01c65db
Changed the Tg value from 300K to 293.15K
malamast Apr 25, 2024
d940b25
Change spatial_residual and spatial_jacobian so that the electron ene…
malamast Apr 27, 2024
638e653
I fixed the bug. Now we suport variable electron energy transport coe…
malamast May 24, 2024
18e3998
I used a moving average filter to smooth the Bolsig+ transport coeffi…
malamast May 28, 2024
60ba64a
I generalised the way we read cross-sections from LXCata so that we c…
malamast Jun 4, 2024
361cf99
made the new developments cupy compatible. It's stil slower compared …
malamast Jun 4, 2024
a028e21
I added some atom-atom reaction between resonace and metastable state…
malamast Jun 19, 2024
ea2e7b6
I fixed some bugs with the variable ion mobility case. There were som…
malamast Jul 4, 2024
5318e5e
I have included more atom-atom impact collisions in the CR model for …
malamast Jul 17, 2024
2f5e54b
Temporarily remove failing 6 species test
trevilo Jul 11, 2025
97b5695
I have chnaged the code to treat BC for ions strongly and not weakly.…
malamast Jul 18, 2024
9dbdf9b
added Argon Ion diffusion data. Renamed some files. Changed how we tr…
malamast Aug 15, 2024
8e260b9
Added functionality to solve for an effective electriv field for ions…
malamast Aug 23, 2024
279aa57
I change the iee index to make it consistent with the iele and iion i…
malamast Aug 23, 2024
5a4fb5a
I made the electron mobility a function of EN (reduced electric field…
malamast Aug 26, 2024
4637354
I have added electron mobility exp data from LXCat. Electron mobility…
malamast Sep 24, 2024
87fa2d3
Added Juan's corrected rates for the 6species model.
malamast Sep 24, 2024
81349e9
CRModel: I added a function to use a Druyvesteyn EEDF. I added a smal…
malamast Jun 20, 2025
e1e1555
chebSolver -> step: I made some small improvemnets to the solver by a…
malamast Jun 20, 2025
820eb4b
chebSolver-> step: Added scipy's lu factorization in the solver for t…
malamast Jun 20, 2025
3dbc77e
chebSolver: I separated the part where we save one period. Now for th…
malamast Jun 20, 2025
e4474b8
chebSolver: I added timestep adaptivity. For now, it only supports th…
malamast Jun 21, 2025
414fb93
I have added a linear line search method to the shooting newton solve…
malamast Jun 21, 2025
62392e3
timePeriodicSolver: I added a use defined flag to let the used decide…
malamast Jun 26, 2025
0a74d02
chebSolver: Applied density and temperature floors. We clip the solut…
malamast Jun 26, 2025
9cfcb6a
Added some local tables to the repo. Added folder Data that contains …
malamast Jun 26, 2025
d51f761
Added to the repo some local tabulated date from Juan for the 6-speci…
malamast Jun 26, 2025
587c345
Add a CR model regression test
trevilo Jul 15, 2025
82520b0
Update testing
trevilo Jul 18, 2025
87a12a0
Add pandas install to regression testing
trevilo Jul 21, 2025
24a9f85
Add CR model to automated github actions regression tests
trevilo Jul 21, 2025
9911e2d
Fix for deprecated use of numpy.where
trevilo Jul 21, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 3 additions & 1 deletion .github/workflows/regression_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install numpy scipy matplotlib h5py
pip install numpy scipy matplotlib h5py pandas
- name: Run Liu case test
run: ./testRunBase.sh
- name: Run constant background CN test
Expand All @@ -35,3 +35,5 @@ jobs:
run: ./testRunBackground.sh
- name: Run six species test
run: ./test6Species.sh
- name: Run CR model test
run: ./testCRModel.sh
Binary file modified BOLSIGChemistry_NominalRates/3BdyRecomb_4p.h5
Binary file not shown.
Binary file modified BOLSIGChemistry_NominalRates/3BdyRecomb_Ground.h5
Binary file not shown.
Binary file modified BOLSIGChemistry_NominalRates/3BdyRecomb_Metastable.h5
Binary file not shown.
Binary file modified BOLSIGChemistry_NominalRates/3BdyRecomb_Resonant.h5
Binary file not shown.
Binary file modified BOLSIGChemistry_NominalRates/DeExcitation_4p.h5
Binary file not shown.
Binary file modified BOLSIGChemistry_NominalRates/DeExcitation_Metastable.h5
Binary file not shown.
Binary file modified BOLSIGChemistry_NominalRates/DeExcitation_Resonant.h5
Binary file not shown.
64 changes: 64 additions & 0 deletions BOLSIGChemistry_NominalRates/EinsteinForm.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import numpy as np
from matplotlib import pyplot as plt
import h5py as h5

kB = 1.38e-23
q = 1.602e-19

## Electron Transport Data
transport = h5.File("./nominal_transport.h5", 'r')
NDe_v_Te = transport["diffusivity"]
Te_trans = NDe_v_Te[:,0]
Te_trans /= 11604
De_interp = (NDe_v_Te[:,1]/3.22e22)
#De_spline = CubicSpline(Te_trans, De_interp)
#De_Te_spline = CubicSpline.derivative(De_spline)

Nmue_v_Te = transport["mobility"]
mue_interp = (Nmue_v_Te[:,1]/3.22e22)
#mue_spline = CubicSpline(Te_trans, mue_interp)
#mue_Te_spline = CubicSpline.derivative(mue_spline)

De_Eins = np.multiply(mue_interp,Te_trans)


## Electron Transport Data 2
# transport_2 = h5.File("../BOLSIGChemistry_Transport/nominal_transport_2.h5", 'r')
# NDe_v_Te_2 = transport["diffusivity"]
# Te_trans_2 = NDe_v_Te_2[:,0]
# Te_trans_2 /= 11604
# De_interp_2 = (NDe_v_Te_2[:,1]/3.22e22)
# Nmue_v_Te_2 = transport["mobility"]
# mue_interp_2 = (Nmue_v_Te_2[:,1]/3.22e22)
# De_Eins_2 = np.multiply(mue_interp_2,Te_trans_2)


#diffInterp = np.zeros(10000)
#mobInterp = np.zeros(10000)
#TePlot = np.linspace(Te_trans[0], Te_trans[-1], diffInterp.shape[0])
#for i in range(len(diffInterp)):
# diffInterp[i] = De_spline(TePlot[i])
# mobInterp[i] = mue_spline(TePlot[i])

fig,ax = plt.subplots()
ax.set_title('Diffusion Coefficient')
ax.set_xlabel('Te [eV]')
ax.set_ylabel('D [m2/s]')
ax.plot(Te_trans, De_interp, marker = 'o', label = 'Bolsig Data')
ax.plot(Te_trans, De_Eins, label = 'Einstein Relation')
# ax.plot(Te_trans_2, De_interp_2, marker = '.', label = 'Bolsig Data')
# ax.plot(Te_trans_2, De_Eins_2, label = 'Einstein Relation')
ax.legend()
# plt.savefig('EinsteinRelation.png')

# fig, ax = plt.subplots()
# ax.set_title('Mobility Coefficient')
# ax.set_xlabel('Te [eV]')
# ax.plot(Te_trans, mue_interp, marker = 'o', label = 'Raw Data')
# # ax.plot(Te_trans_2, mue_interp_2, marker = '.', label = 'Raw Data')
# # ax.plot(TePlot, mobInterp, label = 'Interpolant')
# ax.legend()


plt.show()

Binary file added BOLSIGChemistry_NominalRates/EinsteinRelation.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified BOLSIGChemistry_NominalRates/Excitation_4p.h5
Binary file not shown.
Binary file modified BOLSIGChemistry_NominalRates/Excitation_Metastable.h5
Binary file not shown.
Binary file modified BOLSIGChemistry_NominalRates/Excitation_Resonant.h5
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
48 changes: 48 additions & 0 deletions BOLSIGChemistry_NominalRates/FullModel_1Torr/input.300K.bolsig.dat
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/NOSCREEN

READCOLLISIONS
"glow-discharge/nominal-crs/fullCrs.txt"
Ar Ar5 Ar4 Ar3 Ar2 Ar(2p10) Ar(2p9) Ar(2p8) Ar(2p7) Ar(2p6) Ar(2p5) Ar(2p4) Ar(2p3) Ar(2p2) Ar(2p1)
1

CONDITIONS
0.0
0.0
0.0
300
300
0.0
6.213503594170994e-08
2000000000000000.0
1.0
1.0
1
1
2
0.0
200
0
200.0
1e-10
0.0001
10000
9.99998E-01 1.24270E-06 6.21350E-10 9.32026E-07 3.10675E-10 6.21350E-11 6.21350E-11 6.21350E-11 4.66013E-11 4.66013E-11 3.10675E-11 3.10675E-11 3.10675E-11 3.10675E-11 3.10675E-11
1

RUNSERIES
2
0.200000 50.000000
200
3

SAVERESULTS
"glow-discharge/nominal-rxn/6species/FullModel/output.300K.bolsig.txt"
3
1
1
1
0
0
0
1

Binary file not shown.
Loading