Changeset 22036

Timestamp:

09/05/17 08:54:07 (8 years ago)

Author:

bdef

Message:

BUG:replacing -complex- comands by -cmplx- to avoid lib link issue

Location:

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

Files:

• love_numbers.f90 (modified) (2 diffs)
• lovenb_sub.f90 (modified) (1 diff)
• model.f90 (modified) (2 diffs)

issm/trunk-jpl/src/c/modules/FourierLoveCorex/love_numbers.f90

@@ -248 +248 @@
   ! fluid_tscale=-575.502 / (deg+91.1765) -0.176471 ! this formula sets fluid time scale = 1e6 kyr at degree 2, 1e5 kyr at degree 20 and 1e3 kyr at degree 90, which allows no error growth and still the fluid number as the benchmark at all degree (tested up to degmax=147)
    !print*,fluid_tscale
-  ! freq=complex(0.d0,1.d0)*2.d0*pi*(10.d0**(fluid_tscale)/cst) ! empiric time period that changes according to harmonic degree to ensure getting fluid response without crazy error growing for high degree
+  ! freq=cmplx(0.d0,1.d0)*2.d0*pi*(10.d0**(fluid_tscale)/cst) ! empiric time period that changes according to harmonic degree to ensure getting fluid response without crazy error growing for high degree
 ! it is meant to approximate the theoretical freq=0.d0 that should be assessed for fft
   !elseif (fr <= nfreq/2+1) then
-  ! freq=complex(0.d0,1.d0)*(dble(fr-1)/T)*2.d0*pi
+  ! freq=cmplx(0.d0,1.d0)*(dble(fr-1)/T)*2.d0*pi
   !else 
-  ! freq=complex(0.d0,1.d0)*(-dble(nfreq+1-fr)/T)*2.d0*pi
+  ! freq=cmplx(0.d0,1.d0)*(-dble(nfreq+1-fr)/T)*2.d0*pi
   !end if
   
-  freq=complex(0.d0,frequencies(fr))
+  freq=cmplx(0.d0,frequencies(fr))
   !print*,fr,freq
 
@@ -262 +262 @@
   !freq=dble(fr)/T
   !--  Elastic Love number calculation
-  !freq=2.d0*pi/(1e4*cst)*complex(0.d0,1.d0)
+  !freq=2.d0*pi/(1e4*cst)*cmplx(0.d0,1.d0)
 
    !if (deg==2) then ! for rotationnal feedback

issm/trunk-jpl/src/c/modules/FourierLoveCorex/lovenb_sub.f90

@@ -42 +42 @@
         
    if ((log10(1.d0/ra**int(dble(deg)/10.d0)))<-250.d0) then
-        valini=1.d-300!*complex(1.d0,1.d0)
+        valini=1.d-300!*cmplx(1.d0,1.d0)
    else
-        valini= 1.d0!*complex(1.d0,1.d0)
+        valini= 1.d0!*cmplx(1.d0,1.d0)
    endif
 

issm/trunk-jpl/src/c/modules/FourierLoveCorex/model.f90

@@ -104 +104 @@
   !x=rc/ra
   !write(101,*), 
-  !call earth_nlayers_viscoelas(x-epsdb,ro1,complex(la,0.d0),complex(mu,0d0),g,solid)
+  !call earth_nlayers_viscoelas(x-epsdb,ro1,cmplx(la,0.d0),cmplx(mu,0d0),g,solid)
   !write(101,*), 'ICB, g = ',g
   !write(101,*), 'ICB, ro(Inner Core) = ', ro1
-  !call earth_nlayers_viscoelas(x,ro2,complex(la,0.d0),complex(mu,0d0),g,solid)
+  !call earth_nlayers_viscoelas(x,ro2,cmplx(la,0.d0),cmplx(mu,0d0),g,solid)
   !write(101,*), 'ICB, g = ',g
   !write(101,*), 'ICB, ro(Outer Core) = ', ro2
@@ -115 +115 @@
   !x=rb/ra
   !write(101,*),
-  !call earth_nlayers_viscoelas(x-epsdb,ro1,complex(la,0.d0),complex(mu,0d0),g,solid)
+  !call earth_nlayers_viscoelas(x-epsdb,ro1,cmplx(la,0.d0),cmplx(mu,0d0),g,solid)
   !write(101,*), 'CMB, g = ',g
   !write(101,*), 'CMB, ro(Outer Core) = ', ro1
-  !call earth_nlayers_viscoelas(x,ro2,complex(la,0.d0),complex(mu,0d0),g,solid)
+  !call earth_nlayers_viscoelas(x,ro2,cmplx(la,0.d0),cmplx(mu,0d0),g,solid)
   !write(101,*), 'CMB, g = ',g
   !write(101,*), 'CMB, ro(Mantle) = ', ro2