Indicate property data valid (c0fc96b2) · Commits · NEAMS / saline

.gitlab-ci.yml

+4 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@ stages:

		before_script:
		- if [[ -f "/data/test_gcc/gcc-8.3.0/load_dev_env.sh" ]]; then BASE_DIR="/data/gitlab-runner"; . /data/test_gcc/gcc-8.3.0/load_dev_env.sh; ENV_BASE=/data/test_gcc/gcc-8.3.0; else BASE_DIR="/localhome/gitlab-runner"; . /projects/vera/gcc-8.3.0/load_dev_env.sh; ENV_BASE=/projects/vera/gcc-8.3.0; fi
		- which gcc

		.stage_artifacts: &stage_artifacts
		artifacts:
		@@ -26,4 +27,7 @@ linux_gcc83_testing:
		- mkdir -p $BLD_DIR
		- cd $BLD_DIR
		- rm -rf *
		- echo $PATH
		- which gcc
		- echo "$PATH"
		- $SRC_DIR/ci/linux_gcc83_test.sh $SRC_DIR

ci/linux_gcc83_test.sh

+5 −0

Original line number	Diff line number	Diff line
		#!/bin/bash

		if [[ -f "/data/test_gcc/gcc-8.3.0/load_dev_env.sh" ]]; then BASE_DIR="/data/gitlab-runner"; . /data/test_gcc/gcc-8.3.0/load_dev_env.sh; ENV_BASE=/data/test_gcc/gcc-8.3.0; else BASE_DIR="/localhome/gitlab-runner"; . /projects/vera/gcc-8.3.0/load_dev_env.sh; ENV_BASE=/projects/vera/gcc-8.3.0; fi


		export saline_ENABLE_Fortran=ON # Enable the Fortran library and bindings
		cmake -DBUILDNAME="$(uname -s)-Release-${CI_BUILD_REF_NAME}" \
		-DCMAKE_C_COMPILER=${ENV_BASE}/toolset/gcc-8.3.0/bin/gcc \
		-DCMAKE_CXX_COMPILER=${ENV_BASE}/toolset/gcc-8.3.0/bin/g++ \
		-DCMAKE_BUILD_TYPE=RELEASE \
		-Dsaline_ENABLE_TESTS=ON \
		-DBUILD_SHARED_LIBS:BOOL=ON \

fortran/cix/thermophysical_properties.cpp2f.xml

+8 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,8 @@
		<param name="t" type="double"/>
		<param name="p" type="double"/>
		</method>
		<method name="valid_cp" return_type="bool">
		</method>
		<method name="cp_h" return_type="double">
		<param name="h" type="double"/>
		<param name="p" type="double"/>
		@@ -28,6 +30,8 @@
		<param name="h" type="double"/>
		<param name="p" type="double"/>
		</method>
		<method name="valid_mu" return_type="bool">
		</method>
		<method name="k" return_type="double">
		<param name="t" type="double"/>
		<param name="p" type="double"/>
		@@ -36,6 +40,8 @@
		<param name="h" type="double"/>
		<param name="p" type="double"/>
		</method>
		<method name="valid_k" return_type="bool">
		</method>
		<method name="rho" return_type="double">
		<param name="t" type="double"/>
		<param name="p" type="double"/>
		@@ -52,6 +58,8 @@
		<param name="h" type="double"/>
		<param name="p" type="double"/>
		</method>
		<method name="valid_rho" return_type="bool">
		</method>
		<method name="h_t" return_type="double">
		<param name="t" type="double"/>
		</method>

fortran/tests/tstthermophysical_properties.f90

+52 −10

