X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHOMARD%2FHOMARD_DriverTools.cxx;h=ab29a7df7441587c5e7b615e94dd805214271743;hb=633ecb2c6133ab4f266d218ff13da5e46310c90f;hp=4bcc8146a4770a8de46947529452b75192bb60d2;hpb=77262fdb4bf42ef5a70a8918f6bb3c86b0f6f3b3;p=modules%2Fhomard.git diff --git a/src/HOMARD/HOMARD_DriverTools.cxx b/src/HOMARD/HOMARD_DriverTools.cxx index 4bcc8146..ab29a7df 100644 --- a/src/HOMARD/HOMARD_DriverTools.cxx +++ b/src/HOMARD/HOMARD_DriverTools.cxx @@ -156,7 +156,7 @@ namespace HOMARD os << separator() << iteration.GetEtat(); os << separator() << iteration.GetNumber(); os << separator() << iteration.GetMeshFile(); - os << separator() << iteration.GetMessFile(); + os << separator() << iteration.GetLogFile(); os << separator() << iteration.GetMeshName(); os << separator() << iteration.GetFieldFile(); os << separator() << iteration.GetTimeStep(); @@ -432,7 +432,7 @@ namespace HOMARD iteration.SetMeshFile( chunk.c_str() ); chunk = getNextChunk( stream, start, ok ); if ( !ok ) return false; - iteration.SetMessFile( chunk.c_str() ); + iteration.SetLogFile( chunk.c_str() ); chunk = getNextChunk( stream, start, ok ); if ( !ok ) return false; iteration.SetMeshName( chunk.c_str() ); @@ -730,6 +730,10 @@ namespace HOMARD { boundary.SetCylinder(coords[0],coords[1],coords[2],coords[3],coords[4],coords[5],coords[6]); } else if ( BoundaryType == 2 ) { boundary.SetSphere( coords[0], coords[1], coords[2], coords[3]); } + else if ( BoundaryType == 3 ) + { boundary.SetConeA( coords[0], coords[1], coords[2], coords[3], coords[4], coords[5], coords[6]); } + else if ( BoundaryType == 4 ) + { boundary.SetConeR( coords[0], coords[1], coords[2], coords[3], coords[4], coords[5], coords[6], coords[7]); } // Remarque : la taille de coords est suffisante pour les limites for ( int i = 0; i < 3; i++ ) { chunk = getNextChunk( stream, start, ok );