Changeset 1741 for branches/newmole/source
- Timestamp:
- 01/12/08 13:18:02 (10 months ago)
- Location:
- branches/newmole/source
- Files:
-
- 45 modified
-
age_check.cpp (modified) (1 diff)
-
cddrive.cpp (modified) (10 diffs)
-
conv_base.cpp (modified) (7 diffs)
-
conv_init_solution.cpp (modified) (2 diffs)
-
conv_itercheck.cpp (modified) (2 diffs)
-
conv_temp_eden_ioniz.cpp (modified) (2 diffs)
-
cool_carb.cpp (modified) (5 diffs)
-
cool_eval.cpp (modified) (5 diffs)
-
cool_oxyg.cpp (modified) (1 diff)
-
dynamics.cpp (modified) (2 diffs)
-
grains.cpp (modified) (2 diffs)
-
heat_sum.cpp (modified) (4 diffs)
-
highen.cpp (modified) (1 diff)
-
ion_nitro.cpp (modified) (1 diff)
-
ion_oxyge.cpp (modified) (1 diff)
-
ion_silic.cpp (modified) (3 diffs)
-
ion_sulph.cpp (modified) (1 diff)
-
iso_level.cpp (modified) (1 diff)
-
iso_solve.cpp (modified) (1 diff)
-
iter_end_chk.cpp (modified) (3 diffs)
-
iter_startend.cpp (modified) (6 diffs)
-
molcol.cpp (modified) (3 diffs)
-
mole.h (modified) (2 diffs)
-
mole_co_atom.cpp (modified) (2 diffs)
-
mole_drive.cpp (modified) (32 diffs)
-
mole_eval_balance.cpp (modified) (6 diffs)
-
mole_h2.cpp (modified) (2 diffs)
-
mole_h2_io.cpp (modified) (5 diffs)
-
mole_newton_step.cpp (modified) (9 diffs)
-
mole_reactions.cpp (modified) (12 diffs)
-
mole_solve.cpp (modified) (4 diffs)
-
mole_species.cpp (modified) (12 diffs)
-
nemala2.cpp (modified) (2 diffs)
-
opacity_addtotal.cpp (modified) (5 diffs)
-
pressure_change.cpp (modified) (1 diff)
-
prt_comment.cpp (modified) (4 diffs)
-
prt_lines_molecules.cpp (modified) (1 diff)
-
prt_zone.cpp (modified) (5 diffs)
-
punch_do.cpp (modified) (8 diffs)
-
punch_linedata.cpp (modified) (2 diffs)
-
radius_increment.cpp (modified) (6 diffs)
-
radius_next.cpp (modified) (3 diffs)
-
rt_ots.cpp (modified) (1 diff)
-
rt_tau_inc.cpp (modified) (1 diff)
-
rt_tau_reset.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/newmole/source/age_check.cpp
r1739 r1741 110 110 tlong = MAX2( tlong , timesc.time_H2_Form_longest ); 111 111 112 if( findspecies("CO")->x MoleFracMax< 1e-2 )112 if( findspecies("CO")->xFracLim < 1e-2 ) 113 113 { 114 114 timesc.BigCOMoleForm *= -1.; -
branches/newmole/source/cddrive.cpp
r1739 r1741 708 708 else if( strcmp( chLABEL_CAPS , "CO " )==0 ) 709 709 { 710 *theocl = findspecies("CO")-> hevcol;710 *theocl = findspecies("CO")->column; 711 711 } 712 712 … … 714 714 else if( strcmp( chLABEL_CAPS , "OH " )==0 ) 715 715 { 716 *theocl = findspecies("OH")-> hevcol;716 *theocl = findspecies("OH")->column; 717 717 } 718 718 … … 720 720 else if( strcmp( chLABEL_CAPS , "H2O " )==0 ) 721 721 { 722 *theocl = findspecies("H2O")-> hevcol;722 *theocl = findspecies("H2O")->column; 723 723 } 724 724 … … 726 726 else if( strcmp( chLABEL_CAPS , "O2 " )==0 ) 727 727 { 728 *theocl = findspecies("O2")-> hevcol;728 *theocl = findspecies("O2")->column; 729 729 } 730 730 … … 732 732 else if( strcmp( chLABEL_CAPS , "SIO " )==0 ) 733 733 { 734 *theocl = findspecies("SiO")-> hevcol;734 *theocl = findspecies("SiO")->column; 735 735 } 736 736 … … 738 738 else if( strcmp( chLABEL_CAPS , "C2 " )==0 ) 739 739 { 740 *theocl = findspecies("C2")-> hevcol;740 *theocl = findspecies("C2")->column; 741 741 } 742 742 … … 744 744 else if( strcmp( chLABEL_CAPS , "C3 " )==0 ) 745 745 { 746 *theocl = findspecies("C3")-> hevcol;746 *theocl = findspecies("C3")->column; 747 747 } 748 748 … … 750 750 else if( strcmp( chLABEL_CAPS , "CN " )==0 ) 751 751 { 752 *theocl = findspecies("CN")-> hevcol;752 *theocl = findspecies("CN")->column; 753 753 } 754 754 … … 756 756 else if( strcmp( chLABEL_CAPS , "CH " )==0 ) 757 757 { 758 *theocl = findspecies("CH")-> hevcol;758 *theocl = findspecies("CH")->column; 759 759 } 760 760 … … 762 762 else if( strcmp( chLABEL_CAPS , "CH+ " )==0 ) 763 763 { 764 *theocl = findspecies("CH+")-> hevcol;764 *theocl = findspecies("CH+")->column; 765 765 } 766 766 -
branches/newmole/source/conv_base.cpp
r1740 r1741 230 230 for( i=0; i < mole.num_calc; i++ ) 231 231 { 232 mole_save[i] = (realnum) mole.list[i]-> hevmol;232 mole_save[i] = (realnum) mole.list[i]->den; 233 233 } 234 234 … … 430 430 431 431 /* do all hydrogenic species, and fully do hydrogen itself, including molecules */ 432 /*fprintf(ioQQQ,"DEBUG h2\t%.2f\t%.3e\t%.3e", fnzone,hmi.H2_total,findspecies("H2")-> hevmol);*/432 /*fprintf(ioQQQ,"DEBUG h2\t%.2f\t%.3e\t%.3e", fnzone,hmi.H2_total,findspecies("H2")->den);*/ 433 433 iso_solve( ipH_LIKE ); 434 434 … … 436 436 H2_LevelPops(); 437 437 438 /*fprintf(ioQQQ,"\t%.3e\n", findspecies("H2")-> hevmol);*/438 /*fprintf(ioQQQ,"\t%.3e\n", findspecies("H2")->den);*/ 439 439 440 440 /* evaluate Compton heating, bound E Compton, cosmic rays */ … … 542 542 IonOxyge();*/ 543 543 /* do carbon monoxide after oxygen */ 544 /*fprintf(ioQQQ,"DEBUG co\t%.2f\t%.3e", fnzone,findspecies("CO")-> hevmol);*/544 /*fprintf(ioQQQ,"DEBUG co\t%.2f\t%.3e", fnzone,findspecies("CO")->den);*/ 545 545 /*CO_drive();*/ 546 /*fprintf(ioQQQ,"\t%.3e\n", findspecies("CO")-> hevmol);*/546 /*fprintf(ioQQQ,"\t%.3e\n", findspecies("CO")->den);*/ 547 547 IonFluor(); 548 548 IonNeon(); … … 657 657 if( conv.nTotalIoniz ) 658 658 { 659 if( fabs( hminus_old-findspecies("H-")-> hevmol)/SDIV(findspecies("H-")->hevmol) >659 if( fabs( hminus_old-findspecies("H-")->den)/SDIV(findspecies("H-")->den) > 660 660 conv.EdenErrorAllowed/4. ) 661 661 conv.lgConvIoniz = false; 662 662 strcpy( conv.chConvIoniz, "Big H- chn" ); 663 663 conv.BadConvIoniz[0] = hminus_old; 664 conv.BadConvIoniz[1] = findspecies("H-")-> hevmol;665 } 666 hminus_old = findspecies("H-")-> hevmol;664 conv.BadConvIoniz[1] = findspecies("H-")->den; 665 } 666 hminus_old = findspecies("H-")->den; 667 667 # endif 668 668 … … 927 927 for( i=0; i < mole.num_calc; ++i ) 928 928 { 929 if( fabs(mole.list[i]-> hevmol-mole_save[i])/dense.gas_phase[ipHYDROGEN]-1. >929 if( fabs(mole.list[i]->den-mole_save[i])/dense.gas_phase[ipHYDROGEN]-1. > 930 930 conv.EdenErrorAllowed/2.) 931 931 { … … 933 933 sprintf( conv.chConvIoniz, "ch %-4.4s",mole.list[i]->label ); 934 934 conv.BadConvIoniz[0] = mole_save[i]/dense.gas_phase[ipHYDROGEN]; 935 conv.BadConvIoniz[1] = mole.list[i]-> hevmol/dense.gas_phase[ipHYDROGEN];935 conv.BadConvIoniz[1] = mole.list[i]->den/dense.gas_phase[ipHYDROGEN]; 936 936 } 937 937 } -
branches/newmole/source/conv_init_solution.cpp
r1740 r1741 134 134 if( dense.lgElmtOn[nelem] && mole.list[i]->location == NULL ) 135 135 { 136 realnum dens_elemsp = (realnum) mole.list[i]-> hevmol*mole.list[i]->nElem[nelem];136 realnum dens_elemsp = (realnum) mole.list[i]->den*mole.list[i]->nElem[nelem]; 137 137 if ( FracMoleMax*dense.gas_phase[nelem] < dens_elemsp ) 138 138 { … … 148 148 for(i=0;i<mole.num_calc;++i) 149 149 { 150 OxyInGrains += (1 - mole.list[i]->lgGas_Phase)*mole.list[i]-> hevmol*mole.list[i]->nElem[ipOXYGEN];150 OxyInGrains += (1 - mole.list[i]->lgGas_Phase)*mole.list[i]->den*mole.list[i]->nElem[ipOXYGEN]; 151 151 } 152 152 /* this is now fraction of O in ices */ -
branches/newmole/source/conv_itercheck.cpp
r1740 r1741 156 156 157 157 /* was the species abundance and changing? */ 158 differ = (double)fabs(mole.list[i]-> hevcol_old-mole.list[i]->hevcol) /159 (double)SDIV(mole.list[i]-> hevcol);160 if( (mole.list[i]-> hevcol/colden.colden[ipCOL_HTOT] > 1e-5) &&158 differ = (double)fabs(mole.list[i]->column_old-mole.list[i]->column) / 159 (double)SDIV(mole.list[i]->column); 160 if( (mole.list[i]->column/colden.colden[ipCOL_HTOT] > 1e-5) && 161 161 (differ > conv.autocv) ) 162 162 { … … 168 168 strcpy( conv.chNotConverged, "CO mol col" ); 169 169 /*fprintf(ioQQQ,"debugggreset\t CO mole %li %li %.2e %.2e\n", 170 i,iteration,mole.list[i]-> hevcol_old,mole.list[i]->hevcol);*/170 i,iteration,mole.list[i]->column_old,mole.list[i]->column);*/ 171 171 172 172 if( punch.lgPunConv ) 173 173 { 174 174 fprintf( punch.ipPunConv, "CO mol col, old:%.3e new:%.3e\n" , 175 mole.list[i]-> hevcol_old ,176 mole.list[i]-> hevcol);175 mole.list[i]->column_old , 176 mole.list[i]->column ); 177 177 } 178 178 } -
branches/newmole/source/conv_temp_eden_ioniz.cpp
r1739 r1741 184 184 * >>refer H2 temperature law Sternberg, A., & Neufeld, D.A. 1999, ApJ, 516, 371-380 */ 185 185 TeNew = thermal.T0SN99 / 186 /*(realnum)(1.f + 9.*pow(2.*findspecies("H2")-> hevmol/dense.gas_phase[ipHYDROGEN], 4.) );*/186 /*(realnum)(1.f + 9.*pow(2.*findspecies("H2")->den/dense.gas_phase[ipHYDROGEN], 4.) );*/ 187 187 (realnum)(1.f + 9.*pow(2.*hmi.H2_total/dense.gas_phase[ipHYDROGEN], 4.) ); 188 188 } … … 371 371 /* SIGN: sign of sec arg and abs val of first */ 372 372 /* >>chng 96 nov 08, from 0.1 to 0.08 in fneut */ 373 /*fneut = (dense.xIonDense[ipHYDROGEN][0] + 2.*findspecies("H2")-> hevmol)/dense.gas_phase[ipHYDROGEN];*/373 /*fneut = (dense.xIonDense[ipHYDROGEN][0] + 2.*findspecies("H2")->den)/dense.gas_phase[ipHYDROGEN];*/ 374 374 fneut = (dense.xIonDense[ipHYDROGEN][0] + 2.*hmi.H2_total)/dense.gas_phase[ipHYDROGEN]; 375 375 /*>>chng 04 jan 11, when big H2 is on and heating is important, -
branches/newmole/source/cool_carb.cpp
r1739 r1741 245 245 /** \todo 1 add neutral helium Staemmler, V., & Flower, D. R. 1991, J. Phys. B, 24, 2343 */ 246 246 /* assume CS for He^0 is the same as H^0*/ 247 /*cs01 = cse01 + 3.*(csh01*(dense.xIonDense[ipHYDROGEN][0]+dense.xIonDense[ipHELIUM][0]) + csh201*findspecies("H2")-> hevmol)/dense.cdsqte;248 cs12 = cse12 + 5.*(csh12*(dense.xIonDense[ipHYDROGEN][0]+dense.xIonDense[ipHELIUM][0]) + csh212*findspecies("H2")-> hevmol)/dense.cdsqte;249 cs02 = cse02 + 5.*(csh02*(dense.xIonDense[ipHYDROGEN][0]+dense.xIonDense[ipHELIUM][0]) + csh202*findspecies("H2")-> hevmol)/dense.cdsqte;*/247 /*cs01 = cse01 + 3.*(csh01*(dense.xIonDense[ipHYDROGEN][0]+dense.xIonDense[ipHELIUM][0]) + csh201*findspecies("H2")->den)/dense.cdsqte; 248 cs12 = cse12 + 5.*(csh12*(dense.xIonDense[ipHYDROGEN][0]+dense.xIonDense[ipHELIUM][0]) + csh212*findspecies("H2")->den)/dense.cdsqte; 249 cs02 = cse02 + 5.*(csh02*(dense.xIonDense[ipHYDROGEN][0]+dense.xIonDense[ipHELIUM][0]) + csh202*findspecies("H2")->den)/dense.cdsqte;*/ 250 250 cs01 = cse01 + 3.*(csh01*(dense.xIonDense[ipHYDROGEN][0]+dense.xIonDense[ipHELIUM][0]) + csp01*dense.xIonDense[ipHYDROGEN][1] + csh201*hmi.H2_total)/dense.cdsqte; 251 251 cs12 = cse12 + 5.*(csh12*(dense.xIonDense[ipHYDROGEN][0]+dense.xIonDense[ipHELIUM][0]) + csp12*dense.xIonDense[ipHYDROGEN][1] + csh212*hmi.H2_total)/dense.cdsqte; … … 379 379 /*cs = MIN2(2.20,0.403*phycon.te20/phycon.te02*phycon.te001*phycon.te001) + 380 380 5.8e-10*phycon.te02/dense.cdsqte*4.*(dense.xIonDense[ipHYDROGEN][0] + 381 findspecies("H2")-> hevmol);*/381 findspecies("H2")->den);*/ 382 382 /* electron collision strength */ 383 383 cse12 = MIN2(2.20,0.403*phycon.te20/phycon.te02*phycon.te001*phycon.te001); … … 386 386 /* >>referold c2 cs Tielens, A.G.G., & Hollenbach, D. 1985, ApJ, 291, 722 */ 387 387 /*cs_c2_h12 = 5.8e-10*phycon.te02/dense.cdsqte*4.*(dense.xIonDense[ipHYDROGEN][0] + 388 findspecies("H2")-> hevmol);*/388 findspecies("H2")->den);*/ 389 389 /* >> chng 05 may 21, GS, rate with hydrogen is updated from following */ 390 390 /* >>refer c2 cs Barinovs, G., van Hemert, M., Krems, R. & Dalgarno, A. 2005, ApJ, 620, 537 */ … … 402 402 403 403 /* now convert rate into equivalent cs */ 404 cs_c2_h12 *= 4.*(dense.xIonDense[ipHYDROGEN][0] + findspecies("H2")-> hevmol)/dense.cdsqte;404 cs_c2_h12 *= 4.*(dense.xIonDense[ipHYDROGEN][0] + findspecies("H2")->den)/dense.cdsqte; 405 405 406 406 /* >>chng 05 apr 10, make sure we have good current set of vars */ … … 441 441 csh12, 442 442 dense.eden, 443 (dense.xIonDense[ipHYDROGEN][0] + findspecies("H2")-> hevmol)/dense.cdsqte);443 (dense.xIonDense[ipHYDROGEN][0] + findspecies("H2")->den)/dense.cdsqte); 444 444 } 445 445 } -
branches/newmole/source/cool_eval.cpp
r1739 r1741 269 269 270 270 /* low density rotation cooling */ 271 /*&qn = pow(MAX2(findspecies("H2")-> hevmol,1e-37),0.77) + 1.2*pow(MAX2(dense.xIonDense[ipHYDROGEN][0],1e-37),0.77);*/271 /*&qn = pow(MAX2(findspecies("H2")->den,1e-37),0.77) + 1.2*pow(MAX2(dense.xIonDense[ipHYDROGEN][0],1e-37),0.77);*/ 272 272 qn = pow(MAX2(hmi.H2_total,1e-37),0.77) + 1.2*pow(MAX2(dense.xIonDense[ipHYDROGEN][0],1e-37),0.77); 273 273 /* these are equations 11 from LS83 */ … … 283 283 if( rotlow > 0. ) 284 284 { 285 /*CoolHeavy.h2line = findspecies("H2")-> hevmol*rothi/(1. + rothi/rotlow);*/285 /*CoolHeavy.h2line = findspecies("H2")->den*rothi/(1. + rothi/rotlow);*/ 286 286 CoolHeavy.h2line = hmi.H2_total*rothi/(1. + rothi/rotlow); 287 287 } … … 300 300 CoolHeavy.h2line, 301 301 hmi.H2_total, 302 findspecies("H-")-> hevmol,302 findspecies("H-")->den, 303 303 hmi.HMinus_photo_rate, 304 304 rothi, … … 310 310 * >>refer HD cooling Puy, D., Grenacher, L, & Jetzer, P., 1999, A&A, 345, 723 */ 311 311 factor = sexp(128.6/phycon.te); 312 /*CoolHeavy.HD = 2.66e-21 * hydro.D2H_ratio * POW2(findspecies("H2")-> hevmol) * phycon.sqrte *313 factor/(1416.+phycon.sqrte*findspecies("H2")-> hevmol* (1. + 3.*factor));*/312 /*CoolHeavy.HD = 2.66e-21 * hydro.D2H_ratio * POW2(findspecies("H2")->den) * phycon.sqrte * 313 factor/(1416.+phycon.sqrte*findspecies("H2")->den * (1. + 3.*factor));*/ 314 314 CoolHeavy.HD = 2.66e-21 * hydro.D2H_ratio * POW2(hmi.H2_total) * phycon.sqrte * 315 /*factor/(1416.+phycon.sqrte*findspecies("H2")-> hevmol* (1. + 3.*factor));*/315 /*factor/(1416.+phycon.sqrte*findspecies("H2")->den * (1. + 3.*factor));*/ 316 316 factor/(1416.+phycon.sqrte*hmi.H2_total * (1. + 3.*factor)); 317 317 } … … 352 352 hmi.H2_total , 353 353 CoolHeavy.h2line, 354 findspecies("H-")-> hevmol,354 findspecies("H-")->den , 355 355 dense.eden); 356 356 } -
branches/newmole/source/cool_oxyg.cpp
r1739 r1741 343 343 phycon.te70/phycon.te01)*dense.xIonDense[ipHYDROGEN][1]/dense.EdenHCorr; 344 344 345 /*cs01 = cse01+csp01+3.*(csh01*dense.xIonDense[ipHYDROGEN][0] + cshe01*dense.xIonDense[ipHELIUM][0] + csh201*findspecies("H2")-> hevmol)/345 /*cs01 = cse01+csp01+3.*(csh01*dense.xIonDense[ipHYDROGEN][0] + cshe01*dense.xIonDense[ipHELIUM][0] + csh201*findspecies("H2")->den)/ 346 346 dense.cdsqte; 347 cs12 = cse12+csp12+(csh12*dense.xIonDense[ipHYDROGEN][0] + cshe12*dense.xIonDense[ipHELIUM][0] + csh212*findspecies("H2")-> hevmol)/347 cs12 = cse12+csp12+(csh12*dense.xIonDense[ipHYDROGEN][0] + cshe12*dense.xIonDense[ipHELIUM][0] + csh212*findspecies("H2")->den)/ 348 348 dense.cdsqte; 349 cs02 = cse02+csp02+(csh02*dense.xIonDense[ipHYDROGEN][0] + cshe02*dense.xIonDense[ipHELIUM][0] + csh202*findspecies("H2")-> hevmol)/349 cs02 = cse02+csp02+(csh02*dense.xIonDense[ipHYDROGEN][0] + cshe02*dense.xIonDense[ipHELIUM][0] + csh202*findspecies("H2")->den)/ 350 350 dense.cdsqte;*/ 351 351 -
branches/newmole/source/dynamics.cpp
r1740 r1741 740 740 for(i=0;i<mole.num_calc;i++) 741 741 { 742 sumh += (realnum) mole.list[i]-> hevmol*mole.list[i]->nElem[nelem];742 sumh += (realnum) mole.list[i]->den*mole.list[i]->nElem[nelem]; 743 743 } 744 744 fprintf(ioQQQ, … … 2321 2321 Hep_mean , 2322 2322 /* ratio of CO to total H column densities */ 2323 findspecies("CO")-> hevcol/ SDIV( colden.colden[ipCOL_HTOT] ));2323 findspecies("CO")->column / SDIV( colden.colden[ipCOL_HTOT] )); 2324 2324 } 2325 2325 else -
branches/newmole/source/grains.cpp
r1739 r1741 4897 4897 /* molecular hydrogen onto grains */ 4898 4898 #ifndef IGNORE_GRAIN_ION_COLLISIONS 4899 /*CollisionRateMol = Accommodation*findspecies("H2")-> hevmol* */4899 /*CollisionRateMol = Accommodation*findspecies("H2")->den* */ 4900 4900 CollisionRateMol = Accommodation*hmi.H2_total* 4901 4901 sqrt(8.*BOLTZMANN/PI/ATOMIC_MASS_UNIT/WeightMol*phycon.te); … … 4918 4918 Accommodation = 2.*gv.bin[nd]->atomWeight*WeightMol/POW2(gv.bin[nd]->atomWeight+WeightMol); 4919 4919 #ifndef IGNORE_GRAIN_ION_COLLISIONS 4920 CollisionRateMol += Accommodation*findspecies("CO")-> hevmol*4920 CollisionRateMol += Accommodation*findspecies("CO")->den* 4921 4921 sqrt(8.*BOLTZMANN/PI/ATOMIC_MASS_UNIT/WeightMol*phycon.te); 4922 4922 #else -
branches/newmole/source/heat_sum.cpp
r1740 r1741 117 117 { 118 118 if(mole.list[i]->location == NULL) 119 AtomicCollidDensity += mole.list[i]-> hevmol;119 AtomicCollidDensity += mole.list[i]->den; 120 120 } 121 121 … … 268 268 * opacity_addtotal 269 269 */ 270 dense.xIonDense[ipOXYGEN][0] += (realnum) findspecies("CO")-> hevmol;271 dense.xIonDense[ipCARBON][0] += (realnum) findspecies("CO")-> hevmol;270 dense.xIonDense[ipOXYGEN][0] += (realnum) findspecies("CO")->den; 271 dense.xIonDense[ipCARBON][0] += (realnum) findspecies("CO")->den; 272 272 273 273 /* this will hold cooling due to metal collisional ionization */ … … 482 482 * assuming H0 rates */ 483 483 /*>>KEYWORD H2+ photoionization heating; H3+ photoionization heating */ 484 thermal.heating[0][26] = (findspecies("H2+")-> hevmol+findspecies("H3+")->hevmol) *484 thermal.heating[0][26] = (findspecies("H2+")->den+findspecies("H3+")->den) * 485 485 (ionbal.PhotoRate_Shell[ipHYDROGEN][0][0][1] + 486 486 ionbal.PhotoRate_Shell[ipHYDROGEN][0][0][2]*secondaries.heatef); … … 496 496 { 497 497 /* limit where most H is ionized - simply use atomic and H2 */ 498 hneut = dense.xIonDense[ipHYDROGEN][0] + 2.*(findspecies("H2")-> hevmol+findspecies("H2*")->hevmol);498 hneut = dense.xIonDense[ipHYDROGEN][0] + 2.*(findspecies("H2")->den+findspecies("H2*")->den); 499 499 } 500 500 else -
branches/newmole/source/highen.cpp
r1739 r1741 154 154 * term we actually want eden, so mult by eden over sum of neut */ 155 155 heat_cold_electrons = 5.5e-14/sqthot*CosRayDen* 156 /*dense.eden/(dense.xIonDense[ipHYDROGEN][0] + dense.xIonDense[ipHELIUM][0] + findspecies("H2")-> hevmol);*/156 /*dense.eden/(dense.xIonDense[ipHYDROGEN][0] + dense.xIonDense[ipHELIUM][0] + findspecies("H2")->den);*/ 157 157 dense.eden/(dense.xIonDense[ipHYDROGEN][0] + dense.xIonDense[ipHELIUM][0] + hmi.H2_total); 158 158 -
branches/newmole/source/ion_nitro.cpp
r1739 r1741 63 63 /*>>chng 04 apr 24, do not test for ionhigh being 1, 64 64 * no reason for test on upper stage of ionization, 65 * if codrive called but not evaluated then hevmolis all zero */65 * if codrive called but not evaluated then den is all zero */ 66 66 /* >>chng 04 sep 10, rm check on search phase, no reason for it */ 67 67 # if 0 68 68 if( dense.IonLow[ipNITROGEN]==0 && /*!conv.lgSearch &&*/ 69 co. hevmol[ipNP] > SMALLFLOAT &&70 ionbal.RateIonizTot[ipNITROGEN][0]*co. hevmol[ipATN]> 0. )69 co.den[ipNP] > SMALLFLOAT && 70 ionbal.RateIonizTot[ipNITROGEN][0]*co.den[ipATN]> 0. )