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

Adds kg/m^3 density getter to all interfaces

parent e5e3ee11

fortran/cix/thermophysical_properties.cpp2f.xml

+8 −0
Original line number Diff line number Diff line
@@ -37,6 +37,14 @@ 
      <param name="h" type="double"/>

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

    </method>

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

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

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

    </method>

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

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

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

    </method>

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

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

    </method>

fortran/tests/tstthermophysical_properties.f90

+5 −0
Original line number Diff line number Diff line
@@ -33,6 +33,11 @@ contains 
      stop 2

    endif



    if ( tp%rho(926.00_8, 101.0_8) * 1000.0 /= tp%rho_kgm3(926.00_8,101.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: Thu May 21 19:31:20 EDT 2020

* Date Generated: Mon Oct 04 09:32:58 EDT 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

*/
@@ -49,6 +49,16 @@ double Thermophysical_Properties_rho_h(void * Thermophysical_Properties_ptr,doub 
    return ((Thermophysical_Properties*)Thermophysical_Properties_ptr)->rho_h(*h,*p);

}



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

{

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

}



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

{

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

}



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: Thu May 21 19:31:20 EDT 2020

* Date Generated: Mon Oct 04 09:32:58 EDT 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

*/
@@ -22,6 +22,8 @@ double Thermophysical_Properties_k(void * Thermophysical_Properties_ptr,double * 
double Thermophysical_Properties_k_h(void * Thermophysical_Properties_ptr,double * h,double * p);

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

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

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

+15 −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: Thu May 21 19:31:20 EDT 2020

!! Date Generated: Mon Oct 04 09:32:58 EDT 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

!!/
@@ -65,6 +65,20 @@ real(C_DOUBLE) function f_Thermophysical_Properties_rho_h(Thermophysical_Propert 
    real(C_DOUBLE) :: h;

    real(C_DOUBLE) :: p;

end function

real(C_DOUBLE) function f_Thermophysical_Properties_rho_kgm3(Thermophysical_Properties_ptr, t,p ) BIND(C,name="Thermophysical_Properties_rho_kgm3")

    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_rho_h_kgm3(Thermophysical_Properties_ptr, h,p ) BIND(C,name="Thermophysical_Properties_rho_h_kgm3")

    use,intrinsic :: ISO_C_BINDING

    implicit none

    type(C_PTR), value :: Thermophysical_Properties_ptr;

    real(C_DOUBLE) :: h;

    real(C_DOUBLE) :: p;

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