Skip to content

Commit e60f204

Browse files
MFratersMFraters
committed
add string option to min and max depth to continental and ocean plates.
1 parent fc22cbe commit e60f204

26 files changed

+279
-63
lines changed

‎doc/world_builder_declarations.schema.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@
3333
}
3434
}
3535
},
36+
"Litho1.0 path": {
37+
"default value": "",
38+
"type": "string",
39+
"description": "Path to the litho1.0 files"
40+
},
3641
"potential mantle temperature": {
3742
"default value": 1600.0,
3843
"type": "number",
@@ -712,6 +717,11 @@
712717
]
713718
}
714719
}
720+
},
721+
{
722+
"default value": "",
723+
"type": "string",
724+
"description": ""
715725
}
716726
]
717727
},
@@ -757,6 +767,11 @@
757767
]
758768
}
759769
}
770+
},
771+
{
772+
"default value": "",
773+
"type": "string",
774+
"description": ""
760775
}
761776
]
762777
},
@@ -1260,6 +1275,11 @@
12601275
]
12611276
}
12621277
}
1278+
},
1279+
{
1280+
"default value": "",
1281+
"type": "string",
1282+
"description": ""
12631283
}
12641284
]
12651285
},
@@ -1305,6 +1325,11 @@
13051325
]
13061326
}
13071327
}
1328+
},
1329+
{
1330+
"default value": "",
1331+
"type": "string",
1332+
"description": ""
13081333
}
13091334
]
13101335
},

‎doc/world_builder_declarations_closed.md‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@
4848

4949
::::::::::::::::::::::::
5050

51+
::::::::::::::::::::::::{dropdown} /Litho1.0 path
52+
:name: closed_Litho1.0-path
53+
54+
- **default value**:
55+
- **type**:string
56+
- **description**:Path to the litho1.0 files
57+
::::::::::::::::::::::::
58+
5159
::::::::::::::::::::::::{dropdown} /potential mantle temperature
5260
:name: closed_potential-mantle-temperature
5361

@@ -985,6 +993,14 @@
985993

986994
::::::::::::::
987995

996+
::::::::::::::{dropdown} /features/items/oneOf/1/temperature models/items/oneOf/3/min depth/oneOf/3
997+
:name: closed_features_items_oneOf_1_temperature-models_items_oneOf_3_min-depth_oneOf_3
998+
999+
- **default value**:
1000+
- **type**:string
1001+
- **description**:
1002+
::::::::::::::
1003+
9881004

9891005
::::::::::::::::
9901006

@@ -1061,6 +1077,14 @@
10611077

10621078
::::::::::::::
10631079

1080+
::::::::::::::{dropdown} /features/items/oneOf/1/temperature models/items/oneOf/3/max depth/oneOf/3
1081+
:name: closed_features_items_oneOf_1_temperature-models_items_oneOf_3_max-depth_oneOf_3
1082+
1083+
- **default value**:
1084+
- **type**:string
1085+
- **description**:
1086+
::::::::::::::
1087+
10641088

10651089
::::::::::::::::
10661090

@@ -1834,6 +1858,14 @@
18341858

18351859
::::::::::::::
18361860

1861+
::::::::::::::{dropdown} /features/items/oneOf/1/composition models/items/oneOf/2/min depth/oneOf/3
1862+
:name: closed_features_items_oneOf_1_composition-models_items_oneOf_2_min-depth_oneOf_3
1863+
1864+
- **default value**:
1865+
- **type**:string
1866+
- **description**:
1867+
::::::::::::::
1868+
18371869

18381870
::::::::::::::::
18391871

@@ -1910,6 +1942,14 @@
19101942

19111943
::::::::::::::
19121944

1945+
::::::::::::::{dropdown} /features/items/oneOf/1/composition models/items/oneOf/2/max depth/oneOf/3
1946+
:name: closed_features_items_oneOf_1_composition-models_items_oneOf_2_max-depth_oneOf_3
1947+
1948+
- **default value**:
1949+
- **type**:string
1950+
- **description**:
1951+
::::::::::::::
1952+
19131953

