PrincetonUniversity / SPEC

The Stepped-Pressure Equilibrium Code, an advanced MRxMHD equilibrium solver.
https://princetonuniversity.github.io/SPEC/
GNU General Public License v3.0
25 stars 6 forks source link

Retrieving old (working) master version #23

Closed jloizu closed 7 years ago

jloizu commented 7 years ago

As explained in last comments (Oct25) of the issue "robust convergence", a bug has been identified that was introduced on Aug7 when merging ma00aa with master.

We need to retrieve that version such that the new master version corresponds to the working old version. I think the cleanest way is that I checkout that version and (after testing) make a new commit with these files. Then the history will be preserved, and the latest version will be a working one.

Also, I checked and that does not seem to affect the NAG_REPLACE branch - since, I guess, ma00aa was not merged into it.

Please let me know if this strategy makes sense to you.

jloizu commented 7 years ago

I also want to notice that if I use my method to determine whether two outputs are equivalent or not (I wrote a routine that estimates, from two spec outputs, out1 and out2, what would be the force imbalance on equilibrium out1 if the output geometry of the equilibrium out2 was used as initial condition for out1) I can see that the master version does not produce equivalent results at all when comparing old and new versions run for the slab case. However for the l=2 stellarator testcase, they do...that is why I did not see any problem when I tested and compared both the master and ma00aa branches before merging.

While I do not understand why these two versions produce only different results in the slab but not in the stellarator case, this means we need to perform several tests on different geometries before every merge.

jloizu commented 7 years ago

I have reverted the master version in order to retrieve the project to the version previous to the Aug7th merge, without changing the past commit history. This what I did:

$ git reset --hard b98b8fe
$ git reset --soft HEAD@{1} $ git commit -m "Reverting to the state of the project at..."