Option to read initial texture from ascii file#918
Conversation
Pull Request Test Coverage Report for Build 23867577424Details
💛 - Coveralls |
|
|
This looks great, thanks for dividing up your original PR into these small PR's! The coverage has dropped by several percent because your test only covers the mantle feature, but I think just including the other features in your current test should help to overcome this. I'm not sure why some of the testers are failing though... thoughts on this @MFraters |
5eb78ec to
fab6507
Compare
|
It took me a bit to figure out, but I was able to reproduce the issues on my computer and it now seems to work on my computer. The first issue had to do with that the c and cpp compilation tests where not using the mpi versions of the compiler when doing the manual compilation. The second issue was that the gdb and valgrind were not having the same working directory as the normal tests. I agree with @danieldouglas92 that it would be great if you could add tester coverage for all plugins :) |
|
apparently it is not fixed on the tester.... Let's look at it again tomorrow. |
970a734 to
e591c52
Compare
|
oke, it seems like the issues are fixed now. Can you add the missing tests? Otherwise good to merge I think. btw, I had to rebase in the meantime, do you know how to update your branch? |
|
hmm, I think I accidentally rebased onto an older main, resulting in a large diff for the declarations and a not accurate coverage result. I can fix this, since it was my mistake. |
0a018b1 to
8404af5
Compare
compiling the c and cpp tests and fix gdb and valgrind working directories.
8404af5 to
d9b7330
Compare
|
Fixed the declaration files issues. The test that you made is not actually sampling the plume, subducting plate and oceanic plate. Can you either add points in those features, so that we know that they are tested, or you can also change to a gwb grid tests, which may be easier to sample all features. Other than that, I think it is good to merge :) |
c820d83 to
d2faa39
Compare
927d7d5 to
1ca5cf3
Compare
Thanks Menno! I've fixed the tests for coverage and also a small old typo, so that the typo tester doesn't break. |
I added the option to read the initial texture from an input file as a grain model for all features. Something to note about this grain model:
It will check that the number of particles and the number of grains in the input file are the same as provided by the ASPECT input file.
If there are multiple features, it allows each feature to have different initial textures (from an input file or using the other grain models), and the number of particles within this feature also needs to match the number of particles inside the input file provided. - Both Olivine and Enstatite are allowed.
It expects the input file to have the format of a particle_cpo output file from ASPECT. It expects an input file with headers (Olivine only):
id, mineral_0_volume_fraction, mineral_0_EA_phi, mineral_0_EA_theta, mineral_0_EA_z)
or headers (Olivine and Enstatite):
id mineral_0_volume_fraction mineral_0_EA_phi mineral_0_EA_theta mineral_0_EA_z mineral_1_volume_fraction mineral_1_EA_phi mineral_1_EA_theta mineral_1_EA_z