19141954
::::::::::::::::
19151955

‎doc/world_builder_declarations_open.md‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,15 @@
5353

5454
::::::::::::::::::::::::
5555

56+
::::::::::::::::::::::::{dropdown} /Litho1.0 path
57+
:open:
58+
:name: open_Litho1.0-path
59+
60+
- **default value**:
61+
- **type**:string
62+
- **description**:Path to the litho1.0 files
63+
::::::::::::::::::::::::
64+
5665
::::::::::::::::::::::::{dropdown} /potential mantle temperature
5766
:open:
5867
:name: open_potential-mantle-temperature
@@ -1118,6 +1127,15 @@
11181127

11191128
::::::::::::::
11201129

1130+
::::::::::::::{dropdown} /features/items/oneOf/1/temperature models/items/oneOf/3/min depth/oneOf/3
1131+
:open:
1132+
:name: open_features_items_oneOf_1_temperature-models_items_oneOf_3_min-depth_oneOf_3
1133+
1134+
- **default value**:
1135+
- **type**:string
1136+
- **description**:
1137+
::::::::::::::
1138+
11211139

11221140
::::::::::::::::
11231141

@@ -1205,6 +1223,15 @@
12051223

12061224
::::::::::::::
12071225

1226+
::::::::::::::{dropdown} /features/items/oneOf/1/temperature models/items/oneOf/3/max depth/oneOf/3
1227+
:open:
1228+
:name: open_features_items_oneOf_1_temperature-models_items_oneOf_3_max-depth_oneOf_3
1229+
1230+
- **default value**:
1231+
- **type**:string
1232+
- **description**:
1233+
::::::::::::::
1234+
12081235

12091236
::::::::::::::::
12101237

@@ -2083,6 +2110,15 @@
20832110

20842111
::::::::::::::
20852112

2113+
::::::::::::::{dropdown} /features/items/oneOf/1/composition models/items/oneOf/2/min depth/oneOf/3
2114+
:open:
2115+
:name: open_features_items_oneOf_1_composition-models_items_oneOf_2_min-depth_oneOf_3
2116+
2117+
- **default value**:
2118+
- **type**:string
2119+
- **description**:
2120+
::::::::::::::
2121+
20862122

20872123
::::::::::::::::
20882124

@@ -2170,6 +2206,15 @@
21702206

21712207
::::::::::::::
21722208

2209+
::::::::::::::{dropdown} /features/items/oneOf/1/composition models/items/oneOf/2/max depth/oneOf/3
2210+
:open:
2211+
:name: open_features_items_oneOf_1_composition-models_items_oneOf_2_max-depth_oneOf_3
2212+
2213+
- **default value**:
2214+
- **type**:string
2215+
- **description**:
2216+
::::::::::::::
2217+
21732218

21742219
::::::::::::::::
21752220

‎source/world_builder/features/continental_plate_models/composition/random.cc‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,14 @@ namespace WorldBuilder
6565
"Uniform compositional model. Sets constant compositional field.");
6666

6767
// Declare entries of this plugin
68-
prm.declare_entry("min depth", Types::OneOf(Types::Double(0),Types::Array(Types::ValueAtPoints(0., 2.))),
68+
prm.declare_entry("min depth", Types::OneOf(Types::Double(0),
69+
Types::Array(Types::ValueAtPoints(0., 2.)),
70+
Types::String("")),
6971
"The depth in meters from which the composition of this feature is present.");
7072

71-
prm.declare_entry("max depth", Types::OneOf(Types::Double(std::numeric_limits<double>::max()),Types::Array(Types::ValueAtPoints(std::numeric_limits<double>::max(), 2.))),
73+
prm.declare_entry("max depth", Types::OneOf(Types::Double(std::numeric_limits<double>::max()),
74+
Types::Array(Types::ValueAtPoints(std::numeric_limits<double>::max(), 2.)),
75+
Types::String("")),
7276
"The depth in meters to which the composition of this feature is present.");
7377

7478
prm.declare_entry("compositions", Types::Array(Types::UnsignedInt(),0),

‎source/world_builder/features/continental_plate_models/grains/random_uniform_distribution.cc‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,17 @@ namespace WorldBuilder
6464
"to a single value or to a random distribution.");
6565

6666
// Declare entries of this plugin
67-
prm.declare_entry("min depth", Types::OneOf(Types::Double(0),Types::Array(Types::ValueAtPoints(0., 2.))),
67+
prm.declare_entry("min depth", Types::OneOf(Types::Double(0),
68+
Types::Array(Types::ValueAtPoints(0., 2.)),
69+
Types::String("")),
6870
"The depth in meters from which the composition of this feature is present.");
69-
prm.declare_entry("max depth", Types::OneOf(Types::Double(std::numeric_limits<double>::max()),Types::Array(Types::ValueAtPoints(std::numeric_limits<double>::max(), 2.))),
71+
72+
prm.declare_entry("max depth", Types::OneOf(Types::Double(std::numeric_limits<double>::max()),
73+
Types::Array(Types::ValueAtPoints(std::numeric_limits<double>::max(), 2.)),
74+
Types::String("")),
7075
"The depth in meters to which the composition of this feature is present.");
7176

77+
7278
prm.declare_entry("compositions", Types::Array(Types::UnsignedInt(),0),
7379
"A list with the integer labels of the composition which are present there.");
7480

‎source/world_builder/features/continental_plate_models/grains/random_uniform_distribution_deflected.cc‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,17 @@ namespace WorldBuilder
6363
"to a single value or to a random distribution.");
6464

6565
// Declare entries of this plugin
66-
prm.declare_entry("min depth", Types::OneOf(Types::Double(0),Types::Array(Types::ValueAtPoints(0., 2.))),
66+
prm.declare_entry("min depth", Types::OneOf(Types::Double(0),
67+
Types::Array(Types::ValueAtPoints(0., 2.)),
68+
Types::String("")),
6769
"The depth in meters from which the composition of this feature is present.");
68-
prm.declare_entry("max depth", Types::OneOf(Types::Double(std::numeric_limits<double>::max()),Types::Array(Types::ValueAtPoints(std::numeric_limits<double>::max(), 2.))),
70+
71+
prm.declare_entry("max depth", Types::OneOf(Types::Double(std::numeric_limits<double>::max()),
72+
Types::Array(Types::ValueAtPoints(std::numeric_limits<double>::max(), 2.)),
73+
Types::String("")),
6974
"The depth in meters to which the composition of this feature is present.");
7075

76+
7177
prm.declare_entry("compositions", Types::Array(Types::UnsignedInt(),0),
7278
"A list with the integer labels of the composition which are present there.");
7379

‎source/world_builder/features/continental_plate_models/grains/uniform.cc‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,17 @@ namespace WorldBuilder
6262
"Uniform grains model. All grains start exactly the same.");
6363

6464
// Declare entries of this plugin
65-
prm.declare_entry("min depth", Types::OneOf(Types::Double(0),Types::Array(Types::ValueAtPoints(0., 2.))),
65+
prm.declare_entry("min depth", Types::OneOf(Types::Double(0),
66+
Types::Array(Types::ValueAtPoints(0., 2.)),
67+
Types::String("")),
6668
"The depth in meters from which the composition of this feature is present.");
6769

68-
prm.declare_entry("max depth", Types::OneOf(Types::Double(std::numeric_limits<double>::max()),Types::Array(Types::ValueAtPoints(std::numeric_limits<double>::max(), 2.))),
70+
prm.declare_entry("max depth", Types::OneOf(Types::Double(std::numeric_limits<double>::max()),
71+
Types::Array(Types::ValueAtPoints(std::numeric_limits<double>::max(), 2.)),
72+
Types::String("")),
6973
"The depth in meters to which the composition of this feature is present.");
7074

75+
7176
prm.declare_entry("compositions", Types::Array(Types::UnsignedInt(),0),
7277
"A list with the integer labels of the composition which are present there.");
7378

‎source/world_builder/features/continental_plate_models/temperature/adiabatic.cc‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,17 @@ namespace WorldBuilder
6363
"Adiabatic temperature model. Uses global values by default.");
6464

6565
// Declare entries of this plugin
66-
prm.declare_entry("min depth", Types::OneOf(Types::Double(0),Types::Array(Types::ValueAtPoints(0., 2.))),
66+
prm.declare_entry("min depth", Types::OneOf(Types::Double(0),
67+
Types::Array(Types::ValueAtPoints(0., 2.)),
68+
Types::String("")),
6769
"The depth in meters from which the composition of this feature is present.");
6870

69-
prm.declare_entry("max depth", Types::OneOf(Types::Double(std::numeric_limits<double>::max()),Types::Array(Types::ValueAtPoints(std::numeric_limits<double>::max(), 2.))),
71+
prm.declare_entry("max depth", Types::OneOf(Types::Double(std::numeric_limits<double>::max()),
72+
Types::Array(Types::ValueAtPoints(std::numeric_limits<double>::max(), 2.)),
73+
Types::String("")),
7074
"The depth in meters to which the composition of this feature is present.");
7175

76+
7277
prm.declare_entry("potential mantle temperature", Types::Double(-1),
7378
"The potential temperature of the mantle at the surface in Kelvin. "
7479
"If the value is lower then zero, the global value is used.");

‎source/world_builder/features/continental_plate_models/temperature/chapman.cc‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,16 @@ namespace WorldBuilder
6464
prm.declare_entry("", Types::Object(),
6565
"Continental geotherm using the steady-state 1-D heat conduction equation from Chapman (1986).");
6666

67+
prm.declare_entry("min depth", Types::OneOf(Types::Double(0),
68+
Types::Array(Types::ValueAtPoints(0., 2.)),
69+
Types::String("")),
70+
"The depth in meters from which the composition of this feature is present.");
71+
72+
prm.declare_entry("max depth", Types::OneOf(Types::Double(std::numeric_limits<double>::max()),
73+
Types::Array(Types::ValueAtPoints(std::numeric_limits<double>::max(), 2.)),
74+
Types::String("")),
75+
"The depth in meters to which the composition of this feature is present.");
76+
6777
prm.declare_entry("top temperature", Types::Double(293.15),
6878
"The temperature at the top surface in K of this feature."
6979
"If the value is below zero, then an adiabatic temperature is used.");
@@ -80,12 +90,6 @@ namespace WorldBuilder
8090
"The heat generation per unit volume in W m^(-3) of this feature."
8191
"The default value is 1e-6.");
8292

83-
prm.declare_entry("min depth", Types::OneOf(Types::Double(0),Types::Array(Types::ValueAtPoints(0., 2.))),
84-
"The depth in m from which the composition of this feature is present.");
85-
86-
prm.declare_entry("max depth", Types::OneOf(Types::Double(std::numeric_limits<double>::max()),Types::Array(Types::ValueAtPoints(std::numeric_limits<double>::max(), 2.))),
87-
"The depth in m to which the composition of this feature is present.");
88-
8993
}
9094

9195
void

‎source/world_builder/features/continental_plate_models/temperature/linear.cc‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,12 @@ namespace WorldBuilder
6969
Types::String("")),
7070
"The depth in meters from which the composition of this feature is present.");
7171

72-
prm.declare_entry("max depth", Types::OneOf(Types::Double(std::numeric_limits<double>::max()),Types::Array(Types::ValueAtPoints(std::numeric_limits<double>::max(), 2.)),Types::String("")),
72+
prm.declare_entry("max depth", Types::OneOf(Types::Double(std::numeric_limits<double>::max()),
73+
Types::Array(Types::ValueAtPoints(std::numeric_limits<double>::max(), 2.)),
74+
Types::String("")),
7375
"The depth in meters to which the composition of this feature is present.");
7476

77+
7578
prm.declare_entry("top temperature", Types::Double(293.15),
7679
"The temperature at the top in degree Kelvin of this feature."
7780
"If the value is below zero, the an adiabatic temperature is used.");

0 commit comments

Comments
 (0)