From 9ae83c10a2346b3743a8ccbdd04735eb977fa4c8 Mon Sep 17 00:00:00 2001
From: Andreas Holm <60451789+holm10@users.noreply.github.com>
Date: Thu, 7 Nov 2024 07:57:21 -0800
Subject: [PATCH] Update templates to override subsequent equations by switch

---
 templates/D_only/header/default.py            | 10 ++++++
 templates/D_only/inputs/atoms/tg_atom.py      |  5 ++-
 .../D_only/inputs/atoms/tg_atom_cfdiss0p5.py  |  4 ++-
 .../inputs/atoms/tg_atom_cfnidhdis0p5.py      |  4 ++-
 .../inputs/atoms/tg_atom_cfnidhg20p5.py       |  4 ++-
 .../inputs/atoms/tg_atom_cfnidhgy0p5.py       |  4 ++-
 .../inputs/atoms/tg_atom_cfnidhmol0p5.py      |  4 ++-
 .../inputs/atoms/tg_atom_cftiexclg0p5.py      |  4 ++-
 .../D_only/inputs/atoms/tg_atom_drifts.py     |  4 ++-
 .../D_only/inputs/atoms/tg_atom_istgcore0.py  |  4 ++-
 .../D_only/inputs/atoms/tg_atom_istgcore1.py  |  4 ++-
 .../D_only/inputs/atoms/tg_atom_istgcore3.py  |  4 ++-
 .../D_only/inputs/atoms/tg_atom_istglb0.py    |  4 ++-
 .../D_only/inputs/atoms/tg_atom_istglb3.py    |  4 ++-
 .../D_only/inputs/atoms/tg_atom_istglb5.py    |  4 ++-
 .../D_only/inputs/atoms/tg_atom_istgpfc0.py   |  4 ++-
 .../D_only/inputs/atoms/tg_atom_istgpfc1.py   |  4 ++-
 .../D_only/inputs/atoms/tg_atom_istgpfc2.py   |  4 ++-
 .../D_only/inputs/atoms/tg_atom_istgpfc3.py   |  4 ++-
 .../D_only/inputs/atoms/tg_atom_istgpfc5.py   |  4 ++-
 .../D_only/inputs/atoms/tg_atom_istgrb0.py    |  4 ++-
 .../D_only/inputs/atoms/tg_atom_istgrb1.py    |  4 ++-
 .../D_only/inputs/atoms/tg_atom_istgrb3.py    |  4 ++-
 .../D_only/inputs/atoms/tg_atom_istgrb5.py    |  4 ++-
 .../D_only/inputs/atoms/tg_atom_istgwc0.py    |  4 ++-
 .../D_only/inputs/atoms/tg_atom_istgwc1.py    |  4 ++-
 .../D_only/inputs/atoms/tg_atom_istgwc2.py    |  4 ++-
 .../D_only/inputs/atoms/tg_atom_istgwc3.py    |  4 ++-
 .../D_only/inputs/atoms/tg_atom_istgwc5.py    |  4 ++-
 .../D_only/inputs/atoms/tg_atom_recyce1.py    |  4 ++-
 .../D_only/inputs/atoms/tg_atom_recycm0p1.py  |  4 ++-
 templates/D_only/inputs/equations/default.py  | 34 ++++++++++++-------
 32 files changed, 123 insertions(+), 42 deletions(-)

diff --git a/templates/D_only/header/default.py b/templates/D_only/header/default.py
index 31dee06f..d63df4c6 100644
--- a/templates/D_only/header/default.py
+++ b/templates/D_only/header/default.py
@@ -13,3 +13,13 @@
 except:
     pass
 
+setni = True
+setup = True
+setphi = True
+setphiofft = True
+setng = True
+setupg = True
+setti = True
+sette = True
+settg = True
+
diff --git a/templates/D_only/inputs/atoms/tg_atom.py b/templates/D_only/inputs/atoms/tg_atom.py
index 47a649d9..e0506c9a 100644
--- a/templates/D_only/inputs/atoms/tg_atom.py
+++ b/templates/D_only/inputs/atoms/tg_atom.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,5 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
+
diff --git a/templates/D_only/inputs/atoms/tg_atom_cfdiss0p5.py b/templates/D_only/inputs/atoms/tg_atom_cfdiss0p5.py
index 9c83901a..5eba2eda 100644
--- a/templates/D_only/inputs/atoms/tg_atom_cfdiss0p5.py
+++ b/templates/D_only/inputs/atoms/tg_atom_cfdiss0p5.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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 = 0.5
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_cfnidhdis0p5.py b/templates/D_only/inputs/atoms/tg_atom_cfnidhdis0p5.py
index 24caf31d..1c10a697 100644
--- a/templates/D_only/inputs/atoms/tg_atom_cfnidhdis0p5.py
+++ b/templates/D_only/inputs/atoms/tg_atom_cfnidhdis0p5.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_cfnidhg20p5.py b/templates/D_only/inputs/atoms/tg_atom_cfnidhg20p5.py
index 22387dc2..2ba17436 100644
--- a/templates/D_only/inputs/atoms/tg_atom_cfnidhg20p5.py
+++ b/templates/D_only/inputs/atoms/tg_atom_cfnidhg20p5.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_cfnidhgy0p5.py b/templates/D_only/inputs/atoms/tg_atom_cfnidhgy0p5.py
index 2a6b6ca4..e65e9328 100644
--- a/templates/D_only/inputs/atoms/tg_atom_cfnidhgy0p5.py
+++ b/templates/D_only/inputs/atoms/tg_atom_cfnidhgy0p5.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_cfnidhmol0p5.py b/templates/D_only/inputs/atoms/tg_atom_cfnidhmol0p5.py
index 998e338d..89a72a02 100644
--- a/templates/D_only/inputs/atoms/tg_atom_cfnidhmol0p5.py
+++ b/templates/D_only/inputs/atoms/tg_atom_cfnidhmol0p5.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 0.5 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_cftiexclg0p5.py b/templates/D_only/inputs/atoms/tg_atom_cftiexclg0p5.py
index e4e3a5ac..95986ef4 100644
--- a/templates/D_only/inputs/atoms/tg_atom_cftiexclg0p5.py
+++ b/templates/D_only/inputs/atoms/tg_atom_cftiexclg0p5.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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.5  # Remove the Tg part in the Ti equation
 bbb.cfdiss = 1.0
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_drifts.py b/templates/D_only/inputs/atoms/tg_atom_drifts.py
index 96458e9b..3551291a 100644
--- a/templates/D_only/inputs/atoms/tg_atom_drifts.py
+++ b/templates/D_only/inputs/atoms/tg_atom_drifts.py
@@ -6,6 +6,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
@@ -19,4 +21,4 @@
 bbb.cfnidhgy = 1.0
 bbb.cfnidhg2 = 1.0
 bbb.cfnidhdis = 1.0 #..consider drift heating for dissociation
-bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
\ No newline at end of file
+bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
diff --git a/templates/D_only/inputs/atoms/tg_atom_istgcore0.py b/templates/D_only/inputs/atoms/tg_atom_istgcore0.py
index d83bbdb6..96be12ad 100644
--- a/templates/D_only/inputs/atoms/tg_atom_istgcore0.py
+++ b/templates/D_only/inputs/atoms/tg_atom_istgcore0.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_istgcore1.py b/templates/D_only/inputs/atoms/tg_atom_istgcore1.py
index fc7c41f8..ebc7d013 100644
--- a/templates/D_only/inputs/atoms/tg_atom_istgcore1.py
+++ b/templates/D_only/inputs/atoms/tg_atom_istgcore1.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_istgcore3.py b/templates/D_only/inputs/atoms/tg_atom_istgcore3.py
index c32e0e09..b85e631a 100644
--- a/templates/D_only/inputs/atoms/tg_atom_istgcore3.py
+++ b/templates/D_only/inputs/atoms/tg_atom_istgcore3.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_istglb0.py b/templates/D_only/inputs/atoms/tg_atom_istglb0.py
index c4692874..02b611a1 100644
--- a/templates/D_only/inputs/atoms/tg_atom_istglb0.py
+++ b/templates/D_only/inputs/atoms/tg_atom_istglb0.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_istglb3.py b/templates/D_only/inputs/atoms/tg_atom_istglb3.py
index 74e889b5..a08ccd6c 100644
--- a/templates/D_only/inputs/atoms/tg_atom_istglb3.py
+++ b/templates/D_only/inputs/atoms/tg_atom_istglb3.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_istglb5.py b/templates/D_only/inputs/atoms/tg_atom_istglb5.py
index 1f70b509..b867dcc0 100644
--- a/templates/D_only/inputs/atoms/tg_atom_istglb5.py
+++ b/templates/D_only/inputs/atoms/tg_atom_istglb5.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_istgpfc0.py b/templates/D_only/inputs/atoms/tg_atom_istgpfc0.py
index 07b41247..61784aca 100644
--- a/templates/D_only/inputs/atoms/tg_atom_istgpfc0.py
+++ b/templates/D_only/inputs/atoms/tg_atom_istgpfc0.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_istgpfc1.py b/templates/D_only/inputs/atoms/tg_atom_istgpfc1.py
index 5c06d993..677ffcaf 100644
--- a/templates/D_only/inputs/atoms/tg_atom_istgpfc1.py
+++ b/templates/D_only/inputs/atoms/tg_atom_istgpfc1.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_istgpfc2.py b/templates/D_only/inputs/atoms/tg_atom_istgpfc2.py
index 6415689a..dc9f0c62 100644
--- a/templates/D_only/inputs/atoms/tg_atom_istgpfc2.py
+++ b/templates/D_only/inputs/atoms/tg_atom_istgpfc2.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_istgpfc3.py b/templates/D_only/inputs/atoms/tg_atom_istgpfc3.py
index 1019556b..ddd5b936 100644
--- a/templates/D_only/inputs/atoms/tg_atom_istgpfc3.py
+++ b/templates/D_only/inputs/atoms/tg_atom_istgpfc3.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_istgpfc5.py b/templates/D_only/inputs/atoms/tg_atom_istgpfc5.py
index ea9d74dd..fd34eeaa 100644
--- a/templates/D_only/inputs/atoms/tg_atom_istgpfc5.py
+++ b/templates/D_only/inputs/atoms/tg_atom_istgpfc5.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_istgrb0.py b/templates/D_only/inputs/atoms/tg_atom_istgrb0.py
index 3a13f714..1f6eaae5 100644
--- a/templates/D_only/inputs/atoms/tg_atom_istgrb0.py
+++ b/templates/D_only/inputs/atoms/tg_atom_istgrb0.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_istgrb1.py b/templates/D_only/inputs/atoms/tg_atom_istgrb1.py
index 2780c311..7c27df2f 100644
--- a/templates/D_only/inputs/atoms/tg_atom_istgrb1.py
+++ b/templates/D_only/inputs/atoms/tg_atom_istgrb1.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_istgrb3.py b/templates/D_only/inputs/atoms/tg_atom_istgrb3.py
index b7884b4b..7b9543b0 100644
--- a/templates/D_only/inputs/atoms/tg_atom_istgrb3.py
+++ b/templates/D_only/inputs/atoms/tg_atom_istgrb3.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_istgrb5.py b/templates/D_only/inputs/atoms/tg_atom_istgrb5.py
index 1af580c1..b8ce7c90 100644
--- a/templates/D_only/inputs/atoms/tg_atom_istgrb5.py
+++ b/templates/D_only/inputs/atoms/tg_atom_istgrb5.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_istgwc0.py b/templates/D_only/inputs/atoms/tg_atom_istgwc0.py
index e8e0de22..0b321141 100644
--- a/templates/D_only/inputs/atoms/tg_atom_istgwc0.py
+++ b/templates/D_only/inputs/atoms/tg_atom_istgwc0.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_istgwc1.py b/templates/D_only/inputs/atoms/tg_atom_istgwc1.py
index 4d45ce2e..ef3f6bdf 100644
--- a/templates/D_only/inputs/atoms/tg_atom_istgwc1.py
+++ b/templates/D_only/inputs/atoms/tg_atom_istgwc1.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_istgwc2.py b/templates/D_only/inputs/atoms/tg_atom_istgwc2.py
index 7436aafd..20288a12 100644
--- a/templates/D_only/inputs/atoms/tg_atom_istgwc2.py
+++ b/templates/D_only/inputs/atoms/tg_atom_istgwc2.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_istgwc3.py b/templates/D_only/inputs/atoms/tg_atom_istgwc3.py
index 5adec733..5a610512 100644
--- a/templates/D_only/inputs/atoms/tg_atom_istgwc3.py
+++ b/templates/D_only/inputs/atoms/tg_atom_istgwc3.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_istgwc5.py b/templates/D_only/inputs/atoms/tg_atom_istgwc5.py
index 95da07cf..b48d2a61 100644
--- a/templates/D_only/inputs/atoms/tg_atom_istgwc5.py
+++ b/templates/D_only/inputs/atoms/tg_atom_istgwc5.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_recyce1.py b/templates/D_only/inputs/atoms/tg_atom_recyce1.py
index 374b08ee..fed24807 100644
--- a/templates/D_only/inputs/atoms/tg_atom_recyce1.py
+++ b/templates/D_only/inputs/atoms/tg_atom_recyce1.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 1
-bbb.recycm = -0.9
\ No newline at end of file
+bbb.recycm = -0.9
diff --git a/templates/D_only/inputs/atoms/tg_atom_recycm0p1.py b/templates/D_only/inputs/atoms/tg_atom_recycm0p1.py
index bdc9cd1c..c1413c7f 100644
--- a/templates/D_only/inputs/atoms/tg_atom_recycm0p1.py
+++ b/templates/D_only/inputs/atoms/tg_atom_recycm0p1.py
@@ -5,6 +5,8 @@
 bbb.ziin[1]=0
 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
@@ -20,4 +22,4 @@
 bbb.cfnidhmol = 1.0 #..ignore molecular v in dissociation drift heating
 
 bbb.recyce = 0.3
-bbb.recycm = 0.1
\ No newline at end of file
+bbb.recycm = 0.1
diff --git a/templates/D_only/inputs/equations/default.py b/templates/D_only/inputs/equations/default.py
index 60c37c8e..89f3d987 100644
--- a/templates/D_only/inputs/equations/default.py
+++ b/templates/D_only/inputs/equations/default.py
@@ -1,17 +1,27 @@
-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
\ No newline at end of file
+	bbb.isphiofft = 1