From 2dde0463274f805894a05551b876475d04dbce2d Mon Sep 17 00:00:00 2001 From: SALOME Date: Tue, 25 Aug 2020 10:52:58 +0300 Subject: [PATCH] #18963 Minimize compiler warnings --- CMakeLists.txt | 4 - doc/dev/sphinx/fr/index.rst | 6 +- doc/dev/sphinx/fr/medcalc-develguide.rst | 4 +- doc/dev/sphinx/fr/medcalc-specifications.rst | 8 +- doc/dev/sphinx/fr/medcalc-userguide-gui.rst | 10 +-- doc/dev/sphinx/index.rst | 4 +- doc/dev/sphinx/medcalc-develguide.rst | 4 +- doc/dev/sphinx/medcalc-specifications.rst | 4 +- doc/dev/sphinx/medcalc-userguide-gui.rst | 8 +- src/MEDCalc/MEDCalcConstants.hxx | 7 +- src/MEDCalc/cmp/MED.cxx | 6 +- src/MEDCalc/cmp/MEDCalculator_i.cxx | 2 +- src/MEDCalc/cmp/MEDDataManager_i.cxx | 17 ++-- src/MEDCalc/cmp/MEDPresentation.cxx | 12 +-- src/MEDCalc/cmp/MEDPresentationManager_i.cxx | 28 ++++--- .../cmp/MEDPresentationPointSprite.cxx | 2 +- src/MEDCalc/cmp/MEDPyLockWrapper.hxx | 3 +- src/MEDCalc/gui/DatasourceController.cxx | 4 +- src/MEDCalc/gui/MEDModule.cxx | 14 ++-- src/MEDCalc/gui/MEDWidgetHelper.cxx | 4 +- src/MEDCalc/gui/MEDWidgetHelperMeshView.cxx | 2 +- src/MEDCalc/gui/MEDWidgetHelperSlices.cxx | 2 +- src/MEDCalc/gui/PresentationController.cxx | 11 ++- src/MEDCalc/gui/ProcessingController.cxx | 4 + src/MEDCalc/gui/TestController.hxx | 2 +- src/MEDCalc/gui/WorkspaceController.cxx | 11 +-- src/MEDCalc/gui/XmedConsoleDriver.cxx | 1 - src/MEDCalc/gui/XmedDataModel.hxx | 1 + .../dialogs/WidgetPresentationParameters.cxx | 24 +++++- .../MEDCalculatorBrowserField.cxx | 2 +- .../MEDCalculatorBrowserField.hxx | 2 +- src/MEDCalculator/MEDCalculatorDBField.cxx | 76 ++++++++--------- src/MEDCalculator/MEDCalculatorDBField.hxx | 84 +++++++++---------- .../MEDCalculatorDBRangeSelection.cxx | 14 ++-- .../MEDCalculatorDBRangeSelection.hxx | 14 ++-- .../MEDCalculatorDBSliceField.cxx | 18 ++-- .../MEDCalculatorDBSliceField.hxx | 18 ++-- src/MEDCalculator/Swig/SPythonParser.cxx | 4 +- .../DataArrayDoubleServant.cxx | 2 +- src/MEDCouplingCorba/DataArrayIntServant.cxx | 2 +- .../MPIMEDCouplingFieldDoubleServant.cxx | 4 +- .../MPIMEDCouplingFieldDoubleServant.hxx | 2 +- .../ParaMEDMEMComponent_i.cxx | 12 +-- .../ParaMEDMEMComponent_i.hxx | 6 +- 44 files changed, 245 insertions(+), 224 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a06e6be9..9a78206b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,10 +86,6 @@ ELSE(EXISTS ${MEDCOUPLING_ROOT_DIR}) MESSAGE(FATAL_ERROR "We absolutely need the MEDCoupling tool, please define MEDCOUPLING_ROOT_DIR !") ENDIF(EXISTS ${MEDCOUPLING_ROOT_DIR}) -IF(MEDCOUPLING_USE_64BIT_IDS) - ADD_DEFINITIONS("-DMEDCOUPLING_USE_64BIT_IDS") -ENDIF(MEDCOUPLING_USE_64BIT_IDS) - # # Set list of prerequisites # ========================= diff --git a/doc/dev/sphinx/fr/index.rst b/doc/dev/sphinx/fr/index.rst index 4f4ef14f1..fde84b1c7 100644 --- a/doc/dev/sphinx/fr/index.rst +++ b/doc/dev/sphinx/fr/index.rst @@ -1,7 +1,7 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%% - Documentation du module FIELDS -%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +Documentation du module FIELDS +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Le module SALOME FIELDS (pour Modèle d'Echange de Données) fournit la bibliothèque MEDCoupling (bibliothèque C++ dédiée à la manipulation de diff --git a/doc/dev/sphinx/fr/medcalc-develguide.rst b/doc/dev/sphinx/fr/medcalc-develguide.rst index dc1019cd6..29b7704d4 100644 --- a/doc/dev/sphinx/fr/medcalc-develguide.rst +++ b/doc/dev/sphinx/fr/medcalc-develguide.rst @@ -4,9 +4,9 @@ .. include:: medcalc-definitions.rst -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Module FIELDS: Guide de développement du composant MEDCalc -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Le composant logiciel MEDCalc est un élément du module FIELDS. Il fournit une interface utilisateur pour la manipulation de maillages et de diff --git a/doc/dev/sphinx/fr/medcalc-specifications.rst b/doc/dev/sphinx/fr/medcalc-specifications.rst index 656fd9b17..014acdd39 100644 --- a/doc/dev/sphinx/fr/medcalc-specifications.rst +++ b/doc/dev/sphinx/fr/medcalc-specifications.rst @@ -4,9 +4,9 @@ .. include:: medcalc-definitions.rst -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Module FIELDS: Spécifications fonctionnelles et techniques -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Ce texte présente les spécifications informatiques pour le développement d'un module de manipulation de champs qui répond à @@ -714,7 +714,7 @@ Dans le cadre défini ci-dessus, une session d'utilisation type est: * Effectuer les contrôles visuel et les diagnostics en ligne de commandes python (cf. :ref:`Spécification des fonctions de - visualisation`):: + visualisation`):: >>> view(r) @@ -751,7 +751,7 @@ Sur cette base, on peut envisager une grande variété de cas d'utilisation: l'utilisateur peut visualiser les ligne de commandes nécessaires à taper pour exécuter sa requête. -.. _specification_visualisation: +.. _specification_visualisation-fr: Spécification des fonctions de visualisation ============================================ diff --git a/doc/dev/sphinx/fr/medcalc-userguide-gui.rst b/doc/dev/sphinx/fr/medcalc-userguide-gui.rst index 41d4db0a7..d0ea7cfc7 100644 --- a/doc/dev/sphinx/fr/medcalc-userguide-gui.rst +++ b/doc/dev/sphinx/fr/medcalc-userguide-gui.rst @@ -4,9 +4,9 @@ .. include:: medcalc-definitions.rst -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Module FIELDS: Guide d'utilisation de l'interface graphique -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Ce document est un guide rapide pour l'utilisation de l'interface graphique du module FIELDS. Il montre comment utiliser le module sur la @@ -24,7 +24,7 @@ champs. :backlinks: none Présentation générale du module FIELDS -=================================== +====================================== L'ergonomie générale d'utilisation du module de manipulation de champs est inspirée des logiciels comme octave ou scilab. Elle associe une @@ -71,7 +71,7 @@ processus de la forme suivante: Tour rapide des fonctions du module FIELDS -======================================= +========================================== Cette section présente des exemples d'utilisation du module XMED sous la forme de "storyboard", et illustre au passage les fonctions mises à @@ -656,7 +656,7 @@ carte de champ: .. _xmed.userguide.tui-fr: Utilisation de l'interface textuelle du module FIELDS (TUI) -======================================================== +=========================================================== Toutes les opérations menées au moyen de l'interface graphique peuvent être réalisées (avec plus ou moins de facilité) avec l'interface diff --git a/doc/dev/sphinx/index.rst b/doc/dev/sphinx/index.rst index 275ad05f3..46400a36a 100644 --- a/doc/dev/sphinx/index.rst +++ b/doc/dev/sphinx/index.rst @@ -1,7 +1,7 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Documentation of FIELDS module -%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% The SALOME FIELDS module provides MEDCoupling library (a C++ library dedicated of mesh and field manipulation consistent with MED model), as well as a Graphical diff --git a/doc/dev/sphinx/medcalc-develguide.rst b/doc/dev/sphinx/medcalc-develguide.rst index 8433f52f1..c2c513991 100644 --- a/doc/dev/sphinx/medcalc-develguide.rst +++ b/doc/dev/sphinx/medcalc-develguide.rst @@ -4,9 +4,9 @@ .. include:: medcalc-definitions.rst -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Module FIELDS: Guide de développement du composant MEDCalc -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Le composant logiciel MEDCalc est un élément du module FIELDS. Il fournit une interface utilisateur pour la manipulation de maillages et de diff --git a/doc/dev/sphinx/medcalc-specifications.rst b/doc/dev/sphinx/medcalc-specifications.rst index bd98f6ffb..f9ddc1431 100644 --- a/doc/dev/sphinx/medcalc-specifications.rst +++ b/doc/dev/sphinx/medcalc-specifications.rst @@ -4,9 +4,9 @@ .. include:: medcalc-definitions.rst -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Module FIELDS: Spécifications fonctionnelles et techniques -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Ce texte présente les spécifications informatiques pour le développement d'un module de manipulation de champs qui répond à diff --git a/doc/dev/sphinx/medcalc-userguide-gui.rst b/doc/dev/sphinx/medcalc-userguide-gui.rst index 831214460..4e6497af6 100644 --- a/doc/dev/sphinx/medcalc-userguide-gui.rst +++ b/doc/dev/sphinx/medcalc-userguide-gui.rst @@ -4,9 +4,9 @@ .. include:: medcalc-definitions.rst -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% FIELDS module: User guide for graphical interface -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% This document is a quick guide for Graphical User Interface of FIELDS module. It shows how to use this module on the basis of a few reference examples, built @@ -26,7 +26,7 @@ from use cases identified during requirement analysis stage. look-and-feel may thus be slightly different. General presentation of FIELDS module -================================== +===================================== The overall ergonomics of FIELDS module for field manipulation is inspired by software such as octave or scilab. It combines a graphical interface (GUI) to @@ -62,7 +62,7 @@ A typical use of field manipulation functions is: Quick tour on functions available in FIELDS module -=============================================== +================================================== This section presents some use examples of FIELDS module like a "storyboard", illustrating the functions proposed by the module. diff --git a/src/MEDCalc/MEDCalcConstants.hxx b/src/MEDCalc/MEDCalcConstants.hxx index f6fbefdc1..8d49d10c4 100644 --- a/src/MEDCalc/MEDCalcConstants.hxx +++ b/src/MEDCalc/MEDCalcConstants.hxx @@ -17,6 +17,8 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // +#ifndef SRC_MEDCALC_CMP_MEDCALCCONSTANTS_HXX_ + // This constant strings are used to specify an attribute name for // AttributeParameter attributes associated to a SObject #define IS_IN_WORKSPACE "isInWorkspace" @@ -28,7 +30,8 @@ #define IS_PRESENTATION "isPresentation" #define PRESENTATION_TYPE "presentationType" -static const int NB_TYPE_OF_FIELDS = 4; -static const char* mapTypeOfFieldLabel[NB_TYPE_OF_FIELDS] = +const int NB_TYPE_OF_FIELDS = 4; +const char* const mapTypeOfFieldLabel[NB_TYPE_OF_FIELDS] = {"ON_CELLS", "ON_NODES", "ON_GAUSS_PT", "ON_GAUSS_NE" }; +#endif diff --git a/src/MEDCalc/cmp/MED.cxx b/src/MEDCalc/cmp/MED.cxx index 42160f371..0df324d2e 100644 --- a/src/MEDCalc/cmp/MED.cxx +++ b/src/MEDCalc/cmp/MED.cxx @@ -332,7 +332,7 @@ MED::getStudyPresentationEntry(CORBA::Long presentationId) // set exception handler to catch unexpected CORBA exceptions Unexpect aCatch(SALOME_SalomeException); - MED_ORB::PresentationsList* presList = new MED_ORB::PresentationsList; + //MED_ORB::PresentationsList* presList = new MED_ORB::PresentationsList; // todo: unused SALOMEDS::Study_var aStudy = KERNEL::getStudyServant(); SALOMEDS::StudyBuilder_var studyBuilder = aStudy->NewBuilder(); @@ -359,8 +359,8 @@ MED::getStudyPresentationEntry(CORBA::Long presentationId) Engines::TMPFile* -MED::DumpPython(CORBA::Boolean isPublished, - CORBA::Boolean isMultiFile, +MED::DumpPython(CORBA::Boolean /*isPublished*/, + CORBA::Boolean /*isMultiFile*/, CORBA::Boolean& isValidScript) { SALOMEDS::SObject_var aSO = KERNEL::getStudyServant()->FindComponent("FIELDS"); diff --git a/src/MEDCalc/cmp/MEDCalculator_i.cxx b/src/MEDCalc/cmp/MEDCalculator_i.cxx index b52b7410f..a7b71cabb 100644 --- a/src/MEDCalc/cmp/MEDCalculator_i.cxx +++ b/src/MEDCalc/cmp/MEDCalculator_i.cxx @@ -365,7 +365,7 @@ MEDCALC::FieldHandler * MEDCalculator_i::fct(const MEDCALC::FieldHandler & f_hdl try { field_result = field->clone(true); if ( (nbResComponents == MEDCALC::NBCOMP_DEFAULT ) || - (nbResComponents < 1) || (nbResComponents > field_result->getNumberOfComponents()) ) { + (nbResComponents < 1) || (nbResComponents > (int)field_result->getNumberOfComponents()) ) { field_result->applyFunc(function); } else { diff --git a/src/MEDCalc/cmp/MEDDataManager_i.cxx b/src/MEDCalc/cmp/MEDDataManager_i.cxx index 1df1e28fd..2f0d92c69 100644 --- a/src/MEDCalc/cmp/MEDDataManager_i.cxx +++ b/src/MEDCalc/cmp/MEDDataManager_i.cxx @@ -505,7 +505,7 @@ void MEDDataManager_i::savePersistentFields(const char * filepath) { MEDCALC::FieldIdList fieldIdList; fieldIdList.length(listId.size()); - for (int i=0; iuri; std::string fileName(source_to_file(meshSourceUri)); const char * fieldName = fieldHandler->fieldname; - const char * meshName = _meshHandlerMap[meshHandlerId]->name; + //const char * meshName = _meshHandlerMap[meshHandlerId]->name; // todo: unused timestamp = GetTimeAttachedOnFieldIteration(fileName.c_str(), fieldName, fieldHandler->iteration, fieldHandler->order); LOG("timestamp in med file is " << timestamp); } @@ -750,7 +750,7 @@ MEDCALC::FieldHandler * MEDDataManager_i::addField(MEDCouplingFieldDouble * fiel // MEDCouplingField). As a consequence, the values of these // variables are updated by this function call. This is the means to // retrieve the iteration and order of the field. - double timestamp = fieldDouble->getTime(iteration, order); + /*double timestamp = */fieldDouble->getTime(iteration, order); // todo: unused // For the fields that are created in memory (by operations for // example), the convention for the source attribute is to specify @@ -948,8 +948,7 @@ void MEDDataManager_i::serverlog() { LOG("Size = "<<_fieldHandlerMap.size()); FieldHandlerMapIterator fhmIt; for ( fhmIt = _fieldHandlerMap.begin(); fhmIt != _fieldHandlerMap.end(); fhmIt++) { - long id = fhmIt->first; - LOG("------------------------------------- id = "<getFieldHandler(_handlerId); MEDCALC::MeshHandler* meshHandler = dataManager->getMeshHandler(fieldHandler->meshid); - MEDCALC::DatasourceHandler* dataSHandler = dataManager->getDatasourceHandlerFromID(meshHandler->sourceid); + //MEDCALC::DatasourceHandler* dataSHandler = dataManager->getDatasourceHandlerFromID(meshHandler->sourceid); // todo: unused // get the file name of the field (or its memory information) extractFileName(std::string(fieldHandler->source)); @@ -111,8 +112,7 @@ MEDPresentation::extractFileName(const std::string& name) STDLOG("MEDPresentation::extractFileName('" << name << "')"); _fileName = name; if (_fileName.substr(0, 7) != std::string("file://")) { - const char* msg = "MEDPresentation(): Data source is in memory! Saving it in tmp file."; - STDLOG(msg); + STDLOG("MEDPresentation(): Data source is in memory! Saving it in tmp file."); // export a med file with this field // we could instead use CORBA to transfer the field to PARAVIS like in MEDCalculatorDBFieldReal::display() _fileName = std::tmpnam(NULL); @@ -401,7 +401,7 @@ MEDPresentation::setOrCreateRenderView() } else if (_viewMode == MEDCALC::VIEW_MODE_NEW_LAYOUT) { oss2 << "nbLayouts = len(pvs.GetLayouts());"; pushAndExecPyLine(oss2.str()); oss2.str(""); - oss2 << "__layout1 = pvs.CreateLayout('Layout #\%i'%(nbLayouts+1));"; + oss2 << "__layout1 = pvs.CreateLayout('Layout #%i'%(nbLayouts+1));"; pushAndExecPyLine(oss2.str()); oss2.str(""); oss2 << view << " = pvs.CreateView('RenderView');"; pushAndExecPyLine(oss2.str()); oss2.str(""); diff --git a/src/MEDCalc/cmp/MEDPresentationManager_i.cxx b/src/MEDCalc/cmp/MEDPresentationManager_i.cxx index 4d4a73bf7..bbdf32905 100644 --- a/src/MEDCalc/cmp/MEDPresentationManager_i.cxx +++ b/src/MEDCalc/cmp/MEDPresentationManager_i.cxx @@ -169,9 +169,10 @@ MEDPresentationManager_i::makePointSprite(const MEDCALC::PointSpriteParameters& MEDCALC::MeshViewParameters MEDPresentationManager_i::getMeshViewParameters(MEDPresentation::TypeID presentationID) { - MEDCALC::MeshViewParameters p; - _getParameters(presentationID, p); - return p; + MEDCALC::MeshViewParameters* p = new MEDCALC::MeshViewParameters(); + _getParameters(presentationID, *p); + MEDCALC::MeshViewParameters_var tmp(p); + return tmp._retn(); } @@ -187,9 +188,10 @@ MEDPresentationManager_i::getScalarMapParameters(MEDPresentation::TypeID present MEDCALC::ContourParameters MEDPresentationManager_i::getContourParameters(MEDPresentation::TypeID presentationID) { - MEDCALC::ContourParameters p; - _getParameters(presentationID, p); - return p; + MEDCALC::ContourParameters* p = new MEDCALC::ContourParameters(); + _getParameters(presentationID, *p); + MEDCALC::ContourParameters_var tmp(p); + return tmp._retn(); } MEDCALC::SlicesParameters* @@ -204,9 +206,10 @@ MEDPresentationManager_i::getSlicesParameters(MEDPresentation::TypeID presentati MEDCALC::VectorFieldParameters MEDPresentationManager_i::getVectorFieldParameters(MEDPresentation::TypeID presentationID) { - MEDCALC::VectorFieldParameters p; - _getParameters(presentationID, p); - return p; + MEDCALC::VectorFieldParameters* p = new MEDCALC::VectorFieldParameters(); + _getParameters(presentationID, *p); + MEDCALC::VectorFieldParameters_var tmp(p); + return tmp._retn(); } MEDCALC::PointSpriteParameters* @@ -221,9 +224,10 @@ MEDPresentationManager_i::getPointSpriteParameters(MEDPresentation::TypeID prese MEDCALC::DeflectionShapeParameters MEDPresentationManager_i::getDeflectionShapeParameters(MEDPresentation::TypeID presentationID) { - MEDCALC::DeflectionShapeParameters p; - _getParameters(presentationID, p); - return p; + MEDCALC::DeflectionShapeParameters* p = new MEDCALC::DeflectionShapeParameters(); + _getParameters(presentationID, *p); + MEDCALC::DeflectionShapeParameters_var tmp(p); + return tmp._retn(); } diff --git a/src/MEDCalc/cmp/MEDPresentationPointSprite.cxx b/src/MEDCalc/cmp/MEDPresentationPointSprite.cxx index fdc838c41..3545dc27f 100644 --- a/src/MEDCalc/cmp/MEDPresentationPointSprite.cxx +++ b/src/MEDCalc/cmp/MEDPresentationPointSprite.cxx @@ -81,7 +81,7 @@ MEDPresentationPointSprite::internalGeneratePipeline() // Populate internal array of available components: fillAvailableFieldComponents(); - int nbCompo = getIntProperty(MEDPresentation::PROP_NB_COMPONENTS); + //int nbCompo = getIntProperty(MEDPresentation::PROP_NB_COMPONENTS); // todo: unused // Point sprite needs point data: applyCellToPointIfNeeded(); diff --git a/src/MEDCalc/cmp/MEDPyLockWrapper.hxx b/src/MEDCalc/cmp/MEDPyLockWrapper.hxx index fdcad57cf..06e7621b6 100644 --- a/src/MEDCalc/cmp/MEDPyLockWrapper.hxx +++ b/src/MEDCalc/cmp/MEDPyLockWrapper.hxx @@ -54,9 +54,8 @@ public: */ ~MEDPyLockWrapper() { - PyThreadState* _currState = PyGILState_GetThisThreadState(); #ifdef _DEBUG_ - if (_currState != _state) + if (PyGILState_GetThisThreadState() != _state) { std::cout << "!!!!!!!!! MEDPyLockWrapper inconsistency - now entering infinite loop for debugging\n"; while(1); diff --git a/src/MEDCalc/gui/DatasourceController.cxx b/src/MEDCalc/gui/DatasourceController.cxx index acfc18c71..f0f18b997 100644 --- a/src/MEDCalc/gui/DatasourceController.cxx +++ b/src/MEDCalc/gui/DatasourceController.cxx @@ -233,7 +233,7 @@ void DatasourceController::OnExpandField() // Get the selected objects in the study (SObject) SALOME_StudyEditor::SObjectList* listOfSObject = _studyEditor->getSelectedObjects(); - for (int i=0; isize(); i++) { + for (int i=0; i<(int)listOfSObject->size(); i++) { SALOMEDS::SObject_var soFieldseries = listOfSObject->at(i); std::string name(_studyEditor->getName(soFieldseries)); if (soFieldseries->_is_nil() || name == "MEDCalc") @@ -359,7 +359,7 @@ void DatasourceController::OnUseInWorkspace() { else { // In this case, we don't ask the user to specify an alias for // each item, we just import the whole set of items. - for (int i=0; isize(); i++) { + for (int i=0; i<(int)listOfSObject->size(); i++) { SALOMEDS::SObject_var soField = listOfSObject->at(i); if (soField->_is_nil()) continue; diff --git a/src/MEDCalc/gui/MEDModule.cxx b/src/MEDCalc/gui/MEDModule.cxx index 0401d929e..62481b089 100644 --- a/src/MEDCalc/gui/MEDModule.cxx +++ b/src/MEDCalc/gui/MEDModule.cxx @@ -104,11 +104,13 @@ MEDModule::init() if ( CORBA::is_nil( _MED_engine ) ) { Engines::EngineComponent_var comp = SalomeApp_Application::lcc()->FindOrLoad_Component( "FactoryServer", "FIELDS" ); - if (CORBA::is_nil( comp )) - STDLOG("Could not FindOrLoad_Component FIELDS"); + if (CORBA::is_nil( comp )) { + STDLOG("Could not FindOrLoad_Component FIELDS"); + } _MED_engine = MED_ORB::MED_Gen::_narrow( comp ); - if (CORBA::is_nil( _MED_engine )) - STDLOG("Could not narrow FIELDS engine"); + if (CORBA::is_nil( _MED_engine )) { + STDLOG("Could not narrow FIELDS engine"); + } } } @@ -451,7 +453,7 @@ MEDModule::itemClickGeneric(std::string & name, std::string & type, int & presId } void -MEDModule::onClick(const QModelIndex & index) +MEDModule::onClick(const QModelIndex & /*index*/) { int presId; std::string name, type; @@ -473,7 +475,7 @@ MEDModule::onClick(const QModelIndex & index) } void -MEDModule::onDblClick(const QModelIndex& index) +MEDModule::onDblClick(const QModelIndex& /*index*/) { int presId; std::string name, type; diff --git a/src/MEDCalc/gui/MEDWidgetHelper.cxx b/src/MEDCalc/gui/MEDWidgetHelper.cxx index c06bdbbce..bf192aca4 100644 --- a/src/MEDCalc/gui/MEDWidgetHelper.cxx +++ b/src/MEDCalc/gui/MEDWidgetHelper.cxx @@ -25,8 +25,8 @@ MEDWidgetHelper::MEDWidgetHelper(const PresentationController * presController, MEDCALC::MEDPresentationManager_ptr presManager, int presId, const std::string & presName, WidgetPresentationParameters * paramWidget): - _presController(presController), _presManager(presManager), + _presController(presController), _presId(presId), _presName(presName), _paramWidget(paramWidget) @@ -102,7 +102,7 @@ void MEDWidgetHelper::onComponentChanged(int idx) emit presentationUpdateSignal(event); // --> PresentationController::processPresentationEvent } -void MEDWidgetHelper::onColorMapChanged(int idx) +void MEDWidgetHelper::onColorMapChanged(int /*idx*/) { STDLOG("MEDWidgetHelper::onColorMapChanged"); PresentationEvent* event = new PresentationEvent(); diff --git a/src/MEDCalc/gui/MEDWidgetHelperMeshView.cxx b/src/MEDCalc/gui/MEDWidgetHelperMeshView.cxx index 2385090e6..e37a87323 100644 --- a/src/MEDCalc/gui/MEDWidgetHelperMeshView.cxx +++ b/src/MEDCalc/gui/MEDWidgetHelperMeshView.cxx @@ -72,7 +72,7 @@ void MEDWidgetHelperMeshView::releaseWidget() QObject::disconnect( _paramWidget, SIGNAL(comboMeshIndexChanged(int)), this, SLOT(onMeshModeChanged(int)) ); } -void MEDWidgetHelperMeshView::onMeshModeChanged(int meshMode) +void MEDWidgetHelperMeshView::onMeshModeChanged(int /*meshMode*/) { STDLOG("MEDWidgetHelperMeshView::onMeshModeChanged"); PresentationEvent* event = new PresentationEvent(); diff --git a/src/MEDCalc/gui/MEDWidgetHelperSlices.cxx b/src/MEDCalc/gui/MEDWidgetHelperSlices.cxx index aaf136c55..55a0d488f 100644 --- a/src/MEDCalc/gui/MEDWidgetHelperSlices.cxx +++ b/src/MEDCalc/gui/MEDWidgetHelperSlices.cxx @@ -79,7 +79,7 @@ void MEDWidgetHelperSlices::onNbSlicesChanged(int nbSlices) } -void MEDWidgetHelperSlices::onSliceOrientationChanged(int sliceOrient) +void MEDWidgetHelperSlices::onSliceOrientationChanged(int /*sliceOrient*/) { STDLOG("MEDWidgetHelperSlices::onSliceOrientationChanged"); PresentationEvent* event = new PresentationEvent(); diff --git a/src/MEDCalc/gui/PresentationController.cxx b/src/MEDCalc/gui/PresentationController.cxx index 42b297eed..d4bd40ccb 100644 --- a/src/MEDCalc/gui/PresentationController.cxx +++ b/src/MEDCalc/gui/PresentationController.cxx @@ -289,7 +289,7 @@ PresentationController::visualize(PresentationEvent::EventType eventType) // For each object, emit a signal to the workspace to request a // visualisation using the tui command (so that the user can see how // to make a view of an object from the tui console). - for (int i=0; isize(); i++) { + for (int i=0; i<(int)listOfSObject->size(); i++) { SALOMEDS::SObject_var soObj = listOfSObject->at(i); std::string name(_studyEditor->getName(soObj)); if (soObj->_is_nil() || name == "MEDCalc") @@ -388,7 +388,7 @@ PresentationController::onDeletePresentation() SALOME_StudyEditor::SObjectList* listOfSObject = _studyEditor->getSelectedObjects(); // For each object, emit a signal to the workspace to request pres deletion - for (int i=0; isize(); i++) { + for (int i=0; i<(int)listOfSObject->size(); i++) { SALOMEDS::SObject_var soPres = listOfSObject->at(i); std::string name(_studyEditor->getName(soPres)); if (soPres->_is_nil() || name == "MEDCalc") @@ -581,7 +581,7 @@ PresentationController::processPresentationEvent(const PresentationEvent* event) } MEDWidgetHelper * -PresentationController::findOrCreateWidgetHelper(MEDCALC::MEDPresentationManager_ptr presManager, +PresentationController::findOrCreateWidgetHelper(MEDCALC::MEDPresentationManager_ptr /*presManager*/, // todo: unused int presId, const std::string& type, const std::string& name ) { std::map::const_iterator it =_presHelperMap.find(presId); @@ -604,8 +604,7 @@ PresentationController::findOrCreateWidgetHelper(MEDCALC::MEDPresentationManager wh = new MEDWidgetHelperDeflectionShape(this, _presManager, presId, name, _widgetPresentationParameters); else { - const char * msg ="findOrCreateWidgetHelper(): NOT IMPLEMENTED !!!"; - STDLOG(msg); + STDLOG("findOrCreateWidgetHelper(): NOT IMPLEMENTED !!!"); return wh; } _presHelperMap[presId] = wh; @@ -643,7 +642,7 @@ PresentationController::onParavisDump() SALOME_StudyEditor::SObjectList* listOfSObject = _studyEditor->getSelectedObjects(); // For the first object only, request the dump - for (int i=0; isize(); i++) { + for (int i=0; i<(int)listOfSObject->size(); i++) { SALOMEDS::SObject_var soPres = listOfSObject->at(i); std::string name(_studyEditor->getName(soPres)); if (soPres->_is_nil() || name == "MEDCalc") diff --git a/src/MEDCalc/gui/ProcessingController.cxx b/src/MEDCalc/gui/ProcessingController.cxx index 7f78ed479..b03d414cc 100644 --- a/src/MEDCalc/gui/ProcessingController.cxx +++ b/src/MEDCalc/gui/ProcessingController.cxx @@ -100,8 +100,10 @@ ProcessingController::OnChangeUnderlyingMesh() if ( fieldSeriesId < 0) return; MEDCALC::FieldHandlerList* fieldHandlerList = MEDFactoryClient::getDataManager()->getFieldListInFieldseries(fieldSeriesId); + /* todo: always false! if (fieldHandlerList->length() < 0) return; + */ // For a field series, get the first real field entry: MEDCALC::FieldHandler fieldHandler = (*fieldHandlerList)[0]; fieldId = fieldHandler.id; @@ -158,8 +160,10 @@ ProcessingController::OnInterpolateField() if ( fieldSeriesId < 0) return; MEDCALC::FieldHandlerList* fieldHandlerList = MEDFactoryClient::getDataManager()->getFieldListInFieldseries(fieldSeriesId); + /* todo: always false! if (fieldHandlerList->length() < 0) return; + */ // For a field series, get the first real field entry: MEDCALC::FieldHandler fieldHandler = (*fieldHandlerList)[0]; fieldId = fieldHandler.id; diff --git a/src/MEDCalc/gui/TestController.hxx b/src/MEDCalc/gui/TestController.hxx index 3090838e4..9c2599dc1 100644 --- a/src/MEDCalc/gui/TestController.hxx +++ b/src/MEDCalc/gui/TestController.hxx @@ -29,7 +29,7 @@ class SUIT_Desktop; class QAction; namespace MEDCALC { class MedEvent; -}; +} class TestController: public QObject { Q_OBJECT diff --git a/src/MEDCalc/gui/WorkspaceController.cxx b/src/MEDCalc/gui/WorkspaceController.cxx index a376820e7..f5627a292 100644 --- a/src/MEDCalc/gui/WorkspaceController.cxx +++ b/src/MEDCalc/gui/WorkspaceController.cxx @@ -116,8 +116,8 @@ WorkspaceController::~WorkspaceController() { * connected slots. */ void WorkspaceController::createActions() { - QWidget* dsk = _salomeModule->getApp()->desktop(); - SUIT_ResourceMgr* resMgr = _salomeModule->getApp()->resourceMgr(); + // QWidget* dsk = _salomeModule->getApp()->desktop(); // todo: unused + // SUIT_ResourceMgr* resMgr = _salomeModule->getApp()->resourceMgr(); // todo: unused int toolbarId = _salomeModule->createTool("Workspace", "WorkspaceToolbar"); QString label = tr("LAB_SAVE_WORKSPACE"); @@ -361,8 +361,9 @@ void WorkspaceController::processMedEvent(const MEDCALC::MedEvent* event) { std::string msg(event->msg); QMessageBox::warning(_salomeModule->getApp()->desktop(), "Error", QString::fromStdString(msg)); } - else + else { STDLOG("WorkspaceController::processMedEvent(): Unhandled event!!!"); + } } /*! @@ -458,9 +459,9 @@ void WorkspaceController::_exportItemList(QStringList itemNameIdList) { LOG("WorkspaceController: WARN! No data object associated to the item "<getFieldHandler(); QStringList commands; /* + MEDCALC::FieldHandler* fieldHandler = dataObject->getFieldHandler(); // todo: unused commands+=QString("from xmed.driver_pvis import pvis_scalarmap"); commands+=QString("pvis_scalarmap('%1','%2','%3',%4,%5)") .arg(tmpfilename) @@ -502,7 +503,7 @@ void WorkspaceController::_viewItemList(QStringList itemNameIdList) { // Then, we can request this data object to obtain the associated // FieldHandler. - MEDCALC::FieldHandler* fieldHandler = dataObject->getFieldHandler(); + //MEDCALC::FieldHandler* fieldHandler = dataObject->getFieldHandler(); // todo: unused // And finally, we can create the set of medcalc instructions to // generate the scalar map on this field. diff --git a/src/MEDCalc/gui/XmedConsoleDriver.cxx b/src/MEDCalc/gui/XmedConsoleDriver.cxx index 6bc23849e..52ad6bf4a 100644 --- a/src/MEDCalc/gui/XmedConsoleDriver.cxx +++ b/src/MEDCalc/gui/XmedConsoleDriver.cxx @@ -76,7 +76,6 @@ void XmedConsoleDriver::exec(const QStringList& commands) { MEDCALC::MEDCommandsHistoryManager_ptr history = MEDFactoryClient::getCommandsHistoryManager(); QStringListIterator it(commands); - int i = 0; while (it.hasNext()) { const QString& command = it.next(); _pyConsole->exec(command); diff --git a/src/MEDCalc/gui/XmedDataModel.hxx b/src/MEDCalc/gui/XmedDataModel.hxx index a93f0b8b1..31c94ee54 100644 --- a/src/MEDCalc/gui/XmedDataModel.hxx +++ b/src/MEDCalc/gui/XmedDataModel.hxx @@ -81,6 +81,7 @@ public: class MEDCALCGUI_EXPORT XmedDataProcessor : public DataProcessor { public: XmedDataProcessor(DataModel * dataModel):DataProcessor(dataModel) {}; + virtual ~XmedDataProcessor() {}; MEDCALC::FieldHandlerList * getResultingFieldHandlerList(); MEDCALC::FieldIdList * getResultingFieldIdList(); diff --git a/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.cxx b/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.cxx index 440e5b455..e8963edea 100644 --- a/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.cxx +++ b/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.cxx @@ -218,16 +218,20 @@ WidgetPresentationParameters::setScalarBarRange(MEDCALC::ScalarBarRangeType sbra { _blockSig = true; - int idx; + int idx = -1; if (sbrange == MEDCALC::SCALAR_BAR_ALL_TIMESTEPS) idx = _ui.comboBoxScalarBarRange->findText(tr("LAB_ALL_TIMESTEPS")); else if (sbrange == MEDCALC::SCALAR_BAR_CURRENT_TIMESTEP) idx = _ui.comboBoxScalarBarRange->findText(tr("LAB_CURRENT_TIMESTEP")); if (idx >= 0) - _ui.comboBoxScalarBarRange->setCurrentIndex(idx); + { + _ui.comboBoxScalarBarRange->setCurrentIndex(idx); + } else + { STDLOG("Strange!! No matching found - unable to set scalar bar range in GUI."); + } _blockSig = false; } @@ -244,9 +248,13 @@ WidgetPresentationParameters::setColorMap(MEDCALC::ColorMapType colorMap) idx = _ui.comboBoxColorMap->findText(tr("LAB_COOL_TO_WARM")); if (idx >= 0) - _ui.comboBoxColorMap->setCurrentIndex(idx); + { + _ui.comboBoxColorMap->setCurrentIndex(idx); + } else + { STDLOG("Strange!! No matching found - unable to set color map in GUI."); + } _blockSig = false; } @@ -276,9 +284,13 @@ WidgetPresentationParameters::setMeshMode(MEDCALC::MeshModeType mode) idx = -1; } if (idx >= 0) - _ui.comboBoxMesh->setCurrentIndex(idx); + { + _ui.comboBoxMesh->setCurrentIndex(idx); + } else + { STDLOG("Strange!! No matching found - unable to set mesh mode in GUI."); + } _blockSig = false; } @@ -320,9 +332,13 @@ WidgetPresentationParameters::setSliceOrientation(MEDCALC::SliceOrientationType idx = -1; } if (idx >= 0) + { _ui.comboBoxSliceOrient->setCurrentIndex(idx); + } else + { STDLOG("Strange!! No matching found - unable to set slice orientation in GUI."); + } _blockSig = false; } diff --git a/src/MEDCalculator/MEDCalculatorBrowserField.cxx b/src/MEDCalculator/MEDCalculatorBrowserField.cxx index f1db95e56..02a467403 100644 --- a/src/MEDCalculator/MEDCalculatorBrowserField.cxx +++ b/src/MEDCalculator/MEDCalculatorBrowserField.cxx @@ -324,7 +324,7 @@ void MEDCalculatorBrowserField::setMeshName(const std::string& m) * This method returns a restriction of this containing only selected TimeSteps. * This methods throws an exception if multiple meshes exists in selected time steps. */ -MEDCalculatorBrowserField MEDCalculatorBrowserField::getSelectedTimeSteps() const throw(INTERP_KERNEL::Exception) +MEDCalculatorBrowserField MEDCalculatorBrowserField::getSelectedTimeSteps() const { int nbOfTs=std::count(_steps.begin(),_steps.end(),true); std::vector ts(nbOfTs); diff --git a/src/MEDCalculator/MEDCalculatorBrowserField.hxx b/src/MEDCalculator/MEDCalculatorBrowserField.hxx index 77bc0e091..ade0a134f 100644 --- a/src/MEDCalculator/MEDCalculatorBrowserField.hxx +++ b/src/MEDCalculator/MEDCalculatorBrowserField.hxx @@ -70,7 +70,7 @@ namespace MEDCoupling void setComponentName(int,const std::string&);// Change the name of a component bool isAnySelection() const; void setMeshName(const std::string& m); - MEDCalculatorBrowserField getSelectedTimeSteps() const throw(INTERP_KERNEL::Exception); + MEDCalculatorBrowserField getSelectedTimeSteps() const; private: std::string _name;// field name std::string _file_name;// file name diff --git a/src/MEDCalculator/MEDCalculatorDBField.cxx b/src/MEDCalculator/MEDCalculatorDBField.cxx index 9b0ab26b9..5b1773276 100644 --- a/src/MEDCalculator/MEDCalculatorDBField.cxx +++ b/src/MEDCalculator/MEDCalculatorDBField.cxx @@ -56,31 +56,31 @@ std::vector MEDCalculatorDBField::getDirectChildrenWith return std::vector(); } -MEDCalculatorDBField *MEDCalculatorDBField::operator+(double val) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBField::operator+(double val) const { MCAuto par2=new MEDCalculatorDBFieldCst(val); return (*this)+(*par2); } -MEDCalculatorDBField *MEDCalculatorDBField::operator-(double val) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBField::operator-(double val) const { MCAuto par2=new MEDCalculatorDBFieldCst(val); return (*this)-(*par2); } -MEDCalculatorDBField *MEDCalculatorDBField::operator*(double val) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBField::operator*(double val) const { MCAuto par2=new MEDCalculatorDBFieldCst(val); return (*this)*(*par2); } -MEDCalculatorDBField *MEDCalculatorDBField::operator/(double val) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBField::operator/(double val) const { MCAuto par2=new MEDCalculatorDBFieldCst(val); return (*this)/(*par2); } -MEDCalculatorDBFieldReal *MEDCalculatorDBFieldReal::operator()(const MEDCalculatorDBRangeSelection& t, const MEDCalculatorDBRangeSelection& p, const MEDCalculatorDBRangeSelection& c) throw(INTERP_KERNEL::Exception) +MEDCalculatorDBFieldReal *MEDCalculatorDBFieldReal::operator()(const MEDCalculatorDBRangeSelection& t, const MEDCalculatorDBRangeSelection& p, const MEDCalculatorDBRangeSelection& c) { MEDCalculatorDBFieldReal *ret=new MEDCalculatorDBFieldReal(*this); ret->_t=t; @@ -115,7 +115,7 @@ void MEDCalculatorDBFieldReal::setDescription(const char *descr) _time_steps[*iter]->setDescription(descr);*/ } -void MEDCalculatorDBFieldReal::write(const char *fName, bool writeFromScratch) const throw(INTERP_KERNEL::Exception) +void MEDCalculatorDBFieldReal::write(const char *fName, bool writeFromScratch) const { fetchData(); std::vector ids=_t.getIds(_time_steps.size()); @@ -143,7 +143,7 @@ void MEDCalculatorDBFieldReal::write(const char *fName, bool writeFromScratch) c _time_steps[*iter]->write(fName,_name,_description); } -void MEDCalculatorDBFieldReal::display() const throw(INTERP_KERNEL::Exception) +void MEDCalculatorDBFieldReal::display() const { fetchData(); std::vector ids=_t.getIds(_time_steps.size()); @@ -212,7 +212,7 @@ MEDCalculatorDBFieldReal::MEDCalculatorDBFieldReal(const MEDCalculatorBrowserFie } } -const MEDCalculatorDBFieldReal& MEDCalculatorDBFieldReal::operator=(const MEDCalculatorDBFieldReal& other) throw(INTERP_KERNEL::Exception) +const MEDCalculatorDBFieldReal& MEDCalculatorDBFieldReal::operator=(const MEDCalculatorDBFieldReal& other) { checkConsistencyLight(other); std::vector ids=_t.getIds(_time_steps.size()); @@ -227,13 +227,13 @@ const MEDCalculatorDBFieldReal& MEDCalculatorDBFieldReal::operator=(const MEDCal return *this; } -const MEDCalculatorDBFieldReal& MEDCalculatorDBFieldReal::operator=(double val) throw(INTERP_KERNEL::Exception) +const MEDCalculatorDBFieldReal& MEDCalculatorDBFieldReal::operator=(double val) { MCAuto other=buildCstFieldFromThis(val); return (*this)=*other; } -MEDCalculatorDBField *MEDCalculatorDBFieldReal::operator+(const MEDCalculatorDBField& other) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBFieldReal::operator+(const MEDCalculatorDBField& other) const { const MEDCalculatorDBField *other2=&other; const MEDCalculatorDBFieldReal *otherr=dynamic_cast(other2); @@ -253,7 +253,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::operator+(const MEDCalculatorDBF } } -MEDCalculatorDBField *MEDCalculatorDBFieldReal::add(const MEDCalculatorDBFieldReal& other) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBFieldReal::add(const MEDCalculatorDBFieldReal& other) const { checkConsistencyLight(other); MCAuto ret=new MEDCalculatorDBFieldReal(_type); @@ -330,7 +330,7 @@ bool MEDCalculatorDBFieldReal::isEqualSameType(const MEDCalculatorDBFieldReal& o return true; } -MEDCalculatorDBField *MEDCalculatorDBFieldReal::operator-(const MEDCalculatorDBField& other) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBFieldReal::operator-(const MEDCalculatorDBField& other) const { const MEDCalculatorDBField *other2=&other; const MEDCalculatorDBFieldReal *otherr=dynamic_cast(other2); @@ -350,7 +350,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::operator-(const MEDCalculatorDBF } } -MEDCalculatorDBField *MEDCalculatorDBFieldReal::substract(const MEDCalculatorDBFieldReal& other) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBFieldReal::substract(const MEDCalculatorDBFieldReal& other) const { checkConsistencyLight(other); MCAuto ret=new MEDCalculatorDBFieldReal(_type); @@ -380,7 +380,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::substract(const MEDCalculatorDBF return ret; } -MEDCalculatorDBField *MEDCalculatorDBFieldReal::operator*(const MEDCalculatorDBField& other) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBFieldReal::operator*(const MEDCalculatorDBField& other) const { const MEDCalculatorDBField *other2=&other; const MEDCalculatorDBFieldReal *otherr=dynamic_cast(other2); @@ -400,7 +400,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::operator*(const MEDCalculatorDBF } } -MEDCalculatorDBField *MEDCalculatorDBFieldReal::multiply(const MEDCalculatorDBFieldReal& other) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBFieldReal::multiply(const MEDCalculatorDBFieldReal& other) const { checkConsistencyLight(other); MCAuto ret=new MEDCalculatorDBFieldReal(_type); @@ -430,7 +430,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::multiply(const MEDCalculatorDBFi return ret; } -MEDCalculatorDBField *MEDCalculatorDBFieldReal::operator/(const MEDCalculatorDBField& other) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBFieldReal::operator/(const MEDCalculatorDBField& other) const { const MEDCalculatorDBField *other2=&other; const MEDCalculatorDBFieldReal *otherr=dynamic_cast(other2); @@ -450,7 +450,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::operator/(const MEDCalculatorDBF } } -MEDCalculatorDBField *MEDCalculatorDBFieldReal::divide(const MEDCalculatorDBFieldReal& other) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBFieldReal::divide(const MEDCalculatorDBFieldReal& other) const { checkConsistencyLight(other); MCAuto ret=new MEDCalculatorDBFieldReal(_type); @@ -480,12 +480,12 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::divide(const MEDCalculatorDBFiel return ret; } -MEDCalculatorDBField *MEDCalculatorDBFieldReal::operator^(const MEDCalculatorDBFieldReal& other) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBFieldReal::operator^(const MEDCalculatorDBFieldReal& other) const { return crossProduct(other); } -MEDCalculatorDBField *MEDCalculatorDBFieldReal::dot(const MEDCalculatorDBFieldReal& other) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBFieldReal::dot(const MEDCalculatorDBFieldReal& other) const { checkConsistencyLight(other); MCAuto ret=new MEDCalculatorDBFieldReal(_type); @@ -505,7 +505,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::dot(const MEDCalculatorDBFieldRe return ret; } -MEDCalculatorDBField *MEDCalculatorDBFieldReal::crossProduct(const MEDCalculatorDBFieldReal& other) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBFieldReal::crossProduct(const MEDCalculatorDBFieldReal& other) const { checkConsistencyLight(other); MCAuto ret=new MEDCalculatorDBFieldReal(_type); @@ -525,7 +525,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::crossProduct(const MEDCalculator return ret; } -MEDCalculatorDBField *MEDCalculatorDBFieldReal::doublyContractedProduct() const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBFieldReal::doublyContractedProduct() const { MCAuto ret=new MEDCalculatorDBFieldReal(_type); fetchData(); @@ -540,7 +540,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::doublyContractedProduct() const return ret; } -MEDCalculatorDBField *MEDCalculatorDBFieldReal::determinant() const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBFieldReal::determinant() const { MCAuto ret=new MEDCalculatorDBFieldReal(_type); fetchData(); @@ -555,7 +555,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::determinant() const throw(INTERP return ret; } -MEDCalculatorDBField *MEDCalculatorDBFieldReal::eigenValues() const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBFieldReal::eigenValues() const { MCAuto ret=new MEDCalculatorDBFieldReal(_type); fetchData(); @@ -576,7 +576,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::eigenValues() const throw(INTERP return ret; } -MEDCalculatorDBField *MEDCalculatorDBFieldReal::eigenVectors() const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBFieldReal::eigenVectors() const { MCAuto ret=new MEDCalculatorDBFieldReal(_type); fetchData(); @@ -597,7 +597,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::eigenVectors() const throw(INTER return ret; } -MEDCalculatorDBField *MEDCalculatorDBFieldReal::inverse() const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBFieldReal::inverse() const { MCAuto ret=new MEDCalculatorDBFieldReal(_type); fetchData(); @@ -618,7 +618,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::inverse() const throw(INTERP_KER return ret; } -MEDCalculatorDBField *MEDCalculatorDBFieldReal::trace() const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBFieldReal::trace() const { MCAuto ret=new MEDCalculatorDBFieldReal(_type); fetchData(); @@ -633,7 +633,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::trace() const throw(INTERP_KERNE return ret; } -MEDCalculatorDBField *MEDCalculatorDBFieldReal::deviator() const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBFieldReal::deviator() const { MCAuto ret=new MEDCalculatorDBFieldReal(_type); fetchData(); @@ -654,7 +654,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::deviator() const throw(INTERP_KE return ret; } -MEDCalculatorDBField *MEDCalculatorDBFieldReal::magnitude() const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBFieldReal::magnitude() const { MCAuto ret=new MEDCalculatorDBFieldReal(_type); fetchData(); @@ -669,7 +669,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::magnitude() const throw(INTERP_K return ret; } -void MEDCalculatorDBFieldReal::applyFunc(const char *func) throw(INTERP_KERNEL::Exception) +void MEDCalculatorDBFieldReal::applyFunc(const char *func) { fetchData(); std::vector ids=_t.getIds(_time_steps.size()); @@ -696,7 +696,7 @@ MEDCalculatorDBFieldReal *MEDCalculatorDBFieldReal::buildCstFieldFromThis(double return ret; } -void MEDCalculatorDBFieldReal::checkConsistencyLight(const MEDCalculatorDBFieldReal& other) const throw(INTERP_KERNEL::Exception) +void MEDCalculatorDBFieldReal::checkConsistencyLight(const MEDCalculatorDBFieldReal& other) const { if(_type!=other._type) throw INTERP_KERNEL::Exception("Types of field mismatch !"); @@ -706,7 +706,7 @@ void MEDCalculatorDBFieldReal::checkConsistencyLight(const MEDCalculatorDBFieldR throw INTERP_KERNEL::Exception("Components mismatch !"); } -void MEDCalculatorDBFieldReal::fetchData() const throw(INTERP_KERNEL::Exception) +void MEDCalculatorDBFieldReal::fetchData() const { std::vector > idstoFetch; std::vector ids=_t.getIds(_time_steps.size()); @@ -756,7 +756,7 @@ int MEDCalculatorDBFieldReal::getNumberOfComponents() const /*! * WARNING the caller has the ownership of all of instances in returned vector. */ -std::vector MEDCalculatorDBFieldReal::getFields() const throw(INTERP_KERNEL::Exception) +std::vector MEDCalculatorDBFieldReal::getFields() const { fetchData(); std::vector ids=_t.getIds(_time_steps.size()); @@ -767,14 +767,14 @@ std::vector MEDCalculatorDBFieldReal::getFields() cons return ret; } -std::string MEDCalculatorDBFieldReal::getInfoOnComponent(int i) const throw(INTERP_KERNEL::Exception) +std::string MEDCalculatorDBFieldReal::getInfoOnComponent(int i) const { if(i>=(int)_c_labels.size()) throw INTERP_KERNEL::Exception("MEDCalculatorDBFieldReal::getInfoOnComponent : specified id >= number of component !"); return _c_labels[i]; } -void MEDCalculatorDBFieldReal::setInfoOnComponent(int i, const char *info) throw(INTERP_KERNEL::Exception) +void MEDCalculatorDBFieldReal::setInfoOnComponent(int i, const char *info) { if(i>=(int)_c_labels.size()) throw INTERP_KERNEL::Exception("MEDCalculatorDBFieldReal::setInfoOnComponent : specified id >= number of component !"); @@ -785,7 +785,7 @@ MEDCalculatorDBFieldCst::MEDCalculatorDBFieldCst(double val):_val(val) { } -MEDCalculatorDBField *MEDCalculatorDBFieldCst::operator+(const MEDCalculatorDBField& other) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBFieldCst::operator+(const MEDCalculatorDBField& other) const { const MEDCalculatorDBField *other2=&other; const MEDCalculatorDBFieldCst *otherc=dynamic_cast(other2); @@ -810,7 +810,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldCst::operator+(const MEDCalculatorDBFi } } -MEDCalculatorDBField *MEDCalculatorDBFieldCst::operator-(const MEDCalculatorDBField& other) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBFieldCst::operator-(const MEDCalculatorDBField& other) const { const MEDCalculatorDBField *other2=&other; const MEDCalculatorDBFieldCst *otherc=dynamic_cast(other2); @@ -835,7 +835,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldCst::operator-(const MEDCalculatorDBFi } } -MEDCalculatorDBField *MEDCalculatorDBFieldCst::operator*(const MEDCalculatorDBField& other) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBFieldCst::operator*(const MEDCalculatorDBField& other) const { const MEDCalculatorDBField *other2=&other; const MEDCalculatorDBFieldCst *otherc=dynamic_cast(other2); @@ -860,7 +860,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldCst::operator*(const MEDCalculatorDBFi } } -MEDCalculatorDBField *MEDCalculatorDBFieldCst::operator/(const MEDCalculatorDBField& other) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBField *MEDCalculatorDBFieldCst::operator/(const MEDCalculatorDBField& other) const { const MEDCalculatorDBField *other2=&other; const MEDCalculatorDBFieldCst *otherc=dynamic_cast(other2); diff --git a/src/MEDCalculator/MEDCalculatorDBField.hxx b/src/MEDCalculator/MEDCalculatorDBField.hxx index ddaa60f1b..5ccd86f9f 100644 --- a/src/MEDCalculator/MEDCalculatorDBField.hxx +++ b/src/MEDCalculator/MEDCalculatorDBField.hxx @@ -47,14 +47,14 @@ namespace MEDCoupling static MEDCalculatorDBFieldCst *New(double val); std::size_t getHeapMemorySizeWithoutChildren() const; std::vector getDirectChildrenWithNull() const; - virtual MEDCalculatorDBField *operator+(const MEDCalculatorDBField& other) const throw(INTERP_KERNEL::Exception) = 0; - MEDCalculatorDBField *operator+(double val) const throw(INTERP_KERNEL::Exception); - virtual MEDCalculatorDBField *operator-(const MEDCalculatorDBField& other) const throw(INTERP_KERNEL::Exception) = 0; - MEDCalculatorDBField *operator-(double val) const throw(INTERP_KERNEL::Exception); - virtual MEDCalculatorDBField *operator*(const MEDCalculatorDBField& other) const throw(INTERP_KERNEL::Exception) = 0; - MEDCalculatorDBField *operator*(double val) const throw(INTERP_KERNEL::Exception); - virtual MEDCalculatorDBField *operator/(const MEDCalculatorDBField& other) const throw(INTERP_KERNEL::Exception) = 0; - MEDCalculatorDBField *operator/(double val) const throw(INTERP_KERNEL::Exception); + virtual MEDCalculatorDBField *operator+(const MEDCalculatorDBField& other) const = 0; + MEDCalculatorDBField *operator+(double val) const; + virtual MEDCalculatorDBField *operator-(const MEDCalculatorDBField& other) const = 0; + MEDCalculatorDBField *operator-(double val) const; + virtual MEDCalculatorDBField *operator*(const MEDCalculatorDBField& other) const = 0; + MEDCalculatorDBField *operator*(double val) const; + virtual MEDCalculatorDBField *operator/(const MEDCalculatorDBField& other) const = 0; + MEDCalculatorDBField *operator/(double val) const; virtual bool isEqual(const MEDCalculatorDBField& other, double precM, double precF) const = 0; }; @@ -65,44 +65,44 @@ namespace MEDCoupling ~MEDCalculatorDBFieldReal(); void setName(const char *name); void setDescription(const char *descr); - void write(const char *fName, bool writeFromScratch) const throw(INTERP_KERNEL::Exception); - void display() const throw(INTERP_KERNEL::Exception); + void write(const char *fName, bool writeFromScratch) const; + void display() const; std::string simpleRepr() const; - MEDCalculatorDBFieldReal *operator()(const MEDCalculatorDBRangeSelection& t, const MEDCalculatorDBRangeSelection& p, const MEDCalculatorDBRangeSelection& c) throw(INTERP_KERNEL::Exception); - const MEDCalculatorDBFieldReal& operator=(const MEDCalculatorDBFieldReal& other) throw(INTERP_KERNEL::Exception); - const MEDCalculatorDBFieldReal& operator=(double val) throw(INTERP_KERNEL::Exception); - MEDCalculatorDBField *operator+(const MEDCalculatorDBField& other) const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBField *add(const MEDCalculatorDBFieldReal& other) const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBField *operator-(const MEDCalculatorDBField& other) const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBField *substract(const MEDCalculatorDBFieldReal& other) const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBField *operator*(const MEDCalculatorDBField& other) const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBField *multiply(const MEDCalculatorDBFieldReal& other) const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBField *operator/(const MEDCalculatorDBField& other) const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBField *divide(const MEDCalculatorDBFieldReal& other) const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBField *operator^(const MEDCalculatorDBFieldReal& other) const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBField *dot(const MEDCalculatorDBFieldReal& other) const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBField *crossProduct(const MEDCalculatorDBFieldReal& other) const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBField *doublyContractedProduct() const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBField *determinant() const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBField *eigenValues() const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBField *eigenVectors() const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBField *inverse() const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBField *trace() const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBField *deviator() const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBField *magnitude() const throw(INTERP_KERNEL::Exception); - void applyFunc(const char *func) throw(INTERP_KERNEL::Exception); + MEDCalculatorDBFieldReal *operator()(const MEDCalculatorDBRangeSelection& t, const MEDCalculatorDBRangeSelection& p, const MEDCalculatorDBRangeSelection& c); + const MEDCalculatorDBFieldReal& operator=(const MEDCalculatorDBFieldReal& other); + const MEDCalculatorDBFieldReal& operator=(double val); + MEDCalculatorDBField *operator+(const MEDCalculatorDBField& other) const; + MEDCalculatorDBField *add(const MEDCalculatorDBFieldReal& other) const; + MEDCalculatorDBField *operator-(const MEDCalculatorDBField& other) const; + MEDCalculatorDBField *substract(const MEDCalculatorDBFieldReal& other) const; + MEDCalculatorDBField *operator*(const MEDCalculatorDBField& other) const; + MEDCalculatorDBField *multiply(const MEDCalculatorDBFieldReal& other) const; + MEDCalculatorDBField *operator/(const MEDCalculatorDBField& other) const; + MEDCalculatorDBField *divide(const MEDCalculatorDBFieldReal& other) const; + MEDCalculatorDBField *operator^(const MEDCalculatorDBFieldReal& other) const; + MEDCalculatorDBField *dot(const MEDCalculatorDBFieldReal& other) const; + MEDCalculatorDBField *crossProduct(const MEDCalculatorDBFieldReal& other) const; + MEDCalculatorDBField *doublyContractedProduct() const; + MEDCalculatorDBField *determinant() const; + MEDCalculatorDBField *eigenValues() const; + MEDCalculatorDBField *eigenVectors() const; + MEDCalculatorDBField *inverse() const; + MEDCalculatorDBField *trace() const; + MEDCalculatorDBField *deviator() const; + MEDCalculatorDBField *magnitude() const; + void applyFunc(const char *func); bool isEqual(const MEDCalculatorDBField& other, double precM, double precF) const; bool isEqualSameType(const MEDCalculatorDBFieldReal& other, double precM, double precF) const; MEDCalculatorDBFieldReal *buildCstFieldFromThis(double val) const; - void checkConsistencyLight(const MEDCalculatorDBFieldReal& other) const throw(INTERP_KERNEL::Exception); - void fetchData() const throw(INTERP_KERNEL::Exception); + void checkConsistencyLight(const MEDCalculatorDBFieldReal& other) const; + void fetchData() const; TypeOfField getType() const { return _type; } int getNumberOfSteps() const; int getNumberOfFetchedSteps() const; int getNumberOfComponents() const; - std::vector getFields() const throw(INTERP_KERNEL::Exception); - std::string getInfoOnComponent(int i) const throw(INTERP_KERNEL::Exception); - void setInfoOnComponent(int i, const char *info) throw(INTERP_KERNEL::Exception); + std::vector getFields() const; + std::string getInfoOnComponent(int i) const; + void setInfoOnComponent(int i, const char *info); private: MEDCalculatorDBFieldReal(TypeOfField type); private: @@ -124,10 +124,10 @@ namespace MEDCoupling { public: MEDCalculatorDBFieldCst(double val); - MEDCalculatorDBField *operator+(const MEDCalculatorDBField& other) const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBField *operator-(const MEDCalculatorDBField& other) const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBField *operator*(const MEDCalculatorDBField& other) const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBField *operator/(const MEDCalculatorDBField& other) const throw(INTERP_KERNEL::Exception); + MEDCalculatorDBField *operator+(const MEDCalculatorDBField& other) const; + MEDCalculatorDBField *operator-(const MEDCalculatorDBField& other) const; + MEDCalculatorDBField *operator*(const MEDCalculatorDBField& other) const; + MEDCalculatorDBField *operator/(const MEDCalculatorDBField& other) const; bool isEqual(const MEDCalculatorDBField& other, double precM, double precF) const; MEDCalculatorDBFieldReal *convertIntoReal(const MEDCalculatorDBFieldReal& ref) const; double getValue() const { return _val; } diff --git a/src/MEDCalculator/MEDCalculatorDBRangeSelection.cxx b/src/MEDCalculator/MEDCalculatorDBRangeSelection.cxx index 4c981f45b..03b9578cb 100644 --- a/src/MEDCalculator/MEDCalculatorDBRangeSelection.cxx +++ b/src/MEDCalculator/MEDCalculatorDBRangeSelection.cxx @@ -28,7 +28,7 @@ using namespace MEDCoupling; const char MEDCalculatorDBRangeSelection::ALL_ELTS[]=":"; -MEDCalculatorDBRangeSelection::MEDCalculatorDBRangeSelection(const char *v) throw(INTERP_KERNEL::Exception) +MEDCalculatorDBRangeSelection::MEDCalculatorDBRangeSelection(const char *v) try { setValue(v); @@ -58,7 +58,7 @@ void MEDCalculatorDBRangeSelection::setPyEnd(int val) _end=TraducePyVal(val); } -std::vector MEDCalculatorDBRangeSelection::getIds(int lgth) const throw(INTERP_KERNEL::Exception) +std::vector MEDCalculatorDBRangeSelection::getIds(int lgth) const { if(_start>=lgth || _start<0) { @@ -82,7 +82,7 @@ std::vector MEDCalculatorDBRangeSelection::getIds(int lgth) const t return ret; } -int MEDCalculatorDBRangeSelection::getSize(int lgth) const throw(INTERP_KERNEL::Exception) +int MEDCalculatorDBRangeSelection::getSize(int lgth) const { return getIds(lgth).size(); } @@ -98,19 +98,19 @@ void MEDCalculatorDBRangeSelection::setAll() _end=std::numeric_limits::max(); } -MEDCalculatorDBRangeSelection& MEDCalculatorDBRangeSelection::operator=(const char *v) throw(INTERP_KERNEL::Exception) +MEDCalculatorDBRangeSelection& MEDCalculatorDBRangeSelection::operator=(const char *v) { setValue(v); return *this; } -MEDCalculatorDBRangeSelection& MEDCalculatorDBRangeSelection::operator=(int v) throw(INTERP_KERNEL::Exception) +MEDCalculatorDBRangeSelection& MEDCalculatorDBRangeSelection::operator=(int v) { setValue(v); return *this; } -void MEDCalculatorDBRangeSelection::setValue(const char *v) throw(INTERP_KERNEL::Exception) +void MEDCalculatorDBRangeSelection::setValue(const char *v) { try { @@ -159,7 +159,7 @@ void MEDCalculatorDBRangeSelection::setValue(const char *v) throw(INTERP_KERNEL: } } -void MEDCalculatorDBRangeSelection::setValue(int v) throw(INTERP_KERNEL::Exception) +void MEDCalculatorDBRangeSelection::setValue(int v) { _start=v; _end=v+1; diff --git a/src/MEDCalculator/MEDCalculatorDBRangeSelection.hxx b/src/MEDCalculator/MEDCalculatorDBRangeSelection.hxx index c8a000eea..6a44fe0bd 100644 --- a/src/MEDCalculator/MEDCalculatorDBRangeSelection.hxx +++ b/src/MEDCalculator/MEDCalculatorDBRangeSelection.hxx @@ -31,20 +31,20 @@ namespace MEDCoupling class MEDCALCULATOR_EXPORT MEDCalculatorDBRangeSelection { public: - MEDCalculatorDBRangeSelection(const char *v) throw(INTERP_KERNEL::Exception); + MEDCalculatorDBRangeSelection(const char *v); MEDCalculatorDBRangeSelection(int v); MEDCalculatorDBRangeSelection(); void setPyStart(int val); void setPyEnd(int val); - MEDCalculatorDBRangeSelection& operator=(const char *v) throw(INTERP_KERNEL::Exception); - MEDCalculatorDBRangeSelection& operator=(int v) throw(INTERP_KERNEL::Exception); - std::vector getIds(int lgth) const throw(INTERP_KERNEL::Exception); - int getSize(int lgth) const throw(INTERP_KERNEL::Exception); + MEDCalculatorDBRangeSelection& operator=(const char *v); + MEDCalculatorDBRangeSelection& operator=(int v); + std::vector getIds(int lgth) const; + int getSize(int lgth) const; bool isAll() const; void setAll(); private: - void setValue(const char *v) throw(INTERP_KERNEL::Exception); - void setValue(int v) throw(INTERP_KERNEL::Exception); + void setValue(const char *v); + void setValue(int v); static int TraducePyVal(int val); private: static const char SEPARATOR=':'; diff --git a/src/MEDCalculator/MEDCalculatorDBSliceField.cxx b/src/MEDCalculator/MEDCalculatorDBSliceField.cxx index 9be16e57c..76fcbe2dc 100644 --- a/src/MEDCalculator/MEDCalculatorDBSliceField.cxx +++ b/src/MEDCalculator/MEDCalculatorDBSliceField.cxx @@ -66,7 +66,7 @@ void MEDCalculatorDBSliceField::setDescription(const char *descr) _field->setDescription(descr); } -void MEDCalculatorDBSliceField::write(const char *fName, const std::string& n, const std::string& d) const throw(INTERP_KERNEL::Exception) +void MEDCalculatorDBSliceField::write(const char *fName, const std::string& n, const std::string& d) const { std::string kn=_field->getName(); std::string kd=_field->getDescription(); @@ -214,7 +214,7 @@ MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::crossProduct(const MEDCalc return new MEDCalculatorDBSliceField(f3); } -MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::doublyContractedProduct(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::doublyContractedProduct(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const { std::vector tIds=thisC.getIds(sizeCThis); MCAuto f1=_field->keepSelectedComponents(tIds); @@ -222,7 +222,7 @@ MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::doublyContractedProduct(in return new MEDCalculatorDBSliceField(f2); } -MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::determinant(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::determinant(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const { std::vector tIds=thisC.getIds(sizeCThis); MCAuto f1=_field->keepSelectedComponents(tIds); @@ -230,7 +230,7 @@ MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::determinant(int sizeCThis, return new MEDCalculatorDBSliceField(f2); } -MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::eigenValues(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::eigenValues(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const { std::vector tIds=thisC.getIds(sizeCThis); MCAuto f1=_field->keepSelectedComponents(tIds); @@ -238,7 +238,7 @@ MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::eigenValues(int sizeCThis, return new MEDCalculatorDBSliceField(f2); } -MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::eigenVectors(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::eigenVectors(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const { std::vector tIds=thisC.getIds(sizeCThis); MCAuto f1=_field->keepSelectedComponents(tIds); @@ -246,7 +246,7 @@ MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::eigenVectors(int sizeCThis return new MEDCalculatorDBSliceField(f2); } -MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::inverse(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::inverse(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const { std::vector tIds=thisC.getIds(sizeCThis); MCAuto f1=_field->keepSelectedComponents(tIds); @@ -254,7 +254,7 @@ MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::inverse(int sizeCThis, con return new MEDCalculatorDBSliceField(f2); } -MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::trace(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::trace(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const { std::vector tIds=thisC.getIds(sizeCThis); MCAuto f1=_field->keepSelectedComponents(tIds); @@ -262,7 +262,7 @@ MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::trace(int sizeCThis, const return new MEDCalculatorDBSliceField(f2); } -MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::deviator(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::deviator(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const { std::vector tIds=thisC.getIds(sizeCThis); MCAuto f1=_field->keepSelectedComponents(tIds); @@ -270,7 +270,7 @@ MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::deviator(int sizeCThis, co return new MEDCalculatorDBSliceField(f2); } -MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::magnitude(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception) +MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::magnitude(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const { std::vector tIds=thisC.getIds(sizeCThis); MCAuto f1=_field->keepSelectedComponents(tIds); diff --git a/src/MEDCalculator/MEDCalculatorDBSliceField.hxx b/src/MEDCalculator/MEDCalculatorDBSliceField.hxx index 23c0a955d..7392aa059 100644 --- a/src/MEDCalculator/MEDCalculatorDBSliceField.hxx +++ b/src/MEDCalculator/MEDCalculatorDBSliceField.hxx @@ -48,7 +48,7 @@ namespace MEDCoupling void setField(MEDCouplingFieldDouble *f) const; void setName(const char *name); void setDescription(const char *descr); - void write(const char *fName, const std::string& n, const std::string& d) const throw(INTERP_KERNEL::Exception); + void write(const char *fName, const std::string& n, const std::string& d) const; const MEDCouplingMesh *getMesh(TypeOfField type, const std::string& fname, const std::string& mname, const std::string& fieldName) const; MEDCouplingFieldDouble *getField(TypeOfField type, const std::string& fname, const std::string& mname, const std::string& fieldName) const; MEDCouplingFieldDouble *getFieldWithoutQuestion(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const; @@ -75,14 +75,14 @@ namespace MEDCoupling MEDCalculatorDBSliceField *crossProduct(const MEDCalculatorDBSliceField* other, int sizeCThis, const MEDCalculatorDBRangeSelection& thisC, int sizeCOther, const MEDCalculatorDBRangeSelection& otherC) const; - MEDCalculatorDBSliceField *doublyContractedProduct(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBSliceField *determinant(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBSliceField *eigenValues(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBSliceField *eigenVectors(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBSliceField *inverse(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBSliceField *trace(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBSliceField *deviator(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception); - MEDCalculatorDBSliceField *magnitude(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception); + MEDCalculatorDBSliceField *doublyContractedProduct(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const; + MEDCalculatorDBSliceField *determinant(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const; + MEDCalculatorDBSliceField *eigenValues(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const; + MEDCalculatorDBSliceField *eigenVectors(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const; + MEDCalculatorDBSliceField *inverse(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const; + MEDCalculatorDBSliceField *trace(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const; + MEDCalculatorDBSliceField *deviator(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const; + MEDCalculatorDBSliceField *magnitude(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const; void applyFunc(const char *func, int sizeCThis, const MEDCalculatorDBRangeSelection& thisC); bool isEqual(const MEDCalculatorDBSliceField* other, const DataArrayIdType *cc, const DataArrayIdType *nc, int sizeCThis, const MEDCalculatorDBRangeSelection& thisC, diff --git a/src/MEDCalculator/Swig/SPythonParser.cxx b/src/MEDCalculator/Swig/SPythonParser.cxx index 3b0176ceb..ad85119b3 100644 --- a/src/MEDCalculator/Swig/SPythonParser.cxx +++ b/src/MEDCalculator/Swig/SPythonParser.cxx @@ -94,7 +94,7 @@ void SPythonParser::keepSelectedLevOfPar(const std::string& s, int parLev, PyObj int curLev=0; std::size_t i=0; std::size_t len=s.length(); - bool found=false; + //bool found=false; // todo: unused if(parLev==0) { _content=s; @@ -119,7 +119,7 @@ void SPythonParser::keepSelectedLevOfPar(const std::string& s, int parLev, PyObj std::size_t end=s.find_first_of(')',i); end=end!=std::string::npos?end-i:std::string::npos; _content=s.substr(i,end); - found=true; + //found=true; // todo: unused break; } } diff --git a/src/MEDCouplingCorba/DataArrayDoubleServant.cxx b/src/MEDCouplingCorba/DataArrayDoubleServant.cxx index e4aac481b..f1945199e 100644 --- a/src/MEDCouplingCorba/DataArrayDoubleServant.cxx +++ b/src/MEDCouplingCorba/DataArrayDoubleServant.cxx @@ -68,7 +68,7 @@ SALOME::StringSeq *DataArrayDoubleServant::GetExportableFormats() return ret; } -CORBA::Boolean DataArrayDoubleServant::ExportDataAs(const char *format, SALOME::GenericObj_out exporter) +CORBA::Boolean DataArrayDoubleServant::ExportDataAs(const char * /*format*/, SALOME::GenericObj_out exporter) { exporter=SALOME::GenericObj::_nil(); return false; diff --git a/src/MEDCouplingCorba/DataArrayIntServant.cxx b/src/MEDCouplingCorba/DataArrayIntServant.cxx index d624581c2..ad5d3a9c7 100644 --- a/src/MEDCouplingCorba/DataArrayIntServant.cxx +++ b/src/MEDCouplingCorba/DataArrayIntServant.cxx @@ -68,7 +68,7 @@ SALOME::StringSeq *DataArrayIntServant::GetExportableFormats() return ret; } -CORBA::Boolean DataArrayIntServant::ExportDataAs(const char *format, SALOME::GenericObj_out exporter) +CORBA::Boolean DataArrayIntServant::ExportDataAs(const char * /*format*/, SALOME::GenericObj_out exporter) { exporter=SALOME::GenericObj::_nil(); return false; diff --git a/src/ParaMEDMEMComponent/MPIMEDCouplingFieldDoubleServant.cxx b/src/ParaMEDMEMComponent/MPIMEDCouplingFieldDoubleServant.cxx index 2f25585a5..1a0455d76 100644 --- a/src/ParaMEDMEMComponent/MPIMEDCouplingFieldDoubleServant.cxx +++ b/src/ParaMEDMEMComponent/MPIMEDCouplingFieldDoubleServant.cxx @@ -41,11 +41,11 @@ MPIMEDCouplingFieldDoubleServant::MPIMEDCouplingFieldDoubleServant(CORBA::ORB_pt BCastIOR(orb,pobj,false); } -void MPIMEDCouplingFieldDoubleServant::getDataByMPI(const char* coupling) throw(SALOME::SALOME_Exception) +void MPIMEDCouplingFieldDoubleServant::getDataByMPI(const char* coupling) { except_st *est; void *ret_th; - pthread_t *th; + pthread_t *th = 0; if(_numproc == 0) { diff --git a/src/ParaMEDMEMComponent/MPIMEDCouplingFieldDoubleServant.hxx b/src/ParaMEDMEMComponent/MPIMEDCouplingFieldDoubleServant.hxx index f099e7987..0ff119168 100644 --- a/src/ParaMEDMEMComponent/MPIMEDCouplingFieldDoubleServant.hxx +++ b/src/ParaMEDMEMComponent/MPIMEDCouplingFieldDoubleServant.hxx @@ -36,7 +36,7 @@ namespace MEDCoupling { public: MPIMEDCouplingFieldDoubleServant(CORBA::ORB_ptr orb,PortableServer::POA_ptr poa,ParaMEDMEMComponent_i *pcompo,MEDCouplingFieldDouble* field); - void getDataByMPI(const char* coupling) throw(SALOME::SALOME_Exception); + void getDataByMPI(const char* coupling); char* getRef(); // only for coupling one component with itself CORBA::LongLong getImplementation() {return (CORBA::LongLong)_field;} diff --git a/src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.cxx b/src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.cxx index 39c16cd2e..c073585c2 100644 --- a/src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.cxx +++ b/src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.cxx @@ -56,12 +56,12 @@ ParaMEDMEMComponent_i::~ParaMEDMEMComponent_i() pthread_mutex_destroy (&m2); } -void ParaMEDMEMComponent_i::initializeCoupling(const char * coupling, const char * ior) throw(SALOME::SALOME_Exception) +void ParaMEDMEMComponent_i::initializeCoupling(const char * coupling, const char * ior) { int gsize, grank; except_st *est; void *ret_th; - pthread_t *th; + pthread_t *th = 0; ostringstream msg; pthread_mutex_lock(&m1); @@ -145,11 +145,11 @@ void ParaMEDMEMComponent_i::initializeCoupling(const char * coupling, const char } } -void ParaMEDMEMComponent_i::terminateCoupling(const char * coupling) throw(SALOME::SALOME_Exception) +void ParaMEDMEMComponent_i::terminateCoupling(const char * coupling) { except_st *est; void *ret_th; - pthread_t *th; + pthread_t *th = 0; ostringstream msg; pthread_mutex_lock(&m2); @@ -234,11 +234,11 @@ void ParaMEDMEMComponent_i::setInterpolationOptions(const char * coupling, CORBA::Double max_distance_for_3Dsurf_intersect, CORBA::Long orientation, CORBA::Boolean measure_abs, - const char * splitting_policy) throw(SALOME::SALOME_Exception) + const char * splitting_policy) { except_st *est; void *ret_th; - pthread_t *th; + pthread_t *th = 0; ostringstream msg; if(_numproc == 0) diff --git a/src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.hxx b/src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.hxx index d0088bd01..cf4e92386 100644 --- a/src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.hxx +++ b/src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.hxx @@ -90,9 +90,9 @@ namespace MEDCoupling CORBA::Double max_distance_for_3Dsurf_intersect, CORBA::Long orientation, CORBA::Boolean measure_abs, - const char * splitting_policy ) throw(SALOME::SALOME_Exception); - virtual void initializeCoupling(const char * coupling, const char * ior) throw(SALOME::SALOME_Exception); - virtual void terminateCoupling(const char * coupling) throw(SALOME::SALOME_Exception); + const char * splitting_policy ); + virtual void initializeCoupling(const char * coupling, const char * ior); + virtual void terminateCoupling(const char * coupling); virtual void _getOutputField(const char * coupling, MEDCouplingFieldDouble* field); protected: -- 2.39.2