From a3b974f0f68b4ea42bbfadb42106996e9a1842c8 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 1 Apr 2013 13:57:10 +0000 Subject: [PATCH] Merge from V6_main 01/04/2013 --- HOMARD_version.h.in | 2 +- Makefile.am | 2 +- adm_local/Makefile.am | 2 +- adm_local/unix/Makefile.am | 2 +- adm_local/unix/config_files/Makefile.am | 2 +- adm_local/unix/config_files/check_GUI.m4 | 2 +- adm_local/unix/config_files/check_Med2.m4 | 2 +- adm_local/unix/config_files/check_sphinx.m4 | 2 +- adm_local/unix/make_common_starter.am | 2 +- bin/Makefile.am | 2 +- bin/runAppli.in | 2 +- bin/runSalome.py | 2 +- build_configure | 2 +- clean_configure | 2 +- configure.ac | 2 +- doc/Makefile.am | 2 +- doc/files/tutorial_1.py | 2 +- doc/files/tutorial_2.py | 2 +- doc/files/tutorial_3.py | 2 +- doc/files/tutorial_4.py | 2 +- doc/files/tutorial_5.py | 2 +- idl/HOMARD_Boundary.idl | 2 +- idl/HOMARD_Cas.idl | 2 +- idl/HOMARD_Gen.idl | 2 +- idl/HOMARD_Hypothesis.idl | 2 +- idl/HOMARD_Iteration.idl | 2 +- idl/HOMARD_Zone.idl | 2 +- idl/Makefile.am | 2 +- resources/HOMARDCatalog.xml.in | 2 +- resources/HOMARD_en.xml | 2 +- resources/HOMARD_fr.xml | 2 +- resources/Makefile.am | 2 +- resources/SalomeApp.xml.in | 2 +- src/HOMARD/HOMARD_Boundary.cxx | 2 +- src/HOMARD/HOMARD_Boundary.hxx | 2 +- src/HOMARD/HOMARD_Cas.cxx | 2 +- src/HOMARD/HOMARD_Cas.hxx | 2 +- src/HOMARD/HOMARD_DriverTools.cxx | 2 +- src/HOMARD/HOMARD_DriverTools.hxx | 2 +- src/HOMARD/HOMARD_Gen.cxx | 2 +- src/HOMARD/HOMARD_Gen.hxx | 2 +- src/HOMARD/HOMARD_Hypothesis.cxx | 2 +- src/HOMARD/HOMARD_Hypothesis.hxx | 2 +- src/HOMARD/HOMARD_Iteration.cxx | 2 +- src/HOMARD/HOMARD_Iteration.hxx | 2 +- src/HOMARD/HOMARD_Zone.cxx | 2 +- src/HOMARD/HOMARD_Zone.hxx | 2 +- src/HOMARD/HomardDriver.cxx | 2 +- src/HOMARD/HomardDriver.hxx | 2 +- src/HOMARD/Makefile.am | 2 +- src/HOMARDGUI/HOMARDGUI.cxx | 2 +- src/HOMARDGUI/HOMARDGUI.h | 2 +- src/HOMARDGUI/HOMARDGUI_Utils.cxx | 2 +- src/HOMARDGUI/HOMARDGUI_Utils.h | 2 +- src/HOMARDGUI/HomardQtCommun.cxx | 2 +- src/HOMARDGUI/HomardQtCommun.h | 2 +- src/HOMARDGUI/Makefile.am | 2 +- src/HOMARDGUI/MonCreateBoundaryAn.cxx | 2 +- src/HOMARDGUI/MonCreateBoundaryAn.h | 2 +- src/HOMARDGUI/MonCreateBoundaryDi.cxx | 2 +- src/HOMARDGUI/MonCreateBoundaryDi.h | 2 +- src/HOMARDGUI/MonCreateCase.cxx | 2 +- src/HOMARDGUI/MonCreateCase.h | 2 +- src/HOMARDGUI/MonCreateHypothesis.cxx | 2 +- src/HOMARDGUI/MonCreateHypothesis.h | 2 +- src/HOMARDGUI/MonCreateIteration.cxx | 2 +- src/HOMARDGUI/MonCreateIteration.h | 2 +- src/HOMARDGUI/MonCreateListGroup.cxx | 2 +- src/HOMARDGUI/MonCreateListGroup.h | 2 +- src/HOMARDGUI/MonCreateZone.cxx | 2 +- src/HOMARDGUI/MonCreateZone.h | 2 +- src/HOMARDGUI/MonEditBoundaryAn.cxx | 2 +- src/HOMARDGUI/MonEditBoundaryAn.h | 2 +- src/HOMARDGUI/MonEditBoundaryDi.cxx | 2 +- src/HOMARDGUI/MonEditBoundaryDi.h | 2 +- src/HOMARDGUI/MonEditCase.cxx | 2 +- src/HOMARDGUI/MonEditCase.h | 2 +- src/HOMARDGUI/MonEditFile.cxx | 2 +- src/HOMARDGUI/MonEditFile.h | 2 +- src/HOMARDGUI/MonEditHypothesis.cxx | 2 +- src/HOMARDGUI/MonEditHypothesis.h | 2 +- src/HOMARDGUI/MonEditIteration.cxx | 2 +- src/HOMARDGUI/MonEditIteration.h | 2 +- src/HOMARDGUI/MonEditListGroup.cxx | 2 +- src/HOMARDGUI/MonEditListGroup.h | 2 +- src/HOMARDGUI/MonEditZone.cxx | 2 +- src/HOMARDGUI/MonEditZone.h | 2 +- src/HOMARDGUI/MonIterInfo.cxx | 2 +- src/HOMARDGUI/MonIterInfo.h | 2 +- src/HOMARDGUI/MonMeshInfo.cxx | 2 +- src/HOMARDGUI/MonMeshInfo.h | 2 +- src/HOMARD_I/HOMARD_Boundary_i.cxx | 2 +- src/HOMARD_I/HOMARD_Boundary_i.hxx | 2 +- src/HOMARD_I/HOMARD_Cas_i.cxx | 2 +- src/HOMARD_I/HOMARD_Cas_i.hxx | 2 +- src/HOMARD_I/HOMARD_Gen_i.cxx | 2 +- src/HOMARD_I/HOMARD_Gen_i.hxx | 2 +- src/HOMARD_I/HOMARD_Hypothesis_i.cxx | 2 +- src/HOMARD_I/HOMARD_Hypothesis_i.hxx | 2 +- src/HOMARD_I/HOMARD_Iteration_i.cxx | 2 +- src/HOMARD_I/HOMARD_Iteration_i.hxx | 2 +- src/HOMARD_I/HOMARD_Zone_i.cxx | 2 +- src/HOMARD_I/HOMARD_Zone_i.hxx | 2 +- src/HOMARD_I/HomardMedCommun.cxx | 2 +- src/HOMARD_I/HomardMedCommun.h | 2 +- src/HOMARD_I/Makefile.am | 2 +- src/HOMARD_SCRIPTS/Makefile.am | 2 +- src/HOMARD_SCRIPTS/testHomard.py | 2 +- src/HOMARD_SCRIPTS/test_homard.py | 2 +- src/HOMARD_SWIG/HOMARD_shared_modules.py | 2 +- src/HOMARD_SWIG/Makefile.am | 2 +- src/HOMARD_SWIG/libHOMARD_Swig.i | 2 +- src/Makefile.am | 2 +- tests/Makefile.am | 2 +- tests/test_1.py | 2 +- tests/test_2.py | 2 +- tests/test_3.py | 2 +- 117 files changed, 117 insertions(+), 117 deletions(-) diff --git a/HOMARD_version.h.in b/HOMARD_version.h.in index d1873f6f..479ed1cd 100644 --- a/HOMARD_version.h.in +++ b/HOMARD_version.h.in @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D +// Copyright (C) 2007-2013 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 diff --git a/Makefile.am b/Makefile.am index 39df6985..8208a203 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2012 CEA/DEN, EDF R&D +# Copyright (C) 2011-2013 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 diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am index 88aeda65..ac41a1d3 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2012 CEA/DEN, EDF R&D +# Copyright (C) 2011-2013 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 diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am index 328edada..467b297a 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2012 CEA/DEN, EDF R&D +# Copyright (C) 2011-2013 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 diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am index edbfd5b9..9ba61ebc 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2012 CEA/DEN, EDF R&D +# Copyright (C) 2011-2013 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 diff --git a/adm_local/unix/config_files/check_GUI.m4 b/adm_local/unix/config_files/check_GUI.m4 index 8907e15e..9a9ce600 100755 --- a/adm_local/unix/config_files/check_GUI.m4 +++ b/adm_local/unix/config_files/check_GUI.m4 @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2012 CEA/DEN, EDF R&D +# Copyright (C) 2011-2013 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 diff --git a/adm_local/unix/config_files/check_Med2.m4 b/adm_local/unix/config_files/check_Med2.m4 index bd8f7deb..5e9440ed 100644 --- a/adm_local/unix/config_files/check_Med2.m4 +++ b/adm_local/unix/config_files/check_Med2.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2011-2012 CEA/DEN, EDF R&D +dnl Copyright (C) 2011-2013 CEA/DEN, EDF R&D dnl dnl This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public diff --git a/adm_local/unix/config_files/check_sphinx.m4 b/adm_local/unix/config_files/check_sphinx.m4 index 91bb8573..2e717ba3 100644 --- a/adm_local/unix/config_files/check_sphinx.m4 +++ b/adm_local/unix/config_files/check_sphinx.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2011-2012 CEA/DEN, EDF R&D +dnl Copyright (C) 2011-2013 CEA/DEN, EDF R&D dnl dnl This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index e76403b6..1e894694 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2012 CEA/DEN, EDF R&D +# Copyright (C) 2011-2013 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 diff --git a/bin/Makefile.am b/bin/Makefile.am index 4a6b36ba..0a7e972b 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2012 CEA/DEN, EDF R&D +# Copyright (C) 2011-2013 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 diff --git a/bin/runAppli.in b/bin/runAppli.in index 16b7fb54..7bd9ac95 100755 --- a/bin/runAppli.in +++ b/bin/runAppli.in @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2011-2012 CEA/DEN, EDF R&D +# Copyright (C) 2011-2013 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 diff --git a/bin/runSalome.py b/bin/runSalome.py index f481b367..957f261a 100755 --- a/bin/runSalome.py +++ b/bin/runSalome.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (C) 2011-2012 CEA/DEN, EDF R&D +# Copyright (C) 2011-2013 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 diff --git a/build_configure b/build_configure index 9a3b6c24..156057c6 100755 --- a/build_configure +++ b/build_configure @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2011-2012 CEA/DEN, EDF R&D +# Copyright (C) 2011-2013 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 diff --git a/clean_configure b/clean_configure index c7c8b7f0..d253b213 100755 --- a/clean_configure +++ b/clean_configure @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2011-2012 CEA/DEN, EDF R&D +# Copyright (C) 2011-2013 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 diff --git a/configure.ac b/configure.ac index 8de04cb2..dfb902b7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2012 CEA/DEN, EDF R&D +# Copyright (C) 2011-2013 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 diff --git a/doc/Makefile.am b/doc/Makefile.am index 9d467299..c98222e7 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2012 CEA/DEN, EDF R&D +# Copyright (C) 2011-2013 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 diff --git a/doc/files/tutorial_1.py b/doc/files/tutorial_1.py index de07bc94..aa43b098 100644 --- a/doc/files/tutorial_1.py +++ b/doc/files/tutorial_1.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: iso-8859-1 -*- -# Copyright (C) 2011-2012 CEA/DEN, EDF R&D +# Copyright (C) 2011-2013 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 diff --git a/doc/files/tutorial_2.py b/doc/files/tutorial_2.py index 93af69f8..b0747cec 100644 --- a/doc/files/tutorial_2.py +++ b/doc/files/tutorial_2.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: iso-8859-1 -*- -# Copyright (C) 2011-2012 CEA/DEN, EDF R&D +# Copyright (C) 2011-2013 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 diff --git a/doc/files/tutorial_3.py b/doc/files/tutorial_3.py index a457e509..c98ee03c 100644 --- a/doc/files/tutorial_3.py +++ b/doc/files/tutorial_3.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: iso-8859-1 -*- -# Copyright (C) 2011-2012 CEA/DEN, EDF R&D +# Copyright (C) 2011-2013 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 diff --git a/doc/files/tutorial_4.py b/doc/files/tutorial_4.py index ab4c2dc8..c4af7b9a 100644 --- a/doc/files/tutorial_4.py +++ b/doc/files/tutorial_4.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: iso-8859-1 -*- -# Copyright (C) 2011-2012 CEA/DEN, EDF R&D +# Copyright (C) 2011-2013 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 diff --git a/doc/files/tutorial_5.py b/doc/files/tutorial_5.py index 3104253b..488e7a62 100644 --- a/doc/files/tutorial_5.py +++ b/doc/files/tutorial_5.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: iso-8859-1 -*- -# Copyright (C) 2011-2012 CEA/DEN, EDF R&D +# Copyright (C) 2011-2013 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 diff --git a/idl/HOMARD_Boundary.idl b/idl/HOMARD_Boundary.idl index ef93fb73..da4c0093 100644 --- a/idl/HOMARD_Boundary.idl +++ b/idl/HOMARD_Boundary.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2011-2012 CEA/DEN, EDF R&D +// Copyright (C) 2011-2013 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 diff --git a/idl/HOMARD_Cas.idl b/idl/HOMARD_Cas.idl index d226341e..6e97623c 100644 --- a/idl/HOMARD_Cas.idl +++ b/idl/HOMARD_Cas.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2011-2012 CEA/DEN, EDF R&D +// Copyright (C) 2011-2013 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 diff --git a/idl/HOMARD_Gen.idl b/idl/HOMARD_Gen.idl index 14716c63..4beffc75 100644 --- a/idl/HOMARD_Gen.idl +++ b/idl/HOMARD_Gen.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2011-2012 CEA/DEN, EDF R&D +// Copyright (C) 2011-2013 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 diff --git a/idl/HOMARD_Hypothesis.idl b/idl/HOMARD_Hypothesis.idl index 032a1dae..8c42085c 100644 --- a/idl/HOMARD_Hypothesis.idl +++ b/idl/HOMARD_Hypothesis.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2011-2012 CEA/DEN, EDF R&D +// Copyright (C) 2011-2013 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 diff --git a/idl/HOMARD_Iteration.idl b/idl/HOMARD_Iteration.idl index f7380483..9c6cc6dc 100644 --- a/idl/HOMARD_Iteration.idl +++ b/idl/HOMARD_Iteration.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2011-2012 CEA/DEN, EDF R&D +// Copyright (C) 2011-2013 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 diff --git a/idl/HOMARD_Zone.idl b/idl/HOMARD_Zone.idl index cec49d5b..3ee41609 100644 --- a/idl/HOMARD_Zone.idl +++ b/idl/HOMARD_Zone.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2011-2012 CEA/DEN, EDF R&D +// Copyright (C) 2011-2013 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 diff --git a/idl/Makefile.am b/idl/Makefile.am index b23eab58..c4edc404 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2012 CEA/DEN, EDF R&D +# Copyright (C) 2011-2013 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 diff --git a/resources/HOMARDCatalog.xml.in b/resources/HOMARDCatalog.xml.in index 2aa347ed..260fc8c6 100644 --- a/resources/HOMARDCatalog.xml.in +++ b/resources/HOMARDCatalog.xml.in @@ -1,7 +1,7 @@