search

tofstie / PHiLiP

Parallel High-Order Library for PDEs through hp-adaptive Discontinuous Galerkin methods
Other
0 stars 0 forks source link

Merge master into Label-Ctests #1

Closed tofstie closed 1 month ago

tofstie commented 1 month ago

When cloning and switching to a new branch, apparently master was not copied properly to Label-Ctests. This PR is to merge master into Label-Ctests

tofstie commented 1 month ago

The conflicts were from dougshidong#263 and the small change I made in the initial commit of this branch. Fixed by taking the master changes in NNLS_solver and the commit changes in CMakeLists.txt

tofstie commented 1 month ago

Closed because this would involve commiting into master. Was just easier to delete the Ctests branch and remake it