Skip to content

MHM hybrid mixed#69

Draft
pedrolimasi wants to merge 30 commits intoRefactorGeomfrom
MHM_HybridMixed
Draft

MHM hybrid mixed#69
pedrolimasi wants to merge 30 commits intoRefactorGeomfrom
MHM_HybridMixed

Conversation

@pedrolimasi
Copy link
Member

@philippedevloo Has made a few improvements to mixed MHM approximations. Those would best be listed and detailed by him. But I'm sure he'll happily answer any questions you have.

Please run your target tests on this branch and report back what breaks and what works, so we can merge it to development branch (RefactorGeom).

@gustavobat @PabloGSCarvalho @denisesiq @jbvilleg

@karolinneoc I remember him citing you, and you finding it strange. If you can report your results too anyway, thanks for the help.

philippedevloo and others added 29 commits September 28, 2020 14:49
# Conflicts:
#	Mesh/TPZCompMeshTools.cpp
#	Mesh/TPZCompMeshTools.h
#	Mesh/TPZMultiphysicsCompMesh.cpp
#	Mesh/pzcondensedcompel.cpp
#	Mesh/pzcondensedcompel.h
#	Mesh/pzelchdiv.cpp
#	Pre/TPZMHMixedMeshControl.cpp
@orlandini
Copy link
Member

Dear @pedrolima92, the PR #67 is bound to happen later today. I suggest we wait a little bit longer on this one, so we could merge RefactorGeom back to MHM_Hybrid_Mixed. I am not so sure how would commits like 29373e1 and ff70801 would work out as it is.

@pedrolimasi
Copy link
Member Author

pedrolimasi commented Mar 26, 2021

Sure @orlandini I was admitting the possibility that PR #67 would come first.

  • You and I have already discussed 29373e1, which was a quick fix. And at Changes from 'refactor-cmake' branch #67 we've set a more definitive solution. So that commit will just be overwritten by the commits we discussed leading up to 49c2963.

  • I don't think I'll have any trouble resolving conflicts of my commits.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants