Changeset 291:bd90dccb5ad4

Timestamp:

Sep 14, 2011, 7:50:17 PM (13 years ago)

Author:

Evgeny Stambulchik <Evgeny.Stambulchik@…>

Branch:

default

Phase:

public

Message:

LymanA() gets Z_core parameter.

Location:

source/class/pf

Files:

• Plasma.js (modified) (2 diffs)
• base/Bohr.js (modified) (2 diffs)

source/class/pf/Plasma.js

@@ -53 +53 @@
             var Z_core = this.r.getQ() + 1;
             
-            return Math.pow(Z_core, 4)*
-              (pf.base.Bohr.LymanA(n_u) + pf.base.Bohr.LymanA(n_l));
+            return pf.base.Bohr.LymanA(Z_core, n_u) +
+                   pf.base.Bohr.LymanA(Z_core, n_l);
         },
         
@@ -278 +278 @@
             var level_pop = Math.exp(-photon_en/this.e.getT());
             
-            return level_pop*Math.pow(Z_core, 4)*pf.base.Bohr.LymanA(2)*
+            return level_pop*pf.base.Bohr.LymanA(Z_core, 2)*
                 photon_en*this.r.getN();
         },

source/class/pf/base/Bohr.js

@@ -74 +74 @@
 
         /* Einstein A coefficient of Lyman series of H */
-        LymanA : function(n)
+        LymanA : function(Z_core, n)
         {
             if (n <= 1) {
                 return 0;
             } else {
-                return Math.pow(this.alpha, 3)*
+                return Math.pow(Z_core, 4)*Math.pow(this.alpha, 3)*
                    128/9*n*Math.pow((n - 1)/(n + 1), 2*n)/((n*n - 1)*(n*n - 1));
             }
@@ -118 +118 @@
         oscillatorStrength : function(n_u, n_l)
         {
+            if (n_l >= n_u || n_l <= 1) {
+                return 0;
+            } else
             if (n_l == 1) {
                 return 256/3*Math.pow((n_u - 1)/(n_u + 1), 2*n_u)/