From fcc88f008be873d54bd6d06fbb39def48d3ab414 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Aguerre?= Date: Fri, 24 Jul 2015 18:30:49 +0200 Subject: [PATCH] [Huge] Introducing MEDCalc --- CMakeLists.txt | 42 ++++---- doc/doxygen/doxfiles/gui.dox | 8 +- idl/CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- src/{MEDOP => MEDCalc}/CMakeLists.txt | 0 src/{MEDOP => MEDCalc}/cmp/CMakeLists.txt | 18 ++-- src/{MEDOP => MEDCalc}/doc/CMakeLists.txt | 0 .../doc/models/medcalc.xmi} | 10 +- .../doc/sphinx/CMakeLists.txt | 2 +- ...A_VBERGEAUD_GuideutilisateurMEDMEMOIRE.pdf | Bin ...es_maillages_pour_le_couplage_de_codes.pdf | Bin ...20091218_EDF_VCANO_H-I2C-2009-03595-FR.pdf | Bin .../20100129_MAN_seminaireEDF-CEA_all.pdf | Bin .../documents/20101027_MAN_revueEDF-CEA.pdf | Bin .../documents/20110309_XMED_scan_notes.pdf | Bin .../20110309_XMED_scan_remarques_ELORENTZ.pdf | Bin ...20110310_seminaireEDF-CEA_maquetteXMED.pdf | Bin .../_static/documents/xmed-develguide.pdf | Bin .../_static/documents/xmed-specifications.pdf | Bin .../_static/documents/xmed-userguide.pdf | Bin .../doc/sphinx/_static/medop.css | 0 ...0111115_JUS2011_manipulation_de_champs.pdf | Bin .../20111115_JUS2011_medop_exemple_1.ogv | Bin .../20111115_JUS2011_medop_exemple_3.ogv | Bin .../20111115_JUS2011_medop_exemple_4.ogv | Bin src/{MEDOP => MEDCalc}/doc/sphinx/conf.py.in | 14 +-- .../sphinx/fr/images/xmed-gui-withframe.png | Bin .../doc/sphinx/fr/images/xmed-gui.png | Bin .../doc/sphinx/fr/index.rst | 10 +- .../doc/sphinx/fr/medcalc-definitions.rst} | 0 .../doc/sphinx/fr/medcalc-develguide.rst} | 44 ++++----- .../doc/sphinx/fr/medcalc-references.rst} | 2 +- .../doc/sphinx/fr/medcalc-specifications.rst} | 26 ++--- .../doc/sphinx/fr/medcalc-userguide-gui.rst} | 90 +++++++++--------- .../sphinx/fr/medop-prototype-develguide.rst | 32 +++---- .../doc/sphinx/fr}/medop-prototype-medmem.rst | 46 ++++----- .../sphinx/fr/medop-prototype-overview.rst | 6 +- .../doc/sphinx/fr/medop-workingnotes-2010.rst | 0 .../sphinx/fr}/medop-workingnotes-2011.rst | 8 +- .../doc/sphinx/fr/medop-workingnotes-2012.rst | 4 +- .../doc/sphinx/images/champ_altitude_MAP.png | Bin .../doc/sphinx/images/convert.sh | 0 .../doc/sphinx/images/ico_datasource_add.png | Bin .../ico_datasource_changeUnderlyingMesh.png | Bin .../images/ico_datasource_expandfield.png | Bin .../doc/sphinx/images/ico_datasource_use.png | Bin .../doc/sphinx/images/ico_datasource_view.png | Bin .../doc/sphinx/images/ico_imagesource.png | Bin .../doc/sphinx/images/ico_workspace_save.png | Bin .../doc/sphinx/images/ico_xmed.png | Bin .../doc/sphinx/images/med-uml-main.png | Bin .../doc/sphinx/images/med-uml-main_60pc.png | Bin .../doc/sphinx/images/medlayers.png | Bin .../doc/sphinx/images/medlayers_70pc.png | Bin .../doc/sphinx/images/medmem-corba-layers.png | Bin .../doc/sphinx/images/medmem-layers.png | Bin .../sphinx/images/medop-gui-aliasfield.png | Bin .../images/medop-gui-aliasfield_scale.png | Bin .../doc/sphinx/images/medop-gui-result.png | Bin .../sphinx/images/medop-gui-result_scale.png | Bin .../sphinx/images/medop-gui-selectfield.png | Bin .../images/medop-gui-selectfield_scale.png | Bin .../doc/sphinx/images/medop-gui-visufield.png | Bin .../images/medop-gui-visufield_scale.png | Bin .../doc/sphinx/images/medop_exportparavis.png | Bin .../images/medop_exportparavis_result.png | Bin .../sphinx/images/medop_image2med_dialog.png | Bin .../images/medop_image2med_tomographie.png | Bin .../sphinx/images/medop_projection_inputs.png | Bin .../sphinx/images/medop_projection_result.png | Bin .../doc/sphinx/images/partition_mesh.png | Bin .../doc/sphinx/images/partition_skin.png | Bin .../doc/sphinx/images/xmed-architecture.png | Bin .../doc/sphinx/images/xmed-exploremed.png | Bin .../doc/sphinx/images/xmed-functions.png | Bin ...ed-gui-datasource-changeUnderlyingMesh.png | Bin ...datasource-changeUnderlyingMesh_wsview.png | Bin .../xmed-gui-datasource-contextmenu.png | Bin .../xmed-gui-datasource-contextmenu_60pc.png | Bin .../xmed-gui-datasource-contextmenu_70pc.png | Bin .../xmed-gui-datasource-contextmenu_80pc.png | Bin .../xmed-gui-datasource-expand-zoom.png | Bin .../xmed-gui-datasource-explore-zoom.png | Bin .../images/xmed-gui-datasource-explore.png | Bin ...med-gui-datasource-menucontextuel-zoom.png | Bin .../images/xmed-gui-datasource-selectfile.png | Bin ...ed-gui-datasource-useinworkspace-alias.png | Bin ...d-gui-datasource-useinworkspace-result.png | Bin ...-datasource-useinworkspace-result_70pc.png | Bin .../xmed-gui-datasource-useinworkspace.png | Bin ...med-gui-datasource-useinworkspace_70pc.png | Bin .../xmed-gui-datasource-visualize-result.png | Bin ...d-gui-datasource-visualize-result_50pc.png | Bin ...d-gui-datasource-visualize-result_70pc.png | Bin .../xmed-gui-datasource-visualize-zoom.png | Bin .../images/xmed-gui-datasource-visualize.png | Bin .../xmed-gui-datasource-visualize_50pc.png | Bin .../xmed-gui-datasource-visualize_70pc.png | Bin .../doc/sphinx/images/xmed-gui-start.png | Bin .../doc/sphinx/images/xmed-gui-withframe.png | Bin .../sphinx/images/xmed-gui-workspace-view.png | Bin .../doc/sphinx/images/xmed-gui-workspace.png | Bin .../doc/sphinx/images/xmed-gui.png | Bin .../doc/sphinx/images/xmed-gui_70pc.png | Bin .../doc/sphinx/images/xmed-implantation.png | Bin .../doc/sphinx/images/xmed-irm-diff.png | Bin .../doc/sphinx/images/xmed-irm-field.png | Bin .../doc/sphinx/images/xmed-irm.png | Bin .../xmed-userguide-example2-datasource.png | Bin ...xmed-userguide-example2-workspace-save.png | Bin .../xmed-userguide-example2-workspace.png | Bin .../images/xmed-visu-importtimestamps.png | Bin .../images/xmed-visu-scalarmaptimestamps.png | Bin src/{MEDOP => MEDCalc}/doc/sphinx/index.rst | 10 +- .../doc/sphinx/medcalc-definitions.rst} | 0 .../doc/sphinx/medcalc-develguide.rst} | 44 ++++----- .../doc/sphinx/medcalc-references.rst} | 2 +- .../doc/sphinx/medcalc-specifications.rst} | 26 ++--- .../doc/sphinx/medcalc-userguide-api.rst} | 62 ++++++------ .../doc/sphinx/medcalc-userguide-gui.rst} | 56 ++++++----- .../doc/sphinx/medop-prototype-develguide.rst | 32 +++---- .../doc/sphinx}/medop-prototype-medmem.rst | 46 ++++----- .../doc/sphinx/medop-prototype-overview.rst | 6 +- .../doc/sphinx/medop-workingnotes-2010.rst | 0 .../doc/sphinx}/medop-workingnotes-2011.rst | 8 +- .../doc/sphinx/medop-workingnotes-2012.rst | 4 +- src/{MEDOP => MEDCalc}/exe/CMakeLists.txt | 0 .../exe/image2med/CMakeLists.txt | 0 src/{MEDOP => MEDCalc}/gui/CMakeLists.txt | 32 +++---- .../gui/dialogs/CMakeLists.txt | 18 ++-- src/{MEDOP => MEDCalc}/res/CMakeLists.txt | 4 +- .../res/testfiles/CMakeLists.txt | 4 +- .../tui}/CMakeLists.txt | 7 +- .../tut/medcoupling/README.txt | 0 src/{MEDOP => MEDCalc}/tut/medcoupling/env.sh | 0 .../tut/medcoupling/images/avatar.png | Bin .../tut/medcoupling/images/irm.png | Bin .../tut/medcoupling/images/lena.png | Bin .../tut/medcoupling/images/tests.pgm | 0 .../tut/medcoupling/partition.py | 0 .../tut/medcoupling/pyfunctions/__init__.py | 0 .../tut/medcoupling/pyfunctions/functions.py | 0 .../tut/medcoupling/pyfunctions/lagrange.py | 0 .../tut/medcoupling/pyfunctions/plotter.py | 0 .../tut/medcoupling/test-paravis.py | 0 .../tut/medcoupling/testmed_gendata.py | 22 ++--- .../tut/medcoupling/testmed_lena.py | 0 .../tut/medcoupling/testmed_simple.py | 0 .../tut/medcoupling/testpil.py | 0 src/{MEDOP => MEDCalc}/tut/medloader/Makefile | 0 src/{MEDOP => MEDCalc}/tut/medloader/cmesh.py | 0 .../tut/medloader/explore.py | 0 .../tut/medloader/madnex_field.med | Bin .../tut/medloader/madnex_grid.med | Bin .../tut/medloader/manage.py | 0 .../tut/medloader/testamel.py | 0 .../tut/medloader/timeseries.med | Bin .../tut/medloader/tutorial.py | 0 src/MEDOP/tui/CMakeLists.txt | 21 ---- src/MEDOP/tui/xmedpy/CMakeLists.txt | 43 --------- 160 files changed, 381 insertions(+), 432 deletions(-) rename src/{MEDOP => MEDCalc}/CMakeLists.txt (100%) rename src/{MEDOP => MEDCalc}/cmp/CMakeLists.txt (74%) rename src/{MEDOP => MEDCalc}/doc/CMakeLists.txt (100%) rename src/{MEDOP/doc/models/medop.xmi => MEDCalc/doc/models/medcalc.xmi} (97%) rename src/{MEDOP => MEDCalc}/doc/sphinx/CMakeLists.txt (97%) rename src/{MEDOP => MEDCalc}/doc/sphinx/_static/documents/20070105_CEA_VBERGEAUD_GuideutilisateurMEDMEMOIRE.pdf (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/_static/documents/20091211_CEA_AGEAY_09-017-RT-A_Normalisation_des_champs_et_des_maillages_pour_le_couplage_de_codes.pdf (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/_static/documents/20091218_EDF_VCANO_H-I2C-2009-03595-FR.pdf (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/_static/documents/20100129_MAN_seminaireEDF-CEA_all.pdf (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/_static/documents/20101027_MAN_revueEDF-CEA.pdf (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/_static/documents/20110309_XMED_scan_notes.pdf (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/_static/documents/20110309_XMED_scan_remarques_ELORENTZ.pdf (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/_static/documents/20110310_seminaireEDF-CEA_maquetteXMED.pdf (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/_static/documents/xmed-develguide.pdf (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/_static/documents/xmed-specifications.pdf (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/_static/documents/xmed-userguide.pdf (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/_static/medop.css (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/_static/presentations/20111115_JUS-2011/20111115_JUS2011_manipulation_de_champs.pdf (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/_static/presentations/20111115_JUS-2011/20111115_JUS2011_medop_exemple_1.ogv (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/_static/presentations/20111115_JUS-2011/20111115_JUS2011_medop_exemple_3.ogv (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/_static/presentations/20111115_JUS-2011/20111115_JUS2011_medop_exemple_4.ogv (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/conf.py.in (92%) rename src/{MEDOP => MEDCalc}/doc/sphinx/fr/images/xmed-gui-withframe.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/fr/images/xmed-gui.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/fr/index.rst (88%) rename src/{MEDOP/doc/sphinx/fr/medop-definitions.rst => MEDCalc/doc/sphinx/fr/medcalc-definitions.rst} (100%) rename src/{MEDOP/doc/sphinx/fr/medop-develguide.rst => MEDCalc/doc/sphinx/fr/medcalc-develguide.rst} (88%) rename src/{MEDOP/doc/sphinx/fr/medop-references.rst => MEDCalc/doc/sphinx/fr/medcalc-references.rst} (96%) rename src/{MEDOP/doc/sphinx/medop-specifications.rst => MEDCalc/doc/sphinx/fr/medcalc-specifications.rst} (99%) rename src/{MEDOP/doc/sphinx/fr/medop-userguide-gui.rst => MEDCalc/doc/sphinx/fr/medcalc-userguide-gui.rst} (94%) rename src/{MEDOP => MEDCalc}/doc/sphinx/fr/medop-prototype-develguide.rst (99%) rename src/{MEDOP/doc/sphinx => MEDCalc/doc/sphinx/fr}/medop-prototype-medmem.rst (98%) rename src/{MEDOP => MEDCalc}/doc/sphinx/fr/medop-prototype-overview.rst (97%) rename src/{MEDOP => MEDCalc}/doc/sphinx/fr/medop-workingnotes-2010.rst (100%) rename src/{MEDOP/doc/sphinx => MEDCalc/doc/sphinx/fr}/medop-workingnotes-2011.rst (99%) rename src/{MEDOP => MEDCalc}/doc/sphinx/fr/medop-workingnotes-2012.rst (98%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/champ_altitude_MAP.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/convert.sh (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/ico_datasource_add.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/ico_datasource_changeUnderlyingMesh.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/ico_datasource_expandfield.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/ico_datasource_use.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/ico_datasource_view.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/ico_imagesource.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/ico_workspace_save.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/ico_xmed.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/med-uml-main.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/med-uml-main_60pc.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/medlayers.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/medlayers_70pc.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/medmem-corba-layers.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/medmem-layers.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/medop-gui-aliasfield.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/medop-gui-aliasfield_scale.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/medop-gui-result.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/medop-gui-result_scale.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/medop-gui-selectfield.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/medop-gui-selectfield_scale.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/medop-gui-visufield.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/medop-gui-visufield_scale.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/medop_exportparavis.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/medop_exportparavis_result.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/medop_image2med_dialog.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/medop_image2med_tomographie.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/medop_projection_inputs.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/medop_projection_result.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/partition_mesh.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/partition_skin.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-architecture.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-exploremed.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-functions.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-datasource-changeUnderlyingMesh.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-datasource-changeUnderlyingMesh_wsview.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-datasource-contextmenu.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-datasource-contextmenu_60pc.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-datasource-contextmenu_70pc.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-datasource-contextmenu_80pc.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-datasource-expand-zoom.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-datasource-explore-zoom.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-datasource-explore.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-datasource-menucontextuel-zoom.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-datasource-selectfile.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-datasource-useinworkspace-alias.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-datasource-useinworkspace-result.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-datasource-useinworkspace-result_70pc.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-datasource-useinworkspace.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-datasource-useinworkspace_70pc.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-datasource-visualize-result.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-datasource-visualize-result_50pc.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-datasource-visualize-result_70pc.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-datasource-visualize-zoom.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-datasource-visualize.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-datasource-visualize_50pc.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-datasource-visualize_70pc.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-start.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-withframe.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-workspace-view.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui-workspace.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-gui_70pc.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-implantation.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-irm-diff.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-irm-field.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-irm.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-userguide-example2-datasource.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-userguide-example2-workspace-save.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-userguide-example2-workspace.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-visu-importtimestamps.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/images/xmed-visu-scalarmaptimestamps.png (100%) rename src/{MEDOP => MEDCalc}/doc/sphinx/index.rst (87%) rename src/{MEDOP/doc/sphinx/medop-definitions.rst => MEDCalc/doc/sphinx/medcalc-definitions.rst} (100%) rename src/{MEDOP/doc/sphinx/medop-develguide.rst => MEDCalc/doc/sphinx/medcalc-develguide.rst} (88%) rename src/{MEDOP/doc/sphinx/medop-references.rst => MEDCalc/doc/sphinx/medcalc-references.rst} (96%) rename src/{MEDOP/doc/sphinx/fr/medop-specifications.rst => MEDCalc/doc/sphinx/medcalc-specifications.rst} (99%) rename src/{MEDOP/doc/sphinx/medop-userguide-api.rst => MEDCalc/doc/sphinx/medcalc-userguide-api.rst} (93%) rename src/{MEDOP/doc/sphinx/medop-userguide-gui.rst => MEDCalc/doc/sphinx/medcalc-userguide-gui.rst} (94%) rename src/{MEDOP => MEDCalc}/doc/sphinx/medop-prototype-develguide.rst (99%) rename src/{MEDOP/doc/sphinx/fr => MEDCalc/doc/sphinx}/medop-prototype-medmem.rst (98%) rename src/{MEDOP => MEDCalc}/doc/sphinx/medop-prototype-overview.rst (97%) rename src/{MEDOP => MEDCalc}/doc/sphinx/medop-workingnotes-2010.rst (100%) rename src/{MEDOP/doc/sphinx/fr => MEDCalc/doc/sphinx}/medop-workingnotes-2011.rst (99%) rename src/{MEDOP => MEDCalc}/doc/sphinx/medop-workingnotes-2012.rst (98%) rename src/{MEDOP => MEDCalc}/exe/CMakeLists.txt (100%) rename src/{MEDOP => MEDCalc}/exe/image2med/CMakeLists.txt (100%) rename src/{MEDOP => MEDCalc}/gui/CMakeLists.txt (77%) rename src/{MEDOP => MEDCalc}/gui/dialogs/CMakeLists.txt (78%) rename src/{MEDOP => MEDCalc}/res/CMakeLists.txt (97%) rename src/{MEDOP => MEDCalc}/res/testfiles/CMakeLists.txt (96%) rename src/{MEDOP/tui/presentation => MEDCalc/tui}/CMakeLists.txt (93%) rename src/{MEDOP => MEDCalc}/tut/medcoupling/README.txt (100%) rename src/{MEDOP => MEDCalc}/tut/medcoupling/env.sh (100%) rename src/{MEDOP => MEDCalc}/tut/medcoupling/images/avatar.png (100%) rename src/{MEDOP => MEDCalc}/tut/medcoupling/images/irm.png (100%) rename src/{MEDOP => MEDCalc}/tut/medcoupling/images/lena.png (100%) rename src/{MEDOP => MEDCalc}/tut/medcoupling/images/tests.pgm (100%) rename src/{MEDOP => MEDCalc}/tut/medcoupling/partition.py (100%) rename src/{MEDOP => MEDCalc}/tut/medcoupling/pyfunctions/__init__.py (100%) rename src/{MEDOP => MEDCalc}/tut/medcoupling/pyfunctions/functions.py (100%) rename src/{MEDOP => MEDCalc}/tut/medcoupling/pyfunctions/lagrange.py (100%) rename src/{MEDOP => MEDCalc}/tut/medcoupling/pyfunctions/plotter.py (100%) rename src/{MEDOP => MEDCalc}/tut/medcoupling/test-paravis.py (100%) rename src/{MEDOP => MEDCalc}/tut/medcoupling/testmed_gendata.py (98%) rename src/{MEDOP => MEDCalc}/tut/medcoupling/testmed_lena.py (100%) rename src/{MEDOP => MEDCalc}/tut/medcoupling/testmed_simple.py (100%) rename src/{MEDOP => MEDCalc}/tut/medcoupling/testpil.py (100%) rename src/{MEDOP => MEDCalc}/tut/medloader/Makefile (100%) rename src/{MEDOP => MEDCalc}/tut/medloader/cmesh.py (100%) rename src/{MEDOP => MEDCalc}/tut/medloader/explore.py (100%) rename src/{MEDOP => MEDCalc}/tut/medloader/madnex_field.med (100%) rename src/{MEDOP => MEDCalc}/tut/medloader/madnex_grid.med (100%) rename src/{MEDOP => MEDCalc}/tut/medloader/manage.py (100%) rename src/{MEDOP => MEDCalc}/tut/medloader/testamel.py (100%) rename src/{MEDOP => MEDCalc}/tut/medloader/timeseries.med (100%) rename src/{MEDOP => MEDCalc}/tut/medloader/tutorial.py (100%) delete mode 100644 src/MEDOP/tui/CMakeLists.txt delete mode 100644 src/MEDOP/tui/xmedpy/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 51a6514c3..a79ee2d72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,7 @@ IF(NOT SALOME_MED_STANDALONE) KERNEL_WITH_CORBA() #check whether KERNEL builded with CORBA ADD_DEFINITIONS(${KERNEL_DEFINITIONS}) INCLUDE_DIRECTORIES(${KERNEL_INCLUDE_DIRS}) - SET(_default_MPI ${SALOME_USE_MPI}) + SET(_default_MPI ${SALOME_USE_MPI}) ELSE(EXISTS ${KERNEL_ROOT_DIR}) MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR or turn option SALOME_MED_STANDALONE to ON !") ENDIF(EXISTS ${KERNEL_ROOT_DIR}) @@ -221,24 +221,24 @@ SET(SALOME_INSTALL_BINS bin/salome CACHE PATH "Install path: SALOME binaries") SET(SALOME_INSTALL_LIBS lib/salome CACHE PATH "Install path: SALOME libs") SET(SALOME_INSTALL_IDLS idl/salome CACHE PATH "Install path: SALOME IDL files") SET(SALOME_INSTALL_HEADERS include/salome CACHE PATH "Install path: SALOME headers") -SET(SALOME_INSTALL_SCRIPT_SCRIPTS ${SALOME_INSTALL_BINS} CACHE PATH +SET(SALOME_INSTALL_SCRIPT_SCRIPTS ${SALOME_INSTALL_BINS} CACHE PATH "Install path: SALOME scripts") -SET(SALOME_INSTALL_SCRIPT_DATA ${SALOME_INSTALL_BINS} CACHE PATH +SET(SALOME_INSTALL_SCRIPT_DATA ${SALOME_INSTALL_BINS} CACHE PATH "Install path: SALOME script data") -SET(SALOME_INSTALL_SCRIPT_PYTHON ${SALOME_INSTALL_BINS} CACHE PATH +SET(SALOME_INSTALL_SCRIPT_PYTHON ${SALOME_INSTALL_BINS} CACHE PATH "Install path: SALOME Python scripts") -SET(SALOME_INSTALL_APPLISKEL_SCRIPTS ${SALOME_INSTALL_BINS}/appliskel CACHE PATH +SET(SALOME_INSTALL_APPLISKEL_SCRIPTS ${SALOME_INSTALL_BINS}/appliskel CACHE PATH "Install path: SALOME application skeleton - scripts") -SET(SALOME_INSTALL_APPLISKEL_PYTHON ${SALOME_INSTALL_BINS}/appliskel CACHE PATH +SET(SALOME_INSTALL_APPLISKEL_PYTHON ${SALOME_INSTALL_BINS}/appliskel CACHE PATH "Install path: SALOME application skeleton - Python") SET(SALOME_INSTALL_CMAKE salome_adm/cmake_files CACHE PATH "Install path: SALOME CMake files") -SET(SALOME_INSTALL_CMAKE_LOCAL adm_local/cmake_files CACHE PATH +SET(SALOME_INSTALL_CMAKE_LOCAL adm_local/cmake_files CACHE PATH "Install path: local SALOME CMake files") IF(SALOME_MED_ENABLE_PYTHON) SET(_pydir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) SET(SALOME_INSTALL_PYTHON ${_pydir}/salome CACHE PATH "Install path: SALOME Python stuff") - SET(SALOME_INSTALL_PYTHON_SHARED ${SALOME_INSTALL_PYTHON}/shared_modules CACHE PATH + SET(SALOME_INSTALL_PYTHON_SHARED ${SALOME_INSTALL_PYTHON}/shared_modules CACHE PATH "Install path: SALOME Python shared modules") ENDIF(SALOME_MED_ENABLE_PYTHON) @@ -267,7 +267,7 @@ SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOM SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) -# Sources +# Sources # ======== IF(WIN32) ADD_DEFINITIONS("-D_USE_MATH_DEFINES") @@ -323,21 +323,21 @@ IF(SALOME_USE_MPI) LIST(APPEND _${PROJECT_NAME}_exposed_targets paramedloader) ENDIF() IF(NOT SALOME_MED_STANDALONE) - LIST(APPEND _${PROJECT_NAME}_exposed_targets + LIST(APPEND _${PROJECT_NAME}_exposed_targets paramedcouplingcorba paramedmemcompo) ENDIF() IF(SALOME_BUILD_TESTS) IF(NOT SALOME_MED_MICROMED) LIST(APPEND _${PROJECT_NAME}_exposed_targets ParaMEDMEMTest) ENDIF() - ENDIF() + ENDIF() ENDIF() IF(NOT SALOME_MED_STANDALONE) - LIST(APPEND _${PROJECT_NAME}_exposed_targets + LIST(APPEND _${PROJECT_NAME}_exposed_targets SalomeIDLMED SalomeIDLMEDTests medcouplingcorba medcouplingclient) IF(NOT SALOME_MED_MICROMED) - LIST(APPEND _${PROJECT_NAME}_exposed_targets medcalculator MEDOPFactoryEngine) + LIST(APPEND _${PROJECT_NAME}_exposed_targets medcalculator MEDFactoryEngine) IF(SALOME_MED_ENABLE_PYTHON) LIST(APPEND _${PROJECT_NAME}_exposed_targets medcalculatorspython) ENDIF() @@ -346,8 +346,8 @@ ENDIF() IF(SALOME_BUILD_GUI) IF(NOT SALOME_MED_MICROMED) - LIST(APPEND _${PROJECT_NAME}_exposed_targets - MEDOPGUI_dialogs MEDOPGUI) + LIST(APPEND _${PROJECT_NAME}_exposed_targets + MEDCALCGUI_dialogs MEDCALCGUI) ENDIF() ENDIF() @@ -381,18 +381,18 @@ SET(SCOTCH_ROOT_DIR "${SCOTCH_ROOT_DIR}") SET(XDR_ROOT_DIR "${XDR_ROOT_DIR}") # - in the install tree: -# Get the relative path of the include directory so +# Get the relative path of the include directory so # we can register it in the generated configuration files: SET(CONF_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR}") # Build variables that will be expanded when configuring SalomeConfig.cmake: -SALOME_CONFIGURE_PREPARE(Metis ParMetis Scotch XDR CAS Qt4 CppUnit Graphviz Doxygen Sphinx MPI omniORB +SALOME_CONFIGURE_PREPARE(Metis ParMetis Scotch XDR CAS Qt4 CppUnit Graphviz Doxygen Sphinx MPI omniORB PThread Boost libXml2 Python HDF5 MEDFile) -CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in +CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in ${PROJECT_BINARY_DIR}/to_install/${PROJECT_NAME}Config.cmake INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE}_LOCAL" - PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX + PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX KERNEL_ROOT_DIR GUI_ROOT_DIR MEDFILE_ROOT_DIR MPI_ROOT_DIR HDF5_ROOT_DIR OMNIORB_ROOT_DIR PTHREAD_ROOT_DIR BOOST_ROOT_DIR SWIG_ROOT_DIR PYTHON_ROOT_DIR CPPUNIT_ROOT_DIR GRAPHVIZ_ROOT_DIR DOXYGEN_ROOT_DIR @@ -401,7 +401,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake VERSION ${${PROJECT_NAME_UC}_VERSION} COMPATIBILITY AnyNewerVersion) - + # Install the CMake configuration files: INSTALL(FILES "${PROJECT_BINARY_DIR}/to_install/${PROJECT_NAME}Config.cmake" @@ -409,5 +409,5 @@ INSTALL(FILES DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}") # Install the export set for use with the install-tree -INSTALL(EXPORT ${PROJECT_NAME}TargetGroup DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}" +INSTALL(EXPORT ${PROJECT_NAME}TargetGroup DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}" FILE ${PROJECT_NAME}Targets.cmake) diff --git a/doc/doxygen/doxfiles/gui.dox b/doc/doxygen/doxfiles/gui.dox index d8df24f06..6d765eb1a 100644 --- a/doc/doxygen/doxfiles/gui.dox +++ b/doc/doxygen/doxfiles/gui.dox @@ -6,11 +6,11 @@ you to deal with most standard use case of fields manipulation. The user guide can be found here: - User guide of the MED Graphical Interface + href="../../dev/MED/medcalc-userguide-gui.html">User guide of the MED Graphical Interface As a complement, a starter guide to MEDCouplig API is available: - Starter guide to MEDCoupling API for users + href="../../dev/MED/medcalc-userguide-api.html">Starter guide to MEDCoupling API for users You could also be interested to read the software specifications and @@ -18,9 +18,9 @@ requirements for this graphical module, and even the technical considerations for development: - Software + href="../../dev/MED/medcalc-specifications.html">Software specifications and requirements of the MED Graphical Interface (in french) - Developer guide of the MED Graphical Interface (in french) + href="../../dev/MED/medcalc-develguide.html">Developer guide of the MED Graphical Interface (in french) */ diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt index 9f47f7c2b..69c3b4a6c 100644 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -32,7 +32,7 @@ SET(SalomeIDLMED_IDLSOURCES MEDCalculator.idl MEDEventListener.idl MEDPresentationManager.idl - MEDOPFactory.idl + MEDFactory.idl ) IF(SALOME_USE_MPI) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d3d23be80..614d48eef 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -66,7 +66,7 @@ IF(NOT SALOME_MED_STANDALONE) ADD_SUBDIRECTORY(MEDCouplingCorba) IF(NOT SALOME_MED_MICROMED) ADD_SUBDIRECTORY(MEDCalculator) - ADD_SUBDIRECTORY(MEDOP) + ADD_SUBDIRECTORY(MEDCalc) ENDIF(NOT SALOME_MED_MICROMED) IF(SALOME_MED_ENABLE_PYTHON) ADD_SUBDIRECTORY(MEDCouplingCorba_Swig) diff --git a/src/MEDOP/CMakeLists.txt b/src/MEDCalc/CMakeLists.txt similarity index 100% rename from src/MEDOP/CMakeLists.txt rename to src/MEDCalc/CMakeLists.txt diff --git a/src/MEDOP/cmp/CMakeLists.txt b/src/MEDCalc/cmp/CMakeLists.txt similarity index 74% rename from src/MEDOP/cmp/CMakeLists.txt rename to src/MEDCalc/cmp/CMakeLists.txt index 8c74dbc76..5e5c8393e 100644 --- a/src/MEDOP/cmp/CMakeLists.txt +++ b/src/MEDCalc/cmp/CMakeLists.txt @@ -32,11 +32,11 @@ INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/src/MEDLoader ) -SET(MEDOPFactoryEngine_SOURCES +SET(MEDFactoryEngine_SOURCES MEDDataManager_i.cxx MEDCalculator_i.cxx MEDPresentationManager_i.cxx - MEDOPFactory_i.cxx + MEDFactory_i.cxx ) SET(COMMON_LIBS @@ -65,15 +65,15 @@ IF(WIN32) SET(COMMON_FLAGS "${COMMON_FLAGS} -DNOMINMAX") ENDIF(WIN32) -ADD_LIBRARY(MEDOPFactoryEngine SHARED ${MEDOPFactoryEngine_SOURCES}) -SET_TARGET_PROPERTIES(MEDOPFactoryEngine PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}") -TARGET_LINK_LIBRARIES(MEDOPFactoryEngine SalomeIDLMED ${COMMON_LIBS}) +ADD_LIBRARY(MEDFactoryEngine SHARED ${MEDFactoryEngine_SOURCES}) +SET_TARGET_PROPERTIES(MEDFactoryEngine PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}") +TARGET_LINK_LIBRARIES(MEDFactoryEngine SalomeIDLMED ${COMMON_LIBS}) -INSTALL(TARGETS MEDOPFactoryEngine DESTINATION ${SALOME_INSTALL_LIBS}) +INSTALL(TARGETS MEDFactoryEngine DESTINATION ${SALOME_INSTALL_LIBS}) -FILE(GLOB MEDOPFactoryEngine_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") -INSTALL(FILES ${MEDOPFactoryEngine_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS}) +FILE(GLOB MEDFactoryEngine_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") +INSTALL(FILES ${MEDFactoryEngine_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS}) IF(SALOME_ENABLE_PYTHON) - INSTALL(FILES test_medop_components.py PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ DESTINATION ${SALOME_INSTALL_BINS}/xmed) + INSTALL(FILES test_medcalc_components.py PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ DESTINATION ${SALOME_INSTALL_BINS}/xmed) ENDIF() diff --git a/src/MEDOP/doc/CMakeLists.txt b/src/MEDCalc/doc/CMakeLists.txt similarity index 100% rename from src/MEDOP/doc/CMakeLists.txt rename to src/MEDCalc/doc/CMakeLists.txt diff --git a/src/MEDOP/doc/models/medop.xmi b/src/MEDCalc/doc/models/medcalc.xmi similarity index 97% rename from src/MEDOP/doc/models/medop.xmi rename to src/MEDCalc/doc/models/medcalc.xmi index 9422c56f0..00fbdb5a4 100644 --- a/src/MEDOP/doc/models/medop.xmi +++ b/src/MEDCalc/doc/models/medcalc.xmi @@ -31,7 +31,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -183,7 +183,7 @@ - + @@ -289,8 +289,8 @@ - - + + diff --git a/src/MEDOP/doc/sphinx/CMakeLists.txt b/src/MEDCalc/doc/sphinx/CMakeLists.txt similarity index 97% rename from src/MEDOP/doc/sphinx/CMakeLists.txt rename to src/MEDCalc/doc/sphinx/CMakeLists.txt index 411eaefdf..af144c98b 100644 --- a/src/MEDOP/doc/sphinx/CMakeLists.txt +++ b/src/MEDCalc/doc/sphinx/CMakeLists.txt @@ -20,7 +20,7 @@ SALOME_CONFIGURE_FILE(conf.py.in conf.py) SET(_cmd_options -c ${CMAKE_CURRENT_BINARY_DIR} -b html -d doctrees -D latex_paper_size=a4 ${CMAKE_CURRENT_SOURCE_DIR} html) -SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd env_script "${SPHINX_EXECUTABLE}" "${_cmd_options}") +SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd env_script "${SPHINX_EXECUTABLE}" "${_cmd_options}") ADD_CUSTOM_TARGET(html_docs COMMAND ${_cmd}) diff --git a/src/MEDOP/doc/sphinx/_static/documents/20070105_CEA_VBERGEAUD_GuideutilisateurMEDMEMOIRE.pdf b/src/MEDCalc/doc/sphinx/_static/documents/20070105_CEA_VBERGEAUD_GuideutilisateurMEDMEMOIRE.pdf similarity index 100% rename from src/MEDOP/doc/sphinx/_static/documents/20070105_CEA_VBERGEAUD_GuideutilisateurMEDMEMOIRE.pdf rename to src/MEDCalc/doc/sphinx/_static/documents/20070105_CEA_VBERGEAUD_GuideutilisateurMEDMEMOIRE.pdf diff --git a/src/MEDOP/doc/sphinx/_static/documents/20091211_CEA_AGEAY_09-017-RT-A_Normalisation_des_champs_et_des_maillages_pour_le_couplage_de_codes.pdf b/src/MEDCalc/doc/sphinx/_static/documents/20091211_CEA_AGEAY_09-017-RT-A_Normalisation_des_champs_et_des_maillages_pour_le_couplage_de_codes.pdf similarity index 100% rename from src/MEDOP/doc/sphinx/_static/documents/20091211_CEA_AGEAY_09-017-RT-A_Normalisation_des_champs_et_des_maillages_pour_le_couplage_de_codes.pdf rename to src/MEDCalc/doc/sphinx/_static/documents/20091211_CEA_AGEAY_09-017-RT-A_Normalisation_des_champs_et_des_maillages_pour_le_couplage_de_codes.pdf diff --git a/src/MEDOP/doc/sphinx/_static/documents/20091218_EDF_VCANO_H-I2C-2009-03595-FR.pdf b/src/MEDCalc/doc/sphinx/_static/documents/20091218_EDF_VCANO_H-I2C-2009-03595-FR.pdf similarity index 100% rename from src/MEDOP/doc/sphinx/_static/documents/20091218_EDF_VCANO_H-I2C-2009-03595-FR.pdf rename to src/MEDCalc/doc/sphinx/_static/documents/20091218_EDF_VCANO_H-I2C-2009-03595-FR.pdf diff --git a/src/MEDOP/doc/sphinx/_static/documents/20100129_MAN_seminaireEDF-CEA_all.pdf b/src/MEDCalc/doc/sphinx/_static/documents/20100129_MAN_seminaireEDF-CEA_all.pdf similarity index 100% rename from src/MEDOP/doc/sphinx/_static/documents/20100129_MAN_seminaireEDF-CEA_all.pdf rename to src/MEDCalc/doc/sphinx/_static/documents/20100129_MAN_seminaireEDF-CEA_all.pdf diff --git a/src/MEDOP/doc/sphinx/_static/documents/20101027_MAN_revueEDF-CEA.pdf b/src/MEDCalc/doc/sphinx/_static/documents/20101027_MAN_revueEDF-CEA.pdf similarity index 100% rename from src/MEDOP/doc/sphinx/_static/documents/20101027_MAN_revueEDF-CEA.pdf rename to src/MEDCalc/doc/sphinx/_static/documents/20101027_MAN_revueEDF-CEA.pdf diff --git a/src/MEDOP/doc/sphinx/_static/documents/20110309_XMED_scan_notes.pdf b/src/MEDCalc/doc/sphinx/_static/documents/20110309_XMED_scan_notes.pdf similarity index 100% rename from src/MEDOP/doc/sphinx/_static/documents/20110309_XMED_scan_notes.pdf rename to src/MEDCalc/doc/sphinx/_static/documents/20110309_XMED_scan_notes.pdf diff --git a/src/MEDOP/doc/sphinx/_static/documents/20110309_XMED_scan_remarques_ELORENTZ.pdf b/src/MEDCalc/doc/sphinx/_static/documents/20110309_XMED_scan_remarques_ELORENTZ.pdf similarity index 100% rename from src/MEDOP/doc/sphinx/_static/documents/20110309_XMED_scan_remarques_ELORENTZ.pdf rename to src/MEDCalc/doc/sphinx/_static/documents/20110309_XMED_scan_remarques_ELORENTZ.pdf diff --git a/src/MEDOP/doc/sphinx/_static/documents/20110310_seminaireEDF-CEA_maquetteXMED.pdf b/src/MEDCalc/doc/sphinx/_static/documents/20110310_seminaireEDF-CEA_maquetteXMED.pdf similarity index 100% rename from src/MEDOP/doc/sphinx/_static/documents/20110310_seminaireEDF-CEA_maquetteXMED.pdf rename to src/MEDCalc/doc/sphinx/_static/documents/20110310_seminaireEDF-CEA_maquetteXMED.pdf diff --git a/src/MEDOP/doc/sphinx/_static/documents/xmed-develguide.pdf b/src/MEDCalc/doc/sphinx/_static/documents/xmed-develguide.pdf similarity index 100% rename from src/MEDOP/doc/sphinx/_static/documents/xmed-develguide.pdf rename to src/MEDCalc/doc/sphinx/_static/documents/xmed-develguide.pdf diff --git a/src/MEDOP/doc/sphinx/_static/documents/xmed-specifications.pdf b/src/MEDCalc/doc/sphinx/_static/documents/xmed-specifications.pdf similarity index 100% rename from src/MEDOP/doc/sphinx/_static/documents/xmed-specifications.pdf rename to src/MEDCalc/doc/sphinx/_static/documents/xmed-specifications.pdf diff --git a/src/MEDOP/doc/sphinx/_static/documents/xmed-userguide.pdf b/src/MEDCalc/doc/sphinx/_static/documents/xmed-userguide.pdf similarity index 100% rename from src/MEDOP/doc/sphinx/_static/documents/xmed-userguide.pdf rename to src/MEDCalc/doc/sphinx/_static/documents/xmed-userguide.pdf diff --git a/src/MEDOP/doc/sphinx/_static/medop.css b/src/MEDCalc/doc/sphinx/_static/medop.css similarity index 100% rename from src/MEDOP/doc/sphinx/_static/medop.css rename to src/MEDCalc/doc/sphinx/_static/medop.css diff --git a/src/MEDOP/doc/sphinx/_static/presentations/20111115_JUS-2011/20111115_JUS2011_manipulation_de_champs.pdf b/src/MEDCalc/doc/sphinx/_static/presentations/20111115_JUS-2011/20111115_JUS2011_manipulation_de_champs.pdf similarity index 100% rename from src/MEDOP/doc/sphinx/_static/presentations/20111115_JUS-2011/20111115_JUS2011_manipulation_de_champs.pdf rename to src/MEDCalc/doc/sphinx/_static/presentations/20111115_JUS-2011/20111115_JUS2011_manipulation_de_champs.pdf diff --git a/src/MEDOP/doc/sphinx/_static/presentations/20111115_JUS-2011/20111115_JUS2011_medop_exemple_1.ogv b/src/MEDCalc/doc/sphinx/_static/presentations/20111115_JUS-2011/20111115_JUS2011_medop_exemple_1.ogv similarity index 100% rename from src/MEDOP/doc/sphinx/_static/presentations/20111115_JUS-2011/20111115_JUS2011_medop_exemple_1.ogv rename to src/MEDCalc/doc/sphinx/_static/presentations/20111115_JUS-2011/20111115_JUS2011_medop_exemple_1.ogv diff --git a/src/MEDOP/doc/sphinx/_static/presentations/20111115_JUS-2011/20111115_JUS2011_medop_exemple_3.ogv b/src/MEDCalc/doc/sphinx/_static/presentations/20111115_JUS-2011/20111115_JUS2011_medop_exemple_3.ogv similarity index 100% rename from src/MEDOP/doc/sphinx/_static/presentations/20111115_JUS-2011/20111115_JUS2011_medop_exemple_3.ogv rename to src/MEDCalc/doc/sphinx/_static/presentations/20111115_JUS-2011/20111115_JUS2011_medop_exemple_3.ogv diff --git a/src/MEDOP/doc/sphinx/_static/presentations/20111115_JUS-2011/20111115_JUS2011_medop_exemple_4.ogv b/src/MEDCalc/doc/sphinx/_static/presentations/20111115_JUS-2011/20111115_JUS2011_medop_exemple_4.ogv similarity index 100% rename from src/MEDOP/doc/sphinx/_static/presentations/20111115_JUS-2011/20111115_JUS2011_medop_exemple_4.ogv rename to src/MEDCalc/doc/sphinx/_static/presentations/20111115_JUS-2011/20111115_JUS2011_medop_exemple_4.ogv diff --git a/src/MEDOP/doc/sphinx/conf.py.in b/src/MEDCalc/doc/sphinx/conf.py.in similarity index 92% rename from src/MEDOP/doc/sphinx/conf.py.in rename to src/MEDCalc/doc/sphinx/conf.py.in index 9292409b4..bad7ac849 100644 --- a/src/MEDOP/doc/sphinx/conf.py.in +++ b/src/MEDCalc/doc/sphinx/conf.py.in @@ -132,7 +132,7 @@ html_theme_options = { # The stylecheet file will be searched within the static path, while # the layout.html file will be searched within the template path # (Note that this parameter can't be used together with html_theme. Exclusive) -html_style = 'medop.css' +html_style = 'medcalc.css' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, @@ -175,7 +175,7 @@ html_copy_source = True #html_file_suffix = '' # Output file base name for HTML help builder. -htmlhelp_basename = 'medopdoc' +htmlhelp_basename = 'medcalcdoc' # Options for LaTeX output @@ -196,11 +196,11 @@ latex_elements = { # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, document class [howto/manual]). latex_documents = [ - ('index', 'medop-alldoc.tex', 'Documentation du module MED', 'G. Boulant', 'manual'), - ('medop-specifications', 'medop-specifications.tex', 'Module MED - Specifications', 'G. Boulant', 'manual'), - ('medop-develguide', 'medop-develguide.tex', 'Module MED - Guide de developpement', 'G. Boulant', 'manual'), - ('medop-userguide-gui', 'medop-userguide-gui.tex', 'Module MED - Guide d\'utilisation de l\'interface graphique', 'G. Boulant', 'howto'), - ('medop-userguide-api', 'medop-userguide-api.tex', 'MEDMEM library - Starter guide for users', 'G. Boulant', 'howto') + ('index', 'medcalc-alldoc.tex', 'Documentation du module MED', 'G. Boulant', 'manual'), + ('medcalc-specifications', 'medcalc-specifications.tex', 'Module MED - Specifications', 'G. Boulant', 'manual'), + ('medcalc-develguide', 'medcalc-develguide.tex', 'Module MED - Guide de developpement', 'G. Boulant', 'manual'), + ('medcalc-userguide-gui', 'medcalc-userguide-gui.tex', 'Module MED - Guide d\'utilisation de l\'interface graphique', 'G. Boulant', 'howto'), + ('medcalc-userguide-api', 'medcalc-userguide-api.tex', 'MEDMEM library - Starter guide for users', 'G. Boulant', 'howto') ] # The name of an image file (relative to this directory) to place at the top of diff --git a/src/MEDOP/doc/sphinx/fr/images/xmed-gui-withframe.png b/src/MEDCalc/doc/sphinx/fr/images/xmed-gui-withframe.png similarity index 100% rename from src/MEDOP/doc/sphinx/fr/images/xmed-gui-withframe.png rename to src/MEDCalc/doc/sphinx/fr/images/xmed-gui-withframe.png diff --git a/src/MEDOP/doc/sphinx/fr/images/xmed-gui.png b/src/MEDCalc/doc/sphinx/fr/images/xmed-gui.png similarity index 100% rename from src/MEDOP/doc/sphinx/fr/images/xmed-gui.png rename to src/MEDCalc/doc/sphinx/fr/images/xmed-gui.png diff --git a/src/MEDOP/doc/sphinx/fr/index.rst b/src/MEDCalc/doc/sphinx/fr/index.rst similarity index 88% rename from src/MEDOP/doc/sphinx/fr/index.rst rename to src/MEDCalc/doc/sphinx/fr/index.rst index cf3fa4b1e..8d2939d2e 100644 --- a/src/MEDOP/doc/sphinx/fr/index.rst +++ b/src/MEDCalc/doc/sphinx/fr/index.rst @@ -17,23 +17,23 @@ Documentation de référence .. toctree:: :maxdepth: 1 - medop-userguide-gui.rst - medop-userguide-api.rst + medcalc-userguide-gui.rst + medcalc-userguide-api.rst **Documentation technique** .. toctree:: :maxdepth: 1 - medop-specifications.rst - medop-develguide.rst + medcalc-specifications.rst + medcalc-develguide.rst **Documentation annexe** .. toctree:: :maxdepth: 1 - medop-references.rst + medcalc-references.rst Archives documentaires ====================== diff --git a/src/MEDOP/doc/sphinx/fr/medop-definitions.rst b/src/MEDCalc/doc/sphinx/fr/medcalc-definitions.rst similarity index 100% rename from src/MEDOP/doc/sphinx/fr/medop-definitions.rst rename to src/MEDCalc/doc/sphinx/fr/medcalc-definitions.rst diff --git a/src/MEDOP/doc/sphinx/fr/medop-develguide.rst b/src/MEDCalc/doc/sphinx/fr/medcalc-develguide.rst similarity index 88% rename from src/MEDOP/doc/sphinx/fr/medop-develguide.rst rename to src/MEDCalc/doc/sphinx/fr/medcalc-develguide.rst index 444a0a9a6..063a8e84f 100644 --- a/src/MEDOP/doc/sphinx/fr/medop-develguide.rst +++ b/src/MEDCalc/doc/sphinx/fr/medcalc-develguide.rst @@ -2,19 +2,19 @@ :keywords: maillage, champ, manipulation, med, développement :author: Guillaume Boulant -.. include:: medop-definitions.rst +.. include:: medcalc-definitions.rst %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -Module MED: Guide de développement du composant MEDOP +Module MED: Guide de développement du composant MEDCalc %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -Le composant logiciel MEDOP est un élément du module MED. Il fournit +Le composant logiciel MEDCalc est un élément du module MED. Il fournit une interface utilisateur pour la manipulation de maillages et de champs, composée d'une interface texte (TUI) et d'une interface graphique (GUI). L'interface graphique constitue l'interface graphique du module MED. -Ce document est la documentation technique du composant MEDOP. Il +Ce document est la documentation technique du composant MEDCalc. Il fournit les instructions à suivre pour installer le composant en vue d'un travail de développement, puis décrit les éléments de conception. @@ -25,43 +25,43 @@ d'un travail de développement, puis décrit les éléments de conception. Mise en place de l'espace de développement ========================================== -Gestion de configuration du composant MEDOP +Gestion de configuration du composant MEDCalc ------------------------------------------- -Le composant logiciel MEDOP est un package du module SALOME MED, +Le composant logiciel MEDCalc est un package du module SALOME MED, hébergé dans l'espace source au niveau du sous-répertoire -`src/MEDOP`. La gestion des fichiers sources est donc intégrée dans le +`src/MEDCalc`. La gestion des fichiers sources est donc intégrée dans le module SALOME MED. -Organisation des sources du composant MEDOP +Organisation des sources du composant MEDCalc ------------------------------------------- -Le répertoire source `src/MEDOP` distingue les sous-répertoires +Le répertoire source `src/MEDCalc` distingue les sous-répertoires suivants: * cmp: package containing the SALOME components * tui: package containing the python user interface * gui: package containing the graphical user interface (the GUI part of the MED module) -* res: resources files associated to the MEDOP package (icons, config +* res: resources files associated to the MEDCalc package (icons, config files, data files, ...) * exe: additional executable programs that can be launched from the - MEDOP framework + MEDCalc framework -Construction du composant MEDOP +Construction du composant MEDCalc ------------------------------- -Intégré à la construction du module MED. Le composant MEDOP dépend de +Intégré à la construction du module MED. Le composant MEDCalc dépend de MEDCoupling et MEDLoader uniquement. -Exécution des tests unitaires du composant MEDOP +Exécution des tests unitaires du composant MEDCalc ------------------------------------------------ Les tests unitaires peuvent être exécutés au moyen de scripts python lancés depuis une session shell SALOME. Dans un nouveau shell, taper:: $ ./appli/runSession - [NS=mars:2810]$ python appli/bin/salome/med/test_medop_components.py + [NS=mars:2810]$ python appli/bin/salome/med/test_medcalc_components.py L'exécution imprime un rapport détaillant le résultat pour chaque fonction de test:: @@ -82,7 +82,7 @@ fonction de test:: Les scripts de test sont installés dans le répertoire ``bin/med``. On trouve: -* ``test_medop_components.py``: test les composants SALOME développés pour +* ``test_medcalc_components.py``: test les composants SALOME développés pour la manipulation de champs (``MEDDataManager`` et ``MEDCalculator``). * ``test_xmed_fieldOperations.py``: test des operations de champs telles qu'elles sont mises en oeuvre depuis l'interface textuelle. @@ -161,14 +161,14 @@ Ecrire un service CORBA qui retourne une sequence de FieldHandler: .. code-block:: cpp - MEDOP::FieldHandlerList * MyFunction(...) { - vector fieldHandlerList; + MEDCALC::FieldHandlerList * MyFunction(...) { + vector fieldHandlerList; ... fieldHandlerList.push_back(fieldHandler); // Map the resulting list to a CORBA sequence for return: - MEDOP::FieldHandlerList_var fieldHandlerSeq = new MEDOP::FieldHandlerList(); + MEDCALC::FieldHandlerList_var fieldHandlerSeq = new MEDCALC::FieldHandlerList(); int nbFieldHandler = fieldHandlerList.size(); fieldHandlerSeq->length(nbFieldHandler); for (int i=0; iid] = fieldHandler; // >>> WARNING: CORBA struct specification indicates that the @@ -193,7 +193,7 @@ Ecrire un service CORBA qui retourne une structure CORBA: // copy of the structure found in the map and return the copy. The // CORBA struct specification indicates that a deep copy can be // done using the copy constructor. <<< - return new MEDOP::FieldHandler(*fieldHandler); + return new MEDCALC::FieldHandler(*fieldHandler); @@ -212,7 +212,7 @@ ANNEXE B: Traçabilité avec le module XMED ========================================= Le module SALOME de nom XMED est l'espace de développement initial du -composant logiciel MEDOP, intégré aujourd'hui au module MED. Cette +composant logiciel MEDCalc, intégré aujourd'hui au module MED. Cette annexe est la notice technique de ce module, qui reste disponible mais qui n'est plus maintenu. diff --git a/src/MEDOP/doc/sphinx/fr/medop-references.rst b/src/MEDCalc/doc/sphinx/fr/medcalc-references.rst similarity index 96% rename from src/MEDOP/doc/sphinx/fr/medop-references.rst rename to src/MEDCalc/doc/sphinx/fr/medcalc-references.rst index 9be8cdc5f..2153884c1 100644 --- a/src/MEDOP/doc/sphinx/fr/medop-references.rst +++ b/src/MEDCalc/doc/sphinx/fr/medcalc-references.rst @@ -2,7 +2,7 @@ ANNEXE: Références documentaires %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -.. include:: medop-definitions.rst +.. include:: medcalc-definitions.rst Documents de référence: diff --git a/src/MEDOP/doc/sphinx/medop-specifications.rst b/src/MEDCalc/doc/sphinx/fr/medcalc-specifications.rst similarity index 99% rename from src/MEDOP/doc/sphinx/medop-specifications.rst rename to src/MEDCalc/doc/sphinx/fr/medcalc-specifications.rst index 09ca88cd2..ae152232e 100644 --- a/src/MEDOP/doc/sphinx/medop-specifications.rst +++ b/src/MEDCalc/doc/sphinx/fr/medcalc-specifications.rst @@ -2,7 +2,7 @@ :keywords: maillage, champ, manipulation, med :author: Guillaume Boulant -.. include:: medop-definitions.rst +.. include:: medcalc-definitions.rst %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Module MED: Spécifications fonctionnelles et techniques @@ -123,11 +123,11 @@ supplémentaire: Par convention, on utilisera par la suite les notations: * **U(t,p,c)** pour désigner la valeur de la composante c d'un champ U - à la position p et prise à l'instant t; + à la position p et prise à l'instant t; * **U(t,p,:)** pour signifier que l'on manipule l'ensemble de toutes les composantes; * **U(t,:,c)** pour signifier que l'on manipule le domaine de - définition spatial complet. + définition spatial complet. Dans une grande majorité des cas d'usage on travaille à temps t fixé et sur un domaine spatiale prédéfini. Aussi on utilisera également la @@ -167,7 +167,7 @@ On formalise donc le concept d'opération par les propriétés suivantes: * L'opérateur est caractérisé par un domaine d'application qui spécifie la portée de l'opération. Ce domaine comporte plusieurs dimensions: - + - Un domaine temporel T qui spécifie les pas de temps sur lesquels l'opération est appliquée; - Un domaine spatial D qui spécifie la limite de portée de @@ -283,13 +283,13 @@ de changer le maillage support M1 d'un champs par un maillage M2 à partir du moment où les maillages M1 et M2 sont identiques géométriquement à une erreur près qu'il est possible de spécifier. -.. note:: +.. note:: D'autres situations limites peuvent être évoquées sous l'angle informatique. Ce sont des situations qui a priori n'ont pas de raison d'exister sur le plan conceptuel mais qui peuvent très bien survenir au niveau du module informatique compte-tenu des particularités du modèle MED. Par exemple: - + * Le nombre et la nature des composantes ne sont pas identiques pour tous les champs d'entrée. Par exemple, U défini ses composantes comme U(:,:,1)=Ux, U(:,:,2)=Uy, U(:,:,3)=Uz et V les @@ -408,14 +408,14 @@ de classer ces opérations en deux catégories: * les **opérations binaires**, qui prennent deux opérandes en argument. C'est le cas des opérations algébriques et des opérations vectorielles. - + A partir de cette classification, il convient de distinguer trois formes d'usage selon la nature des opérandes: * les opérandes sont exclusivement des scalaires (typiquement des valeurs de composantes des champs et des paramètres numériques). Par exemple:: - + W(:,:4) = 1+2xU(:,:,2)+V(:,:,3) * les opérandes sont exclusivement des champs. Par exemple:: @@ -478,7 +478,7 @@ paramètre numérique ou la composante d'un champ): .. warning:: A développer: - + * Analyse dimensionnelle du champ résultats pour adapter l'unité. Par exemple, si on fait UxV où U et V sont exprimés en [m] alors le résultat est en [m2]. @@ -676,7 +676,7 @@ l'interface textuelle: l'utilisateur à spécifier un alias pour la variable python qui va permettre la manipulation du champ dans l'interface textuelle de l'espace de travail (par défaut, le nom complet du champ est - proposé). Ici, l'utilisateur spécifie ``f4``: + proposé). Ici, l'utilisateur spécifie ``f4``: .. image:: images/xmed-gui-datasource-useinworkspace_70pc.png :align: center @@ -709,7 +709,7 @@ Dans le cadre défini ci-dessus, une session d'utilisation type est: conséquent de simplification et d'assistance en ligne). Par exemple, si ``fa`` et ``fb`` désignent deux champs définis dans l'espace de travail, alors on peut en faire la somme par la commande:: - + >>> r=fa+fb * Effectuer les contrôles visuel et les diagnostics en ligne de @@ -727,7 +727,7 @@ Sur cette base, on peut envisager une grande variété de cas d'utilisation: chargée dans le dataspace (l'étude SALOME techniquement) et peut être explorée au niveau de l'arbre d'étude. L'arbre peut faire apparaître: - + - les maillages et les groupes (qui peuvent être utilisés éventuellement pour restreindre le domaine d'application) - les champs dont on peut explorer les composantes et les itérations @@ -777,7 +777,7 @@ fonction de visualisation: choisir l'option "Visualize": .. image:: images/xmed-gui-datasource-visualize_70pc.png - :align: center + :align: center * Cette option déclenche l'affichage d'une carte de champ sur le cadre d'affichage des viewers SALOME: diff --git a/src/MEDOP/doc/sphinx/fr/medop-userguide-gui.rst b/src/MEDCalc/doc/sphinx/fr/medcalc-userguide-gui.rst similarity index 94% rename from src/MEDOP/doc/sphinx/fr/medop-userguide-gui.rst rename to src/MEDCalc/doc/sphinx/fr/medcalc-userguide-gui.rst index f09404a64..a90efde32 100644 --- a/src/MEDOP/doc/sphinx/fr/medop-userguide-gui.rst +++ b/src/MEDCalc/doc/sphinx/fr/medcalc-userguide-gui.rst @@ -2,7 +2,7 @@ :keywords: maillage, champ, manipulation, guide utilisateur :author: Guillaume Boulant -.. include:: medop-definitions.rst +.. include:: medcalc-definitions.rst %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Module MED: Guide d'utilisation de l'interface graphique @@ -16,7 +16,7 @@ champs. .. warning:: Le document est autonome, mais il est vivement conseillé de parcourir au préalable (ou en parallèle) :doc:`le document de - spécifications`, au moins pour fixer les + spécifications`, au moins pour fixer les concepts et la terminologie. .. contents:: Sommaire @@ -331,11 +331,11 @@ champ manoeuvré. Pour cela, on tape simplement le nom de la variable puis retour:: >>> f3 - field name (id) = Pulse (3) - mesh name (id) = Grid_80x80 (0) - discretization = ON_NODES - (iter, order) = (3,-1) - data source = file:///home/gboulant/development/projets/salome/MEDOP/XMED/xmed/resources/datafiles/timeseries.med + field name (id) = Pulse (3) + mesh name (id) = Grid_80x80 (0) + discretization = ON_NODES + (iter, order) = (3,-1) + data source = file:///home/gboulant/development/projets/salome/MEDOP/XMED/xmed/resources/datafiles/timeseries.med Elle peut également être utilisée comme argument des commandes de gestion disponibles dans l'interface textuelle (dont la liste @@ -363,16 +363,16 @@ commande ``print``:: >>> print f3 Data content : - Tuple #0 : -0.6 - Tuple #1 : -0.1 - Tuple #2 : 0.4 - Tuple #3 : -0.1 - Tuple #4 : 0.4 + Tuple #0 : -0.6 + Tuple #1 : -0.1 + Tuple #2 : 0.4 + Tuple #3 : -0.1 + Tuple #4 : 0.4 ... - Tuple #6556 : 3.5 - Tuple #6557 : 3.3 - Tuple #6558 : 1.5 - Tuple #6559 : 0.3 + Tuple #6556 : 3.5 + Tuple #6557 : 3.3 + Tuple #6558 : 1.5 + Tuple #6559 : 0.3 Tuple #6560 : 0.2 Il est important de noter que les opérations entre champs ne peuvent @@ -661,25 +661,27 @@ Utilisation de l'interface textuelle du module MED (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 textuelle. Le module de manipulation de champs peut même être utilisé -exclusivement en mode texte. Pour cela, on lance la commande:: +exclusivement en mode texte. +.. + Pour cela, on lance la commande:: $ /medop.sh - -Cette commande ouvre une console de commandes ``medop>``. Un fichier -med peut être chargé et travaillé, par exemple pour créer des champs à -partir des données du fichier. +.. + Cette commande ouvre une console de commandes ``medop>``. Un fichier + med peut être chargé et travaillé, par exemple pour créer des champs à + partir des données du fichier. Que l'on soit en mode texte pur ou en mode graphique, un séquence de travail type dans la console peut ressembler au jeu d'instructions suivantes:: - >>> load("/path/to/mydata.med") + >>> medcalc.LoadDataSource("/path/to/mydata.med") >>> la id=0 name = testfield1 id=1 name = testfield2 - >>> f1=get(0) - >>> f2=get(1) - >>> ls + >>> f1=accessField(0) + >>> f2=accessField(1) + >>> ls f1 (id=0, name=testfield1) f2 (id=1, name=testfield2) >>> r=f1+f2 @@ -692,37 +694,39 @@ suivantes:: f1 (id=0, name=testfield1) f2 (id=1, name=testfield2) r (id=2, name=toto) - >>> put(r) - >>> save("result.med") + >>> putInWorkspace(r) + >>> saveWorkspace("result.med") Les commandes principales sont: -* ``load``: charge un fichier med dans la base de données (utile +* ``LoadDataSource``: charge un fichier med dans la base de données (utile uniquement en mode texte pur):: - >>> load("/path/to/datafile.med") + >>> LoadDataSource("/path/to/datafile.med") + +* ``LoadImageAsDataSource``: load an image as a med file * ``la``: affiche la liste de tous les champs chargés en base de données ("list all") -* ``get``: définit un champ dans l'espace de travail à partir de son +* ``accessField``: définit un champ dans l'espace de travail à partir de son identifiant (utile plutôt en mode texte pur car l'interface graphique permet de faire cette opération par sélection d'un champ dans le dataspace):: - >>> f=get(fieldId) + >>> f=accessField(fieldId) * ``ls``: affiche la liste des champs présent dans l'espace de travail ("list") -* ``put``: met un champ en référence dans l'*espace de gestion*:: +* ``putInWorkspace``: met un champ en référence dans l'*espace de gestion*:: - >>> put(f) + >>> putInWorkspace(f) -* ``save``: sauvegarde tous les champs référencés dans l'espace de +* ``saveWorkspace``: sauvegarde tous les champs référencés dans l'espace de gestion dans un fichier med:: - >>> save("/path/to/resultfile.med") + >>> saveWorkspace("/path/to/resultfile.med") .. note:: On peut faire à ce stade plusieurs remarques: - * la commande ``load`` charge uniquement les méta-informations + * la commande ``LoadDataSource`` charge uniquement les méta-informations décrivant les maillage et les champs (noms, type de discrétisation, liste des pas de temps). Les maillages et les valeurs physiques des champs sont chargées ultérieurement (et @@ -730,7 +734,7 @@ Les commandes principales sont: opération. Dans tous les cas, les données med (méta-informations et valeurs) sont physiquement stockées au niveau de l'espace *base de données*. - * la commande ``get`` définit en réalité un *manipulateur de champ* + * la commande ``accessField`` définit en réalité un *manipulateur de champ* dans l'espace de travail, c'est-à-dire une variable qui fait la liaison avec le champ physique hébergé dans la base de données. Les données physiques ne circulent jamais entre les @@ -740,9 +744,9 @@ Les commandes principales sont: Les commandes TUI suivantes nécessitent de travailler dans l'environnement graphique: -* ``visu``: afficher une carte de champ pour contrôle visuel rapide - (pas de paramettrage possible) - - >>> view(f) - - +* ``medcalc.MakeDeflectionShape`` +* ``medcalc.MakeIsoSurface`` +* ``medcalc.MakePointSprite`` +* ``medcalc.MakeScalarMap`` +* ``medcalc.MakeSlices`` +* ``medcalc.MakeVectorField`` diff --git a/src/MEDOP/doc/sphinx/fr/medop-prototype-develguide.rst b/src/MEDCalc/doc/sphinx/fr/medop-prototype-develguide.rst similarity index 99% rename from src/MEDOP/doc/sphinx/fr/medop-prototype-develguide.rst rename to src/MEDCalc/doc/sphinx/fr/medop-prototype-develguide.rst index de2387b74..0bc2eae90 100644 --- a/src/MEDOP/doc/sphinx/fr/medop-prototype-develguide.rst +++ b/src/MEDCalc/doc/sphinx/fr/medop-prototype-develguide.rst @@ -210,14 +210,14 @@ l'addition de deux champs: import salome salome.salome_init() import SALOME_MED - + medComp = salome.lcc.FindOrLoadComponent("FactoryServer", "MED") medObj = medComp.readStructFile("myfile.med",salome.myStudyName) medOp = medObj.createMedOperator() - + f1 = medObj.getField("testfield1",-1,-1) f2 = medObj.getField("testfield2",-1,-1) - + somme = medOp.add(f1,f2) Il est à noter qu'une instance de ``SALOME_MED::MEDOP`` est associé à @@ -269,7 +269,7 @@ et le numéro d'iteration: salome.salome_init() import SALOME_MED - medComp = salome.lcc.FindOrLoadComponent("FactoryServer", "MED") + medComp = salome.lcc.FindOrLoadComponent("FactoryServer", "MED") medObj = medComp.readStructFile("myfile.med",salome.myStudyName) from xmed import fieldproxy @@ -312,9 +312,9 @@ graphique en images: .. |IMG_SELECT| image:: images/medop-gui-selectfield_scale.png .. |IMG_ALIAS| image:: images/medop-gui-aliasfield_scale.png -+---------------+---------------+ ++---------------+---------------+ | |IMG_SELECT| | |IMG_ALIAS| | -+---------------+---------------+ ++---------------+---------------+ L'image de gauche montre la sélection du pas de temps, l'image de droite la boîte de dialogue qui permet la saisie de l'alias avec @@ -353,7 +353,7 @@ un objet CORBA): // We suppose here that we have a CORBA object reference (object of // type *_ptr or *_var), for example a SALOME_MED::MED object. - SALOME_MED::MED_ptr medObj = ... // anything to get this object + SALOME_MED::MED_ptr medObj = ... // anything to get this object // Get the IOR of this object QString medIOR = SalomeApp_Application::orb()->object_to_string(medObj); @@ -363,7 +363,7 @@ un objet CORBA): QStringList commands; commands+="import salome"; commands+=QString("med=salome.orb.string_to_object(\"%1\")").arg(medIOR); - + QStringListIterator it(commands); while (it.hasNext()) { pyConsole->exec(it.next()); @@ -411,9 +411,9 @@ commandes suivantes: from xmed.fieldproxy import getFieldFromMed from xmed.medproxy import getMedProxy - + med = getMedProxy("IOR:010000001700000049444c3a53414c4f4d455f4d45442f4d45443a312e300000010000000000000064000000010102000e0000003133302e39382e37372e313733009e0a0e000000feadc4ca4c00003169000000001100000200000000000000080000000100000000545441010000001c00000001000000010001000100000001000105090101000100000009010100") - + f1=getFieldFromMed(med,"testfield1",-1,-1) Ce jeu d'instructions reconstitue un pointeur vers le servant CORBA @@ -543,9 +543,9 @@ module du champ dans l'exemple implémenté par défaut): .. |IMG_VISU| image:: images/medop-gui-visufield_scale.png .. |IMG_RESULT| image:: images/medop-gui-result_scale.png -+---------------+---------------+ ++---------------+---------------+ | |IMG_VISU| | |IMG_RESULT| | -+---------------+---------------+ ++---------------+---------------+ Cette fonction répond au besoin de contrôle interactif des résultats produits par les opérations de manipulation de champs. @@ -556,7 +556,7 @@ donnée du servant ``SALOME_MED::FIELD`` qui lui est associé (représenté par la variable ``field_ptr`` dans l'exemple ci-dessous): .. code-block:: python - + import salome import VISU @@ -710,11 +710,11 @@ automatiser proprement): et fournit des fonctions de test unitaire (à exécuter ou pour s'en inspirer). Après avoir lancé SALOME via une application virtuelle, on peut taper:: - + $ /runSession [NS=venus:2810] $ python -i test_medoperation.py - >>> - + >>> + - Ceci permet de tester en particulier l'interface ``MedOp`` et son utilisation dans le module python ``fieldproxy.py``. diff --git a/src/MEDOP/doc/sphinx/medop-prototype-medmem.rst b/src/MEDCalc/doc/sphinx/fr/medop-prototype-medmem.rst similarity index 98% rename from src/MEDOP/doc/sphinx/medop-prototype-medmem.rst rename to src/MEDCalc/doc/sphinx/fr/medop-prototype-medmem.rst index 2302f7b70..9c29fee19 100644 --- a/src/MEDOP/doc/sphinx/medop-prototype-medmem.rst +++ b/src/MEDCalc/doc/sphinx/fr/medop-prototype-medmem.rst @@ -2,7 +2,7 @@ :keywords: maillage, champ, MED, MEDMEM :author: Guillaume Boulant -.. include:: medop-definitions.rst +.. include:: medcalc-definitions.rst %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Note de travail concernant l'utilisation de MEDMEM @@ -115,7 +115,7 @@ d'entrée/sortie branché sur le fichier (``testfilename`` dans l'exemple): .. code-block:: cpp - + MED *myMed = new MED; MED_MED_RDONLY_DRIVER *driverIn = new MED_MED_RDONLY_DRIVER(testfilename, myMed); driverIn->open(); @@ -140,7 +140,7 @@ Puis le champ qui lui est associé doit être physiquement chargé pour permettre la mise à jour du support: .. code-block:: cpp - + MESH * mesh = myMed->getMesh(field); mesh->read(); myMed->updateSupport(); @@ -148,7 +148,7 @@ permettre la mise à jour du support: Pour enfin charger les valeurs des composantes du champ: .. code-block:: cpp - + field->read(); La numérotation des éléments de maillage @@ -204,7 +204,7 @@ Pour exemple, le fragment de code ci-dessous, extrait du fichier ``MedDataManager`` dans l'interface: .. code-block:: cpp - + #include "MEDMEM_MedDataManager.hxx" class MedDataManager @@ -212,24 +212,24 @@ Pour exemple, le fragment de code ci-dessous, extrait du fichier public: ~MedDataManager(); void printFieldDouble(FIELD * field); - + %extend { MedDataManager(char * fileName) { - return new MedDataManager(string(fileName)); + return new MedDataManager(string(fileName)); } MedDataManager(MED * med) { return new MedDataManager(med); } - + %newobject getFieldDouble(const char * fieldName, const int dt, const int it); FIELD * getFieldDouble(const char * fieldName, const int dt, const int it) { - return (FIELD *) self->getFieldDouble(string(fieldName), dt, it); + return (FIELD *) self->getFieldDouble(string(fieldName), dt, it); } } - + }; @@ -380,17 +380,17 @@ utilise l'interface swig fournie par MedCorba_Swig). Après l'import d'amorce systématique: .. code-block:: python - + import salome salome.salome_init() - + import SALOME_MED from libSALOME_Swig import * On peut charger le composant SALOME MED: .. code-block:: python - + medComp=salome.lcc.FindOrLoadComponent("FactoryServer", "MED") grâce auquel les services de chargement de la structure MED peuvent @@ -398,14 +398,14 @@ grâce auquel les services de chargement de la structure MED peuvent structure MED dans l'étude salome passée en argument: .. code-block:: python - + filePathName = "myfile.med" medComp.readStructFileWithFieldType(filePathName,salome.myStudyName) Ce deuxième exemple charge la structure MED mais ne place pas le résultat dans l'étude: .. code-block:: python - + filePathName = "myfile.med" medObj = medComp.readStructFile(filePathName,salome.myStudyName) @@ -418,13 +418,13 @@ verra plus bas) à MEDMEM: fieldIdx = 1 # WRN maybe there is no field of idx=1 iterationIdx = 0 fieldName = medObj.getFieldNames()[fieldIdx] - dtitfield = medObj.getFieldIteration(fieldName,iterationIdx) + dtitfield = medObj.getFieldIteration(fieldName,iterationIdx) it = dtitfield[0] dt = dtitfield[1] fieldObj = medObj.getField(fieldName,it,dt) nbOfFields = medObj.getNumberOfFields() fieldNames = medObj.getFieldNames() - + mesh = fieldObj.getSupport().getMesh() .. note:: @@ -469,22 +469,22 @@ SALOME_MED, ...) sont supposées avoir été faites au préalable (voir les exemples précédents): .. code-block:: python - + # Load the med structure using MED medComp=salome.lcc.FindOrLoadComponent("FactoryServer", "MED") filePathName = "myfile.med" medComp.readStructFileWithFieldType(filePathName,salome.myStudyName) - + # Get the VISU component import VISU visuComp = salome.lcc.FindOrLoadComponent("FactoryServer", "VISU") visuComp.SetCurrentStudy(salome.myStudy) - + # Get the sobject associated to the med object named "Med" aSObject = salome.myStudy.FindObject("Med") isPresent, medSObj = aSObject.FindSubObject(1) - - # Finally, import the med sobject in VISU + + # Finally, import the med sobject in VISU result = visuComp.ImportMed(medSObj) Il est possible de d'aller plus loin et par exemple de déclencher @@ -503,7 +503,7 @@ Notes en vrac Questions: -* Comment obtenir le nom du fichier med à partir d'une structure med? +* Comment obtenir le nom du fichier med à partir d'une structure med? * Peut-on imaginer un moyen de fournir l'objet MEDMEM::MED à partir de la donnée de l'objet CORBA SALOME_MED::MED? diff --git a/src/MEDOP/doc/sphinx/fr/medop-prototype-overview.rst b/src/MEDCalc/doc/sphinx/fr/medop-prototype-overview.rst similarity index 97% rename from src/MEDOP/doc/sphinx/fr/medop-prototype-overview.rst rename to src/MEDCalc/doc/sphinx/fr/medop-prototype-overview.rst index c571c6e6f..5eaa00e08 100644 --- a/src/MEDOP/doc/sphinx/fr/medop-prototype-overview.rst +++ b/src/MEDCalc/doc/sphinx/fr/medop-prototype-overview.rst @@ -56,11 +56,11 @@ images: .. |IMG_VISU| image:: images/medop-gui-visufield_scale.png .. |IMG_RESULT| image:: images/medop-gui-result_scale.png -+---------------+---------------+ ++---------------+---------------+ | |IMG_SELECT| | |IMG_ALIAS| | -+---------------+---------------+ ++---------------+---------------+ | |IMG_VISU| | |IMG_RESULT| | -+---------------+---------------+ ++---------------+---------------+ La solution technique est construite sur les principes suivants: diff --git a/src/MEDOP/doc/sphinx/fr/medop-workingnotes-2010.rst b/src/MEDCalc/doc/sphinx/fr/medop-workingnotes-2010.rst similarity index 100% rename from src/MEDOP/doc/sphinx/fr/medop-workingnotes-2010.rst rename to src/MEDCalc/doc/sphinx/fr/medop-workingnotes-2010.rst diff --git a/src/MEDOP/doc/sphinx/medop-workingnotes-2011.rst b/src/MEDCalc/doc/sphinx/fr/medop-workingnotes-2011.rst similarity index 99% rename from src/MEDOP/doc/sphinx/medop-workingnotes-2011.rst rename to src/MEDCalc/doc/sphinx/fr/medop-workingnotes-2011.rst index 2c38e64bb..269b63b5a 100644 --- a/src/MEDOP/doc/sphinx/medop-workingnotes-2011.rst +++ b/src/MEDCalc/doc/sphinx/fr/medop-workingnotes-2011.rst @@ -2,7 +2,7 @@ :keywords: maillage, champ, manipulation :author: Guillaume Boulant -.. include:: medop-definitions.rst +.. include:: medcalc-definitions.rst %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ANNEXE: Note de travail concernant le chantier XMED 2011 @@ -145,7 +145,7 @@ Nouveaux concepts à prendre en compte ------------------------------------- Au démarrage du chantier 2011, on observe que les concepts suivants -sont introduits dans le module MED: +sont introduits dans le module MED: * Le conteneur MED n'existe plus, utiliser MEDFILEBROWSER pour charger les fichiers med et obtenir les informations générales sur le @@ -469,5 +469,5 @@ Petites améliorations du DataspaceController: est posé dans le WS. On peut donc proposer en option de lui associer un alias pour manipulation dans la console - - + + diff --git a/src/MEDOP/doc/sphinx/fr/medop-workingnotes-2012.rst b/src/MEDCalc/doc/sphinx/fr/medop-workingnotes-2012.rst similarity index 98% rename from src/MEDOP/doc/sphinx/fr/medop-workingnotes-2012.rst rename to src/MEDCalc/doc/sphinx/fr/medop-workingnotes-2012.rst index b6ecb6d37..4a3e10af4 100644 --- a/src/MEDOP/doc/sphinx/fr/medop-workingnotes-2012.rst +++ b/src/MEDCalc/doc/sphinx/fr/medop-workingnotes-2012.rst @@ -2,7 +2,7 @@ :keywords: maillage, champ, manipulation :author: Guillaume Boulant -.. include:: medop-definitions.rst +.. include:: medcalc-definitions.rst %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ANNEXE: Note de travail concernant le chantier XMED 2012 @@ -80,5 +80,5 @@ peut procéder de la manière suivante: * Eliminer la dépendance à XSALOME * Supprimer la gestion des multiversion SALOME5/6 au niveau de l'engine -.. warning:: TODO: refaire le point sur les tâches initiées en 2011 +.. warning:: TODO: refaire le point sur les tâches initiées en 2011 diff --git a/src/MEDOP/doc/sphinx/images/champ_altitude_MAP.png b/src/MEDCalc/doc/sphinx/images/champ_altitude_MAP.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/champ_altitude_MAP.png rename to src/MEDCalc/doc/sphinx/images/champ_altitude_MAP.png diff --git a/src/MEDOP/doc/sphinx/images/convert.sh b/src/MEDCalc/doc/sphinx/images/convert.sh similarity index 100% rename from src/MEDOP/doc/sphinx/images/convert.sh rename to src/MEDCalc/doc/sphinx/images/convert.sh diff --git a/src/MEDOP/doc/sphinx/images/ico_datasource_add.png b/src/MEDCalc/doc/sphinx/images/ico_datasource_add.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/ico_datasource_add.png rename to src/MEDCalc/doc/sphinx/images/ico_datasource_add.png diff --git a/src/MEDOP/doc/sphinx/images/ico_datasource_changeUnderlyingMesh.png b/src/MEDCalc/doc/sphinx/images/ico_datasource_changeUnderlyingMesh.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/ico_datasource_changeUnderlyingMesh.png rename to src/MEDCalc/doc/sphinx/images/ico_datasource_changeUnderlyingMesh.png diff --git a/src/MEDOP/doc/sphinx/images/ico_datasource_expandfield.png b/src/MEDCalc/doc/sphinx/images/ico_datasource_expandfield.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/ico_datasource_expandfield.png rename to src/MEDCalc/doc/sphinx/images/ico_datasource_expandfield.png diff --git a/src/MEDOP/doc/sphinx/images/ico_datasource_use.png b/src/MEDCalc/doc/sphinx/images/ico_datasource_use.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/ico_datasource_use.png rename to src/MEDCalc/doc/sphinx/images/ico_datasource_use.png diff --git a/src/MEDOP/doc/sphinx/images/ico_datasource_view.png b/src/MEDCalc/doc/sphinx/images/ico_datasource_view.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/ico_datasource_view.png rename to src/MEDCalc/doc/sphinx/images/ico_datasource_view.png diff --git a/src/MEDOP/doc/sphinx/images/ico_imagesource.png b/src/MEDCalc/doc/sphinx/images/ico_imagesource.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/ico_imagesource.png rename to src/MEDCalc/doc/sphinx/images/ico_imagesource.png diff --git a/src/MEDOP/doc/sphinx/images/ico_workspace_save.png b/src/MEDCalc/doc/sphinx/images/ico_workspace_save.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/ico_workspace_save.png rename to src/MEDCalc/doc/sphinx/images/ico_workspace_save.png diff --git a/src/MEDOP/doc/sphinx/images/ico_xmed.png b/src/MEDCalc/doc/sphinx/images/ico_xmed.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/ico_xmed.png rename to src/MEDCalc/doc/sphinx/images/ico_xmed.png diff --git a/src/MEDOP/doc/sphinx/images/med-uml-main.png b/src/MEDCalc/doc/sphinx/images/med-uml-main.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/med-uml-main.png rename to src/MEDCalc/doc/sphinx/images/med-uml-main.png diff --git a/src/MEDOP/doc/sphinx/images/med-uml-main_60pc.png b/src/MEDCalc/doc/sphinx/images/med-uml-main_60pc.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/med-uml-main_60pc.png rename to src/MEDCalc/doc/sphinx/images/med-uml-main_60pc.png diff --git a/src/MEDOP/doc/sphinx/images/medlayers.png b/src/MEDCalc/doc/sphinx/images/medlayers.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/medlayers.png rename to src/MEDCalc/doc/sphinx/images/medlayers.png diff --git a/src/MEDOP/doc/sphinx/images/medlayers_70pc.png b/src/MEDCalc/doc/sphinx/images/medlayers_70pc.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/medlayers_70pc.png rename to src/MEDCalc/doc/sphinx/images/medlayers_70pc.png diff --git a/src/MEDOP/doc/sphinx/images/medmem-corba-layers.png b/src/MEDCalc/doc/sphinx/images/medmem-corba-layers.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/medmem-corba-layers.png rename to src/MEDCalc/doc/sphinx/images/medmem-corba-layers.png diff --git a/src/MEDOP/doc/sphinx/images/medmem-layers.png b/src/MEDCalc/doc/sphinx/images/medmem-layers.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/medmem-layers.png rename to src/MEDCalc/doc/sphinx/images/medmem-layers.png diff --git a/src/MEDOP/doc/sphinx/images/medop-gui-aliasfield.png b/src/MEDCalc/doc/sphinx/images/medop-gui-aliasfield.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/medop-gui-aliasfield.png rename to src/MEDCalc/doc/sphinx/images/medop-gui-aliasfield.png diff --git a/src/MEDOP/doc/sphinx/images/medop-gui-aliasfield_scale.png b/src/MEDCalc/doc/sphinx/images/medop-gui-aliasfield_scale.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/medop-gui-aliasfield_scale.png rename to src/MEDCalc/doc/sphinx/images/medop-gui-aliasfield_scale.png diff --git a/src/MEDOP/doc/sphinx/images/medop-gui-result.png b/src/MEDCalc/doc/sphinx/images/medop-gui-result.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/medop-gui-result.png rename to src/MEDCalc/doc/sphinx/images/medop-gui-result.png diff --git a/src/MEDOP/doc/sphinx/images/medop-gui-result_scale.png b/src/MEDCalc/doc/sphinx/images/medop-gui-result_scale.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/medop-gui-result_scale.png rename to src/MEDCalc/doc/sphinx/images/medop-gui-result_scale.png diff --git a/src/MEDOP/doc/sphinx/images/medop-gui-selectfield.png b/src/MEDCalc/doc/sphinx/images/medop-gui-selectfield.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/medop-gui-selectfield.png rename to src/MEDCalc/doc/sphinx/images/medop-gui-selectfield.png diff --git a/src/MEDOP/doc/sphinx/images/medop-gui-selectfield_scale.png b/src/MEDCalc/doc/sphinx/images/medop-gui-selectfield_scale.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/medop-gui-selectfield_scale.png rename to src/MEDCalc/doc/sphinx/images/medop-gui-selectfield_scale.png diff --git a/src/MEDOP/doc/sphinx/images/medop-gui-visufield.png b/src/MEDCalc/doc/sphinx/images/medop-gui-visufield.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/medop-gui-visufield.png rename to src/MEDCalc/doc/sphinx/images/medop-gui-visufield.png diff --git a/src/MEDOP/doc/sphinx/images/medop-gui-visufield_scale.png b/src/MEDCalc/doc/sphinx/images/medop-gui-visufield_scale.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/medop-gui-visufield_scale.png rename to src/MEDCalc/doc/sphinx/images/medop-gui-visufield_scale.png diff --git a/src/MEDOP/doc/sphinx/images/medop_exportparavis.png b/src/MEDCalc/doc/sphinx/images/medop_exportparavis.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/medop_exportparavis.png rename to src/MEDCalc/doc/sphinx/images/medop_exportparavis.png diff --git a/src/MEDOP/doc/sphinx/images/medop_exportparavis_result.png b/src/MEDCalc/doc/sphinx/images/medop_exportparavis_result.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/medop_exportparavis_result.png rename to src/MEDCalc/doc/sphinx/images/medop_exportparavis_result.png diff --git a/src/MEDOP/doc/sphinx/images/medop_image2med_dialog.png b/src/MEDCalc/doc/sphinx/images/medop_image2med_dialog.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/medop_image2med_dialog.png rename to src/MEDCalc/doc/sphinx/images/medop_image2med_dialog.png diff --git a/src/MEDOP/doc/sphinx/images/medop_image2med_tomographie.png b/src/MEDCalc/doc/sphinx/images/medop_image2med_tomographie.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/medop_image2med_tomographie.png rename to src/MEDCalc/doc/sphinx/images/medop_image2med_tomographie.png diff --git a/src/MEDOP/doc/sphinx/images/medop_projection_inputs.png b/src/MEDCalc/doc/sphinx/images/medop_projection_inputs.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/medop_projection_inputs.png rename to src/MEDCalc/doc/sphinx/images/medop_projection_inputs.png diff --git a/src/MEDOP/doc/sphinx/images/medop_projection_result.png b/src/MEDCalc/doc/sphinx/images/medop_projection_result.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/medop_projection_result.png rename to src/MEDCalc/doc/sphinx/images/medop_projection_result.png diff --git a/src/MEDOP/doc/sphinx/images/partition_mesh.png b/src/MEDCalc/doc/sphinx/images/partition_mesh.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/partition_mesh.png rename to src/MEDCalc/doc/sphinx/images/partition_mesh.png diff --git a/src/MEDOP/doc/sphinx/images/partition_skin.png b/src/MEDCalc/doc/sphinx/images/partition_skin.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/partition_skin.png rename to src/MEDCalc/doc/sphinx/images/partition_skin.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-architecture.png b/src/MEDCalc/doc/sphinx/images/xmed-architecture.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-architecture.png rename to src/MEDCalc/doc/sphinx/images/xmed-architecture.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-exploremed.png b/src/MEDCalc/doc/sphinx/images/xmed-exploremed.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-exploremed.png rename to src/MEDCalc/doc/sphinx/images/xmed-exploremed.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-functions.png b/src/MEDCalc/doc/sphinx/images/xmed-functions.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-functions.png rename to src/MEDCalc/doc/sphinx/images/xmed-functions.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-datasource-changeUnderlyingMesh.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-changeUnderlyingMesh.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-datasource-changeUnderlyingMesh.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-changeUnderlyingMesh.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-datasource-changeUnderlyingMesh_wsview.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-changeUnderlyingMesh_wsview.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-datasource-changeUnderlyingMesh_wsview.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-changeUnderlyingMesh_wsview.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-datasource-contextmenu.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-contextmenu.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-datasource-contextmenu.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-contextmenu.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-datasource-contextmenu_60pc.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-contextmenu_60pc.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-datasource-contextmenu_60pc.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-contextmenu_60pc.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-datasource-contextmenu_70pc.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-contextmenu_70pc.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-datasource-contextmenu_70pc.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-contextmenu_70pc.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-datasource-contextmenu_80pc.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-contextmenu_80pc.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-datasource-contextmenu_80pc.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-contextmenu_80pc.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-datasource-expand-zoom.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-expand-zoom.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-datasource-expand-zoom.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-expand-zoom.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-datasource-explore-zoom.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-explore-zoom.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-datasource-explore-zoom.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-explore-zoom.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-datasource-explore.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-explore.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-datasource-explore.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-explore.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-datasource-menucontextuel-zoom.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-menucontextuel-zoom.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-datasource-menucontextuel-zoom.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-menucontextuel-zoom.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-datasource-selectfile.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-selectfile.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-datasource-selectfile.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-selectfile.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-datasource-useinworkspace-alias.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-useinworkspace-alias.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-datasource-useinworkspace-alias.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-useinworkspace-alias.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-datasource-useinworkspace-result.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-useinworkspace-result.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-datasource-useinworkspace-result.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-useinworkspace-result.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-datasource-useinworkspace-result_70pc.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-useinworkspace-result_70pc.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-datasource-useinworkspace-result_70pc.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-useinworkspace-result_70pc.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-datasource-useinworkspace.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-useinworkspace.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-datasource-useinworkspace.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-useinworkspace.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-datasource-useinworkspace_70pc.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-useinworkspace_70pc.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-datasource-useinworkspace_70pc.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-useinworkspace_70pc.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-datasource-visualize-result.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-visualize-result.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-datasource-visualize-result.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-visualize-result.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-datasource-visualize-result_50pc.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-visualize-result_50pc.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-datasource-visualize-result_50pc.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-visualize-result_50pc.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-datasource-visualize-result_70pc.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-visualize-result_70pc.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-datasource-visualize-result_70pc.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-visualize-result_70pc.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-datasource-visualize-zoom.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-visualize-zoom.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-datasource-visualize-zoom.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-visualize-zoom.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-datasource-visualize.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-visualize.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-datasource-visualize.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-visualize.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-datasource-visualize_50pc.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-visualize_50pc.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-datasource-visualize_50pc.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-visualize_50pc.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-datasource-visualize_70pc.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-visualize_70pc.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-datasource-visualize_70pc.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-datasource-visualize_70pc.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-start.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-start.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-start.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-start.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-withframe.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-withframe.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-withframe.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-withframe.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-workspace-view.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-workspace-view.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-workspace-view.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-workspace-view.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui-workspace.png b/src/MEDCalc/doc/sphinx/images/xmed-gui-workspace.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui-workspace.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui-workspace.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui.png b/src/MEDCalc/doc/sphinx/images/xmed-gui.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-gui_70pc.png b/src/MEDCalc/doc/sphinx/images/xmed-gui_70pc.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-gui_70pc.png rename to src/MEDCalc/doc/sphinx/images/xmed-gui_70pc.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-implantation.png b/src/MEDCalc/doc/sphinx/images/xmed-implantation.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-implantation.png rename to src/MEDCalc/doc/sphinx/images/xmed-implantation.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-irm-diff.png b/src/MEDCalc/doc/sphinx/images/xmed-irm-diff.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-irm-diff.png rename to src/MEDCalc/doc/sphinx/images/xmed-irm-diff.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-irm-field.png b/src/MEDCalc/doc/sphinx/images/xmed-irm-field.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-irm-field.png rename to src/MEDCalc/doc/sphinx/images/xmed-irm-field.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-irm.png b/src/MEDCalc/doc/sphinx/images/xmed-irm.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-irm.png rename to src/MEDCalc/doc/sphinx/images/xmed-irm.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-userguide-example2-datasource.png b/src/MEDCalc/doc/sphinx/images/xmed-userguide-example2-datasource.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-userguide-example2-datasource.png rename to src/MEDCalc/doc/sphinx/images/xmed-userguide-example2-datasource.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-userguide-example2-workspace-save.png b/src/MEDCalc/doc/sphinx/images/xmed-userguide-example2-workspace-save.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-userguide-example2-workspace-save.png rename to src/MEDCalc/doc/sphinx/images/xmed-userguide-example2-workspace-save.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-userguide-example2-workspace.png b/src/MEDCalc/doc/sphinx/images/xmed-userguide-example2-workspace.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-userguide-example2-workspace.png rename to src/MEDCalc/doc/sphinx/images/xmed-userguide-example2-workspace.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-visu-importtimestamps.png b/src/MEDCalc/doc/sphinx/images/xmed-visu-importtimestamps.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-visu-importtimestamps.png rename to src/MEDCalc/doc/sphinx/images/xmed-visu-importtimestamps.png diff --git a/src/MEDOP/doc/sphinx/images/xmed-visu-scalarmaptimestamps.png b/src/MEDCalc/doc/sphinx/images/xmed-visu-scalarmaptimestamps.png similarity index 100% rename from src/MEDOP/doc/sphinx/images/xmed-visu-scalarmaptimestamps.png rename to src/MEDCalc/doc/sphinx/images/xmed-visu-scalarmaptimestamps.png diff --git a/src/MEDOP/doc/sphinx/index.rst b/src/MEDCalc/doc/sphinx/index.rst similarity index 87% rename from src/MEDOP/doc/sphinx/index.rst rename to src/MEDCalc/doc/sphinx/index.rst index e291c971c..6560ec984 100644 --- a/src/MEDOP/doc/sphinx/index.rst +++ b/src/MEDCalc/doc/sphinx/index.rst @@ -15,23 +15,23 @@ References .. toctree:: :maxdepth: 1 - medop-userguide-gui.rst - medop-userguide-api.rst + medcalc-userguide-gui.rst + medcalc-userguide-api.rst **Technical documentation** (**in french**): .. toctree:: :maxdepth: 1 - medop-specifications.rst - medop-develguide.rst + medcalc-specifications.rst + medcalc-develguide.rst **Additional documentation** .. toctree:: :maxdepth: 1 - medop-references.rst + medcalc-references.rst Document archive (in french) ============================ diff --git a/src/MEDOP/doc/sphinx/medop-definitions.rst b/src/MEDCalc/doc/sphinx/medcalc-definitions.rst similarity index 100% rename from src/MEDOP/doc/sphinx/medop-definitions.rst rename to src/MEDCalc/doc/sphinx/medcalc-definitions.rst diff --git a/src/MEDOP/doc/sphinx/medop-develguide.rst b/src/MEDCalc/doc/sphinx/medcalc-develguide.rst similarity index 88% rename from src/MEDOP/doc/sphinx/medop-develguide.rst rename to src/MEDCalc/doc/sphinx/medcalc-develguide.rst index 444a0a9a6..063a8e84f 100644 --- a/src/MEDOP/doc/sphinx/medop-develguide.rst +++ b/src/MEDCalc/doc/sphinx/medcalc-develguide.rst @@ -2,19 +2,19 @@ :keywords: maillage, champ, manipulation, med, développement :author: Guillaume Boulant -.. include:: medop-definitions.rst +.. include:: medcalc-definitions.rst %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -Module MED: Guide de développement du composant MEDOP +Module MED: Guide de développement du composant MEDCalc %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -Le composant logiciel MEDOP est un élément du module MED. Il fournit +Le composant logiciel MEDCalc est un élément du module MED. Il fournit une interface utilisateur pour la manipulation de maillages et de champs, composée d'une interface texte (TUI) et d'une interface graphique (GUI). L'interface graphique constitue l'interface graphique du module MED. -Ce document est la documentation technique du composant MEDOP. Il +Ce document est la documentation technique du composant MEDCalc. Il fournit les instructions à suivre pour installer le composant en vue d'un travail de développement, puis décrit les éléments de conception. @@ -25,43 +25,43 @@ d'un travail de développement, puis décrit les éléments de conception. Mise en place de l'espace de développement ========================================== -Gestion de configuration du composant MEDOP +Gestion de configuration du composant MEDCalc ------------------------------------------- -Le composant logiciel MEDOP est un package du module SALOME MED, +Le composant logiciel MEDCalc est un package du module SALOME MED, hébergé dans l'espace source au niveau du sous-répertoire -`src/MEDOP`. La gestion des fichiers sources est donc intégrée dans le +`src/MEDCalc`. La gestion des fichiers sources est donc intégrée dans le module SALOME MED. -Organisation des sources du composant MEDOP +Organisation des sources du composant MEDCalc ------------------------------------------- -Le répertoire source `src/MEDOP` distingue les sous-répertoires +Le répertoire source `src/MEDCalc` distingue les sous-répertoires suivants: * cmp: package containing the SALOME components * tui: package containing the python user interface * gui: package containing the graphical user interface (the GUI part of the MED module) -* res: resources files associated to the MEDOP package (icons, config +* res: resources files associated to the MEDCalc package (icons, config files, data files, ...) * exe: additional executable programs that can be launched from the - MEDOP framework + MEDCalc framework -Construction du composant MEDOP +Construction du composant MEDCalc ------------------------------- -Intégré à la construction du module MED. Le composant MEDOP dépend de +Intégré à la construction du module MED. Le composant MEDCalc dépend de MEDCoupling et MEDLoader uniquement. -Exécution des tests unitaires du composant MEDOP +Exécution des tests unitaires du composant MEDCalc ------------------------------------------------ Les tests unitaires peuvent être exécutés au moyen de scripts python lancés depuis une session shell SALOME. Dans un nouveau shell, taper:: $ ./appli/runSession - [NS=mars:2810]$ python appli/bin/salome/med/test_medop_components.py + [NS=mars:2810]$ python appli/bin/salome/med/test_medcalc_components.py L'exécution imprime un rapport détaillant le résultat pour chaque fonction de test:: @@ -82,7 +82,7 @@ fonction de test:: Les scripts de test sont installés dans le répertoire ``bin/med``. On trouve: -* ``test_medop_components.py``: test les composants SALOME développés pour +* ``test_medcalc_components.py``: test les composants SALOME développés pour la manipulation de champs (``MEDDataManager`` et ``MEDCalculator``). * ``test_xmed_fieldOperations.py``: test des operations de champs telles qu'elles sont mises en oeuvre depuis l'interface textuelle. @@ -161,14 +161,14 @@ Ecrire un service CORBA qui retourne une sequence de FieldHandler: .. code-block:: cpp - MEDOP::FieldHandlerList * MyFunction(...) { - vector fieldHandlerList; + MEDCALC::FieldHandlerList * MyFunction(...) { + vector fieldHandlerList; ... fieldHandlerList.push_back(fieldHandler); // Map the resulting list to a CORBA sequence for return: - MEDOP::FieldHandlerList_var fieldHandlerSeq = new MEDOP::FieldHandlerList(); + MEDCALC::FieldHandlerList_var fieldHandlerSeq = new MEDCALC::FieldHandlerList(); int nbFieldHandler = fieldHandlerList.size(); fieldHandlerSeq->length(nbFieldHandler); for (int i=0; iid] = fieldHandler; // >>> WARNING: CORBA struct specification indicates that the @@ -193,7 +193,7 @@ Ecrire un service CORBA qui retourne une structure CORBA: // copy of the structure found in the map and return the copy. The // CORBA struct specification indicates that a deep copy can be // done using the copy constructor. <<< - return new MEDOP::FieldHandler(*fieldHandler); + return new MEDCALC::FieldHandler(*fieldHandler); @@ -212,7 +212,7 @@ ANNEXE B: Traçabilité avec le module XMED ========================================= Le module SALOME de nom XMED est l'espace de développement initial du -composant logiciel MEDOP, intégré aujourd'hui au module MED. Cette +composant logiciel MEDCalc, intégré aujourd'hui au module MED. Cette annexe est la notice technique de ce module, qui reste disponible mais qui n'est plus maintenu. diff --git a/src/MEDOP/doc/sphinx/medop-references.rst b/src/MEDCalc/doc/sphinx/medcalc-references.rst similarity index 96% rename from src/MEDOP/doc/sphinx/medop-references.rst rename to src/MEDCalc/doc/sphinx/medcalc-references.rst index 0cc327834..43cb54564 100644 --- a/src/MEDOP/doc/sphinx/medop-references.rst +++ b/src/MEDCalc/doc/sphinx/medcalc-references.rst @@ -2,7 +2,7 @@ Appendix: Documentation references %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -.. include:: medop-definitions.rst +.. include:: medcalc-definitions.rst References: diff --git a/src/MEDOP/doc/sphinx/fr/medop-specifications.rst b/src/MEDCalc/doc/sphinx/medcalc-specifications.rst similarity index 99% rename from src/MEDOP/doc/sphinx/fr/medop-specifications.rst rename to src/MEDCalc/doc/sphinx/medcalc-specifications.rst index 09ca88cd2..ae152232e 100644 --- a/src/MEDOP/doc/sphinx/fr/medop-specifications.rst +++ b/src/MEDCalc/doc/sphinx/medcalc-specifications.rst @@ -2,7 +2,7 @@ :keywords: maillage, champ, manipulation, med :author: Guillaume Boulant -.. include:: medop-definitions.rst +.. include:: medcalc-definitions.rst %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Module MED: Spécifications fonctionnelles et techniques @@ -123,11 +123,11 @@ supplémentaire: Par convention, on utilisera par la suite les notations: * **U(t,p,c)** pour désigner la valeur de la composante c d'un champ U - à la position p et prise à l'instant t; + à la position p et prise à l'instant t; * **U(t,p,:)** pour signifier que l'on manipule l'ensemble de toutes les composantes; * **U(t,:,c)** pour signifier que l'on manipule le domaine de - définition spatial complet. + définition spatial complet. Dans une grande majorité des cas d'usage on travaille à temps t fixé et sur un domaine spatiale prédéfini. Aussi on utilisera également la @@ -167,7 +167,7 @@ On formalise donc le concept d'opération par les propriétés suivantes: * L'opérateur est caractérisé par un domaine d'application qui spécifie la portée de l'opération. Ce domaine comporte plusieurs dimensions: - + - Un domaine temporel T qui spécifie les pas de temps sur lesquels l'opération est appliquée; - Un domaine spatial D qui spécifie la limite de portée de @@ -283,13 +283,13 @@ de changer le maillage support M1 d'un champs par un maillage M2 à partir du moment où les maillages M1 et M2 sont identiques géométriquement à une erreur près qu'il est possible de spécifier. -.. note:: +.. note:: D'autres situations limites peuvent être évoquées sous l'angle informatique. Ce sont des situations qui a priori n'ont pas de raison d'exister sur le plan conceptuel mais qui peuvent très bien survenir au niveau du module informatique compte-tenu des particularités du modèle MED. Par exemple: - + * Le nombre et la nature des composantes ne sont pas identiques pour tous les champs d'entrée. Par exemple, U défini ses composantes comme U(:,:,1)=Ux, U(:,:,2)=Uy, U(:,:,3)=Uz et V les @@ -408,14 +408,14 @@ de classer ces opérations en deux catégories: * les **opérations binaires**, qui prennent deux opérandes en argument. C'est le cas des opérations algébriques et des opérations vectorielles. - + A partir de cette classification, il convient de distinguer trois formes d'usage selon la nature des opérandes: * les opérandes sont exclusivement des scalaires (typiquement des valeurs de composantes des champs et des paramètres numériques). Par exemple:: - + W(:,:4) = 1+2xU(:,:,2)+V(:,:,3) * les opérandes sont exclusivement des champs. Par exemple:: @@ -478,7 +478,7 @@ paramètre numérique ou la composante d'un champ): .. warning:: A développer: - + * Analyse dimensionnelle du champ résultats pour adapter l'unité. Par exemple, si on fait UxV où U et V sont exprimés en [m] alors le résultat est en [m2]. @@ -676,7 +676,7 @@ l'interface textuelle: l'utilisateur à spécifier un alias pour la variable python qui va permettre la manipulation du champ dans l'interface textuelle de l'espace de travail (par défaut, le nom complet du champ est - proposé). Ici, l'utilisateur spécifie ``f4``: + proposé). Ici, l'utilisateur spécifie ``f4``: .. image:: images/xmed-gui-datasource-useinworkspace_70pc.png :align: center @@ -709,7 +709,7 @@ Dans le cadre défini ci-dessus, une session d'utilisation type est: conséquent de simplification et d'assistance en ligne). Par exemple, si ``fa`` et ``fb`` désignent deux champs définis dans l'espace de travail, alors on peut en faire la somme par la commande:: - + >>> r=fa+fb * Effectuer les contrôles visuel et les diagnostics en ligne de @@ -727,7 +727,7 @@ Sur cette base, on peut envisager une grande variété de cas d'utilisation: chargée dans le dataspace (l'étude SALOME techniquement) et peut être explorée au niveau de l'arbre d'étude. L'arbre peut faire apparaître: - + - les maillages et les groupes (qui peuvent être utilisés éventuellement pour restreindre le domaine d'application) - les champs dont on peut explorer les composantes et les itérations @@ -777,7 +777,7 @@ fonction de visualisation: choisir l'option "Visualize": .. image:: images/xmed-gui-datasource-visualize_70pc.png - :align: center + :align: center * Cette option déclenche l'affichage d'une carte de champ sur le cadre d'affichage des viewers SALOME: diff --git a/src/MEDOP/doc/sphinx/medop-userguide-api.rst b/src/MEDCalc/doc/sphinx/medcalc-userguide-api.rst similarity index 93% rename from src/MEDOP/doc/sphinx/medop-userguide-api.rst rename to src/MEDCalc/doc/sphinx/medcalc-userguide-api.rst index 6f230abc8..161e0551f 100644 --- a/src/MEDOP/doc/sphinx/medop-userguide-api.rst +++ b/src/MEDCalc/doc/sphinx/medcalc-userguide-api.rst @@ -1,9 +1,9 @@ .. meta:: - :description: introduction guide for users of the MEDMEM library + :description: introduction guide for users of the MEDMEM library :keywords: mesh, field, med, MEDCoupling, MEDLoader :author: Guillaume Boulant -.. include:: medop-definitions.rst +.. include:: medcalc-definitions.rst %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% MEDMEM library: Starter guide for users @@ -73,11 +73,11 @@ What we call MEDMEM library in this document is represented by the orange packages on this diagram. The white packages reprensent the old deprecated MEDMEM library. The blue packages represent the aditionnal components for field manipulation througth the user interface (TUI and -GUI). +GUI). The MEDMEM library comes also with this set of atomic libraries for advanced users/programmers: - + * :tt:`medcouplingcorba`: this library is designed for cross process exchange of medcoupling objects. * :tt:`medpartitioner`: this library provides functions to split a MED @@ -88,18 +88,18 @@ modules (using the swig binding technology) so that all the data processing can be realized by scripting. .. warning:: It could happen that some parts of the C++ libraries are - not wrapped into python modules. This coverture will be - extend on demand and if the integrity of the concepts is - preserved. + not wrapped into python modules. This coverture will be + extend on demand and if the integrity of the concepts is + preserved. Main concepts of the MEDMEM library =================================== .. warning:: TODO avec Antony. Présenter les structure de données de - MEDCoupling principalement. Describe the MEDMEM data - model, the typical content of a med file, the types of - cell that compose the meshes, the types of spatial - discretization of fields, ... + MEDCoupling principalement. Describe the MEDMEM data + model, the typical content of a med file, the types of + cell that compose the meshes, the types of spatial + discretization of fields, ... Basic usages of the MEDMEM library ================================== @@ -109,9 +109,9 @@ library using python examples. The usage of python is just to have a light syntax that makes more easy the first understanding. .. note:: All code examples here after are parts of the tutorial use - cases located in the folder :tt:`src/MEDOP/tut` in the MED - source directory. These use cases are all working executable - programs and they can be used to initiate your own script. + cases located in the folder :tt:`src/MEDCalc/tut` in the MED + source directory. These use cases are all working executable + programs and they can be used to initiate your own script. Preparing the shell environment ------------------------------- @@ -129,18 +129,18 @@ with a set of instructions that looks like:: export PYTHON_INCLUDE=${PYTHONHOME}/include/python2.6 export PATH=${PYTHONHOME}/bin:${PATH} export LD_LIBRARY_PATH=${PYTHONHOME}/lib:${LD_LIBRARY_PATH} - + #------ hdf5 ------ HDF5HOME= export PATH=${HDF5HOME}/bin:$PATH export LD_LIBRARY_PATH=${HDF5HOME}/lib:${LD_LIBRARY_PATH} export HDF5_DISABLE_VERSION_CHECK=1 - + #------ med ------ MED2HOME= export PATH=${MED2HOME}/bin:${PATH} export LD_LIBRARY_PATH=${MED2HOME}/lib:${LD_LIBRARY_PATH} - + #------ medmem --- MED_ROOT_DIR= export LD_LIBRARY_PATH=${MED_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH} @@ -153,8 +153,8 @@ Example 01: Explore a med file to get information concerning meshes and fields ------------------------------------------------------------------------------ :objectives: This example illustrates how to get information - concerning meshes and fields from a med file, using the - MEDLoader library. + concerning meshes and fields from a med file, using the + MEDLoader library. The loading of meshes and fields from a med file to a MEDCoupling data structure requires first the knowledge of metadata associated to these @@ -200,7 +200,7 @@ TypeOfField that is an integer value in this list: * :tt:`3 = ON_GAUSS_NE` .. note:: This constant variables are defined by the MEDLoader module - (:tt:`from MEDLoader import ON_NODES`). + (:tt:`from MEDLoader import ON_NODES`). As a consequence, before loading the physical values of a field, we have to determine the types of spatial discretization that come with @@ -239,7 +239,7 @@ Example 02: Load a mesh and a field from a med file --------------------------------------------------- :objectives: This illustrates how to load the physical data of a - specified mesh and a specified field. + specified mesh and a specified field. The metadata read from a med file are required to identify the list of meshes and fields in the med file. We assume in this example that the @@ -277,7 +277,7 @@ Example 03: Manage the MEDCoupling data load from a med file ------------------------------------------------------------ :objectives: Some suggestions for the MEDCoupling objects management, - in a programming context. + in a programming context. In a real programming case, it could be relevant to explore first the med file to load all metadata concerning the whole set of meshes and @@ -337,9 +337,9 @@ Example 04: Simple arithmetic operations with fields ---------------------------------------------------- :objectives: This example illustrates how to load field iterations - from a med file containing a field timeseries and shows - how to use these iterations in simple arithmetic - operations. + from a med file containing a field timeseries and shows + how to use these iterations in simple arithmetic + operations. We consider a med file :tt:`timeseries.med`, containing one single mesh named :tt:`Grid_80x80` that supports a field with values defined @@ -392,7 +392,7 @@ Exemple 07: Manipulate structured mesh -------------------------------------- :objectives: Illustrates the basic usage of the advanced interface of - MEDLoader. + MEDLoader. The MEDLoader frontal interface let you load unstructured meshes: @@ -437,8 +437,8 @@ Exemple 08: Make a projection of a field ---------------------------------------- :objectives: Make the projection of a field from a source mesh to a - target meshe. The source mesh and the target mesh are - two different mesh of the same geometry. + target meshe. The source mesh and the target mesh are + two different mesh of the same geometry. The input data of this use case are: @@ -448,9 +448,9 @@ The input data of this use case are: the figure below) .. note:: The two meshes are displayed side by side on the figure for - convenience reason, but in the real use case they stand at - the same location in 3D space (they describe the same - geometry). + convenience reason, but in the real use case they stand at + the same location in 3D space (they describe the same + geometry). .. image:: images/medop_projection_inputs.png :align: center diff --git a/src/MEDOP/doc/sphinx/medop-userguide-gui.rst b/src/MEDCalc/doc/sphinx/medcalc-userguide-gui.rst similarity index 94% rename from src/MEDOP/doc/sphinx/medop-userguide-gui.rst rename to src/MEDCalc/doc/sphinx/medcalc-userguide-gui.rst index 3494402c5..7a5de95c8 100644 --- a/src/MEDOP/doc/sphinx/medop-userguide-gui.rst +++ b/src/MEDCalc/doc/sphinx/medcalc-userguide-gui.rst @@ -2,7 +2,7 @@ :keywords: mesh, field, manipulation, user guide :author: Guillaume Boulant -.. include:: medop-definitions.rst +.. include:: medcalc-definitions.rst %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% MED module: User guide for graphical interface @@ -13,7 +13,7 @@ shows how to use this module on the basis of a few reference examples, built from use cases identified during requirement analysis stage. .. warning:: This document is self-contained, but it is strongly advised to - read :doc:`the specification document` (in + read :doc:`the specification document` (in french), at least to clarify concepts and terminology. .. contents:: Contents @@ -571,22 +571,23 @@ Using the textual interface (TUI) All operations driven through GUI can be done (more or less easily) using TUI. The field manipulation module can even be used exclusively in textual mode. -For this run the command:: +.. + For this run the command:: $ /medop.sh - -This command opens a command console ``medop>``. A med file can be loaded and -manipulated, for example to create fields from file data. +.. + This command opens a command console ``medop>``. A med file can be loaded and + manipulated, for example to create fields from file data. Whatever textual or graphical mode is used, a typical workflow in console looks like the following instructions:: - >>> load("/path/to/mydata.med") + >>> medcalc.LoadDataSource("/path/to/mydata.med") >>> la id=0 name = testfield1 id=1 name = testfield2 - >>> f1=get(0) - >>> f2=get(1) + >>> f1=accessField(0) + >>> f2=accessField(1) >>> ls f1 (id=0, name=testfield1) f2 (id=1, name=testfield2) @@ -600,50 +601,53 @@ looks like the following instructions:: f1 (id=0, name=testfield1) f2 (id=1, name=testfield2) r (id=2, name=toto) - >>> put(r) - >>> save("result.med") + >>> putInWorkspace(r) + >>> saveWorkspace("result.med") The main commands are: -* ``load``: load a med file in data base (useful in pure textual mode):: +* ``LoadDataSource``: load a med file in data base (useful in pure textual mode):: + + >>> LoadDataSource("/path/to/datafile.med") - >>> load("/path/to/datafile.med") +* ``LoadImageAsDataSource``: load an image as a med file * ``la``: show the list of all fields loaded in data base ("list all") -* ``get``: set a field in workspace from its identifier (useful in pure +* ``accessField``: set a field in workspace from its identifier (useful in pure textual mode ; this operation can be done in GUI selecting a field from data space).:: - >>> f=get(fieldId) + >>> f=accessField(fieldId) * ``ls``: show the list of fields available in workspace ("list") -* ``put``: put a reference to a field in *management space*:: +* ``putInWorkspace``: put a reference to a field in *management space*:: - >>> put(f) + >>> putInWorkspace(f) -* ``save``: save to a med a file all fields referenced in management space:: +* ``saveWorkspace``: save to a med a file all fields referenced in management space:: - >>> save("/path/to/resultfile.med") + >>> saveWorkspace("/path/to/resultfile.med") .. note:: - * the ``load`` command only loads metadata describing meshes and fields + * the ``LoadDataSource`` command only loads metadata describing meshes and fields (names, discretization types, list of time steps). Meshes and physical quantities on fields are loaded later (and automatically) as soon as an operation needs them. In all cases med data (mete-information and values) are physically stored in *data base* environment. - * the ``get`` command defines a *field handler* in workspace, i.e. + * the ``accessField`` command defines a *field handler* in workspace, i.e. a variable that links to the physical field hosted in data base. Physical data never transit between environments but remain centralized in data base. The following TUI commands need to work in graphical environment: -* ``visu``: display a field map for quick visual control (no parametrization - is possible) - - >>> view(f) - +* ``medcalc.MakeDeflectionShape`` +* ``medcalc.MakeIsoSurface`` +* ``medcalc.MakePointSprite`` +* ``medcalc.MakeScalarMap`` +* ``medcalc.MakeSlices`` +* ``medcalc.MakeVectorField`` .. LocalWords: softwares diff --git a/src/MEDOP/doc/sphinx/medop-prototype-develguide.rst b/src/MEDCalc/doc/sphinx/medop-prototype-develguide.rst similarity index 99% rename from src/MEDOP/doc/sphinx/medop-prototype-develguide.rst rename to src/MEDCalc/doc/sphinx/medop-prototype-develguide.rst index de2387b74..0bc2eae90 100644 --- a/src/MEDOP/doc/sphinx/medop-prototype-develguide.rst +++ b/src/MEDCalc/doc/sphinx/medop-prototype-develguide.rst @@ -210,14 +210,14 @@ l'addition de deux champs: import salome salome.salome_init() import SALOME_MED - + medComp = salome.lcc.FindOrLoadComponent("FactoryServer", "MED") medObj = medComp.readStructFile("myfile.med",salome.myStudyName) medOp = medObj.createMedOperator() - + f1 = medObj.getField("testfield1",-1,-1) f2 = medObj.getField("testfield2",-1,-1) - + somme = medOp.add(f1,f2) Il est à noter qu'une instance de ``SALOME_MED::MEDOP`` est associé à @@ -269,7 +269,7 @@ et le numéro d'iteration: salome.salome_init() import SALOME_MED - medComp = salome.lcc.FindOrLoadComponent("FactoryServer", "MED") + medComp = salome.lcc.FindOrLoadComponent("FactoryServer", "MED") medObj = medComp.readStructFile("myfile.med",salome.myStudyName) from xmed import fieldproxy @@ -312,9 +312,9 @@ graphique en images: .. |IMG_SELECT| image:: images/medop-gui-selectfield_scale.png .. |IMG_ALIAS| image:: images/medop-gui-aliasfield_scale.png -+---------------+---------------+ ++---------------+---------------+ | |IMG_SELECT| | |IMG_ALIAS| | -+---------------+---------------+ ++---------------+---------------+ L'image de gauche montre la sélection du pas de temps, l'image de droite la boîte de dialogue qui permet la saisie de l'alias avec @@ -353,7 +353,7 @@ un objet CORBA): // We suppose here that we have a CORBA object reference (object of // type *_ptr or *_var), for example a SALOME_MED::MED object. - SALOME_MED::MED_ptr medObj = ... // anything to get this object + SALOME_MED::MED_ptr medObj = ... // anything to get this object // Get the IOR of this object QString medIOR = SalomeApp_Application::orb()->object_to_string(medObj); @@ -363,7 +363,7 @@ un objet CORBA): QStringList commands; commands+="import salome"; commands+=QString("med=salome.orb.string_to_object(\"%1\")").arg(medIOR); - + QStringListIterator it(commands); while (it.hasNext()) { pyConsole->exec(it.next()); @@ -411,9 +411,9 @@ commandes suivantes: from xmed.fieldproxy import getFieldFromMed from xmed.medproxy import getMedProxy - + med = getMedProxy("IOR:010000001700000049444c3a53414c4f4d455f4d45442f4d45443a312e300000010000000000000064000000010102000e0000003133302e39382e37372e313733009e0a0e000000feadc4ca4c00003169000000001100000200000000000000080000000100000000545441010000001c00000001000000010001000100000001000105090101000100000009010100") - + f1=getFieldFromMed(med,"testfield1",-1,-1) Ce jeu d'instructions reconstitue un pointeur vers le servant CORBA @@ -543,9 +543,9 @@ module du champ dans l'exemple implémenté par défaut): .. |IMG_VISU| image:: images/medop-gui-visufield_scale.png .. |IMG_RESULT| image:: images/medop-gui-result_scale.png -+---------------+---------------+ ++---------------+---------------+ | |IMG_VISU| | |IMG_RESULT| | -+---------------+---------------+ ++---------------+---------------+ Cette fonction répond au besoin de contrôle interactif des résultats produits par les opérations de manipulation de champs. @@ -556,7 +556,7 @@ donnée du servant ``SALOME_MED::FIELD`` qui lui est associé (représenté par la variable ``field_ptr`` dans l'exemple ci-dessous): .. code-block:: python - + import salome import VISU @@ -710,11 +710,11 @@ automatiser proprement): et fournit des fonctions de test unitaire (à exécuter ou pour s'en inspirer). Après avoir lancé SALOME via une application virtuelle, on peut taper:: - + $ /runSession [NS=venus:2810] $ python -i test_medoperation.py - >>> - + >>> + - Ceci permet de tester en particulier l'interface ``MedOp`` et son utilisation dans le module python ``fieldproxy.py``. diff --git a/src/MEDOP/doc/sphinx/fr/medop-prototype-medmem.rst b/src/MEDCalc/doc/sphinx/medop-prototype-medmem.rst similarity index 98% rename from src/MEDOP/doc/sphinx/fr/medop-prototype-medmem.rst rename to src/MEDCalc/doc/sphinx/medop-prototype-medmem.rst index 2302f7b70..9c29fee19 100644 --- a/src/MEDOP/doc/sphinx/fr/medop-prototype-medmem.rst +++ b/src/MEDCalc/doc/sphinx/medop-prototype-medmem.rst @@ -2,7 +2,7 @@ :keywords: maillage, champ, MED, MEDMEM :author: Guillaume Boulant -.. include:: medop-definitions.rst +.. include:: medcalc-definitions.rst %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Note de travail concernant l'utilisation de MEDMEM @@ -115,7 +115,7 @@ d'entrée/sortie branché sur le fichier (``testfilename`` dans l'exemple): .. code-block:: cpp - + MED *myMed = new MED; MED_MED_RDONLY_DRIVER *driverIn = new MED_MED_RDONLY_DRIVER(testfilename, myMed); driverIn->open(); @@ -140,7 +140,7 @@ Puis le champ qui lui est associé doit être physiquement chargé pour permettre la mise à jour du support: .. code-block:: cpp - + MESH * mesh = myMed->getMesh(field); mesh->read(); myMed->updateSupport(); @@ -148,7 +148,7 @@ permettre la mise à jour du support: Pour enfin charger les valeurs des composantes du champ: .. code-block:: cpp - + field->read(); La numérotation des éléments de maillage @@ -204,7 +204,7 @@ Pour exemple, le fragment de code ci-dessous, extrait du fichier ``MedDataManager`` dans l'interface: .. code-block:: cpp - + #include "MEDMEM_MedDataManager.hxx" class MedDataManager @@ -212,24 +212,24 @@ Pour exemple, le fragment de code ci-dessous, extrait du fichier public: ~MedDataManager(); void printFieldDouble(FIELD * field); - + %extend { MedDataManager(char * fileName) { - return new MedDataManager(string(fileName)); + return new MedDataManager(string(fileName)); } MedDataManager(MED * med) { return new MedDataManager(med); } - + %newobject getFieldDouble(const char * fieldName, const int dt, const int it); FIELD * getFieldDouble(const char * fieldName, const int dt, const int it) { - return (FIELD *) self->getFieldDouble(string(fieldName), dt, it); + return (FIELD *) self->getFieldDouble(string(fieldName), dt, it); } } - + }; @@ -380,17 +380,17 @@ utilise l'interface swig fournie par MedCorba_Swig). Après l'import d'amorce systématique: .. code-block:: python - + import salome salome.salome_init() - + import SALOME_MED from libSALOME_Swig import * On peut charger le composant SALOME MED: .. code-block:: python - + medComp=salome.lcc.FindOrLoadComponent("FactoryServer", "MED") grâce auquel les services de chargement de la structure MED peuvent @@ -398,14 +398,14 @@ grâce auquel les services de chargement de la structure MED peuvent structure MED dans l'étude salome passée en argument: .. code-block:: python - + filePathName = "myfile.med" medComp.readStructFileWithFieldType(filePathName,salome.myStudyName) Ce deuxième exemple charge la structure MED mais ne place pas le résultat dans l'étude: .. code-block:: python - + filePathName = "myfile.med" medObj = medComp.readStructFile(filePathName,salome.myStudyName) @@ -418,13 +418,13 @@ verra plus bas) à MEDMEM: fieldIdx = 1 # WRN maybe there is no field of idx=1 iterationIdx = 0 fieldName = medObj.getFieldNames()[fieldIdx] - dtitfield = medObj.getFieldIteration(fieldName,iterationIdx) + dtitfield = medObj.getFieldIteration(fieldName,iterationIdx) it = dtitfield[0] dt = dtitfield[1] fieldObj = medObj.getField(fieldName,it,dt) nbOfFields = medObj.getNumberOfFields() fieldNames = medObj.getFieldNames() - + mesh = fieldObj.getSupport().getMesh() .. note:: @@ -469,22 +469,22 @@ SALOME_MED, ...) sont supposées avoir été faites au préalable (voir les exemples précédents): .. code-block:: python - + # Load the med structure using MED medComp=salome.lcc.FindOrLoadComponent("FactoryServer", "MED") filePathName = "myfile.med" medComp.readStructFileWithFieldType(filePathName,salome.myStudyName) - + # Get the VISU component import VISU visuComp = salome.lcc.FindOrLoadComponent("FactoryServer", "VISU") visuComp.SetCurrentStudy(salome.myStudy) - + # Get the sobject associated to the med object named "Med" aSObject = salome.myStudy.FindObject("Med") isPresent, medSObj = aSObject.FindSubObject(1) - - # Finally, import the med sobject in VISU + + # Finally, import the med sobject in VISU result = visuComp.ImportMed(medSObj) Il est possible de d'aller plus loin et par exemple de déclencher @@ -503,7 +503,7 @@ Notes en vrac Questions: -* Comment obtenir le nom du fichier med à partir d'une structure med? +* Comment obtenir le nom du fichier med à partir d'une structure med? * Peut-on imaginer un moyen de fournir l'objet MEDMEM::MED à partir de la donnée de l'objet CORBA SALOME_MED::MED? diff --git a/src/MEDOP/doc/sphinx/medop-prototype-overview.rst b/src/MEDCalc/doc/sphinx/medop-prototype-overview.rst similarity index 97% rename from src/MEDOP/doc/sphinx/medop-prototype-overview.rst rename to src/MEDCalc/doc/sphinx/medop-prototype-overview.rst index c571c6e6f..5eaa00e08 100644 --- a/src/MEDOP/doc/sphinx/medop-prototype-overview.rst +++ b/src/MEDCalc/doc/sphinx/medop-prototype-overview.rst @@ -56,11 +56,11 @@ images: .. |IMG_VISU| image:: images/medop-gui-visufield_scale.png .. |IMG_RESULT| image:: images/medop-gui-result_scale.png -+---------------+---------------+ ++---------------+---------------+ | |IMG_SELECT| | |IMG_ALIAS| | -+---------------+---------------+ ++---------------+---------------+ | |IMG_VISU| | |IMG_RESULT| | -+---------------+---------------+ ++---------------+---------------+ La solution technique est construite sur les principes suivants: diff --git a/src/MEDOP/doc/sphinx/medop-workingnotes-2010.rst b/src/MEDCalc/doc/sphinx/medop-workingnotes-2010.rst similarity index 100% rename from src/MEDOP/doc/sphinx/medop-workingnotes-2010.rst rename to src/MEDCalc/doc/sphinx/medop-workingnotes-2010.rst diff --git a/src/MEDOP/doc/sphinx/fr/medop-workingnotes-2011.rst b/src/MEDCalc/doc/sphinx/medop-workingnotes-2011.rst similarity index 99% rename from src/MEDOP/doc/sphinx/fr/medop-workingnotes-2011.rst rename to src/MEDCalc/doc/sphinx/medop-workingnotes-2011.rst index 2c38e64bb..269b63b5a 100644 --- a/src/MEDOP/doc/sphinx/fr/medop-workingnotes-2011.rst +++ b/src/MEDCalc/doc/sphinx/medop-workingnotes-2011.rst @@ -2,7 +2,7 @@ :keywords: maillage, champ, manipulation :author: Guillaume Boulant -.. include:: medop-definitions.rst +.. include:: medcalc-definitions.rst %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ANNEXE: Note de travail concernant le chantier XMED 2011 @@ -145,7 +145,7 @@ Nouveaux concepts à prendre en compte ------------------------------------- Au démarrage du chantier 2011, on observe que les concepts suivants -sont introduits dans le module MED: +sont introduits dans le module MED: * Le conteneur MED n'existe plus, utiliser MEDFILEBROWSER pour charger les fichiers med et obtenir les informations générales sur le @@ -469,5 +469,5 @@ Petites améliorations du DataspaceController: est posé dans le WS. On peut donc proposer en option de lui associer un alias pour manipulation dans la console - - + + diff --git a/src/MEDOP/doc/sphinx/medop-workingnotes-2012.rst b/src/MEDCalc/doc/sphinx/medop-workingnotes-2012.rst similarity index 98% rename from src/MEDOP/doc/sphinx/medop-workingnotes-2012.rst rename to src/MEDCalc/doc/sphinx/medop-workingnotes-2012.rst index b6ecb6d37..4a3e10af4 100644 --- a/src/MEDOP/doc/sphinx/medop-workingnotes-2012.rst +++ b/src/MEDCalc/doc/sphinx/medop-workingnotes-2012.rst @@ -2,7 +2,7 @@ :keywords: maillage, champ, manipulation :author: Guillaume Boulant -.. include:: medop-definitions.rst +.. include:: medcalc-definitions.rst %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ANNEXE: Note de travail concernant le chantier XMED 2012 @@ -80,5 +80,5 @@ peut procéder de la manière suivante: * Eliminer la dépendance à XSALOME * Supprimer la gestion des multiversion SALOME5/6 au niveau de l'engine -.. warning:: TODO: refaire le point sur les tâches initiées en 2011 +.. warning:: TODO: refaire le point sur les tâches initiées en 2011 diff --git a/src/MEDOP/exe/CMakeLists.txt b/src/MEDCalc/exe/CMakeLists.txt similarity index 100% rename from src/MEDOP/exe/CMakeLists.txt rename to src/MEDCalc/exe/CMakeLists.txt diff --git a/src/MEDOP/exe/image2med/CMakeLists.txt b/src/MEDCalc/exe/image2med/CMakeLists.txt similarity index 100% rename from src/MEDOP/exe/image2med/CMakeLists.txt rename to src/MEDCalc/exe/image2med/CMakeLists.txt diff --git a/src/MEDOP/gui/CMakeLists.txt b/src/MEDCalc/gui/CMakeLists.txt similarity index 77% rename from src/MEDOP/gui/CMakeLists.txt rename to src/MEDCalc/gui/CMakeLists.txt index 43faacf4d..953911727 100644 --- a/src/MEDOP/gui/CMakeLists.txt +++ b/src/MEDCalc/gui/CMakeLists.txt @@ -25,20 +25,20 @@ INCLUDE(UseQt4Ext) ADD_SUBDIRECTORY(dialogs) -SET(MEDOPGUI_SOURCES - MEDOPFactoryClient.cxx +SET(MEDCALCGUI_SOURCES + MEDFactoryClient.cxx XmedConsoleDriver.cxx WorkspaceController.cxx XmedDataModel.cxx MEDEventListener_i.cxx - MEDOPModule.cxx + MEDModule.cxx DatasourceController.cxx factory.cxx ) -SET(MEDOPGUI_HEADERS MEDOPModule.hxx MEDEventListener_i.hxx WorkspaceController.hxx DatasourceController.hxx) +SET(MEDCALCGUI_HEADERS MEDModule.hxx MEDEventListener_i.hxx WorkspaceController.hxx DatasourceController.hxx) -QT4_WRAP_CPP(MEDOPGUI_HEADERS_MOC ${MEDOPGUI_HEADERS}) +QT4_WRAP_CPP(MEDCALCGUI_HEADERS_MOC ${MEDCALCGUI_HEADERS}) INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} @@ -55,14 +55,14 @@ INCLUDE_DIRECTORIES( ${PROJECT_BINARY_DIR} ) -SET(MEDOPGUITS_SOURCES +SET(MEDCALCGUITS_SOURCES MED_images.ts MED_msg_en.ts MED_msg_fr.ts MED_msg_ja.ts - MEDOP_msg_en.ts - MEDOP_msg_fr.ts - MEDOP_msg_ja.ts + MEDCALC_msg_en.ts + MEDCALC_msg_fr.ts + MEDCALC_msg_ja.ts ) SET(COMMON_FLAGS @@ -72,8 +72,8 @@ SET(COMMON_FLAGS ${PLATFORM_LIBRARIES} ${BOOST_LIBRARIES} SalomeIDLMED - MEDOPGUI_dialogs - MEDOPFactoryEngine + MEDCALCGUI_dialogs + MEDFactoryEngine ${GUI_qtx} ${GUI_suit} ${GUI_SalomeObject} @@ -88,14 +88,14 @@ SET(COMMON_FLAGS ${GUI_PyConsole} ) -ADD_LIBRARY(MEDOPGUI SHARED ${MEDOPGUI_SOURCES} ${MEDOPGUI_HEADERS_MOC}) +ADD_LIBRARY(MEDCALCGUI SHARED ${MEDCALCGUI_SOURCES} ${MEDCALCGUI_HEADERS_MOC}) IF(WITH_MEDMEMGUI) - SET_TARGET_PROPERTIES(MEDOPGUI PROPERTIES COMPILE_FLAGS "-D__WITH_MEDMEMGUI__") + SET_TARGET_PROPERTIES(MEDCALCGUI PROPERTIES COMPILE_FLAGS "-D__WITH_MEDMEMGUI__") ENDIF(WITH_MEDMEMGUI) -TARGET_LINK_LIBRARIES(MEDOPGUI ${COMMON_FLAGS}) +TARGET_LINK_LIBRARIES(MEDCALCGUI ${COMMON_FLAGS}) -INSTALL(TARGETS MEDOPGUI DESTINATION ${SALOME_INSTALL_LIBS}) -QT4_INSTALL_TS_RESOURCES("${MEDOPGUITS_SOURCES}" "${SALOME_MED_INSTALL_RES_DATA}") +INSTALL(TARGETS MEDCALCGUI DESTINATION ${SALOME_INSTALL_LIBS}) +QT4_INSTALL_TS_RESOURCES("${MEDCALCGUITS_SOURCES}" "${SALOME_MED_INSTALL_RES_DATA}") FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/MEDOP/gui/dialogs/CMakeLists.txt b/src/MEDCalc/gui/dialogs/CMakeLists.txt similarity index 78% rename from src/MEDOP/gui/dialogs/CMakeLists.txt rename to src/MEDCalc/gui/dialogs/CMakeLists.txt index 574c12c27..f3aa8cbfc 100644 --- a/src/MEDOP/gui/dialogs/CMakeLists.txt +++ b/src/MEDCalc/gui/dialogs/CMakeLists.txt @@ -21,7 +21,7 @@ ADD_DEFINITIONS(${CAS_DEFINITIONS} ${BOOST_DEFINITIONS} ${OMNIORB_DEFINITIONS}) INCLUDE(UseQt4Ext) -SET(MEDOPGUI_dialogs_FORMS +SET(MEDCALCGUI_dialogs_FORMS GenericDialog.ui DlgAlias.ui DlgUseInWorkspace.ui @@ -29,9 +29,9 @@ SET(MEDOPGUI_dialogs_FORMS DlgInterpolateField.ui DlgImageToMed.ui ) -QT4_WRAP_UI(MEDOPGUI_dialogs_FORMS_HEADERS ${MEDOPGUI_dialogs_FORMS}) +QT4_WRAP_UI(MEDCALCGUI_dialogs_FORMS_HEADERS ${MEDCALCGUI_dialogs_FORMS}) -SET(MEDOPGUI_dialogs_FILES +SET(MEDCALCGUI_dialogs_FILES GenericDialog.hxx DlgAlias.hxx DlgUseInWorkspace.hxx @@ -39,7 +39,7 @@ SET(MEDOPGUI_dialogs_FILES DlgInterpolateField.hxx DlgImageToMed.hxx ) -QT4_WRAP_CPP(MEDOPGUI_dialogs_HEADERS_MOC ${MEDOPGUI_dialogs_FILES}) +QT4_WRAP_CPP(MEDCALCGUI_dialogs_HEADERS_MOC ${MEDCALCGUI_dialogs_FILES}) INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} @@ -52,7 +52,7 @@ INCLUDE_DIRECTORIES( ${QT4_INCLUDE_DIRECTORY} ) -SET(MEDOPGUI_dialogs_SOURCES +SET(MEDCALCGUI_dialogs_SOURCES GenericDialog.cxx DlgAlias.cxx DlgUseInWorkspace.cxx @@ -61,11 +61,11 @@ SET(MEDOPGUI_dialogs_SOURCES DlgImageToMed.cxx ) -ADD_LIBRARY(MEDOPGUI_dialogs SHARED ${MEDOPGUI_dialogs_SOURCES} ${MEDOPGUI_dialogs_HEADERS_MOC} ${MEDOPGUI_dialogs_FORMS_HEADERS}) -TARGET_LINK_LIBRARIES(MEDOPGUI_dialogs ${CAS_KERNEL} ${QT_LIBRARIES} ${KERNEL_SalomeIDLKernel} +ADD_LIBRARY(MEDCALCGUI_dialogs SHARED ${MEDCALCGUI_dialogs_SOURCES} ${MEDCALCGUI_dialogs_HEADERS_MOC} ${MEDCALCGUI_dialogs_FORMS_HEADERS}) +TARGET_LINK_LIBRARIES(MEDCALCGUI_dialogs ${CAS_KERNEL} ${QT_LIBRARIES} ${KERNEL_SalomeIDLKernel} ${GUI_SalomeGuiHelpers} ${OMNIORB_LIBRARIES} ${GUI_qtx} ${GUI_suit} ${PLATFORM_LIBRARIES} ${KERNEL_SalomeLifeCycleCORBA} ${KERNEL_SalomeKernelHelpers} ${GUI_SalomeGuiHelpers}) -INSTALL(TARGETS MEDOPGUI_dialogs DESTINATION ${SALOME_INSTALL_LIBS}) +INSTALL(TARGETS MEDCALCGUI_dialogs DESTINATION ${SALOME_INSTALL_LIBS}) # # --------------------------------------------------------- @@ -73,7 +73,7 @@ INSTALL(TARGETS MEDOPGUI_dialogs DESTINATION ${SALOME_INSTALL_LIBS}) # --------------------------------------------------------- # ADD_EXECUTABLE(dlgTester dlgTester.cxx) -TARGET_LINK_LIBRARIES(dlgTester MEDOPGUI_dialogs ${QT_LIBS} ${PLATFORM_LIBS}) +TARGET_LINK_LIBRARIES(dlgTester MEDCALCGUI_dialogs ${QT_LIBS} ${PLATFORM_LIBS}) INSTALL(TARGETS dlgTester DESTINATION ${SALOME_INSTALL_BINS}) #ADD_TEST(dlgTester dlgTester) diff --git a/src/MEDOP/res/CMakeLists.txt b/src/MEDCalc/res/CMakeLists.txt similarity index 97% rename from src/MEDOP/res/CMakeLists.txt rename to src/MEDCalc/res/CMakeLists.txt index f1f1f5236..87f6ab69f 100644 --- a/src/MEDOP/res/CMakeLists.txt +++ b/src/MEDCalc/res/CMakeLists.txt @@ -32,8 +32,8 @@ SET(MED_RESOURCES_FILES fileimport-32.png folder.png image_add.png - MEDOP.png - MEDOP_small.png + MEDCalc.png + MEDCalc_small.png workspace_clean.png workspace_save.png ) diff --git a/src/MEDOP/res/testfiles/CMakeLists.txt b/src/MEDCalc/res/testfiles/CMakeLists.txt similarity index 96% rename from src/MEDOP/res/testfiles/CMakeLists.txt rename to src/MEDCalc/res/testfiles/CMakeLists.txt index c101b35fc..4bdb0232b 100644 --- a/src/MEDOP/res/testfiles/CMakeLists.txt +++ b/src/MEDCalc/res/testfiles/CMakeLists.txt @@ -32,7 +32,7 @@ SET(MED_FILES padderoutput.med ) -INSTALL(FILES ${MED_FILES} DESTINATION ${SALOME_MED_INSTALL_RES_DATA}/medop_testfiles) +INSTALL(FILES ${MED_FILES} DESTINATION ${SALOME_MED_INSTALL_RES_DATA}/medcalc_testfiles) SET(MED_IMG_FILES irm_test1.png @@ -42,4 +42,4 @@ SET(MED_IMG_FILES champ_altitude_MAP.pgm ) -INSTALL(FILES ${MED_IMG_FILES} DESTINATION ${SALOME_MED_INSTALL_RES_DATA}/medop_testfiles) +INSTALL(FILES ${MED_IMG_FILES} DESTINATION ${SALOME_MED_INSTALL_RES_DATA}/medcalc_testfiles) diff --git a/src/MEDOP/tui/presentation/CMakeLists.txt b/src/MEDCalc/tui/CMakeLists.txt similarity index 93% rename from src/MEDOP/tui/presentation/CMakeLists.txt rename to src/MEDCalc/tui/CMakeLists.txt index 6aba267cf..8e0d77052 100644 --- a/src/MEDOP/tui/presentation/CMakeLists.txt +++ b/src/MEDCalc/tui/CMakeLists.txt @@ -19,8 +19,13 @@ SET(PYFILES_TO_INSTALL __init__.py - medpresentation.py + fieldproxy.py + medconsole.py + medcorba.py + medevents.py medimages.py + medio.py + medpresentation.py ) SALOME_INSTALL_SCRIPTS("${PYFILES_TO_INSTALL}" ${SALOME_INSTALL_PYTHON}/medcalc) diff --git a/src/MEDOP/tut/medcoupling/README.txt b/src/MEDCalc/tut/medcoupling/README.txt similarity index 100% rename from src/MEDOP/tut/medcoupling/README.txt rename to src/MEDCalc/tut/medcoupling/README.txt diff --git a/src/MEDOP/tut/medcoupling/env.sh b/src/MEDCalc/tut/medcoupling/env.sh similarity index 100% rename from src/MEDOP/tut/medcoupling/env.sh rename to src/MEDCalc/tut/medcoupling/env.sh diff --git a/src/MEDOP/tut/medcoupling/images/avatar.png b/src/MEDCalc/tut/medcoupling/images/avatar.png similarity index 100% rename from src/MEDOP/tut/medcoupling/images/avatar.png rename to src/MEDCalc/tut/medcoupling/images/avatar.png diff --git a/src/MEDOP/tut/medcoupling/images/irm.png b/src/MEDCalc/tut/medcoupling/images/irm.png similarity index 100% rename from src/MEDOP/tut/medcoupling/images/irm.png rename to src/MEDCalc/tut/medcoupling/images/irm.png diff --git a/src/MEDOP/tut/medcoupling/images/lena.png b/src/MEDCalc/tut/medcoupling/images/lena.png similarity index 100% rename from src/MEDOP/tut/medcoupling/images/lena.png rename to src/MEDCalc/tut/medcoupling/images/lena.png diff --git a/src/MEDOP/tut/medcoupling/images/tests.pgm b/src/MEDCalc/tut/medcoupling/images/tests.pgm similarity index 100% rename from src/MEDOP/tut/medcoupling/images/tests.pgm rename to src/MEDCalc/tut/medcoupling/images/tests.pgm diff --git a/src/MEDOP/tut/medcoupling/partition.py b/src/MEDCalc/tut/medcoupling/partition.py similarity index 100% rename from src/MEDOP/tut/medcoupling/partition.py rename to src/MEDCalc/tut/medcoupling/partition.py diff --git a/src/MEDOP/tut/medcoupling/pyfunctions/__init__.py b/src/MEDCalc/tut/medcoupling/pyfunctions/__init__.py similarity index 100% rename from src/MEDOP/tut/medcoupling/pyfunctions/__init__.py rename to src/MEDCalc/tut/medcoupling/pyfunctions/__init__.py diff --git a/src/MEDOP/tut/medcoupling/pyfunctions/functions.py b/src/MEDCalc/tut/medcoupling/pyfunctions/functions.py similarity index 100% rename from src/MEDOP/tut/medcoupling/pyfunctions/functions.py rename to src/MEDCalc/tut/medcoupling/pyfunctions/functions.py diff --git a/src/MEDOP/tut/medcoupling/pyfunctions/lagrange.py b/src/MEDCalc/tut/medcoupling/pyfunctions/lagrange.py similarity index 100% rename from src/MEDOP/tut/medcoupling/pyfunctions/lagrange.py rename to src/MEDCalc/tut/medcoupling/pyfunctions/lagrange.py diff --git a/src/MEDOP/tut/medcoupling/pyfunctions/plotter.py b/src/MEDCalc/tut/medcoupling/pyfunctions/plotter.py similarity index 100% rename from src/MEDOP/tut/medcoupling/pyfunctions/plotter.py rename to src/MEDCalc/tut/medcoupling/pyfunctions/plotter.py diff --git a/src/MEDOP/tut/medcoupling/test-paravis.py b/src/MEDCalc/tut/medcoupling/test-paravis.py similarity index 100% rename from src/MEDOP/tut/medcoupling/test-paravis.py rename to src/MEDCalc/tut/medcoupling/test-paravis.py diff --git a/src/MEDOP/tut/medcoupling/testmed_gendata.py b/src/MEDCalc/tut/medcoupling/testmed_gendata.py similarity index 98% rename from src/MEDOP/tut/medcoupling/testmed_gendata.py rename to src/MEDCalc/tut/medcoupling/testmed_gendata.py index 67c726d0b..26a930837 100755 --- a/src/MEDOP/tut/medcoupling/testmed_gendata.py +++ b/src/MEDCalc/tut/medcoupling/testmed_gendata.py @@ -48,7 +48,7 @@ def createGridMesh(meshName, nbCellsX, nbCellsY): # Create X coordinates nbNodesX = nbCellsX+1 stepX = 0.1 - arrX = [float(i * stepX) for i in range(nbNodesX)] + arrX = [float(i * stepX) for i in range(nbNodesX)] coordsX=MC.DataArrayDouble.New() coordsX.setValues(arrX,nbNodesX,1) @@ -135,14 +135,14 @@ def createField(fieldName,gridMesh, # DataArrayDouble. Note also the usage of float type because # MEDCoupling works only with real numbers listdata=list(data) - + # Create the field using the list obtained from the numpy array field = MC.MEDCouplingFieldDouble.New(typeOfField,MC.ONE_TIME); field.setName(fieldName); field.setMesh(gridMesh); field.setIteration(iteration) field.setTimeValue(float(iteration)) - + nbComponents=1 # Only one single component for a scalar field nbCells=sizeX*sizeY dataArray=MC.DataArrayDouble.New(); @@ -159,7 +159,7 @@ def writeField(fieldName, numpy2Darray, typeOfField, iteration) createFromScratch=False ML.MEDLoader.WriteField(medFileName,field,createFromScratch) - + def createTestNumpy2DArray(sizeX, sizeY): """ @@ -176,7 +176,7 @@ def createTestNumpy2DArray(sizeX, sizeY): numpy2Darray = numpy.vstack(rows) return numpy2Darray - + def createTestFieldOnCells(): # Test field on cells numpy2Darray = createTestNumpy2DArray(sizeX=nbCellsX, sizeY=nbCellsY) @@ -188,7 +188,7 @@ def createTestFieldOnNodes(): numpy2Darray = createTestNumpy2DArray(sizeX=nbNodesX, sizeY=nbNodesY) writeField("FieldOnNodes", numpy2Darray, typeOfField=MC.ON_NODES) - + # # ================================================= @@ -277,7 +277,7 @@ from pyfunctions.functions import FuncStiffPulse def createNumpy2DArrayWithFuncStiff(sizeX, sizeY): f=FuncStiffPulse(xlimit=0.3,stiffness=30,nbPeriods=10) return createNumpy2DArrayWithFunc(sizeX, sizeY, f) - + def createFunctionField_02(): sizeX=nbCellsX sizeY=nbCellsY @@ -293,7 +293,7 @@ def createFunctionField_02(): # # ================================================= -# Functions to create custom fields for MEDOP tests +# Functions to create custom fields for MEDCalc tests # ================================================= # def createTimeSeries(): @@ -330,7 +330,7 @@ def createParametrics(): meshName = "Grid_%sx%s_01"%(nbCellsX, nbCellsY) cmesh = createGridMesh(meshName, nbCellsX, nbCellsY) umesh = unstructuredMesh(cmesh) - + sizeX=nbNodesX sizeY=nbNodesY typeOfField=MC.ON_NODES @@ -360,7 +360,7 @@ def createParametrics_demo(): meshName = "mesh1" cmesh = createGridMesh(meshName, nbCellsX, nbCellsY) umesh = unstructuredMesh(cmesh) - + sizeX=nbNodesX sizeY=nbNodesY typeOfField=MC.ON_NODES @@ -376,7 +376,7 @@ def createParametrics_demo(): numpy2Darray = createNumpy2DArrayWithFunc(sizeX,sizeY,f) field = createField(fieldName,umesh, numpy2Darray,typeOfField,iteration) ML.MEDLoader.WriteField(medFileName,field,False) - + medFileName="parametric_02.med" umesh.setName("mesh2") ML.MEDLoader.WriteUMesh(medFileName,umesh,True); diff --git a/src/MEDOP/tut/medcoupling/testmed_lena.py b/src/MEDCalc/tut/medcoupling/testmed_lena.py similarity index 100% rename from src/MEDOP/tut/medcoupling/testmed_lena.py rename to src/MEDCalc/tut/medcoupling/testmed_lena.py diff --git a/src/MEDOP/tut/medcoupling/testmed_simple.py b/src/MEDCalc/tut/medcoupling/testmed_simple.py similarity index 100% rename from src/MEDOP/tut/medcoupling/testmed_simple.py rename to src/MEDCalc/tut/medcoupling/testmed_simple.py diff --git a/src/MEDOP/tut/medcoupling/testpil.py b/src/MEDCalc/tut/medcoupling/testpil.py similarity index 100% rename from src/MEDOP/tut/medcoupling/testpil.py rename to src/MEDCalc/tut/medcoupling/testpil.py diff --git a/src/MEDOP/tut/medloader/Makefile b/src/MEDCalc/tut/medloader/Makefile similarity index 100% rename from src/MEDOP/tut/medloader/Makefile rename to src/MEDCalc/tut/medloader/Makefile diff --git a/src/MEDOP/tut/medloader/cmesh.py b/src/MEDCalc/tut/medloader/cmesh.py similarity index 100% rename from src/MEDOP/tut/medloader/cmesh.py rename to src/MEDCalc/tut/medloader/cmesh.py diff --git a/src/MEDOP/tut/medloader/explore.py b/src/MEDCalc/tut/medloader/explore.py similarity index 100% rename from src/MEDOP/tut/medloader/explore.py rename to src/MEDCalc/tut/medloader/explore.py diff --git a/src/MEDOP/tut/medloader/madnex_field.med b/src/MEDCalc/tut/medloader/madnex_field.med similarity index 100% rename from src/MEDOP/tut/medloader/madnex_field.med rename to src/MEDCalc/tut/medloader/madnex_field.med diff --git a/src/MEDOP/tut/medloader/madnex_grid.med b/src/MEDCalc/tut/medloader/madnex_grid.med similarity index 100% rename from src/MEDOP/tut/medloader/madnex_grid.med rename to src/MEDCalc/tut/medloader/madnex_grid.med diff --git a/src/MEDOP/tut/medloader/manage.py b/src/MEDCalc/tut/medloader/manage.py similarity index 100% rename from src/MEDOP/tut/medloader/manage.py rename to src/MEDCalc/tut/medloader/manage.py diff --git a/src/MEDOP/tut/medloader/testamel.py b/src/MEDCalc/tut/medloader/testamel.py similarity index 100% rename from src/MEDOP/tut/medloader/testamel.py rename to src/MEDCalc/tut/medloader/testamel.py diff --git a/src/MEDOP/tut/medloader/timeseries.med b/src/MEDCalc/tut/medloader/timeseries.med similarity index 100% rename from src/MEDOP/tut/medloader/timeseries.med rename to src/MEDCalc/tut/medloader/timeseries.med diff --git a/src/MEDOP/tut/medloader/tutorial.py b/src/MEDCalc/tut/medloader/tutorial.py similarity index 100% rename from src/MEDOP/tut/medloader/tutorial.py rename to src/MEDCalc/tut/medloader/tutorial.py diff --git a/src/MEDOP/tui/CMakeLists.txt b/src/MEDOP/tui/CMakeLists.txt deleted file mode 100644 index 734da38ad..000000000 --- a/src/MEDOP/tui/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -ADD_SUBDIRECTORY(xmedpy) -ADD_SUBDIRECTORY(presentation) diff --git a/src/MEDOP/tui/xmedpy/CMakeLists.txt b/src/MEDOP/tui/xmedpy/CMakeLists.txt deleted file mode 100644 index bbc6e70c4..000000000 --- a/src/MEDOP/tui/xmedpy/CMakeLists.txt +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -SET(PYFILES_TO_INSTALL - __init__.py - fieldproxy.py - fieldtools.py - fieldguide.py - cmdtools.py -# For the control of PARAVIS and VISU - driver_pvis.py - driver_visu.py -# For the medop.sh executable program - medop.py -# Modules that are required for test or tutorial purposes only: - properties.py - ) - -SALOME_INSTALL_SCRIPTS("${PYFILES_TO_INSTALL}" ${SALOME_INSTALL_PYTHON}/xmed) - -SET(TEST_SCRIPTS_XMED - tests/test_xmed_fieldOperations.py - tests/test_xmed_uiEventListener.py - tests/test_xmed_visualisation.py - ) - -INSTALL(FILES ${TEST_SCRIPTS_XMED} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ DESTINATION ${SALOME_INSTALL_BINS}/xmed) \ No newline at end of file -- 2.39.2