Commit 6c2bf154 authored by Henderson, Shane's avatar Henderson, Shane
Browse files

Rk library does estimation only

parent b346682e

src/cpp/r_kister_data_store.cc

+0 −17
Original line number Diff line number Diff line
@@ -137,23 +137,6 @@ Data_Store::View R_Kister_Data_Store::setView( const Vec_Name& names, const Vec_ 
    // Set up a view or returning useful data

    Data_Store::View v;



    // Look for the data in the default data first

    Vec_Name tempNames = names;

    if(d.valid(tempNames))

    {

      // See if the data is close enough to what is requested

      std::vector<std::pair<double,size_t>> test = utils::nearest_neighbor(

          mole_percents,d.getSaltComps(names));

      if(test[0].first < 0.01)

      {

        end_members.resize(1);

        endMem_moleFracs = {1.0};

        end_members[0] = d.setView(names,mole_percents);

        v = end_members[0];

        return v;

      }

    }



    end_members.resize(names.size());

    endMem_moleFracs = mole_percents;

tests/tstrk_data_store.cc

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ TEST(rk_data_store,input_order) 
    ASSERT_TRUE(tp_rk.valid_mu());

    ASSERT_TRUE(tp_rk.setComposition({"KCl","NaCl"},{0.1523,0.8477}));

    ASSERT_TRUE(tp_rk.valid_rho());

    ASSERT_FALSE(tp_rk.valid_k());

    ASSERT_FALSE(tp_rk.valid_cp());

    ASSERT_TRUE(tp_rk.valid_k());

    ASSERT_TRUE(tp_rk.valid_cp());

    ASSERT_TRUE(tp_rk.valid_mu());

}

tests/tstthermophysical_properties.f90

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ contains 
      print *,"Failure to set composition!"

      stop 1

    endif

    if ( tp%rho(850.0_8, 101.0_8) /= 2.0486000000000004_8 ) then

    if ( tp%rho(850.0_8, 101.0_8) /= 2.0406762757251267_8 ) then

      write(*,*) tp%rho(850.0_8,101.0_8)

      print *,"Failed to equate values!"

      stop 2