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

Renaming SSassemblageSS

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@6018 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2012-01-10 19:10:05 +00:00
parent 619e7824a6
commit f085546091
12 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Phreeqc.cpp
View File

@ -247,7 +247,7 @@ size_t Phreeqc::list_components(std::list<std::string> &list_c)
// solid-solutions
for (i = 0; i < count_s_s_assemblage; i++)
{
cxxSSassemblage entity(&s_s_assemblage[i]);
cxxSSassemblage entity(&ss_assemblage[i]);
entity.totalize(this);
accumulator.add_extensive(entity.Get_totals(), 1.0);
}
@ -406,7 +406,7 @@ void Phreeqc::init(void)
surface = 0;
//gas_phase = 0;
kinetics = 0;
s_s_assemblage = 0;
ss_assemblage = 0;
cell_data = 0;
elements = 0;
elt_list = 0;
@ -544,7 +544,7 @@ void Phreeqc::init(void)
*/
last_model.exchange = NULL;
last_model.gas_phase = NULL;
last_model.s_s_assemblage = NULL;
last_model.ss_assemblage = NULL;
last_model.kinetics = NULL;
last_model.pp_assemblage = NULL;
last_model.add_formula = NULL;
@ -601,7 +601,7 @@ void Phreeqc::init(void)
pr.initial_exchangers = TRUE;
pr.reactions = TRUE;
pr.gas_phase = TRUE;
pr.s_s_assemblage = TRUE;
pr.ss_assemblage = TRUE;
pr.pp_assemblage = TRUE;
pr.surface = TRUE;
pr.exchange = TRUE;

30
Phreeqc.h
View File