Original line number	Diff line number	Diff line
		@@ -39,25 +39,49 @@ contains
		stop 1
		endif

		print *,tp%mu(926.00_8, 101.0_8)
		if ( tp%mu(926.00_8, 101.0_8) /= 7.4825131826198357_8) then
		print *,"Failed to equate values!"
		stop 2
		print *,"Failed to equate mu values!"
		stop 1
		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 3
		print *,"Failed to equate rho values!"
		stop 1
		endif

		if ( tp%t_melt() /= 828.3_8) then
		print *,"Failed to equate values!"
		stop 2
		print *,"Failed to equate melt values!"
		stop 1
		endif

		if ( tp%t_boil() /= 0.0_8) then
		print *,"Failed to equate values!"
		stop 2
		print *,"Failed to equate boil values!"
		stop 1
		endif

		if ( tp%set_Composition("LiF-BeF2-ThF4",[0.727_8,0.157_8,0.116_8],3) ) then
		if (tp%valid_rho()) then
		print *,"valid check rho failed"
		stop 1
		end if
		if (tp%valid_k()) then
		print *,"valid check k failed"
		stop 1
		end if
		if (tp%valid_cp()) then
		print *,"valid check cp failed"
		stop 1
		end if
		if ( .not. tp%valid_mu()) then
		print *,"valid check mu failed"
		stop 1
		end if
		endif
		if ( tp%set_Composition("LiF-BeF2-ThF4",[0.6998_8,0.1499_8,0.1503_8],3) ) then
		if ( tp%valid_mu()) then
		print *,"valid check mu failed"
		stop 1
		end if
		endif

		call tp%destroy()
		@@ -92,12 +116,30 @@ contains
		stop 1
		endif

		print *,tp%rho(850.0_8, 101.0_8)
		if ( tp%rho(850.0_8, 101.0_8) /= 2.0406762757251267_8 ) then
		print *,"Failed to equate values!"
		stop 2
		endif

		if ( tp%set_Composition("LiF-UF3-ZrF4",[0.727_8,0.157_8,0.116_8],3) ) then
		if (tp%valid_rho()) then
		print *,"valid check rho failed"
		stop 3
		endif
		if (tp%valid_k()) then
		print *,"valid check k failed"
		stop 3
		endif
		if (tp%valid_cp()) then
		print *,"valid check cp failed"
		stop 3
		endif
		if (tp%valid_mu()) then
		print *,"valid check mu failed"
		stop 3
		endif
		endif

		call tp%destroy()
		call rk_data%destroy()
		end subroutine tst_RKData

fortran/thermophysical_propertiesInterface.cpp

+21 −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 27 21:40:06 EST 2021
		* Date Generated: Tue Dec 28 15:51:40 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
		*/
		@@ -14,6 +14,11 @@ double Thermophysical_Properties_cp(void * Thermophysical_Properties_ptr,double
		return ((Thermophysical_Properties)Thermophysical_Properties_ptr)->cp(t,*p);
		}

		bool Thermophysical_Properties_valid_cp(void * Thermophysical_Properties_ptr)
		{
		return ((Thermophysical_Properties*)Thermophysical_Properties_ptr)->valid_cp();
		}

		double Thermophysical_Properties_cp_h(void * Thermophysical_Properties_ptr,double * h,double * p)
		{
		return ((Thermophysical_Properties)Thermophysical_Properties_ptr)->cp_h(h,*p);
		@@ -39,6 +44,11 @@ double Thermophysical_Properties_mu_h(void * Thermophysical_Properties_ptr,doubl
		return ((Thermophysical_Properties)Thermophysical_Properties_ptr)->mu_h(h,*p);
		}

		bool Thermophysical_Properties_valid_mu(void * Thermophysical_Properties_ptr)
		{
		return ((Thermophysical_Properties*)Thermophysical_Properties_ptr)->valid_mu();
		}

		double Thermophysical_Properties_k(void * Thermophysical_Properties_ptr,double * t,double * p)
		{
		return ((Thermophysical_Properties)Thermophysical_Properties_ptr)->k(t,*p);
		@@ -49,6 +59,11 @@ double Thermophysical_Properties_k_h(void * Thermophysical_Properties_ptr,double
		return ((Thermophysical_Properties)Thermophysical_Properties_ptr)->k_h(h,*p);
		}

		bool Thermophysical_Properties_valid_k(void * Thermophysical_Properties_ptr)
		{
		return ((Thermophysical_Properties*)Thermophysical_Properties_ptr)->valid_k();
		}

		double Thermophysical_Properties_rho(void * Thermophysical_Properties_ptr,double * t,double * p)
		{
		return ((Thermophysical_Properties)Thermophysical_Properties_ptr)->rho(t,*p);
		@@ -69,6 +84,11 @@ double Thermophysical_Properties_rho_h_kgm3(void * Thermophysical_Properties_ptr
		return ((Thermophysical_Properties)Thermophysical_Properties_ptr)->rho_h_kgm3(h,*p);
		}

		bool Thermophysical_Properties_valid_rho(void * Thermophysical_Properties_ptr)
		{
		return ((Thermophysical_Properties*)Thermophysical_Properties_ptr)->valid_rho();
		}

		double Thermophysical_Properties_h_t(void * Thermophysical_Properties_ptr,double * t)
		{
		return ((Thermophysical_Properties)Thermophysical_Properties_ptr)->h_t(t);