Commit 135ed6d1 authored by Henderson, Shane's avatar Henderson, Shane
Browse files

Merge branch 'cp_kg_accessor' into 'master' 

Adds getter for cp in units of J/(kg*K)

Closes #2

See merge request neams/saline!2
parents 0df32d50 133f1882

fortran/cix/thermophysical_properties.cpp2f.xml

+20 −1
Original line number Diff line number Diff line
@@ -12,7 +12,14 @@ 
      <param name="h" type="double"/>

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

    </method>



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

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

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

    </method>

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

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

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

    </method>

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

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

      <param name="p" type="double"/>
@@ -45,6 +52,18 @@ 
      <param name="h" type="double"/>

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

    </method>

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

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

    </method>

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

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

    </method>

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

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

    </method>

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

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

    </method>

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

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

    </method>

fortran/thermophysical_propertiesInterface.cpp

+31 −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 Oct 04 09:32:58 EDT 2021

* Date Generated: Wed Nov 24 15:33:57 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

*/
@@ -19,6 +19,16 @@ double Thermophysical_Properties_cp_h(void * Thermophysical_Properties_ptr,doubl 
    return ((Thermophysical_Properties*)Thermophysical_Properties_ptr)->cp_h(*h,*p);

}



double Thermophysical_Properties_cp_kg(void * Thermophysical_Properties_ptr,double * t,double * p)

{

    return ((Thermophysical_Properties*)Thermophysical_Properties_ptr)->cp_kg(*t,*p);

}



double Thermophysical_Properties_cp_h_kg(void * Thermophysical_Properties_ptr,double * h,double * p)

{

    return ((Thermophysical_Properties*)Thermophysical_Properties_ptr)->cp_h_kg(*h,*p);

}



double Thermophysical_Properties_mu(void * Thermophysical_Properties_ptr,double * t,double * p)

