Skip to content

Commit

Permalink
Creates dedicated test branch for tg-molcrm branch
Browse files Browse the repository at this point in the history
  • Loading branch information
holm10 committed Nov 25, 2024
1 parent 787b4ea commit 99b8d1b
Show file tree
Hide file tree
Showing 276 changed files with 3,807 additions and 1,299 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/run_testsuite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Checkout develop branch
uses: actions/checkout@v4
with:
ref: develop
ref: tg_rewrite_H2CRM-compatible_boundary_modularization
repository: LLNL/UEDGE
- name: Build UEDGE
run: |
Expand Down
Binary file modified pytests/fulltests/nonog_d_c-fb_16x8/solution.h5
Binary file not shown.
Binary file modified pytests/fulltests/orthogonal_unittest/solution.h5
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ def write_data(self):
from uedge import bbb
from uedge.hdf5 import hdf5_restore
from copy import deepcopy
from numpy import ndarray
# Helper function accessing UEDGE data using variable
def getdata(var):
from Forthon import package, packageobject
Expand Down
Binary file modified pytests/unittests/D+C/nonog_carbon/default/solution.h5
Binary file not shown.
42 changes: 31 additions & 11 deletions pytests/unittests/D_mols/nonog_mols/default/input.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@
except:
pass

setni = True
setup = True
setphi = True
setphiofft = True
setng = True
setupg = True
setti = True
sette = True
settg = True

bbb.mhdgeo = 1 #use MHD equilibrium
bbb.gengrid=0 #read mesh from gridue file
com.geometry = "snull"
Expand Down Expand Up @@ -100,24 +110,34 @@
bbb.recycw[0:2] = [0.25, 0.95]

# templates/D_mols/inputs/equations/default.py
bbb.isnion = 1
bbb.isupon = 1
bbb.isteon = 1
bbb.istion = 1
bbb.isphion = 1
bbb.isphiofft = 0
bbb.istgon = 0
bbb.isngon = 0
bbb.isngon[0] = 0
bbb.isupgon = 0
bbb.isupgon[0] = 1
if setni:
bbb.isnion = 1
if setup:
bbb.isupon = 1
if sette:
bbb.isteon = 1
if setti:
bbb.istion = 1
if setphi:
bbb.isphion = 1
if setphiofft:
bbb.isphiofft = 0
if settg:
bbb.istgon = 0
if setng:
bbb.isngon = 0
bbb.isngon[0] = 0
if setupg:
bbb.isupgon = 0
bbb.isupgon[0] = 1


# Catch-all for turning off potential equaiton in slab geometry
if bbb.mhdgeo == -1:
bbb.isphion = 0
bbb.isphiofft = 1


# templates/D_mols/inputs/fluxlimits/default.py
bbb.flalfe = 0.21 #electron parallel thermal conduct. grd.coeff
bbb.flalfi = 0.21 #ion parallel thermal conduct. grd.coeff
Expand Down
Binary file modified pytests/unittests/D_mols/nonog_mols/default/solution.h5
Binary file not shown.
44 changes: 33 additions & 11 deletions pytests/unittests/D_mols/nonog_mols/tg_mol/input.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@
except:
pass

setni = True
setup = True
setphi = True
setphiofft = True
setng = True
setupg = True
setti = True
sette = True
settg = True

bbb.mhdgeo = 1 #use MHD equilibrium
bbb.gengrid=0 #read mesh from gridue file
com.geometry = "snull"
Expand Down Expand Up @@ -100,24 +110,34 @@
bbb.recycw[0:2] = [0.25, 0.95]

# templates/D_mols/inputs/equations/default.py
bbb.isnion = 1
bbb.isupon = 1
bbb.isteon = 1
bbb.istion = 1
bbb.isphion = 1
bbb.isphiofft = 0
bbb.istgon = 0
bbb.isngon = 0
bbb.isngon[0] = 0
bbb.isupgon = 0
bbb.isupgon[0] = 1
if setni:
bbb.isnion = 1
if setup:
bbb.isupon = 1
if sette:
bbb.isteon = 1
if setti:
bbb.istion = 1
if setphi:
bbb.isphion = 1
if setphiofft:
bbb.isphiofft = 0
if settg:
bbb.istgon = 0
if setng:
bbb.isngon = 0
bbb.isngon[0] = 0
if setupg:
bbb.isupgon = 0
bbb.isupgon[0] = 1


# Catch-all for turning off potential equaiton in slab geometry
if bbb.mhdgeo == -1:
bbb.isphion = 0
bbb.isphiofft = 1


# templates/D_mols/inputs/fluxlimits/default.py
bbb.flalfe = 0.21 #electron parallel thermal conduct. grd.coeff
bbb.flalfi = 0.21 #ion parallel thermal conduct. grd.coeff
Expand All @@ -133,6 +153,7 @@
bbb.ishymol = 1
com.ngsp = 2
com.nhgsp = 2
setng=False
bbb.isngon[1] = 1
bbb.istgcon[1] = -1
bbb.istgcore[1] = 2
Expand All @@ -142,6 +163,7 @@
bbb.istgrb[1] = 0
bbb.tgwall[1] = 0.2


# templates/D_mols/inputs/radialtransport/default.py
bbb.difni[1] = 1. #D for radial hydrogen diffusion
bbb.kye = 1. #chi_e for radial elec energy diffusion
Expand Down
Binary file modified pytests/unittests/D_mols/nonog_mols/tg_mol/solution.h5
Binary file not shown.
46 changes: 35 additions & 11 deletions pytests/unittests/D_mols/nonog_mols/tg_mol_atoms/input.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@
except:
pass

