matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better heat treatment.

Browse Source
This commit is contained in:
savask 2011-06-13 19:48:43 +07:00 committed by Simon Robertshaw
parent 464d36d910
commit 0fbc55dfe8
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/powder.c
View File

@ -1629,7 +1629,7 @@ void update_particles_i(pixel *vid, int start, int inc)
//heat transfer code //heat transfer code
h_count = 0; h_count = 0;
if (t&&(t!=PT_HSWC||parts[i].life==10)&&ptypes[t].hconduct>(rand()%250)) if (t&&(t!=PT_HSWC||parts[i].life==10)&&ptypes[t].hconduct)
{ {
if (aheat_enable) if (aheat_enable)
{ {
@ -1640,27 +1640,25 @@ void update_particles_i(pixel *vid, int start, int inc)
c_heat = 0.0f; c_heat = 0.0f;
for (j=0; j<8; j++) for (j=0; j<8; j++)
{ {
surround_hconduct[j] = i;
r = surround[j]; r = surround[j];
if ((r>>8)>=NPART || !r) if ((r>>8)>=NPART || !r)
continue; continue;
rt = r&0xFF; rt = r&0xFF;
if (rt&&ptypes[rt].hconduct&&(rt!=PT_HSWC||parts[r>>8].life==10) if ((parts[r>>8].temp < parts[i].temp)&&rt&&ptypes[rt].hconduct&&(rt!=PT_HSWC||parts[r>>8].life==10)
&&(t!=PT_FILT||(rt!=PT_BRAY&&rt!=PT_BIZR&&rt!=PT_BIZRG)) &&(t!=PT_FILT||(rt!=PT_BRAY&&rt!=PT_BIZR&&rt!=PT_BIZRG))
&&(rt!=PT_FILT||(t!=PT_BRAY&&t!=PT_PHOT&&t!=PT_BIZR&&t!=PT_BIZRG))) &&(rt!=PT_FILT||(t!=PT_BRAY&&t!=PT_PHOT&&t!=PT_BIZR&&t!=PT_BIZRG)))
{ {
surround_hconduct[j] = r>>8; float dq, dt;
c_heat += parts[r>>8].temp;
h_count++; dt = parts[i].temp - parts[r>>8].temp;
dq = 0.347*ptypes[t].weight*dt; //It's constant for now
parts[i].temp -= dq*ptypes[t].hconduct/(96.635*ptypes[t].weight);
parts[r>>8].temp += dq*ptypes[rt].hconduct/(96.635*ptypes[rt].weight);
} }
} }
pt = parts[i].temp = (c_heat+parts[i].temp)/(h_count+1); pt = parts[i].temp;
for (j=0; j<8; j++)
{
parts[surround_hconduct[j]].temp = pt;
}
ctemph = ctempl = pt; ctemph = ctempl = pt;
// change boiling point with pressure // change boiling point with pressure
if ((ptypes[t].state==ST_LIQUID && ptransitions[t].tht>-1 && ptransitions[t].tht<PT_NUM && ptypes[ptransitions[t].tht].state==ST_GAS) if ((ptypes[t].state==ST_LIQUID && ptransitions[t].tht>-1 && ptransitions[t].tht<PT_NUM && ptypes[ptransitions[t].tht].state==ST_GAS)