Skip to content

Commit

Permalink
Corrected the output of fluid properties
Browse files Browse the repository at this point in the history
  • Loading branch information
wenqing committed Jun 20, 2017
1 parent 81397e4 commit 4c66d4b
Showing 1 changed file with 17 additions and 0 deletions.
17 changes: 17 additions & 0 deletions FEM/rf_mfp_new.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ CFluidProperties::CFluidProperties() : name("WATER")
beta_T = 0.0;
cmpN = 0;

fluid_id = 1; // Water

#ifdef MFP_TEST // WW
scatter_data = NULL;
#endif
Expand Down Expand Up @@ -170,6 +172,21 @@ std::ios::pos_type CFluidProperties::Read(std::ifstream* mfp_file)
{
in.str(GetLineFromFile1(mfp_file));
in >> name; // sub_line
switch (name[0])
{
case 'C': fluid_id = 0; break; // CARBON DIOXIDE
case 'W': fluid_id = 1; break; // WATER
case 'M': fluid_id = 2; break; // METHANE
case 'N': fluid_id = 3; break; // NITROGEN
case 'H': fluid_id = 4; break; // HYDROGEN
case 'O': fluid_id = 5; break; // OXYGEN
default:
{
std::cout << "Fluid type of " << name << " is not valid. Take the default type of WATER" << std::endl;
fluid_id = 1;
}
}

in.clear();
continue;
}
Expand Down

0 comments on commit 4c66d4b

Please sign in to comment.