Skip to content

Commit 801619d

Browse files
authored
fixed issue with output of molalities of organics and water
1 parent 95b5856 commit 801619d

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

FortranCode/AIOMFAC_inout.f90

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ subroutine AIOMFAC_inout(inputconc, xinputtype, TKelvin, nspecies, outputvars, o
159159
outnames(nc) = "comp_no_"//trim(cn)
160160
wtf_cp = wtf(nc)
161161
xi_cp = X(nc)
162-
mi_cp = mrespSalt(nc) !molality in solvent mixture [mol/(kg solvent mix)]
162+
mi_cp = m_neutral(nc) !molality in solvent mixture [mol/(kg solvent mix)]
163163
actcoeff_cp = actcoeff_n(nc)
164164
if (wtf(nc) > 0.0_wp) then
165165
actcoeff_cp = actcoeff_n(nc)
@@ -230,6 +230,19 @@ subroutine AIOMFAC_inout(inputconc, xinputtype, TKelvin, nspecies, outputvars, o
230230
outputviscvars(2) = -9999.9999999999_wp
231231
endif
232232

233+
!!only for debugging checks:
234+
!block
235+
! real(wp),dimension(:),allocatable :: xfrac_from_m
236+
! real(wp) :: sum1, sum2, sum3, rel_dev
237+
!
238+
! xfrac_from_m = outputvars(3,:)/sum(outputvars(3,:))
239+
! sum1 = sum(xfrac_from_m)
240+
! rel_dev = sum( xfrac_from_m(:)/outputvars(2,:) -1.0_wp )
241+
! sum2 = sum(outputvars(2,:))
242+
! sum3 = sum(outputvars(1,:))
243+
! i = 555 !set breakpoint to check on above values
244+
!end block
245+
233246
!transfer certain error flags raised during calc.:
234247
where(.not. errorflag_list)
235248
errorflag_list = errorflag_clist

FortranCode/maketarget_commands_info_mkmf_Perl.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
# Below is the Terminal command line to produce a Makefile using the Perl script
22
# on a Linux machine (when located in the Fortran code folder).
33

4-
# Also: on CentOS 7 (i.e. RedHat-based, but not on Debian-based linux), execute the following command first:
5-
scl enable devtoolset-7 bash
6-
or with newer version 10:
7-
scl enable devtoolset-10 bash
4+
# Also: on CentOS or RedHat (RHEL) (i.e. RedHat-based, but not on Debian-based linux), execute the following command first:
5+
or with newer version 12:
6+
scl enable gcc-toolset-12 bash
87
# this is necessary if otherwise an older gfortran version is used (often version 4.8.5);
98
# with the above command, you get a much more recent gfortran version ( >= 7.x), which is what we need. See also: https://access.redhat.com/documentation/en-us/red_hat_developer_toolset/8/html/user_guide/chap-gcc .
109

0 commit comments

Comments
 (0)