{

    return ((Thermophysical_Properties*)Thermophysical_Properties_ptr)->mu(*t,*p);
@@ -59,6 +69,26 @@ double Thermophysical_Properties_rho_h_kgm3(void * Thermophysical_Properties_ptr 
    return ((Thermophysical_Properties*)Thermophysical_Properties_ptr)->rho_h_kgm3(*h,*p);

}



double Thermophysical_Properties_h_t(void * Thermophysical_Properties_ptr,double * t)

{

    return ((Thermophysical_Properties*)Thermophysical_Properties_ptr)->h_t(*t);

}



double Thermophysical_Properties_h_t_kg(void * Thermophysical_Properties_ptr,double * t)

{

    return ((Thermophysical_Properties*)Thermophysical_Properties_ptr)->h_t_kg(*t);

}



double Thermophysical_Properties_t_h(void * Thermophysical_Properties_ptr,double * h)

{

    return ((Thermophysical_Properties*)Thermophysical_Properties_ptr)->t_h(*h);

}



double Thermophysical_Properties_t_h_kg(void * Thermophysical_Properties_ptr,double * h)

{

    return ((Thermophysical_Properties*)Thermophysical_Properties_ptr)->t_h_kg(*h);

}



void Thermophysical_Properties_init_data_store(void * Thermophysical_Properties_ptr,Data_Store* data)

{

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

fortran/thermophysical_propertiesInterface.h

+7 −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 Oct 04 09:32:58 EDT 2021

* Date Generated: Wed Nov 24 15:33:57 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

*/
@@ -16,6 +16,8 @@ extern "C" { 
#endif

double Thermophysical_Properties_cp(void * Thermophysical_Properties_ptr,double * t,double * p);

double Thermophysical_Properties_cp_h(void * Thermophysical_Properties_ptr,double * h,double * p);

double Thermophysical_Properties_cp_kg(void * Thermophysical_Properties_ptr,double * t,double * p);

double Thermophysical_Properties_cp_h_kg(void * Thermophysical_Properties_ptr,double * h,double * p);

double Thermophysical_Properties_mu(void * Thermophysical_Properties_ptr,double * t,double * p);

double Thermophysical_Properties_mu_h(void * Thermophysical_Properties_ptr,double * h,double * p);

double Thermophysical_Properties_k(void * Thermophysical_Properties_ptr,double * t,double * p);
@@ -24,6 +26,10 @@ double Thermophysical_Properties_rho(void * Thermophysical_Properties_ptr,double 
double Thermophysical_Properties_rho_h(void * Thermophysical_Properties_ptr,double * h,double * p);

double Thermophysical_Properties_rho_kgm3(void * Thermophysical_Properties_ptr,double * t,double * p);

double Thermophysical_Properties_rho_h_kgm3(void * Thermophysical_Properties_ptr,double * h,double * p);

double Thermophysical_Properties_h_t(void * Thermophysical_Properties_ptr,double * t);

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);

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);

void* Thermophysical_Properties_initialize();

fortran/thermophysical_properties_I.f90

+39 −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 Oct 04 09:32:58 EDT 2021

!! Date Generated: Wed Nov 24 15:33:57 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

!!/
@@ -23,6 +23,20 @@ real(C_DOUBLE) function f_Thermophysical_Properties_cp_h(Thermophysical_Properti 
    real(C_DOUBLE) :: h;

    real(C_DOUBLE) :: p;

end function

real(C_DOUBLE) function f_Thermophysical_Properties_cp_kg(Thermophysical_Properties_ptr, t,p ) BIND(C,name="Thermophysical_Properties_cp_kg")

    use,intrinsic :: ISO_C_BINDING

    implicit none

    type(C_PTR), value :: Thermophysical_Properties_ptr;

    real(C_DOUBLE) :: t;

    real(C_DOUBLE) :: p;

end function

real(C_DOUBLE) function f_Thermophysical_Properties_cp_h_kg(Thermophysical_Properties_ptr, h,p ) BIND(C,name="Thermophysical_Properties_cp_h_kg")

    use,intrinsic :: ISO_C_BINDING

    implicit none

    type(C_PTR), value :: Thermophysical_Properties_ptr;

    real(C_DOUBLE) :: h;

    real(C_DOUBLE) :: p;

end function

real(C_DOUBLE) function f_Thermophysical_Properties_mu(Thermophysical_Properties_ptr, t,p ) BIND(C,name="Thermophysical_Properties_mu")

    use,intrinsic :: ISO_C_BINDING

    implicit none
@@ -79,6 +93,30 @@ real(C_DOUBLE) function f_Thermophysical_Properties_rho_h_kgm3(Thermophysical_Pr 
    real(C_DOUBLE) :: h;

    real(C_DOUBLE) :: p;

end function

real(C_DOUBLE) function f_Thermophysical_Properties_h_t(Thermophysical_Properties_ptr, t ) BIND(C,name="Thermophysical_Properties_h_t")

    use,intrinsic :: ISO_C_BINDING

    implicit none

    type(C_PTR), value :: Thermophysical_Properties_ptr;

    real(C_DOUBLE) :: t;

end function

real(C_DOUBLE) function f_Thermophysical_Properties_h_t_kg(Thermophysical_Properties_ptr, t ) BIND(C,name="Thermophysical_Properties_h_t_kg")

    use,intrinsic :: ISO_C_BINDING

    implicit none

    type(C_PTR), value :: Thermophysical_Properties_ptr;

    real(C_DOUBLE) :: t;

end function

real(C_DOUBLE) function f_Thermophysical_Properties_t_h(Thermophysical_Properties_ptr, h ) BIND(C,name="Thermophysical_Properties_t_h")

    use,intrinsic :: ISO_C_BINDING

    implicit none

    type(C_PTR), value :: Thermophysical_Properties_ptr;

    real(C_DOUBLE) :: h;

end function

real(C_DOUBLE) function f_Thermophysical_Properties_t_h_kg(Thermophysical_Properties_ptr, h ) BIND(C,name="Thermophysical_Properties_t_h_kg")

    use,intrinsic :: ISO_C_BINDING

    implicit none

    type(C_PTR), value :: Thermophysical_Properties_ptr;

    real(C_DOUBLE) :: h;

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

fortran/thermophysical_properties_M.f90

+51 −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 Oct 04 09:32:58 EDT 2021

!! Date Generated: Wed Nov 24 15:33:57 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

!!/
@@ -15,6 +15,8 @@ type Thermophysical_Properties 
    contains

    procedure, pass(this) :: cp => Thermophysical_Properties_cp

    procedure, pass(this) :: cp_h => Thermophysical_Properties_cp_h

    procedure, pass(this) :: cp_kg => Thermophysical_Properties_cp_kg

    procedure, pass(this) :: cp_h_kg => Thermophysical_Properties_cp_h_kg

    procedure, pass(this) :: mu => Thermophysical_Properties_mu

    procedure, pass(this) :: mu_h => Thermophysical_Properties_mu_h

    procedure, pass(this) :: k => Thermophysical_Properties_k
@@ -23,6 +25,10 @@ type Thermophysical_Properties 
    procedure, pass(this) :: rho_h => Thermophysical_Properties_rho_h

    procedure, pass(this) :: rho_kgm3 => Thermophysical_Properties_rho_kgm3

    procedure, pass(this) :: rho_h_kgm3 => Thermophysical_Properties_rho_h_kgm3

    procedure, pass(this) :: h_t => Thermophysical_Properties_h_t

    procedure, pass(this) :: h_t_kg => Thermophysical_Properties_h_t_kg

    procedure, pass(this) :: t_h => Thermophysical_Properties_t_h

    procedure, pass(this) :: t_h_kg => Thermophysical_Properties_t_h_kg

    procedure, pass(this) :: init_data_store => Thermophysical_Properties_init_data_store

    procedure, pass(this) :: set_composition => Thermophysical_Properties_set_composition

    procedure, pass(this) :: initialize => Thermophysical_Properties_initialize
@@ -45,6 +51,22 @@ function Thermophysical_Properties_cp_h(this, h, p) result(result2Return) 
    real(C_DOUBLE):: result2Return

    result2Return=f_Thermophysical_Properties_cp_h(this%instance_ptr, h,p)

end function

function Thermophysical_Properties_cp_kg(this, t, p) result(result2Return)

    implicit none

    class(Thermophysical_Properties)::this

    real(C_DOUBLE)::t

    real(C_DOUBLE)::p

    real(C_DOUBLE):: result2Return

    result2Return=f_Thermophysical_Properties_cp_kg(this%instance_ptr, t,p)

end function

function Thermophysical_Properties_cp_h_kg(this, h, p) result(result2Return)

    implicit none

    class(Thermophysical_Properties)::this

    real(C_DOUBLE)::h

    real(C_DOUBLE)::p

    real(C_DOUBLE):: result2Return

    result2Return=f_Thermophysical_Properties_cp_h_kg(this%instance_ptr, h,p)

end function

function Thermophysical_Properties_mu(this, t, p) result(result2Return)

    implicit none

    class(Thermophysical_Properties)::this
@@ -109,6 +131,34 @@ function Thermophysical_Properties_rho_h_kgm3(this, h, p) result(result2Return) 
    real(C_DOUBLE):: result2Return

    result2Return=f_Thermophysical_Properties_rho_h_kgm3(this%instance_ptr, h,p)

end function

function Thermophysical_Properties_h_t(this, t) result(result2Return)

    implicit none

    class(Thermophysical_Properties)::this

    real(C_DOUBLE)::t

    real(C_DOUBLE):: result2Return

    result2Return=f_Thermophysical_Properties_h_t(this%instance_ptr, t)

end function

function Thermophysical_Properties_h_t_kg(this, t) result(result2Return)

    implicit none

    class(Thermophysical_Properties)::this

    real(C_DOUBLE)::t

    real(C_DOUBLE):: result2Return

    result2Return=f_Thermophysical_Properties_h_t_kg(this%instance_ptr, t)

end function

function Thermophysical_Properties_t_h(this, h) result(result2Return)

    implicit none

    class(Thermophysical_Properties)::this

    real(C_DOUBLE)::h

    real(C_DOUBLE):: result2Return

    result2Return=f_Thermophysical_Properties_t_h(this%instance_ptr, h)

end function

function Thermophysical_Properties_t_h_kg(this, h) result(result2Return)

    implicit none

    class(Thermophysical_Properties)::this

    real(C_DOUBLE)::h

    real(C_DOUBLE):: result2Return

    result2Return=f_Thermophysical_Properties_t_h_kg(this%instance_ptr, h)

end function

subroutine Thermophysical_Properties_init_data_store(this, data)

    implicit none

    class(Thermophysical_Properties)::this