Implemented conductivity for CO2 from Scalabrin. All CO2 tests pass now.

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian Bell
2014-05-30 15:16:32 +02:00
parent 43255cfd5f
commit c63b0e95e2
9 changed files with 118 additions and 32 deletions

View File

@@ -64,6 +64,7 @@ struct ConductivityDiluteVariables
CONDUCTIVITY_DILUTE_ETA0_AND_POLY,
CONDUCTIVITY_DILUTE_CO2,
CONDUCTIVITY_DILUTE_ETHANE,
CONDUCTIVITY_DILUTE_NONE,
CONDUCTIVITY_DILUTE_NOT_SET
};
int type;
@@ -120,6 +121,7 @@ struct ConductivityCriticalVariables
CONDUCTIVITY_CRITICAL_R123,
CONDUCTIVITY_CRITICAL_AMMONIA,
CONDUCTIVITY_CRITICAL_NONE,
CONDUCTIVITY_CRITICAL_CARBONDIOXIDE_SCALABRIN_JPCRD_2006,
CONDUCTIVITY_CRITICAL_NOT_SET
};
int type;