From 03f08469ab3977629952328259d83ee209f15c05 Mon Sep 17 00:00:00 2001 From: Aleks Novikov Date: Thu, 24 Apr 2025 21:06:59 +0200 Subject: [PATCH 1/2] Receive cycleNumber from Python in output/execute/collect calls --- src/coreComponents/fileIO/python/PyHistoryCollection.cpp | 4 ++-- src/coreComponents/fileIO/python/PyHistoryOutput.cpp | 4 ++-- src/coreComponents/fileIO/python/PyVTKOutput.cpp | 4 ++-- src/coreComponents/physicsSolvers/python/PySolver.cpp | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/coreComponents/fileIO/python/PyHistoryCollection.cpp b/src/coreComponents/fileIO/python/PyHistoryCollection.cpp index 5f65e62966a..7bd2a08ea4d 100644 --- a/src/coreComponents/fileIO/python/PyHistoryCollection.cpp +++ b/src/coreComponents/fileIO/python/PyHistoryCollection.cpp @@ -90,15 +90,15 @@ static PyObject * collect( PyHistoryCollection * self, PyObject * args ) double time; double dt; + int cycleNumber; - if( !PyArg_ParseTuple( args, "dd", &time, &dt ) ) + if( !PyArg_ParseTuple( args, "ddi", &time, &dt, &cycleNumber ) ) { return nullptr; } geos::DomainPartition & domain = self->group->getGroupByPath< DomainPartition >( "/Problem/domain" ); - int cycleNumber = int(round( time/dt )); try { self->group->execute( time, dt, cycleNumber, 0, 0, domain ); diff --git a/src/coreComponents/fileIO/python/PyHistoryOutput.cpp b/src/coreComponents/fileIO/python/PyHistoryOutput.cpp index 5da919b192a..e7fff852ef5 100644 --- a/src/coreComponents/fileIO/python/PyHistoryOutput.cpp +++ b/src/coreComponents/fileIO/python/PyHistoryOutput.cpp @@ -88,15 +88,15 @@ static PyObject * output( PyHistoryOutput * self, PyObject * args ) double time; double dt; + int cycleNumber; - if( !PyArg_ParseTuple( args, "dd", &time, &dt ) ) + if( !PyArg_ParseTuple( args, "ddi", &time, &dt, &cycleNumber ) ) { return nullptr; } geos::DomainPartition & domain = self->group->getGroupByPath< DomainPartition >( "/Problem/domain" ); - int cycleNumber = int(round( time/dt )); try { self->group->cleanup( time, cycleNumber, 0, 0, domain ); diff --git a/src/coreComponents/fileIO/python/PyVTKOutput.cpp b/src/coreComponents/fileIO/python/PyVTKOutput.cpp index 496fe116348..89cc2c4026f 100644 --- a/src/coreComponents/fileIO/python/PyVTKOutput.cpp +++ b/src/coreComponents/fileIO/python/PyVTKOutput.cpp @@ -86,15 +86,15 @@ static PyObject * output( PyVTKOutput * self, PyObject * args ) double time; double dt; + int cycleNumber; - if( !PyArg_ParseTuple( args, "dd", &time, &dt ) ) + if( !PyArg_ParseTuple( args, "ddi", &time, &dt, &cycleNumber ) ) { return nullptr; } geos::DomainPartition & domain = self->group->getGroupByPath< DomainPartition >( "/Problem/domain" ); - int cycleNumber = int(round( time/dt )); try { self->group->execute( time, dt, cycleNumber, 0, 0, domain ); diff --git a/src/coreComponents/physicsSolvers/python/PySolver.cpp b/src/coreComponents/physicsSolvers/python/PySolver.cpp index befc482dc15..a854240259e 100644 --- a/src/coreComponents/physicsSolvers/python/PySolver.cpp +++ b/src/coreComponents/physicsSolvers/python/PySolver.cpp @@ -85,15 +85,15 @@ static PyObject * execute( PySolver * self, PyObject * args ) double time; double dt; - if( !PyArg_ParseTuple( args, "dd", &time, &dt ) ) + int cycleNumber; + + if( !PyArg_ParseTuple( args, "ddi", &time, &dt, &cycleNumber ) ) { return nullptr; } geos::DomainPartition & domain = self->group->getGroupByPath< DomainPartition >( "/Problem/domain" ); - int cycleNumber = int(round( time/dt )); - self->group->execute( time, dt, cycleNumber, 0, 0, domain ); Py_RETURN_NONE; From 34d91281f4feefe14477f208ba47846af40daffb Mon Sep 17 00:00:00 2001 From: Aleks Novikov Date: Thu, 24 Apr 2025 23:35:40 +0200 Subject: [PATCH 2/2] Uncrustify formatting --- src/coreComponents/physicsSolvers/python/PySolver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreComponents/physicsSolvers/python/PySolver.cpp b/src/coreComponents/physicsSolvers/python/PySolver.cpp index a854240259e..d8c7ada2ae2 100644 --- a/src/coreComponents/physicsSolvers/python/PySolver.cpp +++ b/src/coreComponents/physicsSolvers/python/PySolver.cpp @@ -86,7 +86,7 @@ static PyObject * execute( PySolver * self, PyObject * args ) double time; double dt; int cycleNumber; - + if( !PyArg_ParseTuple( args, "ddi", &time, &dt, &cycleNumber ) ) { return nullptr;