Commit a8369e93 authored by Henderson, Shane's avatar Henderson, Shane
Browse files

Merge branch 'exposeMeltTemp' into 'master' 

Expose melt and boil temps

Closes #5

See merge request neams/saline!6
parents b2f3b60d 26172b1e

fortran/cix/thermophysical_properties.cpp2f.xml

+4 −0
Original line number Diff line number Diff line
@@ -64,6 +64,10 @@ 
    <method name="t_h_kg" return_type="double">

      <param name="h" type="double"/>

    </method>

    <method name="t_melt" return_type="double">

    </method>

    <method name="t_boil" return_type="double">

    </method>

    <method name="init_data_store" cname="initialize">

      <param name="data" type="Data_Store*"/>      

    </method>

fortran/tests/tstthermophysical_properties.f90

+10 −0
Original line number Diff line number Diff line
@@ -50,6 +50,16 @@ contains 
      stop 3

    endif

    

    if ( tp%t_melt() /= 828.3_8) then

      print *,"Failed to equate values!"

      stop 2

    endif



    if ( tp%t_boil() /= 0.0_8) then

      print *,"Failed to equate values!"

      stop 2

    endif



    call tp%destroy()

    call dflt_data%destroy()

  end subroutine tst_DefaultData

fortran/thermophysical_propertiesInterface.cpp

+11 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
* This file has been dynamically generated by Class Interface Xml (CIX) 

* DO NOT MODIFY THIS FILE -- CHANGES WILL BE OVERWRITTEN UPON REGENERATION

* If changes need to occur, modify the appropriate CIX xml file

* Date Generated: Mon Dec 13 15:31:48 EST 2021

* Date Generated: Mon Dec 27 21:40:06 EST 2021

* If any issues are experiences with this generated file that cannot be fixed

* with adjustment of the CIX xml file, please contact Robert A. Lefebvre, raq@ornl.gov

*/
@@ -89,6 +89,16 @@ double Thermophysical_Properties_t_h_kg(void * Thermophysical_Properties_ptr,dou 
    return ((Thermophysical_Properties*)Thermophysical_Properties_ptr)->t_h_kg(*h);

}



double Thermophysical_Properties_t_melt(void * Thermophysical_Properties_ptr)

{

    return ((Thermophysical_Properties*)Thermophysical_Properties_ptr)->t_melt();

}



double Thermophysical_Properties_t_boil(void * Thermophysical_Properties_ptr)

{

    return ((Thermophysical_Properties*)Thermophysical_Properties_ptr)->t_boil();

}



void Thermophysical_Properties_init_data_store(void * Thermophysical_Properties_ptr,Data_Store* data)

{

    ((Thermophysical_Properties*)Thermophysical_Properties_ptr)->initialize(data);

fortran/thermophysical_propertiesInterface.h

+3 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
* This file has been dynamically generated by Class Interface Xml (CIX) 

* DO NOT MODIFY THIS FILE -- CHANGES WILL BE OVERWRITTEN UPON REGENERATION

* If changes need to occur, modify the appropriate CIX xml file

* Date Generated: Mon Dec 13 15:31:48 EST 2021

* Date Generated: Mon Dec 27 21:40:06 EST 2021

* If any issues are experiences with this generated file that cannot be fixed

* with adjustment of the CIX xml file, please contact Robert A. Lefebvre, raq@ornl.gov

*/
@@ -30,6 +30,8 @@ double Thermophysical_Properties_h_t(void * Thermophysical_Properties_ptr,double 
double Thermophysical_Properties_h_t_kg(void * Thermophysical_Properties_ptr,double * t);

double Thermophysical_Properties_t_h(void * Thermophysical_Properties_ptr,double * h);

double Thermophysical_Properties_t_h_kg(void * Thermophysical_Properties_ptr,double * h);

double Thermophysical_Properties_t_melt(void * Thermophysical_Properties_ptr);

double Thermophysical_Properties_t_boil(void * Thermophysical_Properties_ptr);

void Thermophysical_Properties_init_data_store(void * Thermophysical_Properties_ptr,Data_Store* data);

bool Thermophysical_Properties_set_composition(void * Thermophysical_Properties_ptr,char* name,double* mole_perecents,int * count);

bool Thermophysical_Properties_is_SaltValid(void * Thermophysical_Properties_ptr,char* name,int * count);

fortran/thermophysical_properties_I.f90

+11 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
!! This file has been dynamically generated by Class Interface Xml (CIX) 

!! DO NOT MODIFY THIS FILE -- CHANGES WILL BE OVERWRITTEN UPON REGENERATION

!! If changes need to occur, modify the appropriate CIX xml file

!! Date Generated: Mon Dec 13 15:31:48 EST 2021

!! Date Generated: Mon Dec 27 21:40:06 EST 2021

!! If any issues are experiences with this generated file that cannot be fixed

!! with adjustment of the CIX xml file, please contact Robert A. Lefebvre, raq@ornl.gov

!!/
@@ -117,6 +117,16 @@ real(C_DOUBLE) function f_Thermophysical_Properties_t_h_kg(Thermophysical_Proper 
    type(C_PTR), value :: Thermophysical_Properties_ptr;

    real(C_DOUBLE) :: h;

end function

real(C_DOUBLE) function f_Thermophysical_Properties_t_melt(Thermophysical_Properties_ptr ) BIND(C,name="Thermophysical_Properties_t_melt")

    use,intrinsic :: ISO_C_BINDING

    implicit none

    type(C_PTR), value :: Thermophysical_Properties_ptr;

end function

real(C_DOUBLE) function f_Thermophysical_Properties_t_boil(Thermophysical_Properties_ptr ) BIND(C,name="Thermophysical_Properties_t_boil")

    use,intrinsic :: ISO_C_BINDING

    implicit none

    type(C_PTR), value :: Thermophysical_Properties_ptr;

end function

subroutine f_Thermophysical_Properties_init_data_store(Thermophysical_Properties_ptr, data ) BIND(C,name="Thermophysical_Properties_init_data_store")

    use,intrinsic :: ISO_C_BINDING

    implicit none