소스 검색

Resolved conflict

lagkey
John Daily 6 년 전
부모
커밋
9dd2aaf3b5
4개의 변경된 파일9개의 추가작업 그리고 18개의 파일을 삭제
  1. 1
    1
      CMake/Mingw-Cross.cmake
  2. 7
    8
      CMakeLists.txt
  3. 0
    1
      Modules/FDEM1D/examples/Hantenna.cpp
  4. 1
    8
      Modules/FDEM1D/src/EMEarth1D.cpp

+ 1
- 1
CMake/Mingw-Cross.cmake 파일 보기

@@ -37,4 +37,4 @@ set( CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "" )
37 37
 #set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
38 38
 #Static Libs
39 39
 #Set Linker flags
40
-set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
40
+set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static")

+ 7
- 8
CMakeLists.txt 파일 보기

@@ -22,13 +22,12 @@ set(LEMMA_VERSION_NOQUOTES "${LEMMA_VERSION_MAJOR}.${LEMMA_VERSION_MINOR}.${LEMM
22 22
 ########################################
23 23
 
24 24
 ## Options--what do you want to do
25
-
26 25
 option ( BUILD_SHARED_LIBS      "Shared or static libraries"  OFF )
27
-set(CMAKE_BUILD_TYPE "Release") # STRING
28
-#       "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel."
29
-#       FORCE cache)
30
-set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS Debug Release RelWithDebInfo MinSizeRel )
31
- 
26
+
27
+IF( NOT CMAKE_BUILD_TYPE )
28
+   SET( CMAKE_BUILD_TYPE Release ... FORCE )
29
+ENDIF()
30
+
32 31
 option ( LEMMA_ENABLE_TESTING       "Turn on unit testing" OFF )
33 32
 option ( LEMMA_BUILD_EXAMPLES       "Compile example Lemma applications" OFF )
34 33
 option ( LEMMA_USE_OPENMP           "Use OpenMP in Lemma" OFF )
@@ -57,8 +56,8 @@ if (CMAKE_CROSSCOMPILING)
57 56
     UNSET( yaml-cpp_DIR CACHE ) 
58 57
     UNSET( Eigen3_FOUND CACHE ) 
59 58
     UNSET( yaml-cpp_FOUND CACHE ) 
60
-    find_package (yaml-cpp 0.6 PATHS ${CMAKE_INSTALL_PREFIX} REQUIRED ) #QUIET )  # Serialisation of classes 
61
-    find_package (Eigen3 3.3 PATHS ${CMAKE_INSTALL_PREFIX} REQUIRED )   # QUIET)     # Matrix/Vector & Math
59
+    find_package (yaml-cpp 0.6 PATHS ${CMAKE_INSTALL_PREFIX} ) #QUIET )  # Serialisation of classes 
60
+    find_package (Eigen3 3.3 PATHS ${CMAKE_INSTALL_PREFIX}  )   # QUIET)     # Matrix/Vector & Math
62 61
 endif()
63 62
 
64 63
 find_package (Eigen3 3.3 QUIET)     # Matrix/Vector & Math

+ 0
- 1
Modules/FDEM1D/examples/Hantenna.cpp 파일 보기

@@ -170,7 +170,6 @@ const char *buildString = __DATE__ ", " __TIME__;
170 170
 		EmEarth->AttachFieldPoints(receivers);
171 171
 		EmEarth->SetFieldsToCalculate(H);
172 172
         EmEarth->SetHankelTransformMethod(string2Enum<HANKELTRANSFORMTYPE>(config[0]));
173
-        EmEarth->SetHankelTransformMethod(FHTKEY201);
174 173
 
175 174
     ///////////////////////////////////////////////
176 175
 	// Keep track of time

+ 1
- 8
Modules/FDEM1D/src/EMEarth1D.cpp 파일 보기

@@ -229,15 +229,10 @@ namespace Lemma {
229 229
         }
230 230
 
231 231
         if (Antenna->GetName() == std::string("PolygonalWireAntenna") || Antenna->GetName() == std::string("TEMTransmitter") ) {
232
-
233 232
             icalc += 1;
234
-
235 233
             // Check to see if they are all on a plane? If so we can do this fast
236
-            /* TODO FIX THIS ISSUES */
237 234
             if (Antenna->IsHorizontallyPlanar() && HankelType == ANDERSON801) {
238
-                //std::cout << "Lag baby lag" << std::endl;
239 235
                 for (int ifreq=0; ifreq<Antenna->GetNumberOfFrequencies();++ifreq) {
240
-                    //std::cout << "Num Recs" <<  Receivers->GetNumberOfPoints() << std::endl;
241 236
                     Real wavef = 2.*PI* Antenna->GetFrequency(ifreq);
242 237
                     #ifdef LEMMAUSEOMP
243 238
                     #pragma omp parallel
@@ -248,12 +243,10 @@ namespace Lemma {
248 243
                     #pragma omp for schedule(static, 1)
249 244
                     #endif
250 245
                     for (int irec=0; irec<Receivers->GetNumberOfPoints(); ++irec) {
251
-                    //for (int irec=0; irec<2; ++irec) { // TODO FIXME BELO
252 246
                         auto AntCopy = static_cast<PolygonalWireAntenna*>(Antenna.get())->ClonePA();
253 247
                         SolveLaggedTxRxPair(irec, Hankel.get(), wavef, ifreq, AntCopy.get());
254
-                        //exit(0);
255 248
                     }
256
-                    //Receivers->ClearFields(); // FIXME DEBUG TODO
249
+                    //Receivers->ClearFields();
257 250
                     #ifdef LEMMAUSEOMP
258 251
                     }
259 252
                     #endif

Loading…
취소
저장