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

Merge branch 'add_isValidSalt' into 'master' 

Add is valid salt

Closes #3

See merge request neams/saline!4
parents 2085ad9f 5bf163eb

fortran/cix/thermophysical_properties.cpp2f.xml

+4 −0
Original line number Diff line number Diff line
@@ -72,5 +72,9 @@ 
      <param name="mole_perecents" type="double*"/>

      <param name="count" type="int"/>

    </method>

    <method name="is_SaltValid" cname="isSaltValid" return_type="bool">

      <param name="name" type="char*"/>

      <param name="count" type="int"/>

    </method>

  </class>

</generate>

fortran/tests/tstthermophysical_properties.f90

+18 −0
Original line number Diff line number Diff line
@@ -24,6 +24,15 @@ contains 
    

    ! Assign data store to

    call tp%init_data_store(dflt_data)

    if (.not.tp%is_SaltValid("LiF-BeF2-ThF4",3)) then

      print *,"Failure to validate composition!"

      stop 1

    endif



    if (tp%is_SaltValid("Li2F-BeF2-ThF4",3)) then

      print *,"Failure to validate composition!"

      stop 1

    endif

    

    if (.not.tp%set_composition("LiF-BeF2-ThF4",[0.7011_8, 0.2388_8, 0.0601_8],3)) then

      print *,"Failure to set composition!"
@@ -58,6 +67,15 @@ contains 
    

    ! Assign data store to

    call tp%init_data_store(rk_data)

    if (.not.tp%is_SaltValid("LiF-BeF2-ThF4",3)) then

      print *,"Failure to validate composition!"

      stop 1

    endif



    if (tp%is_SaltValid("Li2F-BeF2-ThF4",3)) then

      print *,"Failure to validate composition!"

      stop 1

    endif

    

    if (.not.tp%set_composition("LiF-NaF-KF",[0.465_8,0.115_8,0.42_8],3)) then

      print *,"Failure to set composition!"

fortran/thermophysical_propertiesInterface.cpp

+6 −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: Wed Nov 24 15:33:57 EST 2021

* Date Generated: Mon Dec 13 15:31:48 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

*/
@@ -99,6 +99,11 @@ bool Thermophysical_Properties_set_composition(void * Thermophysical_Properties_ 
    return ((Thermophysical_Properties*)Thermophysical_Properties_ptr)->setComposition(name,mole_perecents,*count);

}



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

{

    return ((Thermophysical_Properties*)Thermophysical_Properties_ptr)->isSaltValid(name,*count);

}



void* Thermophysical_Properties_initialize()

{

    return new Thermophysical_Properties();

fortran/thermophysical_propertiesInterface.h

+2 −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: Wed Nov 24 15:33:57 EST 2021

* Date Generated: Mon Dec 13 15:31:48 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

*/
@@ -32,6 +32,7 @@ double Thermophysical_Properties_t_h(void * Thermophysical_Properties_ptr,double 
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);

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

void* Thermophysical_Properties_initialize();

void Thermophysical_Properties_destroy(void * Thermophysical_Properties_ptr);

#ifdef __cplusplus

fortran/thermophysical_properties_I.f90

+8 −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: Wed Nov 24 15:33:57 EST 2021

!! Date Generated: Mon Dec 13 15:31:48 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

!!/
@@ -131,6 +131,13 @@ logical(C_BOOL) function f_Thermophysical_Properties_set_composition(Thermophysi 
    real(C_DOUBLE) :: mole_perecents;

    integer(C_INT) :: count;

end function

logical(C_BOOL) function f_Thermophysical_Properties_is_SaltValid(Thermophysical_Properties_ptr, name,count ) BIND(C,name="Thermophysical_Properties_is_SaltValid")

    use,intrinsic :: ISO_C_BINDING

    implicit none

    type(C_PTR), value :: Thermophysical_Properties_ptr;

    character(C_CHAR) :: name;

    integer(C_INT) :: count;

end function

type(C_PTR) function f_Thermophysical_Properties_initialize( )BIND(C,name="Thermophysical_Properties_initialize")

    use,intrinsic :: ISO_C_BINDING

    implicit none