Merge from tetra_hpc branch

[plugins/ghs3dprlplugin.git] / src / tepal2med / tepal2med.cxx

diff --git a/src/tepal2med/tepal2med.cxx b/src/tepal2med/tepal2med.cxx
index ab69867400fad4c8de9164ab96e6fab83130a382..d8be454df11608d243b2ab7f0631c95be6048408 100755 (executable)
--- a/src/tepal2med/tepal2med.cxx
+++ b/src/tepal2med/tepal2med.cxx
@@ -147,8 +147,9 @@ bool ReadFileMED(QString nomfilemed,ghs3dprl_mesh_wrap *mymailw)
       ret = MEDfileClose(fid);
       return false;
    }
-   if (mdim != 3){
-      std::cerr<<"Problem mesh dimension should be 3: "<<mdim<<"\n";
+   //changed with version med: a triangles mesh in 3d is dim 2 now and 3 before 2014
+   if (mdim != 2 && mdim != 3){
+      std::cerr<<"Problem mesh dimension should be 2 or 3: "<<mdim<<"\n";
       ret = MEDfileClose(fid);
       return false;
    }
@@ -328,7 +329,7 @@ if (mymailw->verbose>3){
    med_float *coo=new med_float[nnoe*sdim];
    /* table des numeros de familles des noeuds profil : (nombre de noeuds) */
    med_int *famnodesskin=new med_int[nnoe];
-   med_int *pfltab=new med_int[1]; //inutilise car on lit tout 
+   //med_int *pfltab=new med_int[1]; //inutilise car on lit tout 
    //lecture des noeuds : coordonnees
    ret=MEDmeshNodeCoordinateRd(fid,mymailw->nommaa,MED_NO_DT,MED_NO_IT,MED_FULL_INTERLACE,coo);
           //mdim,coo,mode_coo,MED_ALL,pfltab,0,&rep,mymailw->nomcoo,mymailw->unicoo);
@@ -378,10 +379,10 @@ if (mymailw->verbose>3){
      } 
      std::cout<<std::endl;
    }
-
+   //std::cout<<"\ncvw1 conn nbtria3 "<<nbtria3<<"dt "<<MED_NO_DT<<"it "<<MED_NO_IT<<"cell "<<MED_CELL<<"tria3 "<<MED_TRIA3<<std::endl;
    med_int *conn3=new med_int[nbtria3*3];
    ret=MEDmeshElementConnectivityRd(fid,mymailw->nommaa,MED_NO_DT,MED_NO_IT,
-           MED_CELL,MED_TRIA3,MED_NODAL,MED_FULL_INTERLACE,pfltab);
+           MED_CELL,MED_TRIA3,MED_NODAL,MED_FULL_INTERLACE,conn3);
            //MEDconnLire(fid,mymailw->nommaa,mdim,conn3,mode_coo,pfltab,0,MED_MAILLE,MED_TRIA3,MED_NOD);
    if (ret < 0){
       std::cerr<<"Problem reading MED_TRIA3\n";
@@ -529,7 +530,7 @@ int main(int argc, char *argv[])
    QString path,pathini,casename,casenamemed,fileskinmed,
            tmp,cmd,format,
            test,menu,launchtepal,background,deletegroups,
-           version="V2.0 (MED3)";
+           version="V3.0 (MED3+tepalv1)";
    
    char *chelp=NULL,
         *ccasename=NULL,
@@ -667,7 +668,7 @@ int main(int argc, char *argv[])
    if (menu=="yes") {
     QApplication a(argc,argv);
     dlg_ghs3dmain *m = new dlg_ghs3dmain();
-    m->setWindowTitle("tepal2med 2.1");
+    m->setWindowTitle("tepal2med 3.0");
     m->show();
     a.exec();
     if ( m->result() == QDialog::Accepted ) {
@@ -776,6 +777,8 @@ int main(int argc, char *argv[])
    int nbf=format.length();
    format=format.sprintf(".%%.%dd.%%.%dd",nbf,nbf);
    mymailw->format=format;
+   mymailw->format_tetra=format; //here is tepal: not used
+   mymailw->for_tetrahpc=false; //to know what files to read: .noboite or .mesh
    
    //something like "/home/wambeke/tmp/GHS3DPRL_skin.med"
    fileskinmed=pathini+casename+"_skin.med";