Skip to content

Commit 017be86

Browse files
committed
try fix windows bug 0011...
1 parent 9e0bcf8 commit 017be86

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

source/world_builder/parameters.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -544,12 +544,12 @@ namespace WorldBuilder
544544
// So no try/catch needed.
545545
default_value = value_def->GetDouble();
546546
}
547-
/*else if (Pointer((strict_base + "/" + name).c_str()).Get(parameters) != nullptr && Pointer((strict_base + "/" + name).c_str()).Get(parameters)->IsString())
547+
else if (Pointer((strict_base + "/" + name).c_str()).Get(parameters) != nullptr && Pointer((strict_base + "/" + name).c_str()).Get(parameters)->IsString())
548548
{
549549
//input_type = InputTypes::STRING_TYPE;
550550
// I don't know if a default value makes sense here
551551

552-
}*/
552+
}
553553
else
554554
{
555555
//input_type = InputTypes::DOUBLE_TYPE;
@@ -858,7 +858,7 @@ namespace WorldBuilder
858858
result.first.emplace_back(default_value);
859859
}
860860
//assert(result.first.size() > 0);
861-
//WBAssertThrow(result.first.size() > 0, "Internal error: no entries returned when fetching value at points.");
861+
WBAssertThrow(result.first.size() > 0, "Internal error: no entries returned when fetching value at points.");
862862
return result;
863863
}
864864

source/world_builder/world.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ 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");
116+
prm.declare_entry("Litho1.0 path", Types::String(""), "Path to the litho1.0 files");
117117

118118
prm.declare_entry("potential mantle temperature", Types::Double(1600),
119119
"The potential temperature of the mantle at the surface in Kelvin.");
@@ -198,7 +198,7 @@ namespace WorldBuilder
198198
prm.get_unique_pointers<Features::Interface>("features",prm.features);
199199

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

203203
const CoordinateSystem coordinate_system = prm.coordinate_system->natural_coordinate_system();
204204

0 commit comments

Comments
 (0)