GIT: resolved merge conflict

This commit is contained in:
andy
2012-08-21 18:17:27 +01:00
72 changed files with 1175 additions and 779 deletions

View File

@ -60,13 +60,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
rho0 1000;
T0 350;
Cp0 4100;

View File

@ -54,13 +54,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
rho0 1000;
T0 300;
Cp0 4187;

View File

@ -53,10 +53,6 @@ constantProperties
{
parcelTypeId 2;
rhoMin 1e-15;
TMin 200;
minParticleMass 1e-15;
rho0 2500;
T0 300;
Cp0 900;

View File

@ -45,11 +45,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
minParticleMass 1e-15;
rho0 964;
youngsModulus 6e8;
poissonsRatio 0.35;

View File

@ -37,11 +37,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
minParticleMass 1e-15;
rho0 964;
youngsModulus 6e8;
poissonsRatio 0.35;

View File

@ -54,13 +54,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
rho0 1000;
T0 300;
Cp0 4100;

View File

@ -54,13 +54,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
rho0 1000;
T0 350;
Cp0 4100;

View File

@ -54,13 +54,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
rho0 1000;
T0 350;
Cp0 4100;

View File

@ -53,13 +53,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
rho0 1000;
T0 300;
Cp0 4187;

View File

@ -53,13 +53,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
rho0 1000;
T0 300;
Cp0 4187;

View File

@ -53,13 +53,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
rho0 1000;
T0 300;
Cp0 4187;

View File

@ -54,13 +54,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
rho0 1000;
T0 300;
Cp0 4187;

View File

@ -54,16 +54,9 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
T0 320;
// place holders for rho0 and T0 - reset from liquid props using T0
// place holders for rho0 and Cp0 - reset from liquid props using T0
rho0 1000;
Cp0 4187;