Salome HOME
projects
/
modules
/
homard.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated copyright comment
[modules/homard.git]
/
src
/
HOMARD
/
HOMARD_DriverTools.cxx
diff --git
a/src/HOMARD/HOMARD_DriverTools.cxx
b/src/HOMARD/HOMARD_DriverTools.cxx
old mode 100755
(executable)
new mode 100644
(file)
index
7e464eb
..
b95893e
--- a/
src/HOMARD/HOMARD_DriverTools.cxx
+++ b/
src/HOMARD/HOMARD_DriverTools.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2011-20
14 CEA/DEN, EDF R&D
+// Copyright (C) 2011-20
24 CEA, EDF
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-112,6
+112,7
@@
namespace HOMARD
os << cas.GetName();
os << separator() << cas.GetDirName();
os << separator() << cas.GetConfType();
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();
std::vector<double> coor = cas.GetBoundingBox();
os << separator() << coor.size();
@@
-302,10
+303,14
@@
namespace HOMARD
os << separator() << BoundaryType ;
os << separator() << boundary.GetCaseCreation() ;
os << separator() << BoundaryType ;
os << separator() << boundary.GetCaseCreation() ;
- if ( BoundaryType == 0 )
+ if ( BoundaryType == -1 )
+ {
+ os << separator() << boundary.GetDataFile();
+ }
+ else if ( BoundaryType == 0 )
{
os << separator() << boundary.GetMeshName();
{
os << separator() << boundary.GetMeshName();
- os << separator() << boundary.Get
Mesh
File();
+ os << separator() << boundary.Get
Data
File();
}
else {
std::vector<double> coor = boundary.GetCoords() ;
}
else {
std::vector<double> coor = boundary.GetCoords() ;
@@
-380,6
+385,10
@@
namespace HOMARD
if ( !ok ) return false;
cas.SetConfType( atoi( chunk.c_str() ) );
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;
chunk = getNextChunk( stream, start, ok );
if ( !ok ) return false;
@@
-739,12
+748,20
@@
namespace HOMARD
// Si analytique, les coordonnees des frontieres : le nombre depend du type
// Si discret, le maillage
// Si analytique, les coordonnees des frontieres : le nombre depend du type
// Si discret, le maillage
+ // Si CAO, la géométrie
int lgcoords ;
int lgcoords ;
- if ( BoundaryType == 1 ) { lgcoords = 7 ; }
+ if ( BoundaryType == -1 ) { lgcoords = -1 ; }
+ else if ( BoundaryType == 1 ) { lgcoords = 7 ; }
else if ( BoundaryType == 2 ) { lgcoords = 4 ; }
else { lgcoords = 0 ; }
//
else if ( BoundaryType == 2 ) { lgcoords = 4 ; }
else { lgcoords = 0 ; }
//
- if ( lgcoords == 0 )
+ if ( lgcoords == -1 )
+ {
+ chunk = getNextChunk( stream, start, ok );
+ if ( !ok ) return false;
+ boundary.SetDataFile( chunk.c_str() );
+ }
+ else if ( lgcoords == 0 )
{
chunk = getNextChunk( stream, start, ok );
if ( !ok ) return false;
{
chunk = getNextChunk( stream, start, ok );
if ( !ok ) return false;
@@
-752,7
+769,7
@@
namespace HOMARD
chunk = getNextChunk( stream, start, ok );
if ( !ok ) return false;
chunk = getNextChunk( stream, start, ok );
if ( !ok ) return false;
- boundary.Set
Mesh
File( chunk.c_str() );
+ boundary.Set
Data
File( chunk.c_str() );
}
else
{ std::vector<double> coords;
}
else
{ std::vector<double> coords;