Commit e27d0b7e authored by Stephan Thober's avatar Stephan Thober
Browse files

subsituted IMSL dependency by MKL dependency; removed Proj4 dependency ->...

subsituted IMSL dependency by MKL dependency; removed Proj4 dependency -> switched off lat/lon writing in output file
parent 3c306b72
......@@ -4,12 +4,12 @@
! http://www.mohid.com/wiki/index.php?title=PROJ4
subroutine CoorTrans(lon, lat, x, y)
use proj4
! use proj4
implicit none
real(8), intent(in) :: lon, lat
real(8), intent(out) :: x, y
integer(4) :: status
type(prj90_projection) :: proj
! type(prj90_projection) :: proj
character(len=20), dimension(8) :: params
!
! define parameters of the aiming coordinate system
......@@ -23,28 +23,32 @@ subroutine CoorTrans(lon, lat, x, y)
params(7) = 'x_0=4500000' ! false easting
params(8) = 'y_0=0' ! false northing
!
status=prj90_init(proj,params)
if (status.ne.PRJ90_NOERR) then
write(*,*) prj90_strerrno(status)
stop
end if
! dummy variables
x = 0.
y = 0.
!
! lat,lon --> GK4
status = prj90_fwd(proj, lon, lat, x, y)
if (status.ne.PRJ90_NOERR) then
write(*,*) prj90_strerrno(status)
stop
end if
! status=prj90_init(proj,params)
! if (status.ne.PRJ90_NOERR) then
! write(*,*) prj90_strerrno(status)
! stop
! end if
! !
! ! lat,lon --> GK4
! status = prj90_fwd(proj, lon, lat, x, y)
! if (status.ne.PRJ90_NOERR) then
! write(*,*) prj90_strerrno(status)
! stop
! end if
end subroutine CoorTrans
subroutine CoorTransInv(x, y, lon, lat)
use proj4
! use proj4
implicit none
real(8), intent(in) :: x, y
real(8), intent(out) :: lon, lat
integer(4) :: status
type(prj90_projection) :: proj
! type(prj90_projection) :: proj
character(len=20), dimension(8) :: params
!
! define parameters of the aiming coordinate system
......@@ -58,22 +62,26 @@ subroutine CoorTransInv(x, y, lon, lat)
params(7) = 'x_0=4500000' ! false easting
params(8) = 'y_0=0' ! false northing
!
!print*, ' '
!print*, 'CoordTransInv: before init'
status=prj90_init(proj,params)
!print*, 'CoordTransInv: after init'
if (status.ne.PRJ90_NOERR) then
write(*,*) prj90_strerrno(status)
stop
end if
! dummy variables
lon = 0.
lat = 0.
!
! GK 4 --> lat, lon
!print*, 'CoordTransInv: before transformation', x, y
status = prj90_inv(proj, x, y, lon, lat)
!print*, 'CoordTransInv: after transformation', lon, lat
!print*, ' '
if (status.ne.PRJ90_NOERR) then
write(*,*) prj90_strerrno(status)
stop
end if
! !print*, ' '
! !print*, 'CoordTransInv: before init'
! status=prj90_init(proj,params)
! !print*, 'CoordTransInv: after init'
! if (status.ne.PRJ90_NOERR) then
! write(*,*) prj90_strerrno(status)
! stop
! end if
! !
! ! GK 4 --> lat, lon
! !print*, 'CoordTransInv: before transformation', x, y
! status = prj90_inv(proj, x, y, lon, lat)
! !print*, 'CoordTransInv: after transformation', lon, lat
! !print*, ' '
! if (status.ne.PRJ90_NOERR) then
! write(*,*) prj90_strerrno(status)
! stop
! end if
end subroutine CoorTransInv
......@@ -17,7 +17,7 @@ subroutine EDK(jd,k)
use kriging
use runControl
use varfit, only : beta
use LSASF_INT
! use LSASF_INT
! use mkl95_lapack, only: gesv
use lapack95, only: gesv
......@@ -96,9 +96,9 @@ subroutine EDK(jd,k)
B(nNmax+2) = cell(k)%h
!NOTE: only the upper triangular matrix is needed!
call D_LSASF (A, B, X)
! call gesv(A, B)
! X = B
! call D_LSASF (A, B, X)
call gesv(A, B)
X = B
!
! The BLUE of z is then:
cell(k)%z = 0.
......
......@@ -15,7 +15,8 @@ subroutine OK(jd,k)
use runControl
use varfit, only : beta
use mo_kind, only : i4, dp
use LSASF_INT
! use LSASF_INT
use lapack95, only: gesv
implicit none
integer(i4), intent(in) :: jd ! day
integer(i4), intent(in) :: k ! cell id
......@@ -74,7 +75,9 @@ subroutine OK(jd,k)
!
B(nNmax+1) = 1.0_dp
!NOTE: only the upper triangular matrix is needed!
call D_LSASF (A, B, X)
! call D_LSASF (A, B, X)
call gesv(A, B)
X = B
!
! The BLUE of z is then:
cell(k)%z = 0.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment