Quellcode durchsuchen

default build typ

lagkey
Trevor Irons vor 6 Jahren
Ursprung
Commit
7f82f6216f
2 geänderte Dateien mit 26 neuen und 20 gelöschten Zeilen
  1. 13
    7
      CMakeLists.txt
  2. 13
    13
      Modules/FDEM1D/examples/femforward.cpp

+ 13
- 7
CMakeLists.txt Datei anzeigen

@@ -23,7 +23,13 @@ set(LEMMA_VERSION_NOQUOTES "${LEMMA_VERSION_MAJOR}.${LEMMA_VERSION_MINOR}.${LEMM
23 23
 
24 24
 ## Options--what do you want to do
25 25
 
26
-option ( BUILD_SHARED_LIBS          "Shared or static libraries"  OFF ) 
26
+option ( BUILD_SHARED_LIBS      "Shared or static libraries"  OFF )
27
+option ( CMAKE_BUILD_TYPE       "Debug Release"  RELEASE )
28
+#   set(CMAKE_BUILD_TYPE "Release" CACHE STRING
29
+#       "Choose the type of build, options are: Debug Release
30
+#        RelWithDebInfo MinSizeRel."
31
+#       FORCE)
32
+ 
27 33
 option ( LEMMA_ENABLE_TESTING       "Turn on unit testing" OFF )
28 34
 option ( LEMMA_BUILD_EXAMPLES       "Compile example Lemma applications" OFF )
29 35
 option ( LEMMA_USE_OPENMP           "Use OpenMP in Lemma" OFF )
@@ -134,12 +140,12 @@ else()
134 140
 	set(LABEL_SUFFIX "static")
135 141
 endif()
136 142
 
137
-if(NOT CMAKE_BUILD_TYPE)
138
-   set(CMAKE_BUILD_TYPE "Release" CACHE STRING
139
-       "Choose the type of build, options are: Debug Release
140
-        RelWithDebInfo MinSizeRel."
141
-       FORCE)
142
-endif(NOT CMAKE_BUILD_TYPE)
143
+#if(NOT CMAKE_BUILD_TYPE)
144
+#   set(CMAKE_BUILD_TYPE "Release" CACHE STRING
145
+#       "Choose the type of build, options are: Debug Release
146
+#        RelWithDebInfo MinSizeRel."
147
+#       FORCE)
148
+#endif(NOT CMAKE_BUILD_TYPE)
143 149
 
144 150
 ###################
145 151
 # External Projects

+ 13
- 13
Modules/FDEM1D/examples/femforward.cpp Datei anzeigen

@@ -1,21 +1,21 @@
1 1
 // ===========================================================================
2
-// 
2
+//
3 3
 //       Filename:  utfemforward.cpp
4
-// 
5
-//    Description:  
6
-// 
4
+//
5
+//    Description:
6
+//
7 7
 //        Version:  0.0
8 8
 //        Created:  01/15/2013 12:11:34 PM
9 9
 //       Revision:  none
10
-//       Compiler:  Tested with g++ 
11
-// 
10
+//       Compiler:  Tested with g++
11
+//
12 12
 //         Author:  M. Andy Kass (MAK)
13 13
 //
14 14
 //   Organisation:  Broken Spoke Development, LLC
15
-//                  
15
+//
16 16
 //
17 17
 //          Email:  mkass@numericalgeo.com
18
-// 
18
+//
19 19
 //  This program is free software: you can redistribute it and/or modify
20 20
 //  it under the terms of the GNU General Public License as published by
21 21
 //  the Free Software Foundation, either version 3 of the License, or
@@ -71,14 +71,14 @@ int main() {
71 71
 	DataFEM* modelledData = DataFEM::New();
72 72
 
73 73
 	// Create instrument object
74
-	InstrumentFem* theinstrument = InstrumentFem::New();	
74
+	InstrumentFem* theinstrument = InstrumentFem::New();
75 75
 
76 76
 	// Set up EMEarthModel
77 77
 	Earth->SetNumberOfLayers(5);
78 78
 	Earth->SetLayerConductivity((VectorXcr(5) << 0.,1.e-4,1.e-2,
79 79
 		1.e-4,1.e-6).finished());
80 80
 	Earth->SetLayerThickness((VectorXr(3) << 20.,5.,50.).finished());
81
-	
81
+
82 82
 	// Set up transmitter
83 83
 	Real momtemp;
84 84
 	momtemp = 1;
@@ -111,7 +111,7 @@ int main() {
111 111
 
112 112
 	// See what comes back...
113 113
 	std::cout << Receivers->GetHfield(0,0)(2) << std::endl;
114
-	
114
+
115 115
 	// Need to convert H field to ppm
116 116
 
117 117
 
@@ -171,10 +171,10 @@ int main() {
171 171
 //	for (int ii=0;ii<nObs;ii++) {
172 172
 //		for (int jj=0;jj<nFreqs;jj++) {
173 173
 //			Trans->SetMoment(inpdata->GetTxMom().coeff(jj));
174
-//			
174
+//
175 175
 //		}
176 176
 //	}
177
-	
177
+
178 178
 	//This is a bunch of testing stuff
179 179
 	//theinstrument->AlignWithData(inpdata);
180 180
 	//theinstrument->MakeCalculation();

Laden…
Abbrechen
Speichern