re-indent so that gcc no longer complains about inconsistent indentation

This commit is contained in:
Axel Kohlmeyer 2017-09-05 16:41:19 -04:00
parent 45602e58f9
commit dec1d7b2dc
1 changed files with 90 additions and 90 deletions

View File

@ -628,99 +628,99 @@ void FixTTMMod::end_of_step()
T_electron[ixnode][iynode][iznode] = T_electron[ixnode][iynode][iznode] =
T_electron_first[ixnode][iynode][iznode]; T_electron_first[ixnode][iynode][iznode];
stability_criterion = 1.0 - stability_criterion = 1.0 -
2.0*inner_dt/el_specific_heat * 2.0*inner_dt/el_specific_heat *
(el_thermal_conductivity*(1.0/dx/dx + 1.0/dy/dy + 1.0/dz/dz));
if (stability_criterion < 0.0) {
inner_dt = 0.25*el_specific_heat /
(el_thermal_conductivity*(1.0/dx/dx + 1.0/dy/dy + 1.0/dz/dz)); (el_thermal_conductivity*(1.0/dx/dx + 1.0/dy/dy + 1.0/dz/dz));
if (stability_criterion < 0.0) { }
inner_dt = 0.25*el_specific_heat / num_inner_timesteps = static_cast<unsigned int>(update->dt/inner_dt) + 1;
(el_thermal_conductivity*(1.0/dx/dx + 1.0/dy/dy + 1.0/dz/dz)); inner_dt = update->dt/double(num_inner_timesteps);
} if (num_inner_timesteps > 1000000)
num_inner_timesteps = static_cast<unsigned int>(update->dt/inner_dt) + 1; error->warning(FLERR,"Too many inner timesteps in fix ttm/mod",0);
inner_dt = update->dt/double(num_inner_timesteps); for (int ith_inner_timestep = 0; ith_inner_timestep < num_inner_timesteps;
if (num_inner_timesteps > 1000000) ith_inner_timestep++) {
error->warning(FLERR,"Too many inner timesteps in fix ttm/mod",0); for (int ixnode = 0; ixnode < nxnodes; ixnode++)
for (int ith_inner_timestep = 0; ith_inner_timestep < num_inner_timesteps; for (int iynode = 0; iynode < nynodes; iynode++)
ith_inner_timestep++) { for (int iznode = 0; iznode < nznodes; iznode++)
for (int ixnode = 0; ixnode < nxnodes; ixnode++) T_electron_old[ixnode][iynode][iznode] =
for (int iynode = 0; iynode < nynodes; iynode++) T_electron[ixnode][iynode][iznode];
for (int iznode = 0; iznode < nznodes; iznode++) // compute new electron T profile
T_electron_old[ixnode][iynode][iznode] = duration = duration + inner_dt;
T_electron[ixnode][iynode][iznode]; for (int ixnode = 0; ixnode < nxnodes; ixnode++)
// compute new electron T profile for (int iynode = 0; iynode < nynodes; iynode++)
duration = duration + inner_dt; for (int iznode = 0; iznode < nznodes; iznode++) {
for (int ixnode = 0; ixnode < nxnodes; ixnode++) int right_xnode = ixnode + 1;
for (int iynode = 0; iynode < nynodes; iynode++) int right_ynode = iynode + 1;
for (int iznode = 0; iznode < nznodes; iznode++) { int right_znode = iznode + 1;
int right_xnode = ixnode + 1; if (right_xnode == nxnodes) right_xnode = 0;
int right_ynode = iynode + 1; if (right_ynode == nynodes) right_ynode = 0;
int right_znode = iznode + 1; if (right_znode == nznodes) right_znode = 0;
if (right_xnode == nxnodes) right_xnode = 0; int left_xnode = ixnode - 1;
if (right_ynode == nynodes) right_ynode = 0; int left_ynode = iynode - 1;
if (right_znode == nznodes) right_znode = 0; int left_znode = iznode - 1;
int left_xnode = ixnode - 1; if (left_xnode == -1) left_xnode = nxnodes - 1;
int left_ynode = iynode - 1; if (left_ynode == -1) left_ynode = nynodes - 1;
int left_znode = iznode - 1; if (left_znode == -1) left_znode = nznodes - 1;
if (left_xnode == -1) left_xnode = nxnodes - 1; double skin_layer_d = double(skin_layer);
if (left_ynode == -1) left_ynode = nynodes - 1; double ixnode_d = double(ixnode);
if (left_znode == -1) left_znode = nznodes - 1; double surface_d = double(t_surface_l);
double skin_layer_d = double(skin_layer); mult_factor = 0.0;
double ixnode_d = double(ixnode); if (duration < width){
double surface_d = double(t_surface_l); if (ixnode >= t_surface_l) mult_factor = (intensity/(dx*skin_layer_d))*exp((-1.0)*(ixnode_d - surface_d)/skin_layer_d);
mult_factor = 0.0;
if (duration < width){
if (ixnode >= t_surface_l) mult_factor = (intensity/(dx*skin_layer_d))*exp((-1.0)*(ixnode_d - surface_d)/skin_layer_d);
}
if (ixnode < t_surface_l) net_energy_transfer_all[ixnode][iynode][iznode] = 0.0;
double cr_vac = 1;
if (T_electron_old[ixnode][iynode][iznode] == 0) cr_vac = 0;
double cr_v_l_x = 1;
if (T_electron_old[left_xnode][iynode][iznode] == 0) cr_v_l_x = 0;
double cr_v_r_x = 1;
if (T_electron_old[right_xnode][iynode][iznode] == 0) cr_v_r_x = 0;
double cr_v_l_y = 1;
if (T_electron_old[ixnode][left_ynode][iznode] == 0) cr_v_l_y = 0;
double cr_v_r_y = 1;
if (T_electron_old[ixnode][right_ynode][iznode] == 0) cr_v_r_y = 0;
double cr_v_l_z = 1;
if (T_electron_old[ixnode][iynode][left_znode] == 0) cr_v_l_z = 0;
double cr_v_r_z = 1;
if (T_electron_old[ixnode][iynode][right_znode] == 0) cr_v_r_z = 0;
if (cr_vac != 0) {
T_electron[ixnode][iynode][iznode] =
T_electron_old[ixnode][iynode][iznode] +
inner_dt/el_properties(T_electron_old[ixnode][iynode][iznode]).el_heat_capacity *
((cr_v_r_x*el_properties(T_electron_old[ixnode][iynode][iznode]/2.0+T_electron_old[right_xnode][iynode][iznode]/2.0).el_thermal_conductivity*
(T_electron_old[right_xnode][iynode][iznode]-T_electron_old[ixnode][iynode][iznode])/dx -
cr_v_l_x*el_properties(T_electron_old[ixnode][iynode][iznode]/2.0+T_electron_old[left_xnode][iynode][iznode]/2.0).el_thermal_conductivity*
(T_electron_old[ixnode][iynode][iznode]-T_electron_old[left_xnode][iynode][iznode])/dx)/dx +
(cr_v_r_y*el_properties(T_electron_old[ixnode][iynode][iznode]/2.0+T_electron_old[ixnode][right_ynode][iznode]/2.0).el_thermal_conductivity*
(T_electron_old[ixnode][right_ynode][iznode]-T_electron_old[ixnode][iynode][iznode])/dy -
cr_v_l_y*el_properties(T_electron_old[ixnode][iynode][iznode]/2.0+T_electron_old[ixnode][left_ynode][iznode]/2.0).el_thermal_conductivity*
(T_electron_old[ixnode][iynode][iznode]-T_electron_old[ixnode][left_ynode][iznode])/dy)/dy +
(cr_v_r_z*el_properties(T_electron_old[ixnode][iynode][iznode]/2.0+T_electron_old[ixnode][iynode][right_znode]/2.0).el_thermal_conductivity*
(T_electron_old[ixnode][iynode][right_znode]-T_electron_old[ixnode][iynode][iznode])/dz -
cr_v_l_z*el_properties(T_electron_old[ixnode][iynode][iznode]/2.0+T_electron_old[ixnode][iynode][left_znode]/2.0).el_thermal_conductivity*
(T_electron_old[ixnode][iynode][iznode]-T_electron_old[ixnode][iynode][left_znode])/dz)/dz);
T_electron[ixnode][iynode][iznode]+=inner_dt/el_properties(T_electron[ixnode][iynode][iznode]).el_heat_capacity*
(mult_factor -
net_energy_transfer_all[ixnode][iynode][iznode]/del_vol);
}
else T_electron[ixnode][iynode][iznode] =
T_electron_old[ixnode][iynode][iznode];
if ((T_electron[ixnode][iynode][iznode] > 0.0) && (T_electron[ixnode][iynode][iznode] < electron_temperature_min))
T_electron[ixnode][iynode][iznode] = T_electron[ixnode][iynode][iznode] + 0.5*(electron_temperature_min - T_electron[ixnode][iynode][iznode]);
if (el_properties(T_electron[ixnode][iynode][iznode]).el_thermal_conductivity > el_thermal_conductivity)
el_thermal_conductivity = el_properties(T_electron[ixnode][iynode][iznode]).el_thermal_conductivity;
if ((T_electron[ixnode][iynode][iznode] > 0.0) && (el_properties(T_electron[ixnode][iynode][iznode]).el_heat_capacity < el_specific_heat))
el_specific_heat = el_properties(T_electron[ixnode][iynode][iznode]).el_heat_capacity;
} }
} if (ixnode < t_surface_l) net_energy_transfer_all[ixnode][iynode][iznode] = 0.0;
stability_criterion = 1.0 - double cr_vac = 1;
2.0*inner_dt/el_specific_heat * if (T_electron_old[ixnode][iynode][iznode] == 0) cr_vac = 0;
(el_thermal_conductivity*(1.0/dx/dx + 1.0/dy/dy + 1.0/dz/dz)); double cr_v_l_x = 1;
if (T_electron_old[left_xnode][iynode][iznode] == 0) cr_v_l_x = 0;
double cr_v_r_x = 1;
if (T_electron_old[right_xnode][iynode][iznode] == 0) cr_v_r_x = 0;
double cr_v_l_y = 1;
if (T_electron_old[ixnode][left_ynode][iznode] == 0) cr_v_l_y = 0;
double cr_v_r_y = 1;
if (T_electron_old[ixnode][right_ynode][iznode] == 0) cr_v_r_y = 0;
double cr_v_l_z = 1;
if (T_electron_old[ixnode][iynode][left_znode] == 0) cr_v_l_z = 0;
double cr_v_r_z = 1;
if (T_electron_old[ixnode][iynode][right_znode] == 0) cr_v_r_z = 0;
if (cr_vac != 0) {
T_electron[ixnode][iynode][iznode] =
T_electron_old[ixnode][iynode][iznode] +
inner_dt/el_properties(T_electron_old[ixnode][iynode][iznode]).el_heat_capacity *
((cr_v_r_x*el_properties(T_electron_old[ixnode][iynode][iznode]/2.0+T_electron_old[right_xnode][iynode][iznode]/2.0).el_thermal_conductivity*
(T_electron_old[right_xnode][iynode][iznode]-T_electron_old[ixnode][iynode][iznode])/dx -
cr_v_l_x*el_properties(T_electron_old[ixnode][iynode][iznode]/2.0+T_electron_old[left_xnode][iynode][iznode]/2.0).el_thermal_conductivity*
(T_electron_old[ixnode][iynode][iznode]-T_electron_old[left_xnode][iynode][iznode])/dx)/dx +
(cr_v_r_y*el_properties(T_electron_old[ixnode][iynode][iznode]/2.0+T_electron_old[ixnode][right_ynode][iznode]/2.0).el_thermal_conductivity*
(T_electron_old[ixnode][right_ynode][iznode]-T_electron_old[ixnode][iynode][iznode])/dy -
cr_v_l_y*el_properties(T_electron_old[ixnode][iynode][iznode]/2.0+T_electron_old[ixnode][left_ynode][iznode]/2.0).el_thermal_conductivity*
(T_electron_old[ixnode][iynode][iznode]-T_electron_old[ixnode][left_ynode][iznode])/dy)/dy +
(cr_v_r_z*el_properties(T_electron_old[ixnode][iynode][iznode]/2.0+T_electron_old[ixnode][iynode][right_znode]/2.0).el_thermal_conductivity*
(T_electron_old[ixnode][iynode][right_znode]-T_electron_old[ixnode][iynode][iznode])/dz -
cr_v_l_z*el_properties(T_electron_old[ixnode][iynode][iznode]/2.0+T_electron_old[ixnode][iynode][left_znode]/2.0).el_thermal_conductivity*
(T_electron_old[ixnode][iynode][iznode]-T_electron_old[ixnode][iynode][left_znode])/dz)/dz);
T_electron[ixnode][iynode][iznode]+=inner_dt/el_properties(T_electron[ixnode][iynode][iznode]).el_heat_capacity*
(mult_factor -
net_energy_transfer_all[ixnode][iynode][iznode]/del_vol);
}
else T_electron[ixnode][iynode][iznode] =
T_electron_old[ixnode][iynode][iznode];
if ((T_electron[ixnode][iynode][iznode] > 0.0) && (T_electron[ixnode][iynode][iznode] < electron_temperature_min))
T_electron[ixnode][iynode][iznode] = T_electron[ixnode][iynode][iznode] + 0.5*(electron_temperature_min - T_electron[ixnode][iynode][iznode]);
} while (stability_criterion < 0.0); if (el_properties(T_electron[ixnode][iynode][iznode]).el_thermal_conductivity > el_thermal_conductivity)
el_thermal_conductivity = el_properties(T_electron[ixnode][iynode][iznode]).el_thermal_conductivity;
if ((T_electron[ixnode][iynode][iznode] > 0.0) && (el_properties(T_electron[ixnode][iynode][iznode]).el_heat_capacity < el_specific_heat))
el_specific_heat = el_properties(T_electron[ixnode][iynode][iznode]).el_heat_capacity;
}
}
stability_criterion = 1.0 -
2.0*inner_dt/el_specific_heat *
(el_thermal_conductivity*(1.0/dx/dx + 1.0/dy/dy + 1.0/dz/dz));
} while (stability_criterion < 0.0);
// output nodal temperatures for current timestep // output nodal temperatures for current timestep
if ((nfileevery) && !(update->ntimestep % nfileevery)) { if ((nfileevery) && !(update->ntimestep % nfileevery)) {
// compute atomic Ta for each grid point // compute atomic Ta for each grid point