setni = True
setup = True
setphi = True
setphiofft = True
setng = True
setupg = True
setti = True
sette = True
settg = True

bbb.mhdgeo = 1 #use MHD equilibrium
bbb.gengrid=0 #read mesh from gridue file
com.geometry = "snull"
Expand All @@ -33,6 +43,8 @@
bbb.travis[1] = 0. #shouldn't be used for neutrals - but to be sure


settg = False
bbb.istgon = 0 # Reset Tg equation
bbb.istgon[0] = 1 # Turn on D0 temperature equation
bbb.cftiexclg = 0. # Remove the Tg part in the Ti equation
bbb.cfdiss = 1.0
Expand Down Expand Up @@ -117,24 +129,34 @@
bbb.recycw[0:2] = [0.25, 0.95]

# templates/D_mols/inputs/equations/default.py
bbb.isnion = 1
bbb.isupon = 1
bbb.isteon = 1
bbb.istion = 1
bbb.isphion = 1
bbb.isphiofft = 0
bbb.istgon = 0
bbb.isngon = 0
bbb.isngon[0] = 0
bbb.isupgon = 0
bbb.isupgon[0] = 1
if setni:
bbb.isnion = 1
if setup:
bbb.isupon = 1
if sette:
bbb.isteon = 1
if setti:
bbb.istion = 1
if setphi:
bbb.isphion = 1
if setphiofft:
bbb.isphiofft = 0
if settg:
bbb.istgon = 0
if setng:
bbb.isngon = 0
bbb.isngon[0] = 0
if setupg:
bbb.isupgon = 0
bbb.isupgon[0] = 1


# Catch-all for turning off potential equaiton in slab geometry
if bbb.mhdgeo == -1:
bbb.isphion = 0
bbb.isphiofft = 1


# templates/D_mols/inputs/fluxlimits/default.py
bbb.flalfe = 0.21 #electron parallel thermal conduct. grd.coeff
bbb.flalfi = 0.21 #ion parallel thermal conduct. grd.coeff
Expand All @@ -150,6 +172,7 @@
bbb.ishymol = 1
com.ngsp = 2
com.nhgsp = 2
setng=False
bbb.isngon[1] = 1
bbb.istgcon[1] = -1
bbb.istgcore[1] = 2
Expand All @@ -159,6 +182,7 @@
bbb.istgrb[1] = 0
bbb.tgwall[1] = 0.2


# templates/D_mols/inputs/radialtransport/default.py
bbb.difni[1] = 1. #D for radial hydrogen diffusion
bbb.kye = 1. #chi_e for radial elec energy diffusion
Expand Down
Binary file modified pytests/unittests/D_mols/nonog_mols/tg_mol_atoms/solution.h5
Binary file not shown.
46 changes: 35 additions & 11 deletions pytests/unittests/D_mols/nonog_mols/tg_mol_atoms_drift/input.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@
except:
pass

setni = True
setup = True
setphi = True
setphiofft = True
setng = True
setupg = True
setti = True
sette = True
settg = True

bbb.mhdgeo = 1 #use MHD equilibrium
bbb.gengrid=0 #read mesh from gridue file
com.geometry = "snull"
Expand All @@ -33,6 +43,8 @@
bbb.travis[1] = 0. #shouldn't be used for neutrals - but to be sure


settg = False
bbb.istgon = 0 # Reset Tg equation
bbb.istgon[0] = 1 # Turn on D0 temperature equation
bbb.cftiexclg = 0. # Remove the Tg part in the Ti equation
bbb.cfdiss = 1.0
Expand Down Expand Up @@ -170,24 +182,34 @@


# templates/D_mols/inputs/equations/default.py
bbb.isnion = 1
bbb.isupon = 1
bbb.isteon = 1
bbb.istion = 1
bbb.isphion = 1
bbb.isphiofft = 0
bbb.istgon = 0
bbb.isngon = 0
bbb.isngon[0] = 0
bbb.isupgon = 0
bbb.isupgon[0] = 1
if setni:
bbb.isnion = 1
if setup:
bbb.isupon = 1
if sette:
bbb.isteon = 1
if setti:
bbb.istion = 1
if setphi:
bbb.isphion = 1
if setphiofft:
bbb.isphiofft = 0
if settg:
bbb.istgon = 0
if setng:
bbb.isngon = 0
bbb.isngon[0] = 0
if setupg:
bbb.isupgon = 0
bbb.isupgon[0] = 1


# Catch-all for turning off potential equaiton in slab geometry
if bbb.mhdgeo == -1:
bbb.isphion = 0
bbb.isphiofft = 1


# templates/D_mols/inputs/fluxlimits/default.py
bbb.flalfe = 0.21 #electron parallel thermal conduct. grd.coeff
bbb.flalfi = 0.21 #ion parallel thermal conduct. grd.coeff
Expand All @@ -203,6 +225,7 @@
bbb.ishymol = 1
com.ngsp = 2
com.nhgsp = 2
setng=False
bbb.isngon[1] = 1
bbb.istgcon[1] = -1
bbb.istgcore[1] = 2
Expand All @@ -212,6 +235,7 @@
bbb.istgrb[1] = 0
bbb.tgwall[1] = 0.2


# templates/D_mols/inputs/radialtransport/default.py
bbb.difni[1] = 1. #D for radial hydrogen diffusion
bbb.kye = 1. #chi_e for radial elec energy diffusion
Expand Down
Binary file not shown.
Loading

0 comments on commit 99b8d1b

Please sign in to comment.