Commit 5f35d77b authored by Henderson, Shane's avatar Henderson, Shane
Browse files

Merge branch 'updateSigFigs' into 'master' 

Update sig figs

See merge request neams/saline!5
parents 2c00b903 b8b2e0aa

src/default_data.hh

+108 −108

File changed.

Preview size limit exceeded, changes collapsed.

src/tests/tstdefault_data_store.cc

+4 −4
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ TEST(default_data, FLiNaK_465_115_042) 
    for( size_t i = 0; i < tks.size(); ++i)

    {

        double t_k = tks[i];

        EXPECT_NEAR(rho_calc_ref[i], tp.rho(t_k), 5e-4);

        EXPECT_NEAR(rho_calc_ref[i], tp.rho(t_k), 1e-3);

    }

    EXPECT_NEAR(tp.rho_h(tp.h_t(900)), tp.rho(900), 1e-4);

    EXPECT_FLOAT_EQ(tp.rho(900)*1000.0,tp.rho_kgm3(900));
@@ -297,7 +297,7 @@ TEST(default_data, FLiNaK_465_115_042) 
    for( size_t i = 0; i < tks.size(); ++i)

    {

        double t_k = tks[i];

        EXPECT_NEAR(cp_calc_ref[i], tp.cp(t_k), 5e-4);

        EXPECT_NEAR(cp_calc_ref[i], tp.cp(t_k), 6e-3);

    }

    EXPECT_FLOAT_EQ(tp.cp(900)*(1000.0/41.2909),tp.cp_kg(900));

    EXPECT_NEAR(tp.cp_h(tp.h_t(1200)), tp.cp(1200), 4e-2);
@@ -312,7 +312,7 @@ TEST(default_data, FLiNaK_465_115_042) 
    for( size_t i = 0; i < tks.size(); ++i)

    {

        double t_k = tks[i];

        EXPECT_NEAR(mu_calc_ref[i], tp.mu(t_k), 5e-4);

        EXPECT_NEAR(mu_calc_ref[i], tp.mu(t_k), 5e-2);

    }

    tks.clear();
@@ -332,7 +332,7 @@ TEST(default_data, FLiNaK_465_115_042) 
    EXPECT_NEAR(tp.k_h(tp.h_t(970)), tp.k(970), 1e-4);



    // Test temperature to enthalpy conversion

    EXPECT_NEAR(748.77235618, tp.t_h(1000), 1e-6);

    EXPECT_NEAR(748.77152178380845, tp.t_h(1000), 1e-6);

    EXPECT_NEAR(tp.t_h(tp.h_t(970)),970,5e-2);

    EXPECT_NEAR(tp.t_h_kg(tp.h_t_kg(970)),970,5e-2);

}