| |
| - ``conf_type``: integer as follows: |
| |
-| * 0: conformal |
+| * 0: conformal (default) |
| * 1: non conformal with at max 2 cut edges per element|
| * 2: non conformal with one hanging node per edge of |
| element |
| **GetConfType()** |
| Returns the type of conformity |
+---------------------------------------------------------------+
+| .. module:: SetExtType |
+| |
+| **SetExtType(ext_type)** |
+| Defines the external type for the case |
+| |
+| - ``ext_type`` : integer as follows: |
+| |
+| * 0 : Standard MED (default) |
+| * 1 : Saturne 2D |
++---------------------------------------------------------------+
+| .. module:: GetExtType |
+| |
+| **GetExtType()** |
+| Returns the external type for the case |
++---------------------------------------------------------------+
| .. module:: GetIter0 |
| |
| **GetIter0()** |
| |
| - ``conf_type`` : entier précisant le mode de conformité |
| |
-| * 0 : conforme |
+| * 0 : conforme (défaut) |
| * 1 : non conforme avec au minimum 2 aretes coupees |
| * 2 : non conforme avec 1 noeud par arete de maille |
| * 3 : non conforme quelconque |
| **GetConfType()** |
| Retourne le type de conformité |
+---------------------------------------------------------------+
+| .. module:: SetExtType |
+| |
+| **SetExtType(ext_type)** |
+| Définit le type externe associé au cas |
+| |
+| - ``ext_type`` : entier précisant le type externe |
+| |
+| * 0 : MED standard (défaut) |
+| * 1 : Saturne 2D |
++---------------------------------------------------------------+
+| .. module:: GetExtType |
+| |
+| **GetExtType()** |
+| Retourne le type externe associé au cas |
++---------------------------------------------------------------+
| .. module:: GetIter0 |
| |
| **GetIter0()** |
case_name = "CAS_1"
mesh_name = "MAILL"
- mesh_file = "/local00/Salome/Adapt/m0.med"
+ mesh_file = "/home/A1789/Adapt/m0.med"
case_1 = homard.CreateCase(case_name, mesh_name, mesh_file)
- dirname = "/local00/Salome/Adapt/resu"
+ dirname = "/home/A1789/Adapt/resu"
case_1.SetDirName(dirname)
case_1.SetConfType(1)
+ case_1.SetExtType(0)
case_1.AddBoundaryGroup( 'intersection', '' )
case_1.AddBoundaryGroup( 'cyl_1', 'T1_EXT' )
case_1.AddBoundaryGroup( 'cyl_1', 'T2_EXT' )
void SetConfType(in long ConfType) raises (SALOME::SALOME_Exception);
long GetConfType() raises (SALOME::SALOME_Exception);
+ void SetExtType(in long ExtType) raises (SALOME::SALOME_Exception);
+ long GetExtType() raises (SALOME::SALOME_Exception);
+
void SetBoundingBox(in extrema LesExtremes) raises (SALOME::SALOME_Exception);
extrema GetBoundingBox() raises (SALOME::SALOME_Exception);
*/
//=============================================================================
HOMARD_Cas::HOMARD_Cas():
- _Name(""), _NomDir("/tmp"), _ConfType(0)
+ _Name(""), _NomDir("/tmp"), _ConfType(0), _ExtType(0)
{
MESSAGE("HOMARD_Cas");
}
aScript << _NomDir << "\")\n";
aScript << "\t" <<_Name << ".SetConfType(";
aScript << _ConfType << ")\n";
+ aScript << "\t" <<_Name << ".SetExtType(";
+ aScript << _ExtType << ")\n";
// Suivi de frontieres
std::list<std::string>::const_iterator it = _ListBoundaryGroup.begin();
while(it != _ListBoundaryGroup.end())
{
return _ListIter.size();
}
+//
+// Le type de conformite ou non conformite
+//
//=============================================================================
void HOMARD_Cas::SetConfType( int Conftype )
{
return _ConfType;
}
//
+// Le type exterieur
+//
+//=============================================================================
+void HOMARD_Cas::SetExtType( int ExtType )
+{
+// VERIFICATION( (ExtType>=0) && (ExtType<=1) );
+ _ExtType = ExtType;
+}
+//=============================================================================
+const int HOMARD_Cas::GetExtType() const
+{
+ return _ExtType;
+}
+//
// La boite englobante
//
//=============================================================================
void SetConfType( int ConfType );
const int GetConfType() const;
+ void SetExtType( int ExtType );
+ const int GetExtType() const;
+
void SetBoundingBox( const std::vector<double>& extremas );
const std::vector<double>& GetBoundingBox() const;
std::string _Name;
std::string _NomDir;
int _ConfType;
+ int _ExtType;
int _Etat;
std::vector<double> _Boite; // cf HomardQTCommun pour structure du vecteur
os << cas.GetName();
os << separator() << cas.GetDirName();
os << separator() << cas.GetConfType();
+ os << separator() << cas.GetExtType();
std::vector<double> coor = cas.GetBoundingBox();
os << separator() << coor.size();
if ( !ok ) return false;
cas.SetConfType( atoi( chunk.c_str() ) );
+ chunk = getNextChunk( stream, start, ok );
+ if ( !ok ) return false;
+ cas.SetExtType( atoi( chunk.c_str() ) );
+
chunk = getNextChunk( stream, start, ok );
if ( !ok ) return false;
//
}
//===============================================================================
-void HomardDriver::TexteAdap( )
+void HomardDriver::TexteAdap( int ExtType )
{
MESSAGE("TexteAdap");
//
_Texte += "Action homa\n" ;
- _Texte += "CCAssoci med\n" ;
+ if ( ExtType == 0 ) { _Texte += "CCAssoci med\n" ; }
+ else { _Texte += "CCAssoci saturne_2d\n" ; }
_Texte += "ModeHOMA 1\n" ;
_Texte += "NumeIter " + _siter + "\n" ;
//
void TexteInit( const std::string DirCompute, const std::string LogFile, const std::string Langue );
void TexteInfo( int TypeBila, int NumeIter );
void CreeFichierDonn();
- void TexteAdap( );
+ void TexteAdap( int ExtType );
void CreeFichier();
void TexteMaillage( const std::string NomMesh, const std::string MeshFile, int apres );
void TexteMaillageHOMARD( const std::string Dir, const std::string liter, int apres );
/********************************************************************************
** Form generated from reading UI file 'CreateCase.ui'
**
-** Created: Tue Nov 24 11:06:19 2015
+** Created: Mon Dec 14 17:01:30 2015
** by: Qt User Interface Compiler version 4.6.3
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
class Ui_CreateCase
{
public:
- QGridLayout *gridLayout_3;
+ QGridLayout *gridLayout_5;
QWidget *WName;
QGridLayout *gridLayout_2;
QLabel *Name;
QSpacerItem *spacer;
QCheckBox *CBAdvanced;
QGroupBox *GBAdvancedOptions;
- QGridLayout *gridLayout2;
+ QGridLayout *gridLayout_4;
QCheckBox *CBPyramid;
+ QGroupBox *GBConforme;
+ QGridLayout *gridLayout_3;
+ QHBoxLayout *horizontalLayout_2;
QRadioButton *RBStandard;
QRadioButton *RBBox;
QRadioButton *RBNC1NpA;
QRadioButton *RBNCQuelconque;
+ QGroupBox *GBFormat;
+ QGridLayout *gridLayout2;
+ QRadioButton *RBMED;
+ QRadioButton *RBSaturne2D;
QSpacerItem *spacer_3;
QSpacerItem *spacer_4;
QLabel *Comment;
- QSpacerItem *verticalSpacer;
QGroupBox *GroupButtons;
QGridLayout *gridLayout3;
QPushButton *buttonHelp;
QPushButton *buttonApply;
QPushButton *buttonOk;
QPushButton *buttonCancel;
+ QSpacerItem *verticalSpacer;
QSpacerItem *spacer_2;
void setupUi(QDialog *CreateCase)
CreateCase->setSizeIncrement(QSize(1, 1));
CreateCase->setBaseSize(QSize(600, 320));
CreateCase->setAutoFillBackground(true);
- gridLayout_3 = new QGridLayout(CreateCase);
- gridLayout_3->setObjectName(QString::fromUtf8("gridLayout_3"));
+ gridLayout_5 = new QGridLayout(CreateCase);
+ gridLayout_5->setObjectName(QString::fromUtf8("gridLayout_5"));
WName = new QWidget(CreateCase);
WName->setObjectName(QString::fromUtf8("WName"));
gridLayout_2 = new QGridLayout(WName);
gridLayout_2->addWidget(LEName, 0, 1, 1, 1);
- gridLayout_3->addWidget(WName, 0, 0, 1, 2);
+ gridLayout_5->addWidget(WName, 0, 0, 1, 3);
horizontalSpacer = new QSpacerItem(199, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
- gridLayout_3->addItem(horizontalSpacer, 0, 2, 1, 3);
+ gridLayout_5->addItem(horizontalSpacer, 0, 3, 1, 3);
hboxLayout = new QHBoxLayout();
#ifndef Q_OS_MAC
hboxLayout->addWidget(LEDirName);
- gridLayout_3->addLayout(hboxLayout, 1, 0, 1, 6);
+ gridLayout_5->addLayout(hboxLayout, 1, 0, 1, 7);
spacerItem = new QSpacerItem(20, 18, QSizePolicy::Minimum, QSizePolicy::Expanding);
- gridLayout_3->addItem(spacerItem, 2, 5, 1, 1);
+ gridLayout_5->addItem(spacerItem, 2, 6, 1, 1);
hboxLayout1 = new QHBoxLayout();
#ifndef Q_OS_MAC
hboxLayout1->addWidget(LEFileName);
- gridLayout_3->addLayout(hboxLayout1, 3, 0, 1, 6);
+ gridLayout_5->addLayout(hboxLayout1, 3, 0, 1, 7);
spacerItem1 = new QSpacerItem(20, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
- gridLayout_3->addItem(spacerItem1, 3, 6, 1, 1);
+ gridLayout_5->addItem(spacerItem1, 3, 7, 1, 1);
GBTypeConf = new QGroupBox(CreateCase);
GBTypeConf->setObjectName(QString::fromUtf8("GBTypeConf"));
hboxLayout2->addWidget(RBNonConforme);
- gridLayout_3->addWidget(GBTypeConf, 4, 0, 1, 3);
+ gridLayout_5->addWidget(GBTypeConf, 4, 0, 1, 4);
hboxLayout3 = new QHBoxLayout();
#ifndef Q_OS_MAC
hboxLayout3->addWidget(CBBoundaryA);
- gridLayout_3->addLayout(hboxLayout3, 5, 0, 1, 4);
+ gridLayout_5->addLayout(hboxLayout3, 5, 0, 1, 5);
spacerItem2 = new QSpacerItem(20, 1, QSizePolicy::Minimum, QSizePolicy::Expanding);
- gridLayout_3->addItem(spacerItem2, 5, 4, 1, 1);
+ gridLayout_5->addItem(spacerItem2, 5, 5, 1, 1);
spacerItem3 = new QSpacerItem(20, 2, QSizePolicy::Minimum, QSizePolicy::Expanding);
- gridLayout_3->addItem(spacerItem3, 6, 3, 1, 1);
+ gridLayout_5->addItem(spacerItem3, 6, 4, 1, 1);
GBBoundaryD = new QGroupBox(CreateCase);
GBBoundaryD->setObjectName(QString::fromUtf8("GBBoundaryD"));
gridLayout->addWidget(PBBoundaryDiHelp, 0, 4, 1, 1);
- gridLayout_3->addWidget(GBBoundaryD, 7, 0, 1, 5);
+ gridLayout_5->addWidget(GBBoundaryD, 7, 0, 1, 6);
GBBoundaryA = new QGroupBox(CreateCase);
GBBoundaryA->setObjectName(QString::fromUtf8("GBBoundaryA"));
formLayout->setLayout(0, QFormLayout::FieldRole, gridLayout1);
- gridLayout_3->addWidget(GBBoundaryA, 8, 0, 1, 7);
+ gridLayout_5->addWidget(GBBoundaryA, 8, 0, 1, 8);
spacer = new QSpacerItem(239, 41, QSizePolicy::Minimum, QSizePolicy::Expanding);
- gridLayout_3->addItem(spacer, 9, 0, 1, 3);
+ gridLayout_5->addItem(spacer, 9, 0, 1, 4);
CBAdvanced = new QCheckBox(CreateCase);
CBAdvanced->setObjectName(QString::fromUtf8("CBAdvanced"));
- gridLayout_3->addWidget(CBAdvanced, 10, 0, 1, 2);
+ gridLayout_5->addWidget(CBAdvanced, 10, 0, 1, 3);
GBAdvancedOptions = new QGroupBox(CreateCase);
GBAdvancedOptions->setObjectName(QString::fromUtf8("GBAdvancedOptions"));
- gridLayout2 = new QGridLayout(GBAdvancedOptions);
- gridLayout2->setObjectName(QString::fromUtf8("gridLayout2"));
+ gridLayout_4 = new QGridLayout(GBAdvancedOptions);
+ gridLayout_4->setObjectName(QString::fromUtf8("gridLayout_4"));
CBPyramid = new QCheckBox(GBAdvancedOptions);
CBPyramid->setObjectName(QString::fromUtf8("CBPyramid"));
- gridLayout2->addWidget(CBPyramid, 0, 0, 1, 2);
+ gridLayout_4->addWidget(CBPyramid, 0, 0, 1, 1);
- RBStandard = new QRadioButton(GBAdvancedOptions);
+ GBConforme = new QGroupBox(GBAdvancedOptions);
+ GBConforme->setObjectName(QString::fromUtf8("GBConforme"));
+ gridLayout_3 = new QGridLayout(GBConforme);
+ gridLayout_3->setObjectName(QString::fromUtf8("gridLayout_3"));
+ horizontalLayout_2 = new QHBoxLayout();
+ horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2"));
+ RBStandard = new QRadioButton(GBConforme);
RBStandard->setObjectName(QString::fromUtf8("RBStandard"));
RBStandard->setChecked(true);
- gridLayout2->addWidget(RBStandard, 1, 0, 1, 1);
+ horizontalLayout_2->addWidget(RBStandard);
- RBBox = new QRadioButton(GBAdvancedOptions);
+ RBBox = new QRadioButton(GBConforme);
RBBox->setObjectName(QString::fromUtf8("RBBox"));
RBBox->setChecked(false);
- gridLayout2->addWidget(RBBox, 1, 1, 1, 1);
+ horizontalLayout_2->addWidget(RBBox);
- RBNC1NpA = new QRadioButton(GBAdvancedOptions);
+ RBNC1NpA = new QRadioButton(GBConforme);
RBNC1NpA->setObjectName(QString::fromUtf8("RBNC1NpA"));
- gridLayout2->addWidget(RBNC1NpA, 1, 2, 1, 1);
+ horizontalLayout_2->addWidget(RBNC1NpA);
- RBNCQuelconque = new QRadioButton(GBAdvancedOptions);
+ RBNCQuelconque = new QRadioButton(GBConforme);
RBNCQuelconque->setObjectName(QString::fromUtf8("RBNCQuelconque"));
- gridLayout2->addWidget(RBNCQuelconque, 1, 3, 1, 1);
+ horizontalLayout_2->addWidget(RBNCQuelconque);
+
+
+ gridLayout_3->addLayout(horizontalLayout_2, 0, 0, 1, 1);
+
+
+ gridLayout_4->addWidget(GBConforme, 1, 0, 1, 1);
+
+ GBFormat = new QGroupBox(GBAdvancedOptions);
+ GBFormat->setObjectName(QString::fromUtf8("GBFormat"));
+ gridLayout2 = new QGridLayout(GBFormat);
+ gridLayout2->setObjectName(QString::fromUtf8("gridLayout2"));
+ RBMED = new QRadioButton(GBFormat);
+ RBMED->setObjectName(QString::fromUtf8("RBMED"));
+ RBMED->setChecked(true);
+
+ gridLayout2->addWidget(RBMED, 0, 0, 1, 1);
+
+ RBSaturne2D = new QRadioButton(GBFormat);
+ RBSaturne2D->setObjectName(QString::fromUtf8("RBSaturne2D"));
+
+ gridLayout2->addWidget(RBSaturne2D, 0, 1, 1, 1);
+
+
+ gridLayout_4->addWidget(GBFormat, 2, 0, 1, 1);
- gridLayout_3->addWidget(GBAdvancedOptions, 11, 0, 1, 5);
+ gridLayout_5->addWidget(GBAdvancedOptions, 11, 0, 1, 6);
spacer_3 = new QSpacerItem(128, 13, QSizePolicy::Fixed, QSizePolicy::Minimum);
- gridLayout_3->addItem(spacer_3, 11, 6, 1, 1);
+ gridLayout_5->addItem(spacer_3, 11, 7, 1, 1);
spacer_4 = new QSpacerItem(239, 41, QSizePolicy::Minimum, QSizePolicy::Expanding);
- gridLayout_3->addItem(spacer_4, 12, 0, 1, 3);
+ gridLayout_5->addItem(spacer_4, 12, 0, 1, 5);
Comment = new QLabel(CreateCase);
Comment->setObjectName(QString::fromUtf8("Comment"));
- gridLayout_3->addWidget(Comment, 13, 0, 1, 1);
-
- verticalSpacer = new QSpacerItem(20, 35, QSizePolicy::Minimum, QSizePolicy::Expanding);
-
- gridLayout_3->addItem(verticalSpacer, 14, 1, 1, 1);
+ gridLayout_5->addWidget(Comment, 13, 0, 1, 2);
GroupButtons = new QGroupBox(CreateCase);
GroupButtons->setObjectName(QString::fromUtf8("GroupButtons"));
gridLayout3->addWidget(buttonCancel, 0, 2, 1, 1);
- gridLayout_3->addWidget(GroupButtons, 15, 0, 1, 5);
+ gridLayout_5->addWidget(GroupButtons, 14, 0, 1, 1);
+
+ verticalSpacer = new QSpacerItem(20, 35, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+ gridLayout_5->addItem(verticalSpacer, 14, 1, 1, 1);
spacer_2 = new QSpacerItem(128, 25, QSizePolicy::Fixed, QSizePolicy::Minimum);
- gridLayout_3->addItem(spacer_2, 15, 5, 1, 2);
+ gridLayout_5->addItem(spacer_2, 14, 6, 1, 2);
+ WName->raise();
+ GBTypeConf->raise();
+ GBBoundaryD->raise();
+ GBBoundaryA->raise();
+ CBAdvanced->raise();
+ GBAdvancedOptions->raise();
+ Comment->raise();
+ GroupButtons->raise();
+ RBSaturne2D->raise();
+ RBSaturne2D->raise();
+ RBSaturne2D->raise();
retranslateUi(CreateCase);
CBAdvanced->setText(QApplication::translate("CreateCase", "Advanced options", 0, QApplication::UnicodeUTF8));
GBAdvancedOptions->setTitle(QApplication::translate("CreateCase", "Advanced options", 0, QApplication::UnicodeUTF8));
CBPyramid->setText(QApplication::translate("CreateCase", "Authorized pyramids", 0, QApplication::UnicodeUTF8));
+ GBConforme->setTitle(QApplication::translate("CreateCase", "Conformit\303\251", 0, QApplication::UnicodeUTF8));
RBStandard->setText(QApplication::translate("CreateCase", "Standard", 0, QApplication::UnicodeUTF8));
RBBox->setText(QApplication::translate("CreateCase", "Box", 0, QApplication::UnicodeUTF8));
RBNC1NpA->setText(QApplication::translate("CreateCase", "1 node per edge", 0, QApplication::UnicodeUTF8));
RBNCQuelconque->setText(QApplication::translate("CreateCase", "Free", 0, QApplication::UnicodeUTF8));
+ GBFormat->setTitle(QApplication::translate("CreateCase", "Format", 0, QApplication::UnicodeUTF8));
+ RBMED->setText(QApplication::translate("CreateCase", "MED", 0, QApplication::UnicodeUTF8));
+ RBSaturne2D->setText(QApplication::translate("CreateCase", "Saturne 2D", 0, QApplication::UnicodeUTF8));
Comment->setText(QApplication::translate("CreateCase", " No comment.", 0, QApplication::UnicodeUTF8));
GroupButtons->setTitle(QString());
buttonHelp->setText(QApplication::translate("CreateCase", "Help", 0, QApplication::UnicodeUTF8));
<property name="autoFillBackground">
<bool>true</bool>
</property>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="0" colspan="2">
+ <layout class="QGridLayout" name="gridLayout_5">
+ <item row="0" column="0" colspan="3">
<widget class="QWidget" name="WName" native="true">
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
</layout>
</widget>
</item>
- <item row="0" column="2" colspan="3">
+ <item row="0" column="3" colspan="3">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</spacer>
</item>
- <item row="1" column="0" colspan="6">
+ <item row="1" column="0" colspan="7">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</item>
</layout>
</item>
- <item row="2" column="5">
+ <item row="2" column="6">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</spacer>
</item>
- <item row="3" column="0" colspan="6">
+ <item row="3" column="0" colspan="7">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</item>
</layout>
</item>
- <item row="3" column="6">
+ <item row="3" column="7">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</spacer>
</item>
- <item row="4" column="0" colspan="3">
+ <item row="4" column="0" colspan="4">
<widget class="QGroupBox" name="GBTypeConf">
<property name="title">
<string>Conformity type</string>
</layout>
</widget>
</item>
- <item row="5" column="0" colspan="4">
+ <item row="5" column="0" colspan="5">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</item>
</layout>
</item>
- <item row="5" column="4">
+ <item row="5" column="5">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</spacer>
</item>
- <item row="6" column="3">
+ <item row="6" column="4">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</spacer>
</item>
- <item row="7" column="0" colspan="5">
+ <item row="7" column="0" colspan="6">
<widget class="QGroupBox" name="GBBoundaryD">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
</layout>
</widget>
</item>
- <item row="8" column="0" colspan="7">
+ <item row="8" column="0" colspan="8">
<widget class="QGroupBox" name="GBBoundaryA">
<property name="minimumSize">
<size>
</layout>
</widget>
</item>
- <item row="9" column="0" colspan="3">
+ <item row="9" column="0" colspan="4">
<spacer name="spacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</spacer>
</item>
- <item row="10" column="0" colspan="2">
+ <item row="10" column="0" colspan="3">
<widget class="QCheckBox" name="CBAdvanced">
<property name="text">
<string>Advanced options</string>
</property>
</widget>
</item>
- <item row="11" column="0" colspan="5">
+ <item row="11" column="0" colspan="6">
<widget class="QGroupBox" name="GBAdvancedOptions">
<property name="title">
<string>Advanced options</string>
</property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0" colspan="2">
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="0" column="0">
<widget class="QCheckBox" name="CBPyramid">
<property name="text">
<string>Authorized pyramids</string>
</widget>
</item>
<item row="1" column="0">
- <widget class="QRadioButton" name="RBStandard">
- <property name="text">
- <string>Standard</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
+ <widget class="QGroupBox" name="GBConforme">
+ <property name="title">
+ <string>Conformité</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QRadioButton" name="RBStandard">
+ <property name="text">
+ <string>Standard</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="RBBox">
+ <property name="text">
+ <string>Box</string>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="RBNC1NpA">
+ <property name="text">
+ <string>1 node per edge</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="RBNCQuelconque">
+ <property name="text">
+ <string>Free</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QRadioButton" name="RBBox">
- <property name="text">
- <string>Box</string>
- </property>
- <property name="checked">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QRadioButton" name="RBNC1NpA">
- <property name="text">
- <string>1 node per edge</string>
- </property>
- </widget>
- </item>
- <item row="1" column="3">
- <widget class="QRadioButton" name="RBNCQuelconque">
- <property name="text">
- <string>Free</string>
- </property>
+ <item row="2" column="0">
+ <widget class="QGroupBox" name="GBFormat">
+ <property name="title">
+ <string>Format</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QRadioButton" name="RBMED">
+ <property name="text">
+ <string>MED</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QRadioButton" name="RBSaturne2D">
+ <property name="text">
+ <string>Saturne 2D</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
</layout>
</widget>
</item>
- <item row="11" column="6">
+ <item row="11" column="7">
<spacer name="spacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</spacer>
</item>
- <item row="12" column="0" colspan="3">
+ <item row="12" column="0" colspan="5">
<spacer name="spacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</spacer>
</item>
- <item row="13" column="0">
+ <item row="13" column="0" colspan="2">
<widget class="QLabel" name="Comment">
<property name="text">
<string> No comment.</string>
</property>
</widget>
</item>
- <item row="14" column="1">
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>35</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="15" column="0" colspan="5">
+ <item row="14" column="0">
<widget class="QGroupBox" name="GroupButtons">
<property name="title">
<string/>
</layout>
</widget>
</item>
- <item row="15" column="5" colspan="2">
+ <item row="14" column="1">
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>35</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="14" column="6" colspan="2">
<spacer name="spacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</spacer>
</item>
</layout>
+ <zorder>WName</zorder>
+ <zorder>GBTypeConf</zorder>
+ <zorder>GBBoundaryD</zorder>
+ <zorder>GBBoundaryA</zorder>
+ <zorder>CBAdvanced</zorder>
+ <zorder>GBAdvancedOptions</zorder>
+ <zorder>Comment</zorder>
+ <zorder>GroupButtons</zorder>
+ <zorder>RBSaturne2D</zorder>
+ <zorder>RBSaturne2D</zorder>
+ <zorder>RBSaturne2D</zorder>
</widget>
<resources/>
<connections/>
Ui_CreateCase(),
_aCaseName(""),_aDirName(""),
_ConfType(0),
+ _ExtType(0),
_Pyram(0)
{
MESSAGE("Debut du constructeur de MonCreateCase");
connect( RBNC1NpA, SIGNAL(clicked()), this, SLOT(SetNC1NpA()));
connect( RBNCQuelconque, SIGNAL(clicked()), this, SLOT(SetNCQuelconque()));
+ connect( RBMED, SIGNAL(clicked()), this, SLOT(SetMED()));
+ connect( RBSaturne2D, SIGNAL(clicked()), this, SLOT(SetSaturne2D()));
+
connect( buttonOk, SIGNAL(pressed()), this, SLOT(PushOnOK()));
connect( buttonApply, SIGNAL(pressed()), this, SLOT(PushOnApply(0)));
connect( buttonCancel, SIGNAL(pressed()), this, SLOT(close()));
aCase->SetDirName(aDirName.toStdString().c_str());
_aDirName=aDirName;
aCase->SetConfType(_ConfType);
+ aCase->SetExtType(_ExtType);
// Menage des eventuelles frontieres deja enregistrees
aCase->SupprBoundaryGroup() ;
_ConfType = 3;
}
// ------------------------------------------------------------------------
+void MonCreateCase::SetMED()
+// ------------------------------------------------------------------------
+{
+ _ExtType = 0 ;
+ RBMED->setChecked(true);
+}
+// ------------------------------------------------------------------------
+void MonCreateCase::SetSaturne2D()
+// ------------------------------------------------------------------------
+{
+ _ExtType = 1 ;
+ RBSaturne2D->setChecked(true);
+}
+// ------------------------------------------------------------------------
void MonCreateCase::SetBoundaryD()
// ------------------------------------------------------------------------
{
MESSAGE("Debut de SetAdvanced ");
if (CBAdvanced->isChecked())
{ GBAdvancedOptions->setVisible(1);
+ GBConforme->setVisible(1);
RBStandard->setVisible(1);
RBBox->setVisible(1);
if ( ( _ConfType == 0 ) || ( _ConfType == -1 ) )
else
{ RBNC1NpA->setVisible(1);
RBNCQuelconque->setVisible(1);}
+ GBFormat->setVisible(1);
+ RBMED->setVisible(1);
+ RBSaturne2D->setVisible(1);
}
else
{ GBAdvancedOptions->setVisible(0);
CBPyramid->setChecked(false);
_Pyram = 0 ;
SetStandard() ;
+ SetMED() ;
}
//
adjustSize();
QString _aDirName;
int _ConfType;
+ int _ExtType;
int _Pyram;
virtual void SetNC1NpA();
virtual void SetNCQuelconque();
+ virtual void SetMED();
+ virtual void SetSaturne2D();
+
virtual void SetBoundaryD();
virtual void PushBoundaryDiNew();
virtual void PushBoundaryDiEdit();
else { RBNonConforme->setChecked(true); };
RBConforme->setEnabled(false);
RBNonConforme->setEnabled(false);
+ int ExtType=aCase->GetExtType();
// Non affichage du mode de suivi de frontiere
CBBoundaryA->setVisible(0);
CBAdvanced->setEnabled(false) ;
int Pyram = aCase->GetPyram();
MESSAGE("Pyram "<<Pyram);
- if ( ( Pyram > 0 ) || ( ConfType < 0 ) || ( ConfType > 1 ) )
+ if ( ( Pyram > 0 ) || ( ConfType < 0 ) || ( ConfType > 1 ) || ( ExtType > 0 ) )
{ GBAdvancedOptions->setVisible(1);
+//
if ( Pyram > 0 )
{ CBPyramid->setChecked(true);
- CBPyramid->setEnabled(false);
+ CBPyramid->setVisible(1);
}
else
{ CBPyramid->setChecked(false);
CBPyramid->setVisible(0);
}
+ CBPyramid->setEnabled(false);
+//
if ( ( ConfType == 0 ) || ( ConfType == -1 ) )
{ if ( ConfType == 0 ) { RBStandard->setChecked(true); }
else { RBBox->setChecked(true); }
RBBox->setVisible(1);
RBNC1NpA->setVisible(0);
RBNCQuelconque->setVisible(0);
- RBStandard->setEnabled(false);
- RBBox->setEnabled(false);
}
else
{ if (ConfType==-2) { RBBox->setChecked(true);};
RBBox->setVisible(1);
RBNC1NpA->setVisible(1);
RBNCQuelconque->setVisible(1);
- RBStandard->setEnabled(false);
- RBBox->setEnabled(false);
- RBNC1NpA->setEnabled(false);
- RBNCQuelconque->setEnabled(false);
}
+ RBStandard->setEnabled(false);
+ RBBox->setEnabled(false);
+ RBNC1NpA->setEnabled(false);
+ RBNCQuelconque->setEnabled(false);
+//
+ if ( ExtType == 0 )
+ { GBFormat->setVisible(0);
+ RBMED->setChecked(true);
+ }
+ else
+ { GBFormat->setVisible(1);
+ RBMED->setVisible(1);
+ RBSaturne2D->setVisible(1);
+ RBSaturne2D->setChecked(true);
+ }
+ RBMED->setEnabled(false);
+ RBSaturne2D->setEnabled(false);
}
else
{ GBAdvancedOptions->setVisible(0);
CBPyramid->setChecked(false);
+ RBStandard->setChecked(true);
+ RBMED->setChecked(true);
}
//
// L'etat
return myHomardCas->GetConfType();
}
//=============================================================================
+void HOMARD_Cas_i::SetExtType( CORBA::Long ExtType )
+{
+ ASSERT( myHomardCas );
+// VERIFICATION( (ExtType>=0) && (ExtType<=1) );
+ myHomardCas->SetExtType( ExtType );
+}
+//=============================================================================
+CORBA::Long HOMARD_Cas_i::GetExtType()
+{
+ ASSERT( myHomardCas );
+ return myHomardCas->GetExtType();
+}
+//=============================================================================
void HOMARD_Cas_i::SetBoundingBox( const HOMARD::extrema& LesExtrema )
{
ASSERT( myHomardCas );
void SetConfType( CORBA::Long ConfType );
CORBA::Long GetConfType();
+ void SetExtType( CORBA::Long ExtType );
+ CORBA::Long GetExtType();
+
void SetBoundingBox( const HOMARD::extrema& LesExtremes );
HOMARD::extrema* GetBoundingBox();
// B. Lecture du fichier de configuration
// ATTENTION : on doit veiller a la coherence entre HomardDriver et CreateCaseFromIteration
int NumeIter ;
+ int TypeExt = 0 ;
int TypeConf = 0 ;
int Pyram = 0 ;
char* MeshName ;
// D. Parametrages lus dans le fichier de configuration
myCase->SetConfType (TypeConf) ;
+ myCase->SetExtType (TypeExt) ;
myCase->SetPyram (Pyram) ;
// E. Copie du fichier de maillage homard
int ConfType = myCase->GetConfType();
MESSAGE ( ". ConfType = " << ConfType );
- // D.2. Le maillage de depart
+ // D.1. Le type externe
+ int ExtType = myCase->GetExtType();
+ MESSAGE ( ". ExtType = " << ExtType );
+
+ // D.3. Le maillage de depart
const char* NomMeshParent = myIterationParent->GetMeshName();
MESSAGE ( ". NomMeshParent = " << NomMeshParent );
const char* MeshFileParent = myIterationParent->GetMeshFile();
MESSAGE ( ". MeshFileParent = " << MeshFileParent );
- // D.3. Le maillage associe a l'iteration
+ // D.4. Le maillage associe a l'iteration
const char* MeshFile = myIteration->GetMeshFile();
MESSAGE ( ". MeshFile = " << MeshFile );
FILE *file = fopen(MeshFile,"r");
}
}
- // D.4. Les types de raffinement et de deraffinement
+ // D.5. Les types de raffinement et de deraffinement
// Les appels corba sont lourds, il vaut mieux les grouper
HOMARD::listeTypes* ListTypes = myHypo->GetAdapRefinUnRef();
ASSERT(ListTypes->length() == 3);
// E. Texte du fichier de configuration
// E.1. Incontournables du texte
- myDriver->TexteAdap();
+ myDriver->TexteAdap(ExtType);
int iaux = 0 ;
myDriver->TexteMaillageHOMARD( DirComputePa, siter, iaux ) ;
myDriver->TexteMaillage(NomMeshParent, MeshFileParent, 0);
