Skip to content

Commit ddefb3d

Browse files
authored
Merge pull request #88 from OpenSEMBA/dev
Dev
2 parents c8e1cde + 7378c26 commit ddefb3d

10 files changed

Lines changed: 671 additions & 15 deletions

File tree

CMakePresets.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,17 @@
4646
"MFEM_ENABLE_TESTING": false,
4747
"MFEM_USE_OPENMP": false
4848
}
49+
},
50+
{
51+
"name": "gnu-dbg",
52+
"displayName": "GNU g++ compiler",
53+
"inherits": "default",
54+
"cacheVariables": {
55+
"TULIP_USE_MFEM_AS_SUBDIRECTORY": true,
56+
"MFEM_ENABLE_TESTING": false,
57+
"MFEM_USE_OPENMP": false,
58+
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
59+
}
4960
}
5061
],
5162
"buildPresets": [

docs/tulip_data_format.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
- [`shield`](#shield)
88
- [`dielectric`](#dielectric)
99
- [`open`](#open)
10-
- [`<model>`](#model)
10+
- [`<layers>`](#layers)
1111
- [.tulip.adapted.json file format](#tulipadaptedjson-file-format)
1212
- [Example](#example)
1313
- [`materials` array](#materials-array)
@@ -21,12 +21,14 @@ Tulip uses three types of file formats:
2121
- `CASE_NAME.tulip.out.json` which is the solver output containing the $L$ and $C$ PUL matrices for shielded domains and the multipolar expansion coefficients for an open domain.
2222

2323
# .tulip.input.json file format
24-
Tulip receives a JSON object as an input with the entries described below. Square brackets indicate that the entry is optional and a default value will be assumed, angle brackets indicate that the entry is mandatory.
24+
Tulip receives a JSON object as an input with the entries described below. Square brackets indicate that the entry is optional and a default value will be assumed, angle brackets indicate that the entry is mandatory.
2525

2626
Unless specified otherwise all units are assumed to be in SI-MKS.
2727

2828
Filename should be in the format `CASE_NAME.tulip.input.json`.
2929

30+
At minimum, the input JSON must include top-level `materials` and `layers` arrays.
31+
3032
## `[adapterOptions]`
3133
It can contain the following entries, as explained in [AdapterOption.h](../src/adapter/AdapterOptions.h) with their corresponding default values. An example is shown below.
3234
```json
@@ -49,7 +51,7 @@ Driver manages the solver`and generates outputs. Default options can be checked
4951
```
5052

5153
## `<materials>`
52-
These materials are associated with `model` `layers` to define regions with different material properties.
54+
These materials are associated with top-level `layers` to define regions with different material properties.
5355
They are defined by an array of JSON objects with:
5456
- `[name]` a string with a human readable name.
5557
- `<id>` an integer identifier with a unique number.
@@ -84,12 +86,11 @@ A dielectric is defined with a `[relativePermittivity]` which defaults to `1.0`.
8486
An `open` material serves to specify the computational boundary of the problem. It must intersect every other material layer. If no open boundary is specified for an open problem, one is computed automatically, together with _inner_ and _outer_ regions used to extract the unshielded multiwire coefficients.
8587

8688

87-
## `<model>`
88-
This object can contain the following entries:
89-
+ `<layers>` which is an array which associates the layers present in the `.step` file with the different `materials`. Each layer is specified by:
90-
- `<name>` which must match exactly the name of the corresponding layer within the `.step` file. It must be unique.
91-
- `<id>` which is an integer non-negative unique identifier which will be used to order the results for the calculated PUL matrices.
92-
- `<materialId>` which must match an `id` from a material in the list of `materials`
89+
## `<layers>`
90+
This top-level array associates the layers present in the `.step` file with the different `materials`. Each layer is specified by:
91+
- `<name>` which must match exactly the name of the corresponding layer within the `.step` file. It must be unique.
92+
- `<id>` which is an integer non-negative unique identifier which will be used to order the results for the calculated PUL matrices.
93+
- `<materialId>` which must match an `id` from a material in the list of `materials`
9394

9495

9596
# .tulip.adapted.json file format
@@ -177,4 +178,4 @@ This object can contain the following entries:
177178

178179
For unshielded-domains stores the parameters needed to reconstruct the field using a multipolar expansion.
179180

180-
It also stores `materialAssociation` information which serves to reconstruct the
181+
It also stores `materialAssociation` information which serves to reconstruct the

0 commit comments

Comments
 (0)