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

Merge commit '60ad724c7a34fdd7a075e70da0e99a026d689bc2'

Browse Source
This commit is contained in:
Darth Vader 2021-09-08 14:36:16 +00:00
commit 005f962eec
6 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/phreeqcpp/Phreeqc.cpp
View File

@ -1654,7 +1654,8 @@ Phreeqc::InternalCopy(const Phreeqc* pSrc)
for (int i = 0; i < (int)pSrc->master_isotope.size(); i++) for (int i = 0; i < (int)pSrc->master_isotope.size(); i++)
{ {
class master_isotope* master_isotope_ptr = master_isotope_store(pSrc->master_isotope[i]->name, FALSE); class master_isotope* master_isotope_ptr = master_isotope_store(pSrc->master_isotope[i]->name, FALSE);
memcpy(master_isotope_ptr, pSrc->master_isotope[i], sizeof(class master_isotope)); // memcpy(master_isotope_ptr, pSrc->master_isotope[i], sizeof(class master_isotope));
*master_isotope_ptr = *pSrc->master_isotope[i];
master_isotope_ptr->name = string_hsave(pSrc->master_isotope[i]->name); master_isotope_ptr->name = string_hsave(pSrc->master_isotope[i]->name);
int n; int n;
master_isotope_ptr->master = NULL; master_isotope_ptr->master = NULL;

6
src/phreeqcpp/ReadClass.cxx
View File

@ -753,7 +753,8 @@ run_as_cells(void)
/* /*
* save data for saving solutions * save data for saving solutions
*/ */
memcpy(&save_data, &save, sizeof(class save)); // memcpy(&save_data, &save, sizeof(class save));
save_data = save;
/* /*
*Copy everything to -2 *Copy everything to -2
*/ */
@ -833,7 +834,8 @@ run_as_cells(void)
/* /*
* save end of reaction * save end of reaction
*/ */
memcpy(&save, &save_data, sizeof(class save)); // memcpy(&save, &save_data, sizeof(class save));
save = save_data;
if (use.Get_kinetics_in() == TRUE) if (use.Get_kinetics_in() == TRUE)
{ {
Utilities::Rxn_copy(Rxn_kinetics_map, -2, use.Get_n_kinetics_user()); Utilities::Rxn_copy(Rxn_kinetics_map, -2, use.Get_n_kinetics_user());

20
src/phreeqcpp/isotopes.cpp
View File

@ -517,8 +517,9 @@ calculate_isotope_moles(class element *elt_ptr,
master_isotope_ptr = master_isotope_search("H"); master_isotope_ptr = master_isotope_search("H");
if ((master_isotope_ptr != NULL) && (master_isotope_ptr->elt == elt_ptr)) if ((master_isotope_ptr != NULL) && (master_isotope_ptr->elt == elt_ptr))
{ {
memcpy(&(list[count_isotopes]), master_isotope_ptr, // memcpy(&(list[count_isotopes]), master_isotope_ptr,
sizeof(class master_isotope)); // sizeof(class master_isotope));
list[count_isotopes] = *master_isotope_ptr;
list[count_isotopes].ratio = 1.0; list[count_isotopes].ratio = 1.0;
if (list[count_isotopes].minor_isotope == FALSE) if (list[count_isotopes].minor_isotope == FALSE)
{ {
@ -529,8 +530,9 @@ calculate_isotope_moles(class element *elt_ptr,
master_isotope_ptr = master_isotope_search("O"); master_isotope_ptr = master_isotope_search("O");
if ((master_isotope_ptr != NULL) && (master_isotope_ptr->elt == elt_ptr)) if ((master_isotope_ptr != NULL) && (master_isotope_ptr->elt == elt_ptr))
{ {
memcpy(&(list[count_isotopes]), master_isotope_ptr, // memcpy(&(list[count_isotopes]), master_isotope_ptr,
sizeof(class master_isotope)); // sizeof(class master_isotope));
list[count_isotopes] = *master_isotope_ptr;
list[count_isotopes].ratio = 1.0; list[count_isotopes].ratio = 1.0;
if (list[count_isotopes].minor_isotope == FALSE) if (list[count_isotopes].minor_isotope == FALSE)
{ {
@ -548,8 +550,9 @@ calculate_isotope_moles(class element *elt_ptr,
continue; continue;
if (master_isotope_ptr->elt != elt_ptr) if (master_isotope_ptr->elt != elt_ptr)
continue; continue;
memcpy(&(list[count_isotopes]), master_isotope_ptr, // memcpy(&(list[count_isotopes]), master_isotope_ptr,
sizeof(class master_isotope)); // sizeof(class master_isotope));
list[count_isotopes] = *master_isotope_ptr;
if (list[count_isotopes].minor_isotope == FALSE) if (list[count_isotopes].minor_isotope == FALSE)
{ {
total_is_major = list[count_isotopes].total_is_major; total_is_major = list[count_isotopes].total_is_major;
@ -630,8 +633,9 @@ calculate_isotope_moles(class element *elt_ptr,
{ {
if (list[i].name == master_isotope[j]->name) if (list[i].name == master_isotope[j]->name)
{ {
memcpy(master_isotope[j], &(list[i]), // memcpy(master_isotope[j], &(list[i]),
sizeof(class master_isotope)); // sizeof(class master_isotope));
*master_isotope[j] = list[i];
} }
} }
} }

6
src/phreeqcpp/mainsubs.cpp
View File

@ -817,7 +817,8 @@ reactions(void)
/* /*
* save data for saving solutions * save data for saving solutions
*/ */
memcpy(&save_data, &save, sizeof(class save)); // memcpy(&save_data, &save, sizeof(class save));
save_data = save;
/* /*
*Copy everything to -2 *Copy everything to -2
*/ */
@ -880,7 +881,8 @@ reactions(void)
/* /*
* save end of reaction * save end of reaction
*/ */
memcpy(&save, &save_data, sizeof(class save)); // memcpy(&save, &save_data, sizeof(class save));
save = save_data;
if (use.Get_kinetics_in() == TRUE) if (use.Get_kinetics_in() == TRUE)
{ {
Utilities::Rxn_copy(Rxn_kinetics_map, -2, use.Get_n_kinetics_user()); Utilities::Rxn_copy(Rxn_kinetics_map, -2, use.Get_n_kinetics_user());

9
src/phreeqcpp/spread.cpp
View File

@ -91,8 +91,13 @@ read_solution_spread(void)
soln_defaults.iso.resize(count_iso_defaults); soln_defaults.iso.resize(count_iso_defaults);
/* all iso[i].name is hsave'd, so no conflicts */ /* all iso[i].name is hsave'd, so no conflicts */
memcpy(&soln_defaults.iso[0], iso_defaults, // memcpy(&soln_defaults.iso[0], iso_defaults,
soln_defaults.iso.size() * sizeof(class iso)); // soln_defaults.iso.size() * sizeof(class iso));
for (size_t i = 0; i < count_iso_defaults; ++i) {
soln_defaults.iso[i].name = iso_defaults[i].name;
soln_defaults.iso[i].value = iso_defaults[i].value;
soln_defaults.iso[i].uncertainty = iso_defaults[i].uncertainty;
}
heading = NULL; heading = NULL;
units = NULL; units = NULL;

9
src/phreeqcpp/transport.cpp
View File

@ -2054,7 +2054,8 @@ fill_spec(int l_cell_no, int ref_cell)
} }
for (; i1 < i2; i1++) // i1 is loop variable for (; i1 < i2; i1++) // i1 is loop variable
{ {
memmove(&sol_D[l_cell_no].spec[i1], &sol_D[ref_cell].spec[i1], sizeof(class spec)); // memmove(&sol_D[l_cell_no].spec[i1], &sol_D[ref_cell].spec[i1], sizeof(class spec));
sol_D[l_cell_no].spec[i1] = sol_D[ref_cell].spec[i1];
sol_D[l_cell_no].spec[i1].c = 0.0; sol_D[l_cell_no].spec[i1].c = 0.0;
sol_D[l_cell_no].spec[i1].a = 0.0; sol_D[l_cell_no].spec[i1].a = 0.0;
sol_D[l_cell_no].spec[i1].lm = min_dif_LM; sol_D[l_cell_no].spec[i1].lm = min_dif_LM;
@ -2130,7 +2131,8 @@ fill_spec(int l_cell_no, int ref_cell)
for (; i2 > i3; i2--) // i2 is loop variable for (; i2 > i3; i2--) // i2 is loop variable
sol_D[i1].spec[i2] = sol_D[i1].spec[i2 - 1]; sol_D[i1].spec[i2] = sol_D[i1].spec[i2 - 1];
memmove(&sol_D[i1].spec[i2], &sol_D[l_cell_no].spec[i2], sizeof(class spec)); // memmove(&sol_D[i1].spec[i2], &sol_D[l_cell_no].spec[i2], sizeof(class spec));
sol_D[i1].spec[i2] = sol_D[l_cell_no].spec[i2];
sol_D[i1].spec[i2].a = 0.0; sol_D[i1].spec[i2].a = 0.0;
sol_D[i1].spec[i2].lm = min_dif_LM; sol_D[i1].spec[i2].lm = min_dif_LM;
sol_D[i1].spec[i2].lg = -0.04; sol_D[i1].spec[i2].lg = -0.04;
@ -2157,7 +2159,8 @@ fill_spec(int l_cell_no, int ref_cell)
} }
for (i1 = count_spec; i1 < i3; i1++) for (i1 = count_spec; i1 < i3; i1++)
{ {
memmove(&sol_D[l_cell_no].spec[i1], &sol_D[ref_cell].spec[i1], sizeof(class spec)); // memmove(&sol_D[l_cell_no].spec[i1], &sol_D[ref_cell].spec[i1], sizeof(class spec));
sol_D[l_cell_no].spec[i1] = sol_D[ref_cell].spec[i1];
sol_D[l_cell_no].spec[i1].c = 0.0; sol_D[l_cell_no].spec[i1].c = 0.0;
sol_D[l_cell_no].spec[i1].a = 0.0; sol_D[l_cell_no].spec[i1].a = 0.0;
sol_D[l_cell_no].spec[i1].lm = min_dif_LM; sol_D[l_cell_no].spec[i1].lm = min_dif_LM;