diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2013-05-04 15:58:57 (GMT) |
|---|---|---|
| committer | jacksonmj <mj-pt@jacksonmj.co.uk> | 2013-05-04 16:19:25 (GMT) |
| commit | 79a75c44414949d6ba87a8e2940b85b6342de70a (patch) | |
| tree | add015a8ef43adadbd7c784615025624f12c53de /src/simulation | |
| parent | f93a70edfb5f3091bbb7130ce8c5b439fe13ac30 (diff) | |
| download | powder-79a75c44414949d6ba87a8e2940b85b6342de70a.zip powder-79a75c44414949d6ba87a8e2940b85b6342de70a.tar.gz | |
Fix solidification temperature of molten TUGN
Previously it was 973 K, not the same as the melting point of TUGN
Diffstat (limited to 'src/simulation')
| -rw-r--r-- | src/simulation/Simulation.cpp | 3 | ||||
| -rw-r--r-- | src/simulation/elements/LAVA.cpp | 4 | ||||
| -rw-r--r-- | src/simulation/elements/TUGN.cpp | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index c738fce..499748d 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -4001,6 +4001,9 @@ void Simulation::update_particles_i(int start, int inc) if (parts[i].ctype>0 && parts[i].ctype<PT_NUM && parts[i].ctype!=PT_LAVA) { if (parts[i].ctype==PT_THRM&&pt>=elements[PT_BMTL].HighTemperature) s = 0; else if ((parts[i].ctype==PT_VIBR || parts[i].ctype==PT_BVBR) && pt>=273.15f) s = 0; + else if (parts[i].ctype==PT_TUGN) { + if (pt>3695.0) s = 0; + } else if (elements[parts[i].ctype].HighTemperatureTransition==PT_LAVA) { if (pt>=elements[parts[i].ctype].HighTemperature) s = 0; } diff --git a/src/simulation/elements/LAVA.cpp b/src/simulation/elements/LAVA.cpp index 062dcf8..b52c61e 100644 --- a/src/simulation/elements/LAVA.cpp +++ b/src/simulation/elements/LAVA.cpp @@ -37,7 +37,7 @@ Element_LAVA::Element_LAVA() LowPressureTransition = NT; HighPressure = IPH; HighPressureTransition = NT; - LowTemperature = 2573.15f; + LowTemperature = 3695.0f;// Highest temperature at which any type of lava can solidify LowTemperatureTransition = ST; HighTemperature = ITH; HighTemperatureTransition = NT; @@ -68,4 +68,4 @@ int Element_LAVA::graphics(GRAPHICS_FUNC_ARGS) } -Element_LAVA::~Element_LAVA() {}
\ No newline at end of file +Element_LAVA::~Element_LAVA() {} diff --git a/src/simulation/elements/TUGN.cpp b/src/simulation/elements/TUGN.cpp index 2c2c236..f70037b 100644 --- a/src/simulation/elements/TUGN.cpp +++ b/src/simulation/elements/TUGN.cpp @@ -40,7 +40,7 @@ Element_TUGN::Element_TUGN() HighPressureTransition = NT; LowTemperature = ITL; LowTemperatureTransition = NT; - HighTemperature = ITL; + HighTemperature = ITH; HighTemperatureTransition = NT; /*HighTemperature = 3895.0f; HighTemperatureTransition = PT_LAVA;*/ |