From e1de91155932aa1d3b0b12d3e1553a9e099387d6 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Thu, 8 Feb 2018 16:30:35 +0100 Subject: [PATCH] Aggressive med321 porting to continue porting --- src/MEDLoader/MEDFileField.cxx | 4 ++-- src/MEDLoader/MEDFileField1TS.cxx | 8 +++++++- src/MEDLoader/MEDFileField1TS.hxx | 2 +- src/MEDLoader/MEDFileFieldMultiTS.cxx | 6 ++++++ src/MEDLoader/MEDFileFieldMultiTS.hxx | 2 +- src/MEDLoader/MEDLoader.cxx | 10 +++++----- 6 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/MEDLoader/MEDFileField.cxx b/src/MEDLoader/MEDFileField.cxx index 1042ac0d0..20db49c0f 100644 --- a/src/MEDLoader/MEDFileField.cxx +++ b/src/MEDLoader/MEDFileField.cxx @@ -276,11 +276,11 @@ try:MEDFileFieldGlobsReal(fid) _fields[i]=MEDFileIntFieldMultiTSWithoutSDA::New(fid,fieldName,meshName,typcha,infos,nbOfStep,dtunit,loadAll,ms,entities); break; } - case MED_FLOAT32: + /*case MED_FLOAT32: { _fields[i]=MEDFileFloatFieldMultiTSWithoutSDA::New(fid,fieldName,meshName,typcha,infos,nbOfStep,dtunit,loadAll,ms,entities); break; - } + }*/ case MED_INT: { if(sizeof(med_int)==sizeof(int)) diff --git a/src/MEDLoader/MEDFileField1TS.cxx b/src/MEDLoader/MEDFileField1TS.cxx index 004c178c5..2989cf6e7 100644 --- a/src/MEDLoader/MEDFileField1TS.cxx +++ b/src/MEDLoader/MEDFileField1TS.cxx @@ -1684,11 +1684,13 @@ MEDFileAnyTypeField1TSWithoutSDA *MEDFileAnyTypeField1TS::BuildContentFrom(med_i ret=MEDFileIntField1TSWithoutSDA::New(fieldName,meshName,-1,-1/*iteration*/,-1/*order*/,std::vector()); break; } - case MED_FLOAT32: +#if 0 + case MED_FLOAT32: { ret=MEDFileFloatField1TSWithoutSDA::New(fieldName,meshName,-1,-1/*iteration*/,-1/*order*/,std::vector()); break; } +#endif case MED_INT: { if(sizeof(med_int)==sizeof(int)) @@ -1752,11 +1754,13 @@ MEDFileAnyTypeField1TSWithoutSDA *MEDFileAnyTypeField1TS::BuildContentFrom(med_i ret=MEDFileIntField1TSWithoutSDA::New(fieldName,meshName,-1,-1/*iteration*/,-1/*order*/,std::vector()); break; } +#if 0 case MED_FLOAT32: { ret=MEDFileFloatField1TSWithoutSDA::New(fieldName,meshName,-1,-1/*iteration*/,-1/*order*/,std::vector()); break; } +#endif case MED_INT: { if(sizeof(med_int)==sizeof(int)) @@ -1912,11 +1916,13 @@ MEDFileAnyTypeField1TSWithoutSDA *MEDFileAnyTypeField1TS::BuildContentFrom(med_i ret=MEDFileIntField1TSWithoutSDA::New(fieldName,meshName,-1,iteration,order,std::vector()); break; } +#if 0 case MED_FLOAT32: { ret=MEDFileFloatField1TSWithoutSDA::New(fieldName,meshName,-1,iteration,order,std::vector()); break; } +#endif case MED_INT: { if(sizeof(med_int)==sizeof(int)) diff --git a/src/MEDLoader/MEDFileField1TS.hxx b/src/MEDLoader/MEDFileField1TS.hxx index 54f75f887..155dd85ae 100644 --- a/src/MEDLoader/MEDFileField1TS.hxx +++ b/src/MEDLoader/MEDFileField1TS.hxx @@ -444,7 +444,7 @@ namespace MEDCoupling { friend class MEDFileTemplateField1TS; private: - med_field_type getMEDFileFieldType() const { return MED_FLOAT32; } + med_field_type getMEDFileFieldType() const { return MED_INT32; } MEDLOADER_EXPORT MEDFileFloatField1TS *shallowCpy() const { return new MEDFileFloatField1TS(*this); } private: ~MEDFileFloatField1TS() { } diff --git a/src/MEDLoader/MEDFileFieldMultiTS.cxx b/src/MEDLoader/MEDFileFieldMultiTS.cxx index 7630fc4c9..07fb0d371 100644 --- a/src/MEDLoader/MEDFileFieldMultiTS.cxx +++ b/src/MEDLoader/MEDFileFieldMultiTS.cxx @@ -502,11 +502,13 @@ void MEDFileAnyTypeFieldMultiTSWithoutSDA::loadStructureOrStructureAndBigArraysR _time_steps[i]=MEDFileIntField1TSWithoutSDA::New(getName(),getMeshName(),i+1,numdt,numo,_infos); break; } +#if 0 case MED_FLOAT32: { _time_steps[i]=MEDFileFloatField1TSWithoutSDA::New(getName(),getMeshName(),i+1,numdt,numo,_infos); break; } +#endif case MED_INT: { if(sizeof(med_int)==sizeof(int)) @@ -1160,11 +1162,13 @@ MEDFileAnyTypeFieldMultiTSWithoutSDA *MEDFileAnyTypeFieldMultiTS::BuildContentFr ret=new MEDFileIntFieldMultiTSWithoutSDA(fid,i,loadAll,ms,entities); break; } +#if 0 case MED_FLOAT32: { ret=new MEDFileFloatFieldMultiTSWithoutSDA(fid,i,loadAll,ms,entities); break; } +#endif case MED_INT: { if(sizeof(med_int)==sizeof(int)) @@ -1204,11 +1208,13 @@ MEDFileAnyTypeFieldMultiTSWithoutSDA *MEDFileAnyTypeFieldMultiTS::BuildContentFr ret=new MEDFileIntFieldMultiTSWithoutSDA(fid,0,loadAll,ms,0); break; } +#if 0 case MED_FLOAT32: { ret=new MEDFileFloatFieldMultiTSWithoutSDA(fid,0,loadAll,ms,0); break; } +#endif case MED_INT: { if(sizeof(med_int)==sizeof(int)) diff --git a/src/MEDLoader/MEDFileFieldMultiTS.hxx b/src/MEDLoader/MEDFileFieldMultiTS.hxx index 40a9e08a9..534c67288 100644 --- a/src/MEDLoader/MEDFileFieldMultiTS.hxx +++ b/src/MEDLoader/MEDFileFieldMultiTS.hxx @@ -188,7 +188,7 @@ namespace MEDCoupling protected: MEDFileFloatFieldMultiTSWithoutSDA(const std::string& fieldName, const std::string& meshName):MEDFileNDTemplateFieldMultiTSWithoutSDA(fieldName,meshName) { } MEDFileFloatFieldMultiTSWithoutSDA(med_idt fid, const std::string& fieldName, const std::string& meshName, med_field_type fieldTyp, const std::vector& infos, int nbOfStep, const std::string& dtunit, bool loadAll, const MEDFileMeshes *ms, const MEDFileEntities *entities):MEDFileNDTemplateFieldMultiTSWithoutSDA(fid,fieldName,meshName,fieldTyp,infos,nbOfStep,dtunit,loadAll,ms,entities) { } - med_field_type getMEDFileFieldType() const { return MED_FLOAT32; } + med_field_type getMEDFileFieldType() const { return MED_INT32; } public: MEDLOADER_EXPORT MEDFileFloatFieldMultiTSWithoutSDA() { } }; diff --git a/src/MEDLoader/MEDLoader.cxx b/src/MEDLoader/MEDLoader.cxx index fcbe7d8eb..8cf534bdb 100644 --- a/src/MEDLoader/MEDLoader.cxx +++ b/src/MEDLoader/MEDLoader.cxx @@ -49,7 +49,7 @@ #include -med_geometry_type typmai[MED_N_CELL_FIXED_GEO] = { MED_POINT1, +med_geometry_type typmai[MED_N_CELL_FIXED_GEO+1] = { MED_POINT1, MED_SEG2, MED_SEG3, MED_SEG4, @@ -67,7 +67,7 @@ med_geometry_type typmai[MED_N_CELL_FIXED_GEO] = { MED_POINT1, MED_TETRA10, MED_PYRA13, MED_PENTA15, - MED_PENTA18, + MED_PENTA15, MED_HEXA20, MED_HEXA27, MED_POLYGON, @@ -76,7 +76,7 @@ med_geometry_type typmai[MED_N_CELL_FIXED_GEO] = { MED_POINT1, med_geometry_type typmainoeud[1] = { MED_NONE }; -INTERP_KERNEL::NormalizedCellType typmai2[MED_N_CELL_FIXED_GEO] = { INTERP_KERNEL::NORM_POINT1, +INTERP_KERNEL::NormalizedCellType typmai2[MED_N_CELL_FIXED_GEO+1] = { INTERP_KERNEL::NORM_POINT1, INTERP_KERNEL::NORM_SEG2, INTERP_KERNEL::NORM_SEG3, INTERP_KERNEL::NORM_SEG4, @@ -94,7 +94,7 @@ INTERP_KERNEL::NormalizedCellType typmai2[MED_N_CELL_FIXED_GEO] = { INTERP_KERNE INTERP_KERNEL::NORM_TETRA10, INTERP_KERNEL::NORM_PYRA13, INTERP_KERNEL::NORM_PENTA15, - INTERP_KERNEL::NORM_PENTA18, + INTERP_KERNEL::NORM_PENTA15, INTERP_KERNEL::NORM_HEXA20, INTERP_KERNEL::NORM_HEXA27, INTERP_KERNEL::NORM_POLYGON, @@ -129,7 +129,7 @@ med_geometry_type typmai3[34] = { MED_POINT1,//0 MED_PENTA15,//25 MED_NONE,//26 MED_HEXA27,//27 - MED_PENTA18,//28 + MED_PENTA15,//28 MED_NONE,//29 MED_HEXA20,//30 MED_POLYHEDRON,//31 -- 2.39.2