Skip to content
This repository has been archived by the owner on Jul 12, 2023. It is now read-only.

Commit

Permalink
pypi update
Browse files Browse the repository at this point in the history
0.0.16 --> 0.0.17
  • Loading branch information
sgkang committed Aug 17, 2019
1 parent bcaa537 commit 394a09b
Show file tree
Hide file tree
Showing 3 changed files with 326 additions and 310 deletions.
608 changes: 312 additions & 296 deletions notebooks/examples/Test_global_em1d_inversion.ipynb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

setup(
name='simpegEM1D',
version='0.0.15',
version='0.0.17',
packages=find_packages(),
install_requires=[
'SimPEG>=0.4.1',
Expand Down
26 changes: 13 additions & 13 deletions simpegEM1D/Fortran/m_rTE_Fortran.f90
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ subroutine rTE_forward(nLayers, nFrequencies, nFilter, frequencies, lambda, sig,

cm1 = 0.5d0 * (1.d0 - c)
cp1 = 0.5d0 * (1.d0 + c)

rTE(i, jj) = cm1 / cp1
enddo
enddo

return ! Early escape
endif


do k = 1, nLayers - 1
thickness(k) = -(depth(k+1) - depth(k))
c1(k) = 1.d0 + chi(k)
Expand Down Expand Up @@ -147,7 +147,7 @@ subroutine rTE_sensitivity(nLayers, nFrequencies, nFilter, frequencies, lambda,
!f2py intent(in) :: halfSpace
complex(kind=8), intent(inout) :: drTE(nLayers, nFrequencies, nFilter)
!f2py intent(in, out) :: drTE

real(kind=8) :: h0, h_1
real(kind=8) :: lam, lam2
real(kind=8) :: thickness(nLayers - 1)
Expand All @@ -164,10 +164,10 @@ subroutine rTE_sensitivity(nLayers, nFrequencies, nFilter, frequencies, lambda,
complex(kind=8) :: dudsig
complex(kind=8) :: mTemp00, mTemp01, mTemp10, mTemp11
complex(kind=8) :: m0Sum00, m0Sum01, m0Sum10, m0Sum11
complex(kind=8) :: m1Sum00, m1Sum01, m1Sum10, m1Sum11
complex(kind=8) :: m1Sum00, m1Sum01, m1Sum10, m1Sum11
complex(kind=8) :: w
complex(kind=8) :: utemp0, utemp1
complex(kind=8), dimension(nLayers) :: M00, M01, M10, M11
complex(kind=8), dimension(nLayers) :: M00, M01, M10, M11
complex(kind=8), dimension(nLayers) :: dJ00, dJ01, dJ10, dJ11

integer :: i
Expand Down Expand Up @@ -197,7 +197,7 @@ subroutine rTE_sensitivity(nLayers, nFrequencies, nFilter, frequencies, lambda,
dJ1sum11 = 0.25d0 * (cTmp2 / utemp1) * cTmp3

drTE(1, i, jj) = ((-dJ1sum11 * M0sum11) - dJ1sum11 * M0sum01) / M0sum11**2.d0

enddo
enddo
return ! Early Exit
Expand Down Expand Up @@ -358,7 +358,7 @@ subroutine rTE_sensitivity(nLayers, nFrequencies, nFilter, frequencies, lambda,
cTmp4 = Mtemp01 - Mtemp11
dJ_10Mtemp01 = dj0Mtemp00 * cTmp4
dJ_10Mtemp11 = -dj0Mtemp11 * cTmp4

dJ01Mtemp00 = (c2t * utemp1) / (c3t * utemp0**2.d0)
dJ01Mtemp11 = dJ01Mtemp00 * utemp0
dJ01Mtemp10 = exp(-2.d0 * utemp0 * h0)
Expand All @@ -375,7 +375,7 @@ subroutine rTE_sensitivity(nLayers, nFrequencies, nFilter, frequencies, lambda,
dJ01Mtemp00 = (M00(k) * dj1Mtemp00) + cTmp4
dJ01Mtemp01 = (M00(k) * dj1Mtemp01) - cTmp4
cTmp4 = M11(k) * dj1Mtemp10
dJ01Mtemp10 = (M10(k) * dj1Mtemp00) + cTmp4
dJ01Mtemp10 = (M10(k) * dj1Mtemp00) + cTmp4
dJ01Mtemp11 = (M10(k) * dj1Mtemp01) - cTmp4

dJ00(k) = dudsig * (dJ_10Mtemp00 + dJ01Mtemp00)
Expand Down Expand Up @@ -403,7 +403,7 @@ subroutine rTE_sensitivity(nLayers, nFrequencies, nFilter, frequencies, lambda,
dJ00(nLayers) = cTmp4
dJ01(nLayers) = -cTmp4
cTmp4 = dudsig * dj0Mtemp11
dJ10(nLayers) = -cTmp4
dJ10(nLayers) = -cTmp4
dJ11(nLayers) = cTmp4

! Second pass, Double loop
Expand All @@ -414,13 +414,13 @@ subroutine rTE_sensitivity(nLayers, nFrequencies, nFilter, frequencies, lambda,
dJ0sum00 = dJ1sum00 ; dJ0sum10 = dJ1sum10
dJ0sum01 = dJ1sum01 ; dJ0sum11 = dJ1sum11

! k = 1
! k = 1
if (nLayers > 2) then
dJ1sum00 = (dJ00(1) * M00(3)) + (dJ01(1) * M10(3))
dJ1sum10 = (dJ10(1) * M00(3)) + (dJ11(1) * M10(3))
dJ1sum01 = (dJ00(1) * M01(3)) + (dJ01(1) * M11(3))
dJ1sum11 = (dJ10(1) * M01(3)) + (dJ11(1) * M11(3))

dJ0sum00 = dJ1sum00 ; dJ0sum10 = dJ1sum10
dJ0sum01 = dJ1sum01 ; dJ0sum11 = dJ1sum11

Expand All @@ -438,7 +438,7 @@ subroutine rTE_sensitivity(nLayers, nFrequencies, nFilter, frequencies, lambda,
cTmp3 = 1.d0 / M1sum11**2.d0

drTE(1, i, jj) = (dJ1sum01 * M1sum11 - dJ1sum11 * M1sum01) * cTmp3

do k1 = 2, nLayers - 1
dJ0sum00 = M00(1) ; dJ0sum10 = M10(1)
dJ0sum01 = M01(1) ; dJ0sum11 = M11(1)
Expand Down Expand Up @@ -500,4 +500,4 @@ subroutine rTE_sensitivity(nLayers, nFrequencies, nFilter, frequencies, lambda,
enddo !jj = 1, nFilter
end subroutine
!====================================================================!
end module
end module

0 comments on commit 394a09b

Please sign in to comment.