User: knarf
Date: 2010/12/06 06:07 PM
Modified:
/TOVSolverHot/src/
tov.c
Log:
kill tabs and use spaces instead
File Changes:
Directory: /TOVSolverHot/src/
=============================
File [modified]: tov.c
Delta lines: +262 -262
===================================================================
--- TOVSolverHot/src/tov.c 2010-12-05 02:05:49 UTC (rev 30)
+++ TOVSolverHot/src/tov.c 2010-12-07 00:07:55 UTC (rev 31)
@@ -62,19 +62,19 @@
if (TOV_Solve_for_TOVs != 3)
{
- if (TOV_Solve_for_TOVs == 2)
- {
- CCTK_WARN(1, "TOV_Solve_for_TOVs is depreciated. "
+ if (TOV_Solve_for_TOVs == 2)
+ {
+ CCTK_WARN(1, "TOV_Solve_for_TOVs is depreciated. "
"Use TOV_Enforce_Interpolation=\"yes\" instead.\n");
- if (CCTK_ParameterSet("TOV_Enforce_Interpolation",
+ if (CCTK_ParameterSet("TOV_Enforce_Interpolation",
"TOVSolver",
"true"))
- CCTK_WARN(0, "Error while steering this parameter.\n");
- else
- CCTK_WARN(1, "Steered this parameter for now accordingly.\n");
- }
- else
- CCTK_WARN(1, "TOV_Solve_for_TOVs is depreciated. "
+ CCTK_WARN(0, "Error while steering this parameter.\n");
+ else
+ CCTK_WARN(1, "Steered this parameter for now accordingly.\n");
+ }
+ else
+ CCTK_WARN(1, "TOV_Solve_for_TOVs is depreciated. "
"Use TOV_Enforce_Interpolation instead.\n");
}
if (TOV_ProperPosition)
@@ -163,34 +163,34 @@
xent = nuc_eos_entropy;
xye = nuc_eos_ye;
if(nuc_eos_keytemp==2) {
- CCTK_WARN(0,"nuc_eos_keytemp=2 not yet handled");
+ CCTK_WARN(0,"nuc_eos_keytemp=2 not yet handled");
} else {
- keytemp = 1;
+ keytemp = 1;
}
} else {
keytemp = 0;
}
// guess for rho
rho = pow(press / 100.0, 1.0 / 2.0);
- EOS_Omni_RhoFromPressEpsTempEnt(eoskey,
- keytemp,
- TOVSolverHot_eos_rf_prec,
- n,
- &rho,
- &eps,
- &xtemp,
- &xent,
- &xye,
- &press,
- &keyerr,
- &anyerr);
+ EOS_Omni_RhoFromPressEpsTempEnt(eoskey,
+ keytemp,
+ TOVSolverHot_eos_rf_prec,
+ n,
+ &rho,
+ &eps,
+ &xtemp,
+ &xent,
+ &xye,
+ &press,
+ &keyerr,
+ &anyerr);
if(anyerr) {
CCTK_VInfo(CCTK_THORNSTRING, "EOS problem in TOV 1: %d %d",
- keyerr,anyerr);
+ keyerr,anyerr);
CCTK_VInfo(CCTK_THORNSTRING, "%15.6E %15.6E %15.6E %15.6E %15.6E",
- rho,eps,xtemp,xye,press);
+ rho,eps,xtemp,xye,press);
CCTK_WARN(0,"aborting");
}
@@ -324,7 +324,7 @@
/* set start values */
if(!use_EOS_Omni) {
TOV_press_1d[star_i] = TOV_K *
- pow(rho_central, TOV_Gamma);
+ pow(rho_central, TOV_Gamma);
} else {
// EOS_Omni code
CCTK_INT keytemp;
@@ -333,34 +333,34 @@
CCTK_INT n = 1;
CCTK_REAL xeps,xtemp,xye,xent;
if(eoskey==4) {
- xtemp = nuc_eos_temperature;
- xent = nuc_eos_entropy;
- xye = nuc_eos_ye;
- if(nuc_eos_keytemp==2) {
- CCTK_WARN(0,"nuc_eos_keytemp=2 not yet handled");
- } else {
- keytemp = 1;
- }
+ xtemp = nuc_eos_temperature;
+ xent = nuc_eos_entropy;
+ xye = nuc_eos_ye;
+ if(nuc_eos_keytemp==2) {
+ CCTK_WARN(0,"nuc_eos_keytemp=2 not yet handled");
+ } else {
+ keytemp = 1;
+ }
} else {
- keytemp = 0;
+ keytemp = 0;
}
- EOS_Omni_press(eoskey,
- keytemp,
- TOVSolverHot_eos_rf_prec,
- n,
- &rho_central,
- &xeps,
- &xtemp,
- &xye,
- &(TOV_press_1d[star_i]),
- &keyerr,
- &anyerr);
+ EOS_Omni_press(eoskey,
+ keytemp,
+ TOVSolverHot_eos_rf_prec,
+ n,
+ &rho_central,
+ &xeps,
+ &xtemp,
+ &xye,
+ &(TOV_press_1d[star_i]),
+ &keyerr,
+ &anyerr);
if(anyerr) {
- CCTK_VInfo(CCTK_THORNSTRING, "EOS problem in TOV 2: %d",
- keyerr);
- CCTK_VInfo(CCTK_THORNSTRING, "%15.6E %15.6E %15.6E %15.6E %15.6E",
- rho_central,eps,xtemp,xye,TOV_press_1d[star_i]);
- CCTK_WARN(0,"aborting");
+ CCTK_VInfo(CCTK_THORNSTRING, "EOS problem in TOV 2: %d",
+ keyerr);
+ CCTK_VInfo(CCTK_THORNSTRING, "%15.6E %15.6E %15.6E %15.6E %15.6E",
+ rho_central,eps,xtemp,xye,TOV_press_1d[star_i]);
+ CCTK_WARN(0,"aborting");
}
}
@@ -432,70 +432,70 @@
TOV_press_1d[i+1] = 0.0;
if(!use_EOS_Omni) {
- local_rho = pow(TOV_press_1d[i+1] / TOV_K, 1.0 / TOV_Gamma);
+ local_rho = pow(TOV_press_1d[i+1] / TOV_K, 1.0 / TOV_Gamma);
} else {
- // EOS_Omni code
- CCTK_INT keytemp;
- CCTK_INT keyerr = 0;
- CCTK_INT anyerr = 0;
- CCTK_INT n = 1;
- CCTK_REAL xeps,xtemp,xye,xent;
- if(eoskey==4) {
- xye = nuc_eos_ye;
- xtemp = nuc_eos_temperature;
- xent = nuc_eos_entropy;
- if(nuc_eos_keytemp==2) {
- CCTK_WARN(0,"nuc_eos_keytemp=2 not yet handled");
- } else {
- keytemp = 1;
- }
- } else {
- keytemp = 0;
- }
- local_rho = TOV_Rho_Central[0];
- EOS_Omni_RhoFromPressEpsTempEnt(eoskey,
- keytemp,
- TOVSolverHot_eos_rf_prec,
- n,
- &local_rho,
- &xeps,
- &xtemp,
- &xent,
- &xye,
- &(TOV_press_1d[i+1]),
- &keyerr,
- &anyerr);
+ // EOS_Omni code
+ CCTK_INT keytemp;
+ CCTK_INT keyerr = 0;
+ CCTK_INT anyerr = 0;
+ CCTK_INT n = 1;
+ CCTK_REAL xeps,xtemp,xye,xent;
+ if(eoskey==4) {
+ xye = nuc_eos_ye;
+ xtemp = nuc_eos_temperature;
+ xent = nuc_eos_entropy;
+ if(nuc_eos_keytemp==2) {
+ CCTK_WARN(0,"nuc_eos_keytemp=2 not yet handled");
+ } else {
+ keytemp = 1;
+ }
+ } else {
+ keytemp = 0;
+ }
+ local_rho = TOV_Rho_Central[0];
+ EOS_Omni_RhoFromPressEpsTempEnt(eoskey,
+ keytemp,
+ TOVSolverHot_eos_rf_prec,
+ n,
+ &local_rho,
+ &xeps,
+ &xtemp,
+ &xent,
+ &xye,
+ &(TOV_press_1d[i+1]),
+ &keyerr,
+ &anyerr);
- if(anyerr) {
- CCTK_VInfo(CCTK_THORNSTRING, "EOS problem in TOV 3: %d",
- keyerr);
- CCTK_VInfo(CCTK_THORNSTRING, "%15.6E %15.6E %15.6E %15.6E %15.6E",
- local_rho,xeps,xtemp,xye,TOV_press_1d[i+1]);
- CCTK_WARN(0,"aborting");
- }
- // CCTK_VInfo(CCTK_THORNSTRING, "%6d %15.6E %15.6E",
- // i,local_rho,TOV_rbar_1d[i]);
-
+ if(anyerr) {
+ CCTK_VInfo(CCTK_THORNSTRING, "EOS problem in TOV 3: %d",
+ keyerr);
+ CCTK_VInfo(CCTK_THORNSTRING, "%15.6E %15.6E %15.6E %15.6E %15.6E",
+ local_rho,xeps,xtemp,xye,TOV_press_1d[i+1]);
+ CCTK_WARN(0,"aborting");
+ }
+ // CCTK_VInfo(CCTK_THORNSTRING, "%6d %15.6E %15.6E",
+ // i,local_rho,TOV_rbar_1d[i]);
+
}
/* scan for the surface */
if(!(use_EOS_Omni && eoskey==4)) {
- if ( (local_rho <= 0.0) ||
- (TOV_press_1d[i+1] <= 0.0) )
- {
- TOV_Surface[star] = TOV_r_1d[i];
- TOV_R_Surface[star] = TOV_rbar_1d[i];
- TOV_RProp_Surface[star] = TOV_rprop_1d[i];
- TOV_Surface_Index = i;
- }
+ if ( (local_rho <= 0.0) ||
+ (TOV_press_1d[i+1] <= 0.0) )
+ {
+ TOV_Surface[star] = TOV_r_1d[i];
+ TOV_R_Surface[star] = TOV_rbar_1d[i];
+ TOV_RProp_Surface[star] = TOV_rprop_1d[i];
+ TOV_Surface_Index = i;
+ }
} else {
- if ( (local_rho <= nuc_eos_rho_min) )
- {
- TOV_Surface[star] = TOV_r_1d[i];
- TOV_R_Surface[star] = TOV_rbar_1d[i];
- TOV_RProp_Surface[star] = TOV_rprop_1d[i];
- TOV_Surface_Index = i;
- }
+ if ( (local_rho <= nuc_eos_rho_min) )
+ {
+ TOV_Surface[star] = TOV_r_1d[i];
+ TOV_R_Surface[star] = TOV_rbar_1d[i];
+ TOV_RProp_Surface[star] = TOV_rprop_1d[i];
+ TOV_Surface_Index = i;
+ }
}
}
if (TOV_Surface[star] < 0.0)
@@ -550,27 +550,27 @@
if(eoskey != 4 ) {
CCTK_VInfo("", "TOV radius mass bary_mass cent.rho rho(cgs)");
for (i=0; i<TOV_Num_TOVs; i++)
- CCTK_VInfo(""," %d %8g %8g %8g %8.3g %8g",
- i+1, TOV_R_Surface[i],
- TOV_m_1d[(i+1)*TOV_Num_Radial-1],
- TOV_mbary_1d[(i+1)*TOV_Num_Radial-1],
- TOV_Rho_Central[i],
- TOV_Rho_Central[i]/pow(CONSTANT_G_cgi,3.0)/
- pow(CONSTANT_Msolar_cgi,2.0)*
- pow(CONSTANT_c_cgi,6.0));
+ CCTK_VInfo(""," %d %8g %8g %8g %8.3g %8g",
+ i+1, TOV_R_Surface[i],
+ TOV_m_1d[(i+1)*TOV_Num_Radial-1],
+ TOV_mbary_1d[(i+1)*TOV_Num_Radial-1],
+ TOV_Rho_Central[i],
+ TOV_Rho_Central[i]/pow(CONSTANT_G_cgi,3.0)/
+ pow(CONSTANT_Msolar_cgi,2.0)*
+ pow(CONSTANT_c_cgi,6.0));
} else {
CCTK_VInfo(CCTK_THORNSTRING, "Made a hot polytrope: T = %5.2f MeV",
- nuc_eos_temperature);
+ nuc_eos_temperature);
CCTK_VInfo(CCTK_THORNSTRING, "TOV radius mass bary_mass cent.rho rho(cgs)");
for (i=0; i<TOV_Num_TOVs; i++)
- CCTK_VInfo(CCTK_THORNSTRING," %d %8g %8g %8g %8.3g %8g",
- i+1, TOV_R_Surface[i],
- TOV_m_1d[(i+1)*TOV_Num_Radial-1],
- TOV_mbary_1d[(i+1)*TOV_Num_Radial-1],
- TOV_Rho_Central[i],
- TOV_Rho_Central[i]/pow(CONSTANT_G_cgi,3.0)/
- pow(CONSTANT_Msolar_cgi,2.0)*
- pow(CONSTANT_c_cgi,6.0));
+ CCTK_VInfo(CCTK_THORNSTRING," %d %8g %8g %8g %8.3g %8g",
+ i+1, TOV_R_Surface[i],
+ TOV_m_1d[(i+1)*TOV_Num_Radial-1],
+ TOV_mbary_1d[(i+1)*TOV_Num_Radial-1],
+ TOV_Rho_Central[i],
+ TOV_Rho_Central[i]/pow(CONSTANT_G_cgi,3.0)/
+ pow(CONSTANT_Msolar_cgi,2.0)*
+ pow(CONSTANT_c_cgi,6.0));
}
}
@@ -627,14 +627,14 @@
*r=TOV_rbar_1d_local[1];
if (*r > TOV_rbar_1d_local[TOV_Num_Radial-2])
{
- {
- *press_point= 0.0;
- M = 0.5 * TOV_r_1d_local[TOV_Num_Radial-1] *
- (1.0 - exp(2.0*TOV_phi_1d_local[TOV_Num_Radial-1]));
- *r_point=(2* *r+M)*(2* *r+M)*0.25/ *r;
- *phi_point=0.5*log(1-2*M/ *r_point);
- return;
- }
+ {
+ *press_point= 0.0;
+ M = 0.5 * TOV_r_1d_local[TOV_Num_Radial-1] *
+ (1.0 - exp(2.0*TOV_phi_1d_local[TOV_Num_Radial-1]));
+ *r_point=(2* *r+M)*(2* *r+M)*0.25/ *r;
+ *phi_point=0.5*log(1-2*M/ *r_point);
+ return;
+ }
}
if (TOV_Fast_Interpolation)
@@ -827,128 +827,128 @@
/* is some perturbation wanted? */
if (Perturb[star] == 0)
- if(!use_EOS_Omni) {
- rho_point[star] = pow(press_point[star]/TOV_K,
- 1.0/TOV_Gamma);
- } else {
- // EOS_Omni code
- CCTK_INT keytemp;
- CCTK_INT keyerr = 0;
- CCTK_INT anyerr = 0;
- CCTK_INT n = 1;
- CCTK_REAL xeps,xtemp,xye,xent,xprs;
+ if(!use_EOS_Omni) {
+ rho_point[star] = pow(press_point[star]/TOV_K,
+ 1.0/TOV_Gamma);
+ } else {
+ // EOS_Omni code
+ CCTK_INT keytemp;
+ CCTK_INT keyerr = 0;
+ CCTK_INT anyerr = 0;
+ CCTK_INT n = 1;
+ CCTK_REAL xeps,xtemp,xye,xent,xprs;
- if(eoskey==4) {
- xtemp = nuc_eos_temperature;
- xent = nuc_eos_entropy;
- xye = nuc_eos_ye;
- if(nuc_eos_keytemp==2) {
- CCTK_WARN(0,"nuc_eos_keytemp=2 not yet handled");
- } else {
- keytemp = 1;
- }
- if(press_point[star] > 0.0e0) {
- // initial guess
- rho_point[star] = pow(press_point[star] / 100.0, 1.0 / 2.0);
- xprs = press_point[star];
- EOS_Omni_RhoFromPressEpsTempEnt(eoskey,
- keytemp,
- TOVSolverHot_eos_rf_prec,
- n,
- &(rho_point[star]),
- &(eps_point[star]),
- &xtemp,
- &xent,
- &xye,
- &(press_point[star]),
- &keyerr,
- &anyerr);
-
- if(anyerr) {
- CCTK_VInfo(CCTK_THORNSTRING, "EOS problem in TOV 4: %d",
- keyerr);
- CCTK_VInfo(CCTK_THORNSTRING, "%15.6E %15.6E %15.6E %15.6E %15.6E",
- rho_point[star],eps_point[star],xtemp,xye,xprs);
- CCTK_WARN(0,"aborting");
- }
- } else {
- rho_point[star] = nuc_eos_rho_min;
- keytemp = 1;
- EOS_Omni_press(eoskey,
- keytemp,
- TOVSolverHot_eos_rf_prec,
- n,
- &rho_point[star],
- &eps_point[star],
- &xtemp,
- &xye,
- &xprs,
- &keyerr,
- &anyerr);
- if(anyerr) {
- CCTK_VInfo(CCTK_THORNSTRING, "EOS problem in TOV 4a: %d",
- keyerr);
- CCTK_VInfo(CCTK_THORNSTRING, "%15.6E %15.6E %15.6E %15.6E %15.6E",
- rho_point[star],eps_point[star],xtemp,xye,press_point[star]);
- CCTK_WARN(0,"aborting");
- }
- }
- } else {
- keytemp = 0;
- // initial guess
- rho_point[star] = pow(press_point[star] / 100.0, 1.0 / 2.0);
- EOS_Omni_RhoFromPressEpsTempEnt(eoskey,
- keytemp,
- TOVSolverHot_eos_rf_prec,
- n,
- &(rho_point[star]),
- &(eps_point[star]),
- &xtemp,
- &xent,
- &xye,
- &(press_point[star]),
- &keyerr,
- &anyerr);
-
- if(anyerr) {
- CCTK_VInfo(CCTK_THORNSTRING, "EOS problem in TOV 4: %d",
- keyerr);
- CCTK_VInfo(CCTK_THORNSTRING, "%15.6E %15.6E %15.6E %15.6E %15.6E",
- rho_point[star],eps_point[star],xtemp,xye,press_point[star]);
- CCTK_WARN(0,"aborting");
- }
- }
+ if(eoskey==4) {
+ xtemp = nuc_eos_temperature;
+ xent = nuc_eos_entropy;
+ xye = nuc_eos_ye;
+ if(nuc_eos_keytemp==2) {
+ CCTK_WARN(0,"nuc_eos_keytemp=2 not yet handled");
+ } else {
+ keytemp = 1;
+ }
+ if(press_point[star] > 0.0e0) {
+ // initial guess
+ rho_point[star] = pow(press_point[star] / 100.0, 1.0 / 2.0);
+ xprs = press_point[star];
+ EOS_Omni_RhoFromPressEpsTempEnt(eoskey,
+ keytemp,
+ TOVSolverHot_eos_rf_prec,
+ n,
+ &(rho_point[star]),
+ &(eps_point[star]),
+ &xtemp,
+ &xent,
+ &xye,
+ &(press_point[star]),
+ &keyerr,
+ &anyerr);
+
+ if(anyerr) {
+ CCTK_VInfo(CCTK_THORNSTRING, "EOS problem in TOV 4: %d",
+ keyerr);
+ CCTK_VInfo(CCTK_THORNSTRING, "%15.6E %15.6E %15.6E %15.6E %15.6E",
+ rho_point[star],eps_point[star],xtemp,xye,xprs);
+ CCTK_WARN(0,"aborting");
+ }
+ } else {
+ rho_point[star] = nuc_eos_rho_min;
+ keytemp = 1;
+ EOS_Omni_press(eoskey,
+ keytemp,
+ TOVSolverHot_eos_rf_prec,
+ n,
+ &rho_point[star],
+ &eps_point[star],
+ &xtemp,
+ &xye,
+ &xprs,
+ &keyerr,
+ &anyerr);
+ if(anyerr) {
+ CCTK_VInfo(CCTK_THORNSTRING, "EOS problem in TOV 4a: %d",
+ keyerr);
+ CCTK_VInfo(CCTK_THORNSTRING, "%15.6E %15.6E %15.6E %15.6E %15.6E",
+ rho_point[star],eps_point[star],xtemp,xye,press_point[star]);
+ CCTK_WARN(0,"aborting");
+ }
+ }
+ } else {
+ keytemp = 0;
+ // initial guess
+ rho_point[star] = pow(press_point[star] / 100.0, 1.0 / 2.0);
+ EOS_Omni_RhoFromPressEpsTempEnt(eoskey,
+ keytemp,
+ TOVSolverHot_eos_rf_prec,
+ n,
+ &(rho_point[star]),
+ &(eps_point[star]),
+ &xtemp,
+ &xent,
+ &xye,
+ &(press_point[star]),
+ &keyerr,
+ &anyerr);
+
+ if(anyerr) {
+ CCTK_VInfo(CCTK_THORNSTRING, "EOS problem in TOV 4: %d",
+ keyerr);
+ CCTK_VInfo(CCTK_THORNSTRING, "%15.6E %15.6E %15.6E %15.6E %15.6E",
+ rho_point[star],eps_point[star],xtemp,xye,press_point[star]);
+ CCTK_WARN(0,"aborting");
+ }
+ }
- if(rho_point[star] > nuc_eos_rho_min) {
- temperature_point[star] = xtemp;
- entropy_point[star] = xent;
- ye_point[star] = xye;
- } else {
- temperature_point[star] = nuc_eos_temperature;
- entropy_point[star] = nuc_eos_entropy;
- ye_point[star] = nuc_eos_ye;
- }
- }
+ if(rho_point[star] > nuc_eos_rho_min) {
+ temperature_point[star] = xtemp;
+ entropy_point[star] = xent;
+ ye_point[star] = xye;
+ } else {
+ temperature_point[star] = nuc_eos_temperature;
+ entropy_point[star] = nuc_eos_entropy;
+ ye_point[star] = nuc_eos_ye;
+ }
+ }
else
- if(!use_EOS_Omni) {
- rho_point[star] = pow(press_point[star]/TOV_K,
- 1.0/TOV_Gamma) *
- (1.0 +
- Pert_Amplitude[star] *
- cos(PI/2.0 * r[i3D] / TOV_R_Surface[star]));
- } else {
- CCTK_WARN(0, "Perturbation handling not implemented for EOS_Omni");
- }
+ if(!use_EOS_Omni) {
+ rho_point[star] = pow(press_point[star]/TOV_K,
+ 1.0/TOV_Gamma) *
+ (1.0 +
+ Pert_Amplitude[star] *
+ cos(PI/2.0 * r[i3D] / TOV_R_Surface[star]));
+ } else {
+ CCTK_WARN(0, "Perturbation handling not implemented for EOS_Omni");
+ }
- if(!use_EOS_Omni) {
- if (rho_point[star] > local_tiny)
- eps_point[star] = press_point[star] / (TOV_Gamma - 1.0)
- / rho_point[star];
- else
- eps_point[star] = 0.0;
- } // eps already handled by EOS_Omni call above
+ if(!use_EOS_Omni) {
+ if (rho_point[star] > local_tiny)
+ eps_point[star] = press_point[star] / (TOV_Gamma - 1.0)
+ / rho_point[star];
+ else
+ eps_point[star] = 0.0;
+ } // eps already handled by EOS_Omni call above
mu_point[star] = rho_point[star] * (1.0 + eps_point[star]);
}
@@ -1071,12 +1071,12 @@
rho[i3D] = TOV_Atmosphere[star];
eps[i3D] = eps_point[star];
press[i3D] = press_point[star];
-
- if(eoskey==4) {
- temperature[i3D] = temperature_point[star];
- entropy[i3D] = entropy_point[star];
- Y_e[i3D] = ye_point[star];
- }
+
+ if(eoskey==4) {
+ temperature[i3D] = temperature_point[star];
+ entropy[i3D] = entropy_point[star];
+ Y_e[i3D] = ye_point[star];
+ }
}
else if (CCTK_EQUALS(TOV_Combine_Method, "average"))
{
@@ -1113,11 +1113,11 @@
eps[i3D] += eps_point[star_i];
press[i3D] += press_point[star_i];
- if(eoskey==4) {
- temperature[i3D] += temperature_point[star_i];
- entropy[i3D] += entropy_point[star_i];
- Y_e[i3D] += ye_point[star_i];
- }
+ if(eoskey==4) {
+ temperature[i3D] += temperature_point[star_i];
+ entropy[i3D] += entropy_point[star_i];
+ Y_e[i3D] += ye_point[star_i];
+ }
/* we still have to know if we are inside one star - and which */
if ( (rho_point[star_i] > max_rho) &&
@@ -1192,7 +1192,7 @@
dens[i3D];
if(eoskey==4) {
- Y_e_con[i3D] = Y_e[i3D] * dens[i3D];
+ Y_e_con[i3D] = Y_e[i3D] * dens[i3D];
}
