Browse Source

Python binder fix for reading in files

master
Trevor Irons 4 years ago
parent
commit
098f53d289

+ 1
- 1
Modules/FDEM1D/include/DipoleSource.h View File

92
              *   used in Python wrapping
92
              *   used in Python wrapping
93
              */
93
              */
94
             static std::shared_ptr<DipoleSource> DeSerialize( const std::string& node ) {
94
             static std::shared_ptr<DipoleSource> DeSerialize( const std::string& node ) {
95
-                return DipoleSource::DeSerialize(YAML::Load(node));
95
+                return DipoleSource::DeSerialize(YAML::LoadFile(node));
96
             }
96
             }
97
 
97
 
98
             /** Returns a deep copy of the dipole. Used to make thread safe methods. Does not
98
             /** Returns a deep copy of the dipole. Used to make thread safe methods. Does not

+ 1
- 1
Modules/FDEM1D/include/FieldPoints.h View File

97
              *   used in Python wrapping
97
              *   used in Python wrapping
98
              */
98
              */
99
             static std::shared_ptr<FieldPoints> DeSerialize( const std::string& node ) {
99
             static std::shared_ptr<FieldPoints> DeSerialize( const std::string& node ) {
100
-                return FieldPoints::DeSerialize(YAML::Load(node));
100
+                return FieldPoints::DeSerialize(YAML::LoadFile(node));
101
             }
101
             }
102
 
102
 
103
             // ====================  OPERATORS     ===========================
103
             // ====================  OPERATORS     ===========================

+ 1
- 1
Modules/FDEM1D/include/LayeredEarthEM.h View File

67
              *   used in Python wrapping
67
              *   used in Python wrapping
68
              */
68
              */
69
             static std::shared_ptr< LayeredEarthEM > DeSerialize( const std::string& node ) {
69
             static std::shared_ptr< LayeredEarthEM > DeSerialize( const std::string& node ) {
70
-                return LayeredEarthEM::DeSerialize(YAML::Load(node));
70
+                return LayeredEarthEM::DeSerialize(YAML::LoadFile(node));
71
             }
71
             }
72
 
72
 
73
             /** @return a deep copy
73
             /** @return a deep copy

+ 1
- 1
Modules/FDEM1D/include/PolygonalWireAntenna.h View File

71
              *   used in Python wrapping
71
              *   used in Python wrapping
72
              */
72
              */
73
             static std::shared_ptr<PolygonalWireAntenna> DeSerialize( const std::string& node ) {
73
             static std::shared_ptr<PolygonalWireAntenna> DeSerialize( const std::string& node ) {
74
-                return PolygonalWireAntenna::DeSerialize(YAML::Load(node));
74
+                return PolygonalWireAntenna::DeSerialize(YAML::LoadFile(node));
75
             }
75
             }
76
 
76
 
77
             // ====================  OPERATORS     =======================
77
             // ====================  OPERATORS     =======================

+ 1
- 1
Modules/FDEM1D/include/WireAntenna.h View File

74
              *   used in Python wrapping
74
              *   used in Python wrapping
75
              */
75
              */
76
             static std::shared_ptr<WireAntenna> DeSerialize( const std::string& node ) {
76
             static std::shared_ptr<WireAntenna> DeSerialize( const std::string& node ) {
77
-                return WireAntenna::DeSerialize(YAML::Load(node));
77
+                return WireAntenna::DeSerialize(YAML::LoadFile(node));
78
             }
78
             }
79
 
79
 
80
             // ====================  OPERATORS     =======================
80
             // ====================  OPERATORS     =======================

+ 1
- 1
Modules/LemmaCore/include/ASCIIParser.h View File

79
      *   used in Python wrapping
79
      *   used in Python wrapping
80
      */
80
      */
81
     static std::shared_ptr<ASCIIParser> DeSerialize( const std::string& node ) {
81
     static std::shared_ptr<ASCIIParser> DeSerialize( const std::string& node ) {
82
-        return ASCIIParser::DeSerialize(YAML::Load(node));
82
+        return ASCIIParser::DeSerialize(YAML::LoadFile(node));
83
     }
83
     }
84
 
84
 
85
     /**
85
     /**

+ 1
- 1
Modules/LemmaCore/include/CubicSplineInterpolator.h View File

102
      *   used in Python wrapping
102
      *   used in Python wrapping
103
      */
103
      */
104
     static std::shared_ptr<CubicSplineInterpolator> DeSerialize( const std::string& node ) {
104
     static std::shared_ptr<CubicSplineInterpolator> DeSerialize( const std::string& node ) {
105
-        return CubicSplineInterpolator::DeSerialize(YAML::Load(node));
105
+        return CubicSplineInterpolator::DeSerialize(YAML::LoadFile(node));
106
     }
106
     }
107
 
107
 
108
     // ====================  OPERATORS     =======================
108
     // ====================  OPERATORS     =======================

+ 1
- 1
Modules/LemmaCore/include/RectilinearGrid.h View File

87
              *   used in Python wrapping
87
              *   used in Python wrapping
88
              */
88
              */
89
             static std::shared_ptr<RectilinearGrid> DeSerialize( const std::string& node ) {
89
             static std::shared_ptr<RectilinearGrid> DeSerialize( const std::string& node ) {
90
-                return RectilinearGrid::DeSerialize(YAML::Load(node));
90
+                return RectilinearGrid::DeSerialize(YAML::LoadFile(node));
91
             }
91
             }
92
 
92
 
93
             // ====================  OPERATORS     =======================
93
             // ====================  OPERATORS     =======================

+ 1
- 1
Modules/LemmaCore/include/RectilinearGridReader.h View File

82
              *   used in Python wrapping
82
              *   used in Python wrapping
83
              */
83
              */
84
             static std::shared_ptr<RectilinearGridReader> DeSerialize( const std::string& node ) {
84
             static std::shared_ptr<RectilinearGridReader> DeSerialize( const std::string& node ) {
85
-                return RectilinearGridReader::DeSerialize(YAML::Load(node));
85
+                return RectilinearGridReader::DeSerialize(YAML::LoadFile(node));
86
             }
86
             }
87
 
87
 
88
             /**
88
             /**

+ 1
- 1
python/setup.py View File

21
 
21
 
22
 setup(
22
 setup(
23
   name             = 'pyLemma',
23
   name             = 'pyLemma',
24
-  version          = '0.0.10', 
24
+  version          = '0.0.11', 
25
   author           = 'Trevor Irons and others',
25
   author           = 'Trevor Irons and others',
26
   author_email     = 'Trevor.Irons@lemmasoftware.org',
26
   author_email     = 'Trevor.Irons@lemmasoftware.org',
27
   description      = 'A short description of the app/lib',
27
   description      = 'A short description of the app/lib',

Loading…
Cancel
Save