Merge pull request #3 from ukaea/dev-mijin-1.0.3.-hotfix

Fixed divide-by-zero bug in common_models.py
ukaea · Jul 27, 2023 · 97dd92c · 97dd92c
2 parents 9d92f5a + 3ac5538
commit 97dd92c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## v1.0.3, 2023-07-27
+
+- Minor bug fixes and code cleanup
+
+### Bug Fixes
+
+- Fixed divide-by-zero issue in common_models.py
+
 ## v1.0.2, 2023-06-28
 
 - Minor calculation tree improvements and bug fixes

diff --git a/RMK_support/common_models.py b/RMK_support/common_models.py
@@ -2511,12 +2511,12 @@ def dvEnergyTerm(
 
     vProfile = [1 / (v**2) for v in vGrid]
 
-    drag = vGrid**2 * dv
-    vSum = [
-        0 for i in range(len(drag))
-    ]  # vGrid**2 if exact energy source is required, 0 if exactly no particle source is required (either way the error is negligible)
-    vSum[:-1] = vGrid[1:] ** 2 - vGrid[:-1] ** 2
-    drag = drag / vSum
+    drag = dv * np.ones(len(vGrid))
+    vSum = np.zeros(
+        len(drag)
+    )  # ones if exact energy source is required, 0 if exactly no particle source is required (either way the error is negligible)
+    vSum[:-1] = vGrid[:-1] ** 2 / (vGrid[1:] ** 2 - vGrid[:-1] ** 2)
+    drag = drag * vSum
     normConst = sc.CustomNormConst(multConst=multConst)
 
     newTerm = sc.GeneralMatrixTerm(

diff --git a/examples/sk_comp_thesis_kin.py b/examples/sk_comp_thesis_kin.py
@@ -157,9 +157,9 @@ def generatorSKThesisKin(**kwargs) -> RKWrapper:
     elCondConst = 125*(1+433*sqrt2*ionZ/360)/(32*delta)
 
     #Taken from config after initialization
-    qNorm = 0.30049520576485995E+8
+    qNorm = skNorms["heatFlux"]
 
-    normalizationConst = rk.normalization["eVTemperature"]**3.5/(lengthNorm*qNorm)
+    normalizationConst = tempNorm**3.5/(lengthNorm*qNorm)
     kappaDeriv = sc.simpleDerivation(-elCondConst*nConstGradT*normalizationConst, [2.5,-1.0])
     rk.addCustomDerivation("kappa", kappaDeriv)
 

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name="RMK_support",
-    version="1.0.2",
+    version="1.0.3",
     packages=["RMK_support"],
     install_requires=[
         "numpy",