X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHOMARD%2FHOMARD_Iteration.cxx;h=78fe8bcf100cfac91d70ee852df04ad9a6e91e9b;hb=31086b2b08730cab7973f016edd2aaafee1eabbb;hp=592154ba76c6a77e7ff428e596aa9b16a83de512;hpb=9e58f253ace5b07462140dc8e3b2d1aea1d366a6;p=modules%2Fhomard.git diff --git a/src/HOMARD/HOMARD_Iteration.cxx b/src/HOMARD/HOMARD_Iteration.cxx index 592154ba..78fe8bcf 100644 --- a/src/HOMARD/HOMARD_Iteration.cxx +++ b/src/HOMARD/HOMARD_Iteration.cxx @@ -1,11 +1,11 @@ // HOMARD HOMARD : implementation of HOMARD idl descriptions // -// Copyright (C) 2011-2013 CEA/DEN, EDF R&D +// Copyright (C) 2011-2023 CEA, EDF // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : HOMARD_Iteration.cxx -// Author : Paul RASCLE, EDF +// Author : Gerald NICOLAS, EDF // Module : HOMARD // // Remarques : @@ -41,7 +41,7 @@ */ //============================================================================= HOMARD_Iteration::HOMARD_Iteration(): - _Name( "" ), _Etat( false ), + _Name( "" ), _Etat( 0 ), _NumIter( -1 ), _NomMesh( "" ), _MeshFile( "" ), _FieldFile( "" ), _TimeStep( -1 ), _Rank( -1 ), @@ -147,8 +147,8 @@ std::string HOMARD_Iteration::GetDumpPython() const // Compute MESSAGE (". Compute "); - if (_Etat == true) { aScript << "\tcodret = " <<_Name << ".Compute(1, 1)\n"; } - else { aScript << "\t#codret = " <<_Name << ".Compute(1, 1)\n"; } + if ( _Etat == 2 ) { aScript << "\tcodret = " <<_Name << ".Compute(1, 1)\n"; } + else { aScript << "\t#codret = " <<_Name << ".Compute(1, 1)\n"; } // MESSAGE (". Fin de l ecriture de l iteration " << _Name ); return aScript.str(); @@ -255,7 +255,7 @@ void HOMARD_Iteration::SetFieldInterpTimeStep( const char* FieldInterp, int Time //============================================================================= void HOMARD_Iteration::SetFieldInterpTimeStepRank( const char* FieldInterp, int TimeStep, int Rank ) { - MESSAGE("Champ " << FieldInterp << ", hypothese " << _NomHypo ) + MESSAGE("Champ " << FieldInterp << ", hypothese " << _NomHypo ); // Verification de la presence du champ dans l'hypothese std::list::iterator it = find( _ListFieldInterp.begin(), _ListFieldInterp.end(), FieldInterp ); if ( it == _ListFieldInterp.end() )