Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nlte and p1 model rebase #239

Draft
wants to merge 18 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3c9e4c0
change the input files and add back the index ordering for Ion1 in M2…
malamast Aug 25, 2023
b7adbbd
Set up the nlte case.
malamast Aug 25, 2023
d952f01
Added an assert statement to make sure that exitCheckFreq gets only p…
malamast Sep 1, 2023
ba1057d
Fix issue with negative unphisical number densities. Negative values …
malamast Sep 6, 2023
8c3441d
An attempt to run the two-temperature plasma model but it failed. The…
malamast Sep 14, 2023
072dbeb
Added a input-file flag to enable saving the temperature field. This …
malamast Sep 25, 2023
6d8a75a
The coupling of the P1 radiation model is complete. The input file ha…
malamast Oct 12, 2023
de27f14
I have added a class RadiativeDecay to deal with radiative decay reac…
malamast Oct 16, 2023
5e96715
after rebase main to my local branch
malamast Oct 16, 2023
a9585d0
fixed some minor issues after rebaseing main to my local
malamast Oct 16, 2023
274a56b
Fixed issue with the order of the species. I have added the functions…
malamast Oct 19, 2023
3c8bc24
I made some changes to test-table.cpp to make it compatible with the …
malamast Oct 19, 2023
5de5aa6
fix some merge issues after rebasing
malamast Oct 19, 2023
2895528
Fixed an if statement in M2ulPhyS.cpp related to the selection of the…
malamast Oct 19, 2023
f5b0c59
fixed some issues in source_term related with the selection of the ra…
malamast Oct 20, 2023
00f038b
fix some bugs with iBackground index that where causing air tests to …
malamast Oct 20, 2023
5208f37
moved the rad-data for nec in rad-data/NEC/ and chenged the paths in …
malamast Oct 20, 2023
19f57c4
add back the nec_sample.h5 files
malamast Oct 20, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,580 changes: 2,580 additions & 0 deletions doc/Doxyfile

Large diffs are not rendered by default.

25 changes: 25 additions & 0 deletions run.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash

cd test

rm -R output-plasma
rm -R output-plasma-refine2

# cp Restart/lowP/restart_output-plasma.LTE.h5 restart_output-plasma.sol.h5
cp Restart/highP/restart_output-plasma-refine2.LTE.h5 restart_output-plasma-refine2.sol.h5
# cp Restart/highP/restart_output-plasma-refine2.NLTE.h5 restart_output-plasma-refine2.sol.h5



EXE=../src/tps
RUNFILE="inputs/plasma.ini"
# RUNFILE="inputs/input.4iters.cyl.ini"

# RUNFILE="inputs/perfectGas.air.ini"

NPROC=10

mpirun -np $NPROC $EXE --runFile $RUNFILE
# mpirun -np $NPROC libtool --mode=execute gdb --args $EXE --runFile $RUNFILE


14 changes: 14 additions & 0 deletions src/BCintegrator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,8 @@ void BCintegrator::AssembleFaceVector(const FiniteElement &el1, const FiniteElem
const IntegrationRule *ir = &intRules->Get(Tr.GetGeometryType(), intorder);
const int numActiveSpecies = mixture->GetNumActiveSpecies();
const int nvel = mixture->GetNumVels();
const bool twoTemperature_ = mixture->IsTwoTemperature();
const int iTe = num_equation - 1;

for (int i = 0; i < ir->GetNPoints(); i++) {
const IntegrationPoint &ip = ir->IntPoint(i);
Expand Down Expand Up @@ -390,6 +392,18 @@ void BCintegrator::AssembleFaceVector(const FiniteElement &el1, const FiniteElem
funval1(eq) = sum;
}

if (twoTemperature_ && eq == iTe) {
funval1(eq) = max(sum,0.0);
}

if (twoTemperature_ && eq == iTe) {
funval1(eq) = max(sum,0.0);
}

if (twoTemperature_ && eq == iTe) {
funval1(eq) = max(sum,0.0);
}

// interpolation gradients
for (int d = 0; d < dim; d++) {
sum = 0.;
Expand Down
Loading
Loading