Changeset 22009

Timestamp:

08/25/17 14:11:04 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: do not call love_core if _HAVE_LOVE_ is not defined

Location:

issm/trunk-jpl/src/c

Files:

• cores/CorePointerFromSolutionEnum.cpp (modified) (1 diff)
• cores/gia_core.cpp (modified) (1 diff)
• modules/FourierLoveCorex/FourierLoveCorex.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/cores/CorePointerFromSolutionEnum.cpp

@@ -76 +76 @@
                         break;
                 case LoveSolutionEnum:
+                        #if _HAVE_LOVE_
                         solutioncore=&love_core;
+                        #else
+                        _error_("ISSM not compiled with Love capability");
+                        #endif
                         break;
 

issm/trunk-jpl/src/c/cores/gia_core.cpp

@@ -56 +56 @@
         xDelete<IssmDouble>(x);
         xDelete<IssmDouble>(y);
-
-
 }

issm/trunk-jpl/src/c/modules/FourierLoveCorex/FourierLoveCorex.cpp

@@ -19 +19 @@
 }
 
-/*}}}*/
-
 void FourierLoveCorex( IssmDouble* LoveKr, IssmDouble* LoveKi, IssmDouble* LoveHr, IssmDouble* LoveHi, IssmDouble* LoveLr, 
                 IssmDouble* LoveLi, int nfreq, IssmDouble* frequencies, int sh_nmax, int sh_nmin, 
@@ -33 +31 @@
                  &numlayers,  radius,  viscosity,  lame_lambda,  lame_mu, 
                  burgers_viscosity,  burgers_mu,  density,  isburgers,  issolid);
-
-        
-        
 }