Copyright update 2020

[modules/homard.git] / src / HOMARD / HOMARD_Zone.cxx

diff --git a/src/HOMARD/HOMARD_Zone.cxx b/src/HOMARD/HOMARD_Zone.cxx
index 742d594caead9b99df718e3239f883f654714fe4..0d938a53b0c665ab25010fa52da35cbfd56a10ef 100644 (file)
--- a/src/HOMARD/HOMARD_Zone.cxx
+++ b/src/HOMARD/HOMARD_Zone.cxx
@@ -1,11 +1,11 @@
-//  HOMARD HOMARD : implementaion of HOMARD idl descriptions
+//  HOMARD HOMARD : implementation of HOMARD idl descriptions
 //
-// Copyright (C) 2011-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2011-2020  CEA/DEN, EDF R&D
 //
 // 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_Zone.cxx
-//  Author : Paul RASCLE, EDF
+//  Author : Gerald NICOLAS, EDF
 //  Module : HOMARD
 //
 // Remarques :
@@ -32,6 +32,7 @@
 // Quand les 2 fonctions Setxxx et Getxxx sont presentes, Setxxx est decrit en premier
 
 #include "HOMARD_Zone.hxx"
+#include "HOMARD.hxx"
 #include "utilities.h"
 
 //=============================================================================
@@ -75,12 +76,12 @@ std::string HOMARD_Zone::GetDumpPython() const
 //   MESSAGE("GetDumpPython avec _Name " << _Name) ;
   std::ostringstream aScript;
   aScript << "\n# Creation of the ";
-  if ( _Type >= 11 and _Type <= 13 ) { aScript << "rectangle " ; }
+  if ( _Type >= 11 && _Type <= 13 ) { aScript << "rectangle " ; }
   else if ( _Type == 2 ) { aScript << "box " ;}
-  else if ( _Type >= 31 and _Type <= 33 ) { aScript << "disk " ;}
+  else if ( _Type >= 31 && _Type <= 33 ) { aScript << "disk " ;}
   else if ( _Type == 4 ) { aScript << "sphere " ; }
   else if ( _Type == 5 ) { aScript << "cylinder " ; }
-  else if ( _Type >= 61 and _Type <= 63 ) { aScript << "disk with hole " ;}
+  else if ( _Type >= 61 && _Type <= 63 ) { aScript << "disk with hole " ;}
   else if ( _Type == 7 ) { aScript << "pipe " ; }
   aScript << _Name << "\n" ;
 //
@@ -275,7 +276,7 @@ std::vector<double> HOMARD_Zone::GetCoords() const
       mesCoor.push_back( _Rayonint ) ;
       break ;
     }
-    ASSERT ( _Type == -1 ) ;
+    VERIFICATION ( ( (_Type>10) && (_Type<14) ) || (_Type==2) || ( (_Type>30) && (_Type<34) ) || (_Type==4) || (_Type==5) || ( (_Type>60) && (_Type<64) ) || (_Type==7) ) ;
   }
   return mesCoor;
 }
@@ -314,7 +315,7 @@ void HOMARD_Zone::SupprHypo( const char* NomHypo )
   if ( it != _ListHypo.end() )
   {
     MESSAGE ("Dans SupprHypo pour " << NomHypo) ;
-    _ListHypo.erase( it ) ;
+    it = _ListHypo.erase( it ) ;
   }
 }
 //=============================================================================