search

adaptive-cfd / WABBIT

Wavelet Adaptive Block-Based solver for Interactions with Turbulence
https://www.cfd.tu-berlin.de/
GNU General Public License v3.0
56 stars 27 forks source link

Changes related with two pairs of wings, bristled wings, corrugation etc. #40

Closed dkolom closed 4 years ago

dkolom commented 4 years ago

Github shows many commits, I think this is because of the way I merged the changes from adaptive-cfd into my repository. The only relevant changes are in the 'conflicting files' LIB/EQUATION/insects/module_insects.f90 and LIB/EQUATION/insects/wings_geometry.f90

tommy-engels commented 4 years ago

Pull request merged manually (without git) as the latest commit to adaptive-cfd:master, please review.

You seem to have merged dkolom:newGhostNodes into dkolom:master which is why the pull request shows hundreds of commits. we should not merge this in the repository.

I therefore manually copied your changes. I suggest you delete your repository and fork again (or any other way that copies the current state of the adaptive-cfd:main ) before committing further changes. alternatively, we can add you to the adaptive-cfd group and you commit directly there.

We'll close the request once you approve of the changes.

best regards

dkolom commented 4 years ago

Thanks! I've forked again as you recommended. There are some additional now changes today, they should be able to merge automatically. Regards, Dmitry

On Mon, Sep 14, 2020 at 6:28 PM Thomas Engels notifications@github.com wrote:

Pull request merged manually (without git) as the latest commit to adaptive-cfd:master, please review.

You seem to have merged dkolom:newGhostNodes into dkolom:master which is why the pull request shows hundreds of commits. we should not merge this in the repository.

I therefore manually copied your changes. I suggest you delete your repository and fork again (or any other way that copies the current state of the adaptive-cfd:main ) before committing further changes. alternatively, we can add you to the adaptive-cfd group and you commit directly there.

We'll close the request once you approve of the changes.

best regards

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/adaptive-cfd/WABBIT/pull/40#issuecomment-691936471, or unsubscribe https://github.com/notifications/unsubscribe-auth/ABENQFEXUPGJM3DT4BHYXDLSFXO3JANCNFSM4RHCVWNA .