@ -132,7 +132,7 @@ public:
int system_total_solids(cxxExchange *exchange_ptr,
cxxPPassemblage *pp_assemblage_ptr,
cxxGasPhase *gas_phase_ptr,
struct s_s_assemblage *s_s_assemblage_ptr,
struct ss_assemblage *s_s_assemblage_ptr,
struct surface *surface_ptr);
static LDBLE f_rho(LDBLE rho_old, void *cookie);
@ -833,7 +833,7 @@ public:
// LDBLE step_fraction);
int add_reaction(cxxReaction *reaction_ptr, int step_number,
LDBLE step_fraction);
int add_s_s_assemblage(struct s_s_assemblage *s_s_assemblage_ptr);
int add_s_s_assemblage(struct ss_assemblage *s_s_assemblage_ptr);
int add_solution(struct solution *solution_ptr, LDBLE extensive,
LDBLE intensive);
int add_surface(struct surface *surface_ptr);
@ -845,7 +845,7 @@ public:
//int reaction_calc(struct irrev *irrev_ptr);
int reaction_calc(cxxReaction *reaction_ptr);
int solution_check(void);
int s_s_assemblage_check(struct s_s_assemblage *s_s_assemblage_ptr);
int s_s_assemblage_check(struct ss_assemblage *s_s_assemblage_ptr);
// structures.cpp -------------------------------
int clean_up(void);
@ -969,29 +969,29 @@ protected:
struct species *s_search(const char *name);
struct species *s_store(const char *name, LDBLE z, int replace_if_found);
public:
struct s_s_assemblage *s_s_assemblage_alloc(void);
struct s_s_assemblage *s_s_assemblage_bsearch(int k, int *n);
struct ss_assemblage *s_s_assemblage_alloc(void);
struct ss_assemblage *s_s_assemblage_bsearch(int k, int *n);
protected:
static int s_s_assemblage_compare(const void *ptr1, const void *ptr2);
public:
int s_s_assemblage_copy(struct s_s_assemblage *s_s_assemblage_old_ptr,
struct s_s_assemblage *s_s_assemblage_new_ptr,
int s_s_assemblage_copy(struct ss_assemblage *s_s_assemblage_old_ptr,
struct ss_assemblage *s_s_assemblage_new_ptr,
int n_user_new);
protected:
int s_s_assemblage_copy_to_last(int n, int n_user);
int s_s_assemblage_duplicate(int n_user_old, int n_user_new);
int s_s_assemblage_delete(int n_user_old);
public:
int s_s_assemblage_free(struct s_s_assemblage *s_s_assemblage_ptr);
int s_s_assemblage_free(struct ss_assemblage *s_s_assemblage_ptr);
protected:
int s_s_assemblage_init(struct s_s_assemblage *s_s_assemblage_ptr,
int s_s_assemblage_init(struct ss_assemblage *s_s_assemblage_ptr,
int n_user, int n_user_end, char *description);
int s_s_assemblage_ptr_to_user(struct s_s_assemblage *s_s_assemblage_ptr_old,
int s_s_assemblage_ptr_to_user(struct ss_assemblage *s_s_assemblage_ptr_old,
int n_user_new);
struct s_s_assemblage *s_s_assemblage_replicate(struct s_s_assemblage
struct ss_assemblage *s_s_assemblage_replicate(struct ss_assemblage
*s_s_assemblage_old_ptr,
int n_user_new);
struct s_s_assemblage *s_s_assemblage_search(int n_user, int *n);
struct ss_assemblage *s_s_assemblage_search(int n_user, int *n);
int s_s_assemblage_sort(void);
static int s_s_compare(const void *ptr1, const void *ptr2);
struct save_values *save_values_bsearch(struct save_values *k, int *n);
@ -1114,7 +1114,7 @@ public:
//struct irrev * cxxReaction2irrev(const cxxReaction * rxn);
struct solution * cxxSolution2solution(const cxxSolution * sol);
struct isotope * cxxSolutionIsotopeList2isotope(const cxxSolutionIsotopeList * il);
struct s_s_assemblage * cxxSSassemblage2s_s_assemblage(const cxxSSassemblage * ss);
struct ss_assemblage * cxxSSassemblage2s_s_assemblage(const cxxSSassemblage * ss);
struct s_s * cxxSSassemblageSS2s_s(const std::map < std::string, cxxSSassemblageSS > * sscomp);
struct surface * cxxSurface2surface(const cxxSurface * surf);
struct surface_comp * cxxSurfaceComp2surface_comp(const std::map < std::string, cxxSurfaceComp > * sc);
@ -1408,7 +1408,7 @@ protected:
int count_s_s_assemblage;
int max_s_s_assemblage;
struct s_s_assemblage *s_s_assemblage;
struct ss_assemblage *ss_assemblage;
/*----------------------------------------------------------------------
* Pure-phase assemblage
*---------------------------------------------------------------------- */
@ -1908,7 +1908,7 @@ public:
N_Vector kinetics_y, kinetics_abstol;
void *kinetics_cvode_mem;
//struct pp_assemblage *cvode_pp_assemblage_save;
struct s_s_assemblage *cvode_s_s_assemblage_save;
struct ss_assemblage *cvode_s_s_assemblage_save;
cxxPPassemblage *cvode_pp_assemblage_save;
LDBLE *m_original;
LDBLE *m_temp;

34
ReadClass.cxx
View File

@ -456,8 +456,8 @@ read_solid_solutions_raw(void)
cxxSSassemblage ex;
ex.read_raw(parser);
//struct s_s_assemblage *s_s_assemblage_ptr = ex.cxxSSassemblage2s_s_assemblage(PHREEQC_THIS);
struct s_s_assemblage *s_s_assemblage_ptr = cxxSSassemblage2s_s_assemblage(&ex);
//struct ss_assemblage *s_s_assemblage_ptr = ex.cxxSSassemblage2s_s_assemblage(PHREEQC_THIS);
struct ss_assemblage *s_s_assemblage_ptr = cxxSSassemblage2s_s_assemblage(&ex);
int n;
/*
@ -466,8 +466,8 @@ read_solid_solutions_raw(void)
if (s_s_assemblage_bsearch(s_s_assemblage_ptr->n_user, &n) != NULL)
{
s_s_assemblage_free(&s_s_assemblage[n]);
s_s_assemblage_copy(s_s_assemblage_ptr, &s_s_assemblage[n],
s_s_assemblage_free(&ss_assemblage[n]);
s_s_assemblage_copy(s_s_assemblage_ptr, &ss_assemblage[n],
s_s_assemblage_ptr->n_user);
}
else
@ -475,11 +475,11 @@ read_solid_solutions_raw(void)
n = count_s_s_assemblage++;
if (count_s_s_assemblage >= max_s_s_assemblage)
{
space((void **) ((void *) &(s_s_assemblage)),
space((void **) ((void *) &(ss_assemblage)),
count_s_s_assemblage, &max_s_s_assemblage,
sizeof(struct s_s_assemblage));
sizeof(struct ss_assemblage));
}
s_s_assemblage_copy(s_s_assemblage_ptr, &s_s_assemblage[n],
s_s_assemblage_copy(s_s_assemblage_ptr, &ss_assemblage[n],
s_s_assemblage_ptr->n_user);
s_s_assemblage_sort();
}
@ -986,16 +986,16 @@ read_solid_solutions_modify(void)
}
// read entity
cxxSSassemblage entity(&(s_s_assemblage[n]));
cxxSSassemblage entity(&(ss_assemblage[n]));
entity.read_raw(parser, false);
// save entity
//struct s_s_assemblage *entity_ptr = entity.cxxSSassemblage2s_s_assemblage(PHREEQC_THIS);
struct s_s_assemblage *entity_ptr = cxxSSassemblage2s_s_assemblage(&entity);
s_s_assemblage_free(&(s_s_assemblage[n]));
s_s_assemblage_copy(entity_ptr, &(s_s_assemblage[n]), entity_ptr->n_user);
free_check_null(s_s_assemblage[n].description);
s_s_assemblage[n].description = string_duplicate(entity_ptr->description);
//struct ss_assemblage *entity_ptr = entity.cxxSSassemblage2s_s_assemblage(PHREEQC_THIS);
struct ss_assemblage *entity_ptr = cxxSSassemblage2s_s_assemblage(&entity);
s_s_assemblage_free(&(ss_assemblage[n]));
s_s_assemblage_copy(entity_ptr, &(ss_assemblage[n]), entity_ptr->n_user);
free_check_null(ss_assemblage[n].description);
ss_assemblage[n].description = string_duplicate(entity_ptr->description);
s_s_assemblage_free(entity_ptr);
free_check_null(entity_ptr);
@ -1304,7 +1304,7 @@ delete_entities(void)
{
for (i = 0; i < count_s_s_assemblage; i++)
{
s_s_assemblage_delete(s_s_assemblage[i].n_user);
s_s_assemblage_delete(ss_assemblage[i].n_user);
}
}
else
@ -1780,7 +1780,7 @@ dump_ostream(std::ostream& os)
{
for (i = 0; i < count_s_s_assemblage; i++)
{
cxxSSassemblage cxxentity(&s_s_assemblage[i]);
cxxSSassemblage cxxentity(&ss_assemblage[i]);
cxxentity.dump_raw(os,0);
}
}
@ -1792,7 +1792,7 @@ dump_ostream(std::ostream& os)
if (s_s_assemblage_bsearch(*it, &n) != NULL)
{
cxxSSassemblage cxxentity(&s_s_assemblage[n]);
cxxSSassemblage cxxentity(&ss_assemblage[n]);
cxxentity.dump_raw(os,0);
}
}

0
SSassemblageSS.cxx → SS.cxx
View File

0
SSassemblageSS.h → SS.h
View File

2
SSassemblage.cxx
View File

@ -28,7 +28,7 @@ cxxSSassemblage::cxxSSassemblage(PHRQ_io * io)
{
}
cxxSSassemblage::cxxSSassemblage(struct s_s_assemblage * s_s_assemblage_ptr, PHRQ_io * io)
cxxSSassemblage::cxxSSassemblage(struct ss_assemblage * s_s_assemblage_ptr, PHRQ_io * io)
//
// constructor for cxxSSassemblage from struct SSassemblage
//

2
SSassemblage.h
View File

@ -22,7 +22,7 @@ class cxxSSassemblage:public cxxNumKeyword
public:
cxxSSassemblage(PHRQ_io * io = NULL);
cxxSSassemblage(struct s_s_assemblage *, PHRQ_io * io = NULL);
cxxSSassemblage(struct ss_assemblage *, PHRQ_io * io = NULL);
cxxSSassemblage(const std::map < int, cxxSSassemblage > &entity_map,
cxxMix & mx, int n_user, PHRQ_io * io = NULL);
~cxxSSassemblage();

12
Solution.cxx
View File

@ -1637,12 +1637,12 @@ cxxSolution::Update(const cxxNameDouble &nd)
// }
// for (i = 0; i < count_s_s_assemblage; i++)
// {
// if (s_s_assemblage[i].new_def != TRUE)
// if (ss_assemblage[i].new_def != TRUE)
// {
// std::cout << "Solid solution " << s_s_assemblage[i].
// std::cout << "Solid solution " << ss_assemblage[i].
// n_user << "\n";
// std::ostringstream oss;
// cxxSSassemblage ex(&(s_s_assemblage[i]));
// cxxSSassemblage ex(&(ss_assemblage[i]));
// ex.dump_raw(oss, 0);
// //std::cerr << oss.str();
//
@ -1659,10 +1659,10 @@ cxxSolution::Update(const cxxNameDouble &nd)
//
// ex1.read_raw(cparser);
//
// struct s_s_assemblage *s_s_assemblage_ptr =
// struct ss_assemblage *s_s_assemblage_ptr =
// ex1.cxxSSassemblage2s_s_assemblage();
// s_s_assemblage_free(&s_s_assemblage[i]);
// s_s_assemblage_copy(s_s_assemblage_ptr, &s_s_assemblage[i],
// s_s_assemblage_free(&ss_assemblage[i]);
// s_s_assemblage_copy(s_s_assemblage_ptr, &ss_assemblage[i],
// s_s_assemblage_ptr->n_user);
// s_s_assemblage_free(s_s_assemblage_ptr);
// free_check_null(s_s_assemblage_ptr);

16
StorageBin.cxx
View File

@ -799,10 +799,10 @@ cxxStorageBin::read_raw_keyword(CParser & parser)
// }
//
// // SSassemblages
// if (system_ptr->s_s_assemblage != NULL)
// if (system_ptr->ss_assemblage != NULL)
// {
// this->SSassemblages[system_ptr->s_s_assemblage->n_user] =
// cxxSSassemblage(system_ptr->s_s_assemblage);
// this->SSassemblages[system_ptr->ss_assemblage->n_user] =
// cxxSSassemblage(system_ptr->ss_assemblage);
// }
//
// // Surfaces
@ -1016,14 +1016,14 @@ cxxStorageBin::cxxStorageBin2system(PHREEQC_PTR_ARG_COMMA int n)
// SSassemblages
if (this->getSSassemblage(n) != NULL)
{
//system_ptr->s_s_assemblage =
//system_ptr->ss_assemblage =
// (this->getSSassemblage(n))->cxxSSassemblage2s_s_assemblage(P_INSTANCE);
system_ptr->s_s_assemblage =
system_ptr->ss_assemblage =
P_INSTANCE_POINTER cxxSSassemblage2s_s_assemblage((this->getSSassemblage(n)));
}
else
{
system_ptr->s_s_assemblage = NULL;
system_ptr->ss_assemblage = NULL;
}
// Surfaces
@ -1472,7 +1472,7 @@ cxxStorageBin::Set_System(struct Use *use_ptr)
this->system.Set_PPassemblage(&(it->second));
}
}
// s_s_assemblage
// ss_assemblage
if (use_ptr->s_s_assemblage_ptr != NULL)
{
std::map < int, cxxSSassemblage >::iterator it =
@ -1579,7 +1579,7 @@ cxxStorageBin::Set_System(int i)
this->system.Set_PPassemblage(&(it->second));
}
}
// s_s_assemblage
// ss_assemblage
{
std::map < int, cxxSSassemblage >::iterator it = this->SSassemblages.find(i);
if (it != this->SSassemblages.end())

8
StorageBinList.cpp
View File

@ -121,7 +121,7 @@ void StorageBinList::SetAll(bool tf)
this->pp_assemblage.Clear();
this->exchange.Clear();
this->surface.Clear();
this->s_s_assemblage.Clear();
this->ss_assemblage.Clear();
this->gas_phase.Clear();
this->kinetics.Clear();
this->mix.Clear();
@ -133,7 +133,7 @@ void StorageBinList::SetAll(bool tf)
this->pp_assemblage.Set_defined(tf);
this->exchange.Set_defined(tf);
this->surface.Set_defined(tf);
this->s_s_assemblage.Set_defined(tf);
this->ss_assemblage.Set_defined(tf);
this->gas_phase.Set_defined(tf);
this->kinetics.Set_defined(tf);
this->mix.Set_defined(tf);
@ -154,7 +154,7 @@ bool StorageBinList::Read(CParser & parser)
vopts.push_back("equilibrium_phases");
vopts.push_back("exchange");
vopts.push_back("surface");
vopts.push_back("s_s_assemblage");
vopts.push_back("ss_assemblage");
vopts.push_back("solid_solution");
vopts.push_back("solid_solutions");
vopts.push_back("gas_phase");
@ -323,7 +323,7 @@ void StorageBinList::TransferAll(StorageBinListItem &source)
this->pp_assemblage.Augment(*it);
this->exchange.Augment(*it);
this->surface.Augment(*it);
this->s_s_assemblage.Augment(*it);
this->ss_assemblage.Augment(*it);
this->gas_phase.Augment(*it);
this->kinetics.Augment(*it);
this->mix.Augment(*it);

4
StorageBinList.h
View File

@ -37,7 +37,7 @@ public:
StorageBinListItem & Get_pp_assemblage(void) { return(this->pp_assemblage); };
StorageBinListItem & Get_exchange(void) { return(this->exchange); };
StorageBinListItem & Get_surface(void) { return(this->surface); };
StorageBinListItem & Get_s_s_assemblage(void) { return(this->s_s_assemblage); };
StorageBinListItem & Get_s_s_assemblage(void) { return(this->ss_assemblage); };
StorageBinListItem & Get_gas_phase(void) { return(this->gas_phase); };
StorageBinListItem & Get_kinetics(void) { return(this->kinetics); };
StorageBinListItem & Get_mix(void) { return(this->mix); };
@ -49,7 +49,7 @@ protected:
StorageBinListItem pp_assemblage;
StorageBinListItem exchange;
StorageBinListItem surface;
StorageBinListItem s_s_assemblage;
StorageBinListItem ss_assemblage;
StorageBinListItem gas_phase;
StorageBinListItem kinetics;
StorageBinListItem mix;

2
dumper.cpp
View File

@ -50,7 +50,7 @@ bool dumper::Read(CParser & parser)
vopts.push_back("equilibrium_phases"); // 10
vopts.push_back("exchange");
vopts.push_back("surface");
vopts.push_back("s_s_assemblage");
vopts.push_back("ss_assemblage");
vopts.push_back("solid_solution");
vopts.push_back("solid_solutions"); // 15
vopts.push_back("gas_phase");