diff --git a/Common/onelab.h b/Common/onelab.h index b89e1da6dfe59a18089d9ce355b5e68ff2850422..e528447c4216bbda603b2e7f57293e3c1ca9d0b2 100644 --- a/Common/onelab.h +++ b/Common/onelab.h @@ -1,4 +1,4 @@ -// OneLab - Copyright (C) 2011-2012 ULg-UCL +// OneLab - Copyright (C) 2011-2013 ULg-UCL // // Permission is hereby granted, free of charge, to any person // obtaining a copy of this software and associated documentation @@ -22,7 +22,8 @@ // ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE // OF THIS SOFTWARE. // -// Please report all bugs and problems to the public mailing list <gmsh@geuz.org>. +// Please report all bugs and problems to the public mailing list +// <gmsh@geuz.org>. #ifndef _ONELAB_H_ #define _ONELAB_H_ diff --git a/Geo/GModel.h b/Geo/GModel.h index 5f6dbf1d734d86a46811abfc522775b71845fda3..da1c5fa851c330023eb7512d69e34b7224558419 100644 --- a/Geo/GModel.h +++ b/Geo/GModel.h @@ -18,6 +18,7 @@ #include "SPoint3.h" #include "SBoundingBox3d.h" #include "boundaryLayersData.h" + template <class scalar> class simpleFunction; class FM_Internals; @@ -154,7 +155,7 @@ class GModel // boundary layer columns i.e. list of vertices that form columns // in boundary layers - BoundaryLayerColumns _columns; + BoundaryLayerColumns _columns; public: GModel(std::string name=""); diff --git a/contrib/onelab/python/onelab.py b/contrib/onelab/python/onelab.py index 90dac0d51d7a0805a749fbb0087a102a7e3b01e1..fb33b1f30ac796067ac22be0172c033ab3fb3462 100755 --- a/contrib/onelab/python/onelab.py +++ b/contrib/onelab/python/onelab.py @@ -1,3 +1,32 @@ +""" +OneLab - Copyright (C) 2011-2013 ULg-UCL + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, copy, +modify, merge, publish, distribute, and/or sell copies of the +Software, and to permit persons to whom the Software is furnished +to do so, provided that the above copyright notice(s) and this +permission notice appear in all copies of the Software and that +both the above copyright notice(s) and this permission notice +appear in supporting documentation. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE +COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR +ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY +DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS +ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE +OF THIS SOFTWARE. + +Please report all bugs and problems to the public mailing list +<gmsh@geuz.org>. +""" + import socket, struct, os, sys _VERSION = '1.05' @@ -280,7 +309,3 @@ class client : if self.socket : self._send(self._GMSH_STOP, 'Goodbye!') self.socket.close() - - - -