Skip to content

Update OpenFOAM-OpenFOAM tutorials according to major preCICE config changes - #107

Merged
MakisH merged 4 commits into
developfrom
simplify-paralel-config
Jan 11, 2020
Merged

Update OpenFOAM-OpenFOAM tutorials according to major preCICE config changes#107
MakisH merged 4 commits into
developfrom
simplify-paralel-config

Conversation

@MakisH

@MakisH MakisH commented Dec 19, 2019

Copy link
Copy Markdown
Member

This PR applies the same changes as precice/tutorials#60, namely:

  • Remove the precice-config_parallel.xml files. We don't need mpi-single to run parallel cases anymore. Furthermore, distribution-type is removed from preCICE (breaking change).
  • Rename precice-config_serial.xml to precice-config.xml, replacing the respective link.
  • Remove the link creation mechanism in runFluid, runSolid, Allrun, Allrun_parallel.

Depends on precice/precice#572.

@MakisH
MakisH changed the base branch from master to develop December 19, 2019 23:23
BenjaminRodenberg added a commit to precice/systemtests that referenced this pull request Jan 10, 2020
BenjaminRodenberg added a commit to precice/systemtests that referenced this pull request Jan 10, 2020
<relative-convergence-measure limit="1.0e-6" data="Temperature" mesh="Fluid-Mesh"/>
<extrapolation-order value="2"/>
<post-processing:IQN-ILS>
<acceleration:IQN-ILS>

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This corrensponds to a diferent change in preCICE, but since in the tutorials repository they are treated as one, it's ok to treat it as one here as well.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

However, we need to update this for every tutorial.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

precice/tutorials#60 already contains this change. E.g. here. Sorry, if I am causing confusion. I thought that #107 is just the OpenFOAM version of precice/tutorials#60. (And it is more convenient for our current testing problems, if the breaking changes are not scattered)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but we have more tutorials here (i.e. the nearest-projection variant). Just let me take care of this.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And it is more convenient for our current testing problems, if the breaking changes are not scattered

I think I can hack around this problem in my testing branch (see precice/systemtests@2460f9a). Therefore, you can ignore this argument. If you want to keep things separated, feel free to git revert 1e826a8

@MakisH MakisH changed the title Tutorials (OpenFOAM-OpenFOAM): Simplify parallel configuration Update OpenFOAM-OpenFOAM tutorials according to major preCICE config changes Jan 10, 2020
@MakisH

MakisH commented Jan 11, 2020

Copy link
Copy Markdown
Member Author

This is ready to merge, but the system tests fail with unclear reason.

@Eder-K

Eder-K commented Jan 11, 2020

Copy link
Copy Markdown
Contributor

The error in this tests seems to be the same one that is currently being worked on in precice/systemtests#150. When triggering a test here, we should therefore have it run on the branch of the PR.

However, the triggering script used here

- curl -LO --retry 3 https://raw.githubusercontent.com/precice/systemtests/master/trigger_systemtests.py

is taken from the master branch of systemtests. That script version in turn is quite old and only runs tests on systemtests/master, which doesn't contain the aforementioned fixes from precice/systemtests#150. The functionality for triggering on different branches is currently in precice/systemtests#143.

So, to run the test, we could alter the .travis.yml file here to first pull the new script version from PR 143 and then run on PR 150:

      script: 
        - curl -LO --retry 3 https://raw.githubusercontent.com/precice/systemtests/i_141/trigger_systemtests.py
        - travis_wait 60 python trigger_systemtests.py --adapter openfoam --wait --branch BenjaminRueth-patch-of-of

@MakisH
MakisH merged commit 7cfe2ca into develop Jan 11, 2020
MakisH added a commit that referenced this pull request Feb 9, 2020
…changes (#107)

* Tutorials: remove parallel versions of precice-config.xml

* Tutorials: Update config files for parallel simulations

* Replace post-processing with acceleration

* Replace post-processing with acceletation (NP tutorial)

Co-authored-by: Benjamin Rüth <benjamin.rueth@tum.de>
MakisH added a commit that referenced this pull request Feb 9, 2020
…changes (#107)

* Tutorials: remove parallel versions of precice-config.xml

* Tutorials: Update config files for parallel simulations

* Replace post-processing with acceleration

* Replace post-processing with acceletation (NP tutorial)

Co-authored-by: Benjamin Rüth <benjamin.rueth@tum.de>
@MakisH
MakisH deleted the simplify-paralel-config branch February 12, 2020 19:37
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.

4 participants