Skip to content

Commit db32ede

Browse files
committed
cleanup
1 parent 90de747 commit db32ede

File tree

3 files changed

+1
-8
lines changed

3 files changed

+1
-8
lines changed

include/world_builder/world.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,6 @@ namespace WorldBuilder
257257
*/
258258
std::vector<Point<2> > cross_section;
259259

260-
/**
261-
* The path to the Litho1.0 data directory
262-
*/
263-
std::string litho_1_0_path;
264260

265261
/**
266262
* Todo

source/world_builder/parameters.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ namespace WorldBuilder
834834
{
835835
WBAssertThrow(false,"Could not find \"" << value << "\" in \"" << strict_base << "/" << name << "\". ");
836836
}
837-
assert(result.first.size() > 0);
837+
WBAssertThrow(result.first.size() > 0,"Internal error: program should not get here.");
838838
}
839839
else
840840
{
@@ -857,7 +857,6 @@ namespace WorldBuilder
857857
// there is no user defined value. Case one: return the default value and no points
858858
result.first.emplace_back(default_value);
859859
}
860-
assert(result.first.size() > 0);
861860
WBAssertThrow(result.first.size() > 0, "Internal error: no entries returned when fetching value at points.");
862861
return result;
863862
}

source/world_builder/world.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ namespace WorldBuilder
113113
prm.declare_entry("$schema", Types::String(""),"The optional filename or https address to a JSON schema file");
114114

115115
prm.declare_entry("cross section", Types::Array(Types::Point<2>(),2,2),"This is an array of two points along where the cross section is taken");
116-
prm.declare_entry("Litho1.0 path", Types::String(""), "Path to the litho1.0 files");
117116

118117
prm.declare_entry("potential mantle temperature", Types::Double(1600),
119118
"The potential temperature of the mantle at the surface in Kelvin.");
@@ -198,7 +197,6 @@ namespace WorldBuilder
198197
prm.get_unique_pointers<Features::Interface>("features",prm.features);
199198

200199
const bool set_cross_section = prm.check_entry("cross section");
201-
litho_1_0_path = prm.get<std::string>("Litho1.0 path");
202200

203201
const CoordinateSystem coordinate_system = prm.coordinate_system->natural_coordinate_system();
204202

0 commit comments

Comments
 (0)