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

Commented dead code related to density of water in Pitzer.

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9396 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2015-03-25 16:47:42 +00:00
parent 4d47ed13fc
commit a6d63e33b5
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Phreeqc.cpp
View File

@ -824,6 +824,7 @@ void Phreeqc::init(void)
x_arg_max = 0;
res_arg_max = 0;
scratch_max = 0;
#ifdef SKIP
/* dw.cpp ------------------------------- */
/* COMMON /QQQQ/ */
Q0 = 0;
@ -843,6 +844,7 @@ void Phreeqc::init(void)
B2T = 0;
B1TT = 0;
B2TT = 0;
#endif
/* gases.cpp ------------------------------- */
a_aa_sum = 0;
b2 = 0;

10
Phreeqc.h
View File

@ -252,7 +252,7 @@ public:
void fpunchf_user(int user_index, const char *format, double d);
void fpunchf_user(int user_index, const char *format, char * d);
int fpunchf_end_row(const char *format);
#ifdef SKIP
// dw.cpp -------------------------------
int BB(LDBLE T);
LDBLE PS(LDBLE T);
@ -260,7 +260,7 @@ public:
int DFIND(LDBLE * DOUT, LDBLE P, LDBLE D, LDBLE T);
int QQ(LDBLE T, LDBLE D);
LDBLE BASE(LDBLE D);
#endif
// input.cpp -------------------------------
int reading_database(void);
void set_reading_database(int reading_database);
@ -526,8 +526,10 @@ public:
int set_pz(int initial);
int calc_pitz_param(struct pitz_param *pz_ptr, LDBLE TK, LDBLE TR);
int check_gammas_pz(void);
#ifdef SKIP
LDBLE DC(LDBLE T);
int DW(LDBLE T);
#endif
int ISPEC(const char *name);
LDBLE G(LDBLE Y);
LDBLE GP(LDBLE Y);
@ -1721,7 +1723,7 @@ protected:
/* cl1.cpp ------------------------------- */
LDBLE *x_arg, *res_arg, *scratch;
int x_arg_max, res_arg_max, scratch_max;
#ifdef SKIP
/* dw.cpp ------------------------------- */
/* COMMON /QQQQ/ */
LDBLE Q0, Q5;
@ -1729,7 +1731,7 @@ protected:
LDBLE Z, DZ, Y;
LDBLE G1, G2, GF;
LDBLE B1, B2, B1T, B2T, B1TT, B2TT;
#endif
/* gases.cpp ------------------------------- */
LDBLE a_aa_sum, b2, b_sum, R_TK;

3
dw.cpp
View File

@ -1,6 +1,6 @@
#include "Phreeqc.h"
#ifdef SKIP
/* ---------------------------------------------------------------------- */
int Phreeqc::
DW(LDBLE T)
@ -412,3 +412,4 @@ C
B = U[7] + U[8] / T + U[9] * T;
return (D1000 + C * log((B + VP * 1.01325e0) / (B + 1000.0e0)));
}
#endif