Mixing io ii #23

jmarcelogimenez · 2015-05-14T21:39:01Z

We have solved the integration between the file-IO wrapper with the internalInterfaces wrapper. Examples and Unittests are working.

khiltunen · 2015-05-19T06:24:26Z

openfoam-interface/internal-interface/tests/test_foam_interface.py

@@ -0,0 +1,312 @@
+""" test foam native interface


This test is now for IO wrapper interface. Should be changed to use internal interface and add test of methods which are missing

The test has been changed to use the internal interface

nathanfranklin · 2015-05-19T09:08:04Z

openfoam-interface/internal-interface/libs/sourceFiles/LESModel.C

@@ -0,0 +1,210 @@
+/*---------------------------------------------------------------------------*\


There were no differences between this file LESModel.C and the one found in OpenFoam 2.2.x ("OpenFOAM-XXX/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C"). Can this file be removed and the one from OpenFoam used?

nathanfranklin · 2015-05-20T11:44:01Z

foam_controlwrapper/examples/poiseuille.py

@@ -3,12 +3,12 @@
 """

 from simphony.core.cuba import CUBA


@khiltunen, @jmarcelogimenez , the foam_controlwrapper/examples/poiseuille.py and foam_internalwrapper/examples/poiseuille.py are also mostly the same. Both types of wrappers support the same functionality, right? When looking at the files, it seems so..except for one minor thing (i.e. CUBAExt.NUMBER_OF_CORES).

I would think that these are examples of using simphony-openfoam (regardless of its its the INTERNAL or FILE-IO version). Therefore, foam_controlwrapper/examples/poiseuille.py and foam_internalwrapper/examples/poiseuille.py could be replaced by`examples/poiseuille.py``.

I would suggest not trying to tackle this in this PR but to address it in a seperate PR and an issue should be opened up now (e.g. "make a single poiseuille.py")

@jmarcelogimenez , this comment has been not addressed. An issue should be opened if it is not going to be addressed in this PR.

nathanfranklin · 2015-05-22T09:45:27Z

The code is passing flake8 now.

@santiagomarquezd , are there some local changes you made that were not pushed to github yet?

nathanfranklin · 2015-06-03T16:51:29Z

What is the status of this PR?

CI is now failing. See https://travis-ci.org/simphony/simphony-openfoam/builds/63707826

khiltunen · 2015-06-04T06:30:24Z

@santiagomarquezd could you please let me know if assistance is needed to get this PR fixed

santiagomarquezd · 2015-06-04T13:32:13Z

Hi @khiltunen, we detected the same problem here in our local repository, we will work on that today

jmarcelogimenez · 2015-06-05T16:23:06Z

This branch is almost ready to merge, excepting the test fails that ocurr when a cuds file is read. We are following the discussion in #26, so we are waiting for instructions about how to manage it.

nathanfranklin · 2015-06-08T07:21:32Z

This branch is almost ready to merge, excepting the test fails that ocurr when a cuds file is read. We are following the discussion in #26, so we are waiting for instructions about how to manage it.

i would think just using a version of simphony-common 0.1.3 would do the trick at the moment (and not have to wait for #26)

Set that as the fixed version in requirements files and in the setup.py

khiltunen · 2015-06-08T10:12:15Z

I agree that we should stick on 0.1.3 for now.

nathanfranklin · 2015-06-15T13:12:41Z

I agree that we should stick on 0.1.3 for now.

@jmarcelogimenez , there is a PR (#29) under review so that the master now uses 0.1.3 of simphony-common.

Once that PR (#29) is merged, can you merge these new changes in master to this branch (see _What should I do if there is a new bugfix release that helps me with a feature PR?_ in the FAQ on https://publicwiki-01.fraunhofer.de/SimPhoNy-Project/index.php/Simphony_packages_development_workflow or let us know if you need assistance or want us to do it).

This should resolve the current error that revolves around the format of the file being used for testing.

nathanfranklin · 2015-06-16T16:06:33Z

@jmarcelogimenez , master now uses 0.1.3 of simphony-common. Please merge these new changes in master to this branch (see my previous comment).

nathanfranklin · 2015-06-23T15:37:26Z

Are there any updates on this PR?

jmarcelogimenez · 2015-06-25T17:19:13Z

We have solved the simphony-common version issues. Waiting for travis checking ...

nathanfranklin · 2015-06-26T12:24:07Z

foam_controlwrapper/tests/test_controlwrapper.py

@@ -266,8 +266,8 @@ def test_run_time(self):
        new_vel = cell.data[CUBA.VELOCITY]
        new_pres = cell.data[CUBA.PRESSURE]

-        self.assertNotEqual(old_vel, new_vel)
-        self.assertNotEqual(old_pres, new_pres)
+        #self.assertNotEqual(old_vel, new_vel)


why are these commented out?

jmarcelogimenez · 2015-06-26T20:47:32Z

@nathanfranklin we do not know why the travis test fail. In our local installations the tests work fine. If you look at this build: https://travis-ci.org/simphony/simphony-openfoam/builds/68353970, you can see the same result that we obtain here. Rarely, next travis builds do not work, without change the code! It looks like the test is reading an original OF file instead of our modificated file (fvSchemes.C). Then, if we can not reproduce that failure, we can not solve it.

Any idea?

Update: The problem was a linking precedence. Our compiler worked different than others, then the behavior was unpredictable. We have fixed the method selected in order to use our implementation.

jmarcelogimenez · 2015-06-29T18:52:32Z

We have solved some linking issues.
This PR is able to be merged.
@nathanfranklin, will you do the merging?

nathanfranklin · 2015-06-29T19:56:51Z

@khiltunen, have you had a look too to see if your comments were addressed?

@jmarcelogimenez , I added some issues to the comments to be addresed in later PRS. From my end it looks good to merge.

khiltunen · 2015-06-30T06:47:29Z

My comment's were all addressed. So this is OK to merge

jmarcelogimenez · 2015-06-30T14:06:54Z

So ... who is responsible for making the merge?

nathanfranklin · 2015-06-30T14:09:02Z

@jmarcelogimenez , the developers of this repository. so you all and @khiltunen.

Mixing io ii

itziakos · 2015-06-30T17:43:46Z

foam_internalwrapper/tests/foam_mesh.py

@@ -0,0 +1,665 @@
+""" Mesh module


This file is duplicate with foam_internalwrapper/foam_mesh.py please remove

I will open a github issue

jmarcelogimenez added 3 commits May 14, 2015 18:34

Integration OpenFoam wrappers

03a2385

modification of readme

7da1bfe

modification of readm

33fcced

khiltunen reviewed May 19, 2015
View reviewed changes

nathanfranklin mentioned this pull request May 19, 2015

Feature openfoam internalinterface #20

Closed

nathanfranklin reviewed May 19, 2015
View reviewed changes

itziakos mentioned this pull request May 19, 2015

setup a stable and latest build in travis ci #19

Closed

nathanfranklin reviewed May 20, 2015
View reviewed changes

Corrections for #23

058ed86

jmarcelogimenez added 3 commits June 4, 2015 10:50

Fixing travis-ci problem

56de9ed

Fixing travis-ci problem

50518d4

Fixing travis-ci problem

a501271

nathanfranklin mentioned this pull request Jun 8, 2015

can poiseuille.cuds be generated? simphony/simphony-numerrin#3

Closed

This was referenced Jun 17, 2015

WIP: Add internal wrappers simphony/simphony-framework#31

Closed

WIP: Add internal wrappers simphony/simphony-framework#32

Closed

nathanfranklin mentioned this pull request Jun 25, 2015

WIP: Add internal wrappers simphony/simphony-framework#36

Closed

Merging with master

4fd8c5b

solving bug with OF opt version and controlwrapper test by-passed

d1b09c5

nathanfranklin reviewed Jun 26, 2015
View reviewed changes

fixing some issues

93e573c

Fixing linking issues

2373c1f

jmarcelogimenez mentioned this pull request Jun 30, 2015

Provide a single setup.py to install the full simphony-openfoam plugin #24

Open

jmarcelogimenez added a commit that referenced this pull request Jun 30, 2015

Merge pull request #23 from simphony/mixing-io-ii

590934b

Mixing io ii

jmarcelogimenez merged commit 590934b into master Jun 30, 2015

itziakos reviewed Jun 30, 2015
View reviewed changes

nathanfranklin deleted the mixing-io-ii branch July 1, 2015 15:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Mixing io ii #23

Mixing io ii #23

jmarcelogimenez commented May 14, 2015

khiltunen May 19, 2015

santiagomarquezd May 21, 2015

nathanfranklin May 19, 2015

santiagomarquezd May 21, 2015

nathanfranklin May 20, 2015

nathanfranklin Jun 26, 2015

nathanfranklin commented May 22, 2015

nathanfranklin commented Jun 3, 2015

khiltunen commented Jun 4, 2015

santiagomarquezd commented Jun 4, 2015

jmarcelogimenez commented Jun 5, 2015

nathanfranklin commented Jun 8, 2015

khiltunen commented Jun 8, 2015

nathanfranklin commented Jun 15, 2015

nathanfranklin commented Jun 16, 2015

nathanfranklin commented Jun 23, 2015

jmarcelogimenez commented Jun 25, 2015

nathanfranklin Jun 26, 2015

jmarcelogimenez commented Jun 26, 2015

jmarcelogimenez commented Jun 29, 2015

nathanfranklin commented Jun 29, 2015

khiltunen commented Jun 30, 2015

jmarcelogimenez commented Jun 30, 2015

nathanfranklin commented Jun 30, 2015

itziakos Jun 30, 2015

itziakos Jun 30, 2015

		@@ -0,0 +1,210 @@
		/---------------------------------------------------------------------------\

Mixing io ii #23

Mixing io ii #23

Conversation

jmarcelogimenez commented May 14, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nathanfranklin commented May 22, 2015

nathanfranklin commented Jun 3, 2015

khiltunen commented Jun 4, 2015

santiagomarquezd commented Jun 4, 2015

jmarcelogimenez commented Jun 5, 2015

nathanfranklin commented Jun 8, 2015

khiltunen commented Jun 8, 2015

nathanfranklin commented Jun 15, 2015

nathanfranklin commented Jun 16, 2015

nathanfranklin commented Jun 23, 2015

jmarcelogimenez commented Jun 25, 2015

Choose a reason for hiding this comment

jmarcelogimenez commented Jun 26, 2015

jmarcelogimenez commented Jun 29, 2015

nathanfranklin commented Jun 29, 2015

khiltunen commented Jun 30, 2015

jmarcelogimenez commented Jun 30, 2015

nathanfranklin commented Jun 30, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment