Changeset 1849 for branches/newmole/source/mole_drive.cpp

Timestamp:

03/15/08 13:48:18 (10 months ago)

Author:

rjrw

Message:

In most places, findrate is better than findrk as it has consistent
units and automatically includes factors of reactant density.

Files:

• branches/newmole/source/mole_drive.cpp (modified) (7 diffs)

branches/newmole/source/mole_drive.cpp

@@ -740 +740 @@
                         create_h3p = mole_findrate("H,H3+=>H2,H2+");
                         create_h3pe = mole_findrate("e-,H3+=>H2,H"); 
-                        create_grains = mole_findrk("H,H,grnh=>H2*")+mole_findrk("H,H,grnh=>H2");
+                        create_grains = mole_findrate("H,H,grnh=>H2*")+mole_findrate("H,H,grnh=>H2");
                         create_hminus = (mole_findrate("H,H-=>H2,e-")+mole_findrate("H,H-=>H2*,e-"));
 
@@ -760 +760 @@
                         /* >>chng 04 jan 28, had wrong Boltzmann factor,
                          * caught by gargi Shaw */
-                        destroy_hm = (mole_findrk("H2,e-=>H,H-")+mole_findrk("H2*,e-=>H,H-"))*findspecies("e-")->den;
+                        destroy_hm = (mole_findrate("H2,e-=>H,H-")+mole_findrate("H2*,e-=>H,H-"));
                         /*destroy_hm2 = eh2hhm;*/
-                        destroy_solomon = hmi.H2_Solomon_dissoc_rate_used_H2g;
-                        destroy_2h = (mole_findrk("H2,e-=>H,H,e-")+mole_findrk("H2*,e-=>H,H,e-"));
-                        destroy_hp = mole_findrk("H2,H+=>H3+")*findspecies("H+")->den;
-                        destroy_h = mole_findrk("H,H2=>H,H,H")*findspecies("H")->den;
-                        destroy_hp2 = mole_findrk("H2,H+=>H2+,H")*findspecies("H+")->den;
-                        destroy_h3p = mole_findrk("H2,H3+=>H2,H2+,H") * findspecies("H3+")->den;
+                        destroy_solomon = hmi.H2_Solomon_dissoc_rate_used_H2g * findspecies("H2")->den;
+                        destroy_2h = (mole_findrate("H2,e-=>H,H,e-")+mole_findrate("H2*,e-=>H,H,e-"));
+                        destroy_hp = mole_findrate("H2,H+=>H3+");
+                        destroy_h = mole_findrate("H,H2=>H,H,H");
+                        destroy_hp2 = mole_findrate("H2,H+=>H2+,H");
+                        destroy_h3p = mole_findrate("H2,H3+=>H2,H2+,H");
                         destroysum = destroy_hm + /*destroy_hm2 +*/ destroy_solomon + destroy_2h + 
                                 destroy_hp+ destroy_h+ destroy_hp2+ destroy_h3p;
@@ -796 +796 @@
                                 destsum , createsum;
 
-                        double sum_first_ions = 0.;
-                        long int nelem;
-
-                        for( nelem=ipHYDROGEN; nelem < LIMELM; nelem++ )
+                        create_from_Ho = mole_findrate("H,e-=>H-,PHOTON");
+                        create_3body_Ho = mole_findrate("H,e-,e-=>H-,e-");
+                        /* total formation is sum of g and s attachment */
+                        create_batach = (mole_findrate("H2,e-=>H,H-") + mole_findrate("H2*,e-=>H,H-"));
+                        destroy_photo = mole_findrate("H-,PHOTON=>H,e-");
+                        destroy_coll_heavies = 0.;
+                        for( i=ipLITHIUM; i < LIMELM; i++ )
                         {
-                                if (nelem != ipHYDROGEN && nelem != ipHELIUM)
-                                        sum_first_ions += mole.list[element_list[nelem]->ipMl[1]]->den;
-                        }
-
-                        create_from_Ho = mole_findrk("H,e-=>H-,PHOTON")*findspecies("e-")->den;
-                        create_3body_Ho = mole_findrk("H,e-,e-=>H-,e-")*findspecies("e-")->den*findspecies("e-")->den;
-                        /* total formation is sum of g and s attachment */
-                        create_batach = (mole_findrk("H2,e-=>H,H-") + mole_findrk("H2*,e-=>H,H-"))*findspecies("e-")->den;
-                        destroy_photo = hmi.HMinus_photo_rate;
-                        destroy_coll_heavies = mole_findrk("H-,Li+=>H,Li")*sum_first_ions;
-                        destroy_coll_electrons = mole_findrk("H-,e-=>H-,e-,e-")*findspecies("e-")->den;
-                        destroy_Hattach = mole.list[element_list[ipHYDROGEN]->ipMl[0]]->den*(mole_findrk("H,H-=>H2,e-")+mole_findrk("H,H-=>H2*,e-"));
-                        destroy_fhneut = mole_findrk("H-,H+=>H,H")*mole.list[element_list[ipHYDROGEN]->ipMl[1]]->den;
+                                char react[32];
+                                if (dense.lgElmtOn[i]) 
+                                {
+                                        sprintf(react,"H-,%s=>H,%s",mole.list[element_list[i]->ipMl[1]]->label,element_list[i]->label);
+                                        destroy_coll_heavies += mole_findrate(react);
+                                }
+                        }
+                        destroy_coll_electrons = mole_findrate("H-,e-=>H-,e-,e-");
+                        destroy_Hattach = (mole_findrate("H,H-=>H2,e-")+mole_findrate("H,H-=>H2*,e-"));
+                        destroy_fhneut = mole_findrate("H-,H+=>H,H");
 
                         destsum = destroy_photo + destroy_coll_heavies + destroy_coll_electrons + 
@@ -912 +912 @@
         {
 
-                double sum_first_ions = 0.;
-                long int nelem;
-
-                for( nelem=ipHYDROGEN; nelem < LIMELM; nelem++ )
-                {
-                        if (nelem != ipHYDROGEN && nelem != ipHELIUM)                           
-                                sum_first_ions += mole.list[element_list[nelem]->ipMl[1]]->den;
-                }
-
+                double destroy_coll_heavies = 0.;
+
+                for( i=ipLITHIUM; i < LIMELM; i++ )
+                {
+                        char react[32];
+                        if (dense.lgElmtOn[i]) 
+                        {
+                                sprintf(react,"H-,%s=>H,%s",mole.list[element_list[i]->ipMl[1]]->label,element_list[i]->label);
+                                destroy_coll_heavies += mole_findrate(react);
+                        }
+                }
                 fprintf( ioQQQ, " MOLE, Dep Coef, H-:%10.2e H2:%10.2e H2+:%10.2e\n", 
                   hmi.hmidep, hmi.h2dep, hmi.h2pdep );
                 fprintf( ioQQQ, "     H- creat: Rad atch%10.3e Induc%10.3e bHneut%10.2e 3bod%10.2e b=>H2%10.2e N(H-);%10.2e b(H-);%10.2e\n", 
-                                                 mole_findrate("H,e-=>H-,PHOTON"), hmi.HMinus_induc_rec_rate, mole_findrate("H,H=>H-,H+"), 
+                                                 mole_findrate("H,e-=>H-,PHOTON"), hmi.HMinus_induc_rec_rate*findspecies("H-")->den, mole_findrate("H,H=>H-,H+"), 
                                                  mole_findrate("H,e-,e-=>H-,e-"), 
                                                  mole_findrate("H2,e-=>H,H-"), findspecies("H-")->den, hmi.hmidep );
 
                 fprintf( ioQQQ, "     H- destr: Photo;%10.3e mut neut%10.2e e- coll ion%10.2e =>H2%10.2e x-ray%10.2e p+H-%10.2e\n", 
-                                                 hmi.HMinus_photo_rate, mole_findrk("H-,Li+=>H,Li")*sum_first_ions, 
-                                                 mole_findrk("H-,e-=>H-,e-,e-")*findspecies("e-")->den, 
-                                                 mole.list[element_list[ipHYDROGEN]->ipMl[0]]->den*(mole_findrk("H,H-=>H2,e-")+mole_findrk("H,H-=>H2*,e-")), iso.gamnc[ipH_LIKE][ipHYDROGEN][ipH1s], 
-                                                 mole.list[element_list[ipHYDROGEN]->ipMl[1]]->den*mole_findrk("H-,H+=>H,H") );
+                                                 mole_findrate("H-,PHOTON=>H,e-"), destroy_coll_heavies, 
+                                                 mole_findrate("H-,e-=>H-,e-,e-"), 
+                                                 (mole_findrate("H,H-=>H2,e-")+mole_findrate("H,H-=>H2*,e-")), iso.gamnc[ipH_LIKE][ipHYDROGEN][ipH1s]*findspecies("H-")->den, 
+                                                 mole_findrate("H-,H+=>H,H") );
                 fprintf( ioQQQ, "     H- heating:%10.3e Ind cooling%10.2e Spon cooling%10.2e\n", 
                                                  hmi.hmihet, hmi.HMinus_induc_rec_cooling, hmi.hmicol );
@@ -993 +995 @@
                         fprintf(ioQQQ," debuggggrn grn\t%.2f\t%.3e\t%.3e\tfrac\t%.3e\tH-\t%.3e\t%.3e\tfrac\t%.3e\t%.3e\t%.3e\t%.3e\n",
                                 fnzone ,
-                                mole_findrk("H,H,grnh=>H2*")+mole_findrk("H,H,grnh=>H2") , 
+                                mole_findrate("H,H,grnh=>H2*")+mole_findrate("H,H,grnh=>H2") , 
                                 hmi.H2_forms_grains+hmi.H2star_forms_grains ,
-                                                        mole_findrk("H,H,grnh=>H2*")/SDIV(mole_findrk("H,H,grnh=>H2*")+mole_findrk("H,H,grnh=>H2")),
+                                                        mole_findrate("H,H,grnh=>H2*")/SDIV(mole_findrate("H,H,grnh=>H2*")+mole_findrate("H,H,grnh=>H2")),
                                                         (mole_findrate("H,H-=>H2,e-")+mole_findrate("H,H-=>H2*,e-")),
                                 hmi.H2star_forms_hminus+hmi.H2_forms_hminus,
                                                         frac_H2star_hminus(),
-                                                        (mole_findrk("H,H-=>H2,e-")+mole_findrk("H,H-=>H2*,e-")),findspecies("H")->den,findspecies("H-")->den
+                                                        (mole_findrate("H,H-=>H2,e-")+mole_findrate("H,H-=>H2*,e-")),findspecies("H")->den,findspecies("H-")->den
                                 );
                 }
@@ -1020 +1022 @@
                                                         phycon.te, 
                                                         dense.eden,
-                                                        (mole_findrk("H,H-=>H2,e-")+mole_findrk("H,H-=>H2*,e-")),
-                                                        mole_findrk("H2,e-=>H,H-")*findspecies("e-")->den, 
-                                                        mole_findrk("H2*,e-=>H,H-")*findspecies("e-")->den, 
-                                                        mole_findrk("H,e-=>H-,PHOTON")*findspecies("e-")->den,
-                                                        hmi.HMinus_induc_rec_rate,
+                                                        (mole_findrate("H,H-=>H2,e-")+mole_findrate("H,H-=>H2*,e-")),
+                                                        mole_findrate("H2,e-=>H,H-"), 
+                                                        mole_findrate("H2*,e-=>H,H-"), 
+                                                        mole_findrate("H,e-=>H-,PHOTON"),
+                                                        hmi.HMinus_induc_rec_rate*findspecies("H-")->den,
                                                         mole.list[element_list[ipHYDROGEN]->ipMl[0]]->den,
                                                         mole.list[element_list[ipHYDROGEN]->ipMl[1]]->den,
@@ -1044 +1046 @@
                                                          hmi.H2_rate_destroy, 
                                                          hmi.H2_Solomon_dissoc_rate_used_H2g / hmi.H2_rate_destroy, 
-                                                         mole_findrk("H2,e-=>H,H-")*findspecies("e-")->den / hmi.H2_rate_destroy, 
-                                                         mole_findrk("H,H2=>H,H,H") / hmi.H2_rate_destroy, 
+                                                         mole_findrate("H2,e-=>H,H-") / (hmi.H2_total*hmi.H2_rate_destroy), 
+                                                         mole_findrate("H,H2=>H,H,H") / (hmi.H2_total*hmi.H2_rate_destroy), 
                                                          hmi.H2_photoionize_rate / hmi.H2_rate_destroy, 
-                                                         mole_findrk("H2,H+=>H2+,H") / hmi.H2_rate_destroy, 
-                                                         (mole_findrk("H2,e-=>H,H,e-")+mole_findrk("H2*,e-=>H,H,e-")) /hmi.H2_rate_destroy, 
-                                                         mole_findrk("H2,H+=>H3+") / hmi.H2_rate_destroy ,
+                                                         mole_findrate("H2,H+=>H2+,H") / (hmi.H2_total* hmi.H2_rate_destroy), 
+                                                         (mole_findrate("H2,e-=>H,H,e-")+mole_findrate("H2*,e-=>H,H,e-")) / (hmi.H2_total* hmi.H2_rate_destroy), 
+                                                         mole_findrate("H2,H+=>H3+") / (hmi.H2_total* hmi.H2_rate_destroy) ,
                                                          secondaries.csupra[ipHYDROGEN][0]*2.02 / hmi.H2_rate_destroy
                           );