fix: Bug with AWG display and electron velocity

DanielRasho · Nov 9, 2023 · ea9a84b · ea9a84b
1 parent d95be9b
commit ea9a84b
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 19 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -16,7 +16,7 @@ import {
   diameterUnits
 } from './lib/WireMaterials'
 import { SimulationEngine } from './lib/SimulationEngine'
-import { AWG_TO_METERS } from './lib/Utils'
+import { AWGToMeters } from './lib/Utils'
 import NoneLogo from './assets/none.jpg'
 import AluminumLogo from './assets/aluminumLogo.png'
 import CopperLogo from './assets/copperLogo.png'
@@ -202,10 +202,10 @@ const flickWalkingSimulation = (value) => {
         }}{{ context.length.unit }}, Diameter:
         {{
           (context.diameter.unit === diameterUnits.AWG
-            ? context.diameter.value * AWG_TO_METERS
+            ? AWGToMeters(context.diameter.value)
             : context.diameter.value
           ).toExponential(3)
-        }}m
+        }}mm²
       </p>
       <simulation-display
         :sim-info="engine"

diff --git a/src/components/organisms/simulationDisplay.vue b/src/components/organisms/simulationDisplay.vue
@@ -1,12 +1,12 @@
 <template>
   <div>
     <svg class="oval" viewBox="0 0 30 90" width="8%" height="100%">
-  <ellipse cx="15" cy="45" rx="14" ry="63" stroke-width="1"/>
-  </svg>
+      <ellipse cx="15" cy="45" rx="14" ry="63" stroke-width="1" />
+    </svg>
     <canvas v-bind:id="ELEMENT_ID"></canvas>
     <svg class="oval" viewBox="0 0 30 90" width="8%" height="100%">
-  <ellipse cx="15" cy="45" rx="14" ry="63" stroke-width="1"/>
-  </svg>
+      <ellipse cx="15" cy="45" rx="14" ry="63" stroke-width="1" />
+    </svg>
   </div>
 </template>
 
@@ -23,7 +23,8 @@ import { WIRE_MATERIALS } from '../../lib/WireMaterials'
 
 const ELEMENT_ID = 'simulationContainer'
 const ELECTRON_RADIUS = 5
-const VELOCITY_FACTOR = 1e12
+const VELOCITY_FACTOR = 1e10
+const ELECTRON_COUNT_FACTOR = 1e-21
 
 const props = defineProps({
   simInfo: {
@@ -94,7 +95,7 @@ const setupMultipleElectronsSimulation = () => {
   const CANVAS_WIDTH = elem.clientWidth
   const CANVAS_HEIGHT = elem.clientHeight
 
-  const ELECTRONS_COUNT = props.simInfo.totalElectrons * 1e-28
+  const ELECTRONS_COUNT = props.simInfo.totalElectrons * ELECTRON_COUNT_FACTOR
   console.log('Electrons count', ELECTRONS_COUNT, props.simInfo.totalElectrons)
 
   let electrons = []
@@ -280,7 +281,6 @@ const setupInitialConditions = () => {
 </script>
 
 <style scoped>
-
 .oval {
   position: absolute;
   transform: translateX(-50%);
@@ -291,7 +291,7 @@ ellipse {
   stroke: white;
 }
 
-div{
+div {
   width: 100%;
   position: relative;
 }

diff --git a/src/lib/SimulationEngine.js b/src/lib/SimulationEngine.js
@@ -1,6 +1,6 @@
 import { SimulationContext } from './SimulationContext'
 import { WIRE_MATERIALS, diameterUnits } from './WireMaterials'
-import { AWG_TO_METERS, ELECTRON_CHARGE } from '../lib/Utils'
+import { ELECTRON_CHARGE, AWGToArea } from '../lib/Utils'
 
 export const SIMULATION_TYPES = {
   MULTIPLE_ELECTRONS: false,
@@ -52,7 +52,7 @@ export class SimulationEngine {
 
   calculateResistence(context) {
     let wireTransversalArea = this.calculateTransversalArea(context)
-    console.log(wireTransversalArea )
+    console.log(wireTransversalArea)
     return (
       (context.material.resistivity.value * context.length.value) /
       wireTransversalArea
@@ -90,17 +90,13 @@ export class SimulationEngine {
     const MILI_TO_METERS = 1 / 1000
     let wireUnit = context.diameter.unit
     let wireValue = context.diameter.value
-    console.log("Wire diameter" + wireValue);
+    console.log('Wire diameter' + wireValue)
     switch (wireUnit) {
       case diameterUnits.MILIMETERS:
         let diameter = wireValue * MILI_TO_METERS
         return (Math.PI * Math.pow(diameter, 2)) / 4
       case diameterUnits.AWG:
-        return (
-          0.012668 *
-          Math.pow(92, (36 - wireValue) / 19.5) *
-          Math(MILI_TO_METERS, 2)
-        )
+        return AWGToArea(wireValue)
     }
   }
 }
diff --git a/src/lib/Utils.js b/src/lib/Utils.js
@@ -42,3 +42,18 @@ export const getRandomElement = (list) =>
  */
 export const isInBetween = (n, min, max, exclusive = false) =>
   exclusive ? n > min && n < max : n >= min && n <= max
+
+/**
+ * Calculates the area that the given AWG measurement represents.
+ * @param {Number} awg The diameter of the cable in AWG
+ * @returns {Number} The AWG measurement in meters^2.
+ */
+export const AWGToArea = (awg) =>
+  0.012668 * Math.pow(92, (36 - awg) / 19.5) * Math.pow(1e-3, 2)
+
+/**
+ * Calculates the meters that the given AWG measurement represents.
+ * @param {Number} awg The diameter of the cable in AWG
+ * @returns {Number} The AWG measurement in meters.
+ */
+export const AWGToMeters = (awg) => 0.127 * Math.pow(92, (36 - awg) / 39) * 1e-3