updated equilibrate to use 2-character string rather than an integer.
This commit is contained in:
parent
7f6b32cb0b
commit
f50e48e54f
2 changed files with 16 additions and 16 deletions
|
|
@ -14,21 +14,21 @@ module cantera_thermo
|
|||
end type phase_t
|
||||
|
||||
! these definitions are for use with the equilibrate function.
|
||||
integer, parameter :: TV = 100
|
||||
integer, parameter :: HP = 101
|
||||
integer, parameter :: SP = 102
|
||||
integer, parameter :: PV = 103
|
||||
integer, parameter :: TP = 104
|
||||
integer, parameter :: UV = 105
|
||||
integer, parameter :: SV = 107
|
||||
! integer, parameter :: TV = 100
|
||||
! integer, parameter :: HP = 101
|
||||
! integer, parameter :: SP = 102
|
||||
! integer, parameter :: PV = 103
|
||||
! integer, parameter :: TP = 104
|
||||
! integer, parameter :: UV = 105
|
||||
! integer, parameter :: SV = 107
|
||||
|
||||
integer, parameter :: VT = -100
|
||||
integer, parameter :: PH = -101
|
||||
integer, parameter :: PS = -102
|
||||
integer, parameter :: VP = -103
|
||||
integer, parameter :: PT = -104
|
||||
integer, parameter :: VU = -105
|
||||
integer, parameter :: VS = -107
|
||||
! integer, parameter :: VT = -100
|
||||
! integer, parameter :: PH = -101
|
||||
! integer, parameter :: PS = -102
|
||||
! integer, parameter :: VP = -103
|
||||
! integer, parameter :: PT = -104
|
||||
! integer, parameter :: VU = -105
|
||||
! integer, parameter :: VS = -107
|
||||
|
||||
contains
|
||||
|
||||
|
|
@ -402,7 +402,7 @@ contains
|
|||
subroutine ctthermo_equilibrate(self, XY)
|
||||
implicit none
|
||||
type(phase_t), intent(inout) :: self
|
||||
integer, intent(in) :: XY
|
||||
character*(*), intent(in) :: XY
|
||||
self%err = th_equil(self%thermo_id, XY)
|
||||
end subroutine ctthermo_equilibrate
|
||||
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@ interface
|
|||
|
||||
integer function th_equil(n, XY)
|
||||
integer, intent(in) :: n
|
||||
integer, intent(in) :: XY
|
||||
character*(*), intent(in) :: XY
|
||||
end function th_equil
|
||||
|
||||
double precision function th_refpressure(n)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue