Bläddra i källkod

Moved a few pieces around and worked on Serialization a bit.

enhancement_3
Trevor Irons 8 år sedan
förälder
incheckning
afe5dc6790

+ 0
- 61
LemmaCore/include/Lemma Visa fil

@@ -1,61 +0,0 @@
1
-/* This file is part of Lemma, a geophysical modelling and inversion API */
2
-
3
-/* Copyright (C) 2009-2013 Trevor Irons <trevorirons@gmail.com> */
4
-
5
-/* This Source Code Form is subject to the terms of the Mozilla Public
6
- * License, v. 2.0. If a copy of the MPL was not distributed with this
7
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
8
-
9
-/**
10
-  @file
11
-  @author   Trevor Irons
12
-  @version  $Id$
13
- **/
14
-
15
-// Convenience include all of Lemma
16
-
17
-#ifndef  LEMMAINCLUDE_INC
18
-#define  LEMMAINCLUDE_INC
19
-
20
-// Basic EM Classes
21
-//#include "dipolesource.h"
22
-#include "emearth1d.h"
23
-#include "emearth3d.h"
24
-#include "kernel.h"
25
-#include "receiverpoints.h"
26
-#include "receivercubes.h"
27
-#include "hankeltransformgaussianquadrature.h"
28
-#include "layeredearthem.h"
29
-#include "WireAntenna.h"
30
-#include "PolygonalWireAntenna.h"
31
-#include "gaussianquadrature.h"
32
-#include "digitalfiltercostrans.h"
33
-#include "octreegrid.h"
34
-
35
-// TEM
36
-#include "TEMSurvey.h"
37
-#include "TEMInductiveReceiver.h"
38
-#include "TEMTransmitter.h"
39
-
40
-//#include "rectilineargrid.h"
41
-
42
-// Specialized EM Classes
43
-#include "instrumenttem.h"
44
-#include "instrumentfem.h"
45
-
46
-// TEM Classes
47
-#include "datatem.h"
48
-#include "modelreadertem1dubc.h"
49
-#include "datareadertem.h"
50
-
51
-// FEM Classes
52
-#include "datareaderfemubc.h"
53
-#include "datafem.h"
54
-
55
-// Inverse
56
-#include "quasinewtonbfgs.h"
57
-#include "inversesolvertem1d.h"
58
-#endif   // ----- #ifndef LEMMAINCLUDE_INC  -----
59
-
60
-/* vim: set tabstop=4 expandtab: */
61
-/* vim: set filetype=cpp: */

+ 40
- 0
LemmaCore/include/LemmaCore Visa fil

@@ -0,0 +1,40 @@
1
+/* This file is part of Lemma, a geophysical modelling and inversion API */
2
+
3
+/* Copyright (C) 2009-2013 Trevor Irons <trevorirons@gmail.com> */
4
+
5
+/* This Source Code Form is subject to the terms of the Mozilla Public
6
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
7
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
8
+
9
+/**
10
+  @file
11
+  @author   Trevor Irons
12
+  @version  $Id$
13
+ **/
14
+
15
+// Convenience include all of LemmaCore
16
+#ifndef  LEMMAINCLUDE_INC
17
+#define  LEMMAINCLUDE_INC
18
+#include "ASCIIParser.h"
19
+#include "CubicSplineInterpolator.h"
20
+//#include "Data.h"
21
+//#include "DataReader.h"
22
+//#include "EarthModel.h"
23
+//#include "Filter.h"
24
+//#include "Grid.h"
25
+//#include "GridReader.h"
26
+//#include "Instrument.h"
27
+//#include "LayeredEarth.h"
28
+//#include "LemmaObject.h"
29
+#include "RectilinearGrid.h"
30
+#include "RectilinearGridReader.h"
31
+#include "RectilinearGridVTKExporter.h"
32
+#include "WindowFilter.h"
33
+#include "banner.h"
34
+#include "helper.h"
35
+#include "timer.h"
36
+
37
+#endif   // ----- #ifndef LEMMAINCLUDE_INC  -----
38
+
39
+/* vim: set tabstop=4 expandtab: */
40
+/* vim: set filetype=cpp: */

+ 6
- 2
LemmaCore/include/LemmaObject.h Visa fil

@@ -20,6 +20,7 @@
20 20
 #include "yaml-cpp/yaml.h"
21 21
 #endif
22 22
 
23
+#include <chrono>
23 24
 #include <memory>
24 25
 
25 26
 namespace Lemma {
@@ -49,7 +50,6 @@ class LemmaObject {
49 50
     public:
50 51
 
51 52
         // ====================  LIFECYCLE     ==============================
52
-        //virtual std::shared_ptr<LemmaObject> NewSP() const = 0;
53 53
 
54 54
         // Needed because many derived classes have Eigen vectors as members,
55 55
         // causing alignment issues when vectorisation is enabled.
@@ -79,7 +79,11 @@ class LemmaObject {
79 79
          *        all external classes that might need to be serialized.
80 80
          */
81 81
         virtual YAML::Node Serialize() const {
82
-            return YAML::Node();
82
+            YAML::Node node = YAML::Node();
83
+
84
+            std::time_t now = std::chrono::system_clock::to_time_t( std::chrono::system_clock::now() );
85
+            node["Serialized"] = std::ctime(&now);
86
+            return node;
83 87
         };
84 88
         #endif
85 89
 

LemmaCore/include/AEMSurvey.h → Modules/FDEM1D/AEMSurvey.h Visa fil


LemmaCore/include/AEMSurveyReader.h → Modules/FDEM1D/AEMSurveyReader.h Visa fil


LemmaCore/include/bicgstab.h → Modules/Optimization/include/bicgstab.h Visa fil


LemmaCore/include/cg.h → Modules/Optimization/include/cg.h Visa fil


LemmaCore/include/logbarriercg.h → Modules/Optimization/include/logbarriercg.h Visa fil


LemmaCore/include/logbarriercg_newton.h → Modules/Optimization/include/logbarriercg_newton.h Visa fil


Laddar…
Avbryt
Spara