Skip to content

Commit 2a42194

Browse files
committed
keep up w master 6
1 parent 5919a62 commit 2a42194

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

src/hesian.f90

+10-5
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ subroutine hesian( NGdof, position, Mvol, mn, LGdof )
5454

5555
INTEGER :: vvol, idof, ii, mi, ni, irz, issym, isymdiff, lvol, ieval(1:1), igdof, ifd
5656
REAL :: oldEnergy(-2:2), error, cpul
57+
5758
REAL :: oldBB(1:Mvol,-2:2), oBBdRZ(1:Mvol,0:1,1:LGdof), ohessian(1:NGdof,1:NGdof)
5859

5960
REAL :: oRbc(1:mn,0:Mvol), oZbs(1:mn,0:Mvol), oRbs(1:mn,0:Mvol), oZbc(1:mn,0:Mvol), determinant
@@ -104,8 +105,10 @@ subroutine hesian( NGdof, position, Mvol, mn, LGdof )
104105

105106
xx(0,-2:2)= zero
106107

108+
107109
!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
108-
#ifdef MINIMIZE
110+
111+
#ifdef MINIMIZE
109112

110113
oldBB(1:Mvol,0) = lBBintegral(1:Mvol)
111114

@@ -241,6 +244,7 @@ subroutine hesian( NGdof, position, Mvol, mn, LGdof )
241244
LComputeAxis = .false.
242245
WCALL( hesian, dforce, ( NGdof, position(0:NGdof), force(0:NGdof), LComputeDerivatives, LComputeAxis) ) ! calculate force-imbalance & hessian;
243246

247+
244248
ohessian(1:NGdof,1:NGdof) = hessian2D(1:NGdof,1:NGdof) ! internal copy; 22 Apr 15;
245249

246250

@@ -263,7 +267,7 @@ subroutine hesian( NGdof, position, Mvol, mn, LGdof )
263267
xx(0,-2:2)= zero ; dRZ = 1.0E-04
264268

265269
write(svol,'(i3.3)')myid
266-
! open(lunit+myid,file="."//trim(ext)//".hessian."//svol,status="unknown")
270+
! open(lunit+myid,file=trim(get_hidden(ext))//".hessian."//svol,status="unknown")
267271

268272
! lmu(1:Nvol) = mu(1:Nvol) ; lpflux(1:Nvol) = pflux(1:Nvol) ; lhelicity(1:Nvol) = helicity(1:Nvol) ! save original profile information; 20 Jun 14;
269273

@@ -457,9 +461,9 @@ subroutine hesian( NGdof, position, Mvol, mn, LGdof )
457461
! FATAL( global, .true., eigenvalue solver needs updating to F08NAF )
458462
!#endif
459463
call dgeev('N', JOB, NGdof, hessian2D(1:LDA,1:NGdof), LDA, evalr(1:NGdof), evali(1:NGdof), &
460-
evecl(1:Ldvr,1:NGdof), Ldvr, revecr(1:Ldvr,1:2*NGdof), Ldvr, work(1:Lwork), Lwork, if02ebf )
461-
evecr(1:Ldvr,1:NGdof) = revecr(1:Ldvr,1:NGdof)
462-
eveci(1:Ldvr,1:NGdof) = revecr(1:Ldvr,NGdof+1:2*NGdof)
464+
evecl(1:Ldvr,1:NGdof), Ldvr, revecr(1:Ldvr,1:2*NGdof), Ldvr, work(1:Lwork), Lwork, if02ebf )
465+
evecr(1:Ldvr,1:NGdof) = revecr(1:Ldvr,1:NGdof)
466+
eveci(1:Ldvr,1:NGdof) = revecr(1:Ldvr,NGdof+1:2*NGdof)
463467

464468
if( myid.eq.0 ) then
465469
cput = GETTIME
@@ -575,6 +579,7 @@ subroutine hesian( NGdof, position, Mvol, mn, LGdof )
575579

576580
!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
577581

582+
578583
if( myid.eq.0 ) then ! write to file; 04 Dec 14;
579584
open(hunit, file=trim(get_hidden(ext))//".GF.ev", status="unknown", form="unformatted")
580585
write(hunit) NGdof, Ldvr, Ldvi

src/sphdf5.f90

+1-1
Original file line numberDiff line numberDiff line change
@@ -1085,7 +1085,7 @@ subroutine hdfint
10851085
HWRITERA( grpOutput, mn, (Mvol+1), Rbs, iRbs(1:mn,0:Mvol) )
10861086
!latex \type{iZbc(1:mn,0:Mvol)} & real & \pb{Fourier harmonics, $Z_{m,n}$, of interfaces} \\
10871087
HWRITERA( grpOutput, mn, (Mvol+1), Zbc, iZbc(1:mn,0:Mvol) )
1088-
!latex \type{BnsErr} & real & \pb{error in self-consistency of field on plasma boundary (in freeboundary)} \\
1088+
!latex \type{BnsErr} & real & \pb{error in self-consistency of field on plasma boundary (in freeboundary)} \\
10891089
HWRITERV( grpOutput, 1, BnsErr, (/ BnsErr /)) ! already in /input/global
10901090
!latex \type{ForceErr} & real & \pb{force-balance error across interfaces} \\
10911091
HWRITERV( grpOutput, 1, ForceErr, (/ ForceErr /))

0 commit comments

Comments
 (0)