Skip to content

Saturation fallback #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vegardjervell wants to merge 8 commits into
base: main
Choose a base branch
from
+515 −44
Open

Saturation fallback #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c852f12
Make safe tp-flash return while signalling error instead of terminating.
vegardjervell May 8, 2025
5e8a839
Implement flash-based bracket solvers for saturation pressure and tem…
vegardjervell May 8, 2025
cce16e1
Merge branch 'main' into saturation_fallback
vegardjervell May 8, 2025
8b60d69
Correctly propagate error code from mod_newton_search to twoPhaseTPfl…
vegardjervell May 8, 2025
710cc08
Force termination of bracket search for saturation line if outside mi…
vegardjervell May 14, 2025
3155a72
Terminate saturation bracket search if temperature is outside min/max…
vegardjervell May 14, 2025
3eefcc8
Report exit code if saturation point solver raises an exception.
vegardjervell May 14, 2025
4918228
Add tolerance for phase fractions in saturation bracket solver.
vegardjervell May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions addon/pycThermopack/thermopack/thermo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2960,7 +2960,7 @@ def bubble_temperature(self, press, z):

y = np.array(y_c)
if ierr_c.value != 0:
raise Exception("bubble_temperature calculation failed")
raise Exception(f"bubble_temperature calculation failed (exit code {ierr_c.value})")
return temp, y

def bubble_pressure(self, temp, z):
Expand Down Expand Up @@ -2998,7 +2998,7 @@ def bubble_pressure(self, temp, z):

y = np.array(y_c)
if ierr_c.value != 0:
raise Exception("bubble_pressure calculation failed")
raise Exception(f"bubble_pressure calculation failed (exit code {ierr_c.value})")
return press, y

def dew_temperature(self, press, z):
Expand Down Expand Up @@ -3036,7 +3036,7 @@ def dew_temperature(self, press, z):

x = np.array(x_c)
if ierr_c.value != 0:
raise Exception("dew_temperature calculation failed")
raise Exception(f"dew_temperature calculation failed (exit code {ierr_c.value})")
return temp, x

def dew_pressure(self, temp, z):
Expand Down Expand Up @@ -3074,7 +3074,7 @@ def dew_pressure(self, temp, z):

x = np.array(x_c)
if ierr_c.value != 0:
raise Exception("bubble_pressure calculation failed")
raise Exception(f"bubble_pressure calculation failed (exit code {ierr_c.value})")
return press, x

def get_envelope_twophase(self, initial_pressure, z, maximum_pressure=1.5e7,
Expand Down
18 changes: 18 additions & 0 deletions src/error.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,21 @@ subroutine StopError(s)
endif
if (dostop) call exit(err)
end subroutine StopError

!-------------------------------------------------------
!> Take an error message and exit code, concatenate to a single
!> error message, and forward call to stoperror
!>
!> \author VGJ 2025-05-08
!-------------------------------------------------------
subroutine stoperror_with_exitcode(msg, ierr)
implicit none
character(len=*), intent(in) :: msg
integer, intent(in) :: ierr
character(len=32) :: err_str
character(len=:), allocatable :: full_msg

write(err_str, '(I0)') ierr
full_msg = trim(msg) // new_line('a') // ' Exit code: ' // trim(adjustl(err_str))
call stoperror(full_msg)
end subroutine stoperror_with_exitcode
Loading
Loading