Sfoglia il codice sorgente

Python binder fix for reading in files

master
Trevor Irons 5 anni fa
parent
commit
098f53d289

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

@@ -92,7 +92,7 @@ namespace Lemma {
92 92
              *   used in Python wrapping
93 93
              */
94 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 98
             /** Returns a deep copy of the dipole. Used to make thread safe methods. Does not

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

@@ -97,7 +97,7 @@ namespace Lemma {
97 97
              *   used in Python wrapping
98 98
              */
99 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 103
             // ====================  OPERATORS     ===========================

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

@@ -67,7 +67,7 @@ namespace Lemma {
67 67
              *   used in Python wrapping
68 68
              */
69 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 73
             /** @return a deep copy

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

@@ -71,7 +71,7 @@ namespace Lemma {
71 71
              *   used in Python wrapping
72 72
              */
73 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 77
             // ====================  OPERATORS     =======================

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

@@ -74,7 +74,7 @@ namespace Lemma {
74 74
              *   used in Python wrapping
75 75
              */
76 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 80
             // ====================  OPERATORS     =======================

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

@@ -79,7 +79,7 @@ class ASCIIParser : public LemmaObject {
79 79
      *   used in Python wrapping
80 80
      */
81 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 Vedi File

@@ -102,7 +102,7 @@ class CubicSplineInterpolator : public LemmaObject {
102 102
      *   used in Python wrapping
103 103
      */
104 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 108
     // ====================  OPERATORS     =======================

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

@@ -87,7 +87,7 @@ namespace Lemma {
87 87
              *   used in Python wrapping
88 88
              */
89 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 93
             // ====================  OPERATORS     =======================

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

@@ -82,7 +82,7 @@ namespace Lemma {
82 82
              *   used in Python wrapping
83 83
              */
84 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 Vedi File

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

Loading…
Annulla
Salva