add IO functionalities to write DCIP2D mesh and models #84
Conversation
Codecov Report
@@ Coverage Diff @@
## master #84 +/- ##
==========================================
+ Coverage 77.06% 77.44% +0.38%
==========================================
Files 17 17
Lines 4870 4948 +78
==========================================
+ Hits 3753 3832 +79
+ Misses 1117 1116 -1
Continue to review full report at Codecov.
|
| @@ -300,7 +300,56 @@ def _toVTRObj(mesh, models=None): | |||
| vtkObj.GetCellData().SetActiveScalars(models.keys()[0]) | |||
| return vtkObj | |||
|
|
|||
| def readModelUBC(mesh, fileName): | |||
| def _readModelUBC_2D(mesh, fileName): | |||
| """ | |||
discretize/MeshIO.py
Outdated
|
|
||
| else: | ||
|
|
||
| if len(obsfile[1:]) == 1: |
There was a problem hiding this comment.
would you mind adding a test that hits these lines?
There was a problem hiding this comment.
we can actually make this function much simpler. Will do.
tests/base/2d_2cyl_model
Outdated
| @@ -0,0 +1,48 @@ | |||
| 135 47 | |||
There was a problem hiding this comment.
@thast: is this for testing, if you slack me the file, I will upload and send you a url where you can download it so it is not in the core repo
There was a problem hiding this comment.
@lheagy : Thanks for pointing it out. The test actually writes and then read back the testing files here (so we test both input and output).
I will reproduce what we do in SimPEG and create a temporary folder that we then delete, so no storing will be necessary.
tests/base/ubc_DC2D_tensor_mesh.msh
Outdated
| 3550 1 | ||
| 3950 1 | ||
| 4550 1 | ||
| !comment line |
There was a problem hiding this comment.
same here, I am happy to upload this
…he same place by giving the option to specify the folder outside of the filename
discretize/MeshIO.py
Outdated
| @@ -118,7 +118,7 @@ def unpackdx(fid, nrows): | |||
| return tensMsh | |||
|
|
|||
| @classmethod | |||
| def readUBC(TensorMesh, fileName, meshdim=None): | |||
| def readUBC(TensorMesh, fileName, meshdim=None, folder=''): | |||
There was a problem hiding this comment.
do we want folder or directory ?
cc @rowanc1: do you know what is more common?
There was a problem hiding this comment.
Indeed directory does sound better.
discretize/MeshIO.py
Outdated
| # Fist line is the size of the model | ||
| sizeM = np.array(msh.ravel()[0].split(), dtype=float) | ||
| # Check if the mesh is a UBC 2D mesh | ||
| if sizeM.shape[0] == 1: | ||
| Tnsmsh = TensorMesh._readUBC_2DMesh(fileName) | ||
| Tnsmsh = TensorMesh._readUBC_2DMesh(fname) |
There was a problem hiding this comment.
to simplify this a bit (and reduce redundancy), why don't we just assign meshdim = 2 here or meshdim = 3 below, and then check meshdim and call the appropriate readUBC method after that.
Thoughts?
There was a problem hiding this comment.
I agree, this is a function I wrote in a previous PR but it was a redundant check between what the user expects and what the machine read.
|
Thanks @lheagy, can you merge it for me please? Does not seem I have the rights to do so |
the
MeshIOfunctionswriteUBCandwriteModelUBCare now compatible with 2D meshes and models.We now make sure that mesh and model get saved at the same place by giving the option to specify the folder outside of the filename (before the folder was given by the
dict.keys, not very practical)The upgrade is backward compatible