max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 16:44:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

more testing of copy operator.

Browse Source 
set new_def false for solid_solution mix.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7455 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2013-02-11 19:04:35 +00:00
parent 916ccdafa8
commit 85528955b4
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SSassemblage.cxx
View File

@ -49,6 +49,7 @@ cxxNumKeyword(io)
this->add(*entity_ptr, it->second);
}
}
this->new_def = false;
}
cxxSSassemblage::~cxxSSassemblage()
@ -116,7 +117,7 @@ cxxSSassemblage::dump_raw(std::ostream & s_oss, unsigned int indent, int *n_out)
s_oss << indent1 << "# SOLID_SOLUTION candidate identifiers with new_def=true #\n";
s_oss << indent1;
s_oss << "-new_def " << this->new_def << "\n";
s_oss << "-new_def " << (this->new_def ? 1 : 0) << "\n";
s_oss << indent1 << "# solid solution workspace variables #\n";
s_oss << indent1;

6
class_main.cpp
View File

@ -36,7 +36,7 @@ main(int argc, char *argv[])
tmpDbgFlag |= _CRTDBG_LEAK_CHECK_DF;
///tmpDbgFlag |= _CRTDBG_CHECK_ALWAYS_DF;
_CrtSetDbgFlag(tmpDbgFlag);
//_crtBreakAlloc = 9482;
//_crtBreakAlloc = 329203;
#endif
#ifdef SKIP
//Set the x86 floating-point control word according to what
@ -125,7 +125,9 @@ main_method(int argc, char *argv[])
}
Phreeqc MyCopy;
MyCopy = *this;
//this->clean_up();
this->clean_up();
this->init();
this->initialize();
/*
* Read input data for simulation
*/