diff --git a/code/aux.f b/code/aux.f index ec81b967..6ecd67ff 100644 --- a/code/aux.f +++ b/code/aux.f @@ -495,71 +495,71 @@ subroutine hyperpar(uuk,ttk) n = lx1*ly1*lz1*nelt if (ifpod(1)) then if (rmode.eq.'ON '.or.rmode.eq.'ONB'.or.rmode.eq.'CP ') then - call read_serial(umin,nb,'ops/umin ',wk,nid) - call read_serial(umax,nb,'ops/umax ',wk,nid) + call read_serial(upmin,nb,'ops/umin ',wk,nid) + call read_serial(upmax,nb,'ops/umax ',wk,nid) else - call cfill(umin,1.e9,nb) - call cfill(umax,-1.e9,nb) + call cfill(upmin,1.e9,nb) + call cfill(upmax,-1.e9,nb) do j=1,ns do i=1,nb - if (uuk(i,j).lt.umin(i)) umin(i)=uuk(i,j) - if (uuk(i,j).gt.umax(i)) umax(i)=uuk(i,j) + if (uuk(i,j).lt.upmin(i)) upmin(i)=uuk(i,j) + if (uuk(i,j).gt.upmax(i)) upmax(i)=uuk(i,j) enddo enddo do j=1,nb ! compute hyper-parameter - d= umax(j)-umin(j) - umin(j) = umin(j) - ep * d - umax(j) = umax(j) + ep * d - if (nio.eq.0) write (6,*) j,umin(j),umax(j),'uminmax' + d= upmax(j)-upmin(j) + upmin(j) = upmin(j) - ep * d + upmax(j) = upmax(j) + ep * d + if (nio.eq.0) write (6,*) j,upmin(j),upmax(j),'uminmax' enddo endif ! compute distance between umax and umin - call sub3(udis,umax,umin,nb) + call sub3(updis,upmax,upmin,nb) if (nio.eq.0) then do i=1,nb - write (6,*) i,udis(i),'udis' + write (6,*) i,updis(i),'udis' enddo endif if (rmode.eq.'ALL'.or.rmode.eq.'OFF'.or.rmode.eq.'AEQ') then - call dump_serial(umin,nb,'ops/umin ',nid) - call dump_serial(umax,nb,'ops/umax ',nid) + call dump_serial(upmin,nb,'ops/umin ',nid) + call dump_serial(upmax,nb,'ops/umax ',nid) endif endif if (ifpod(2)) then if (rmode.eq.'ON '.or.rmode.eq.'ONB'.or.rmode.eq.'CP ') then - call read_serial(tmin,nb,'ops/tmin ',wk,nid) - call read_serial(tmax,nb,'ops/tmax ',wk,nid) + call read_serial(tpmin,nb,'ops/tmin ',wk,nid) + call read_serial(tpmax,nb,'ops/tmax ',wk,nid) else - call cfill(tmin,1.e9,nb) - call cfill(tmax,-1.e9,nb) + call cfill(tpmin,1.e9,nb) + call cfill(tpmax,-1.e9,nb) do j=1,ns do i=1,nb - if (ttk(i,j).lt.tmin(i)) tmin(i)=ttk(i,j) - if (ttk(i,j).gt.tmax(i)) tmax(i)=ttk(i,j) + if (ttk(i,j).lt.tpmin(i)) tpmin(i)=ttk(i,j) + if (ttk(i,j).gt.tpmax(i)) tpmax(i)=ttk(i,j) enddo enddo do j=1,nb ! compute hyper-parameter - d= tmax(j)-tmin(j) - tmin(j) = tmin(j) - ep * d - tmax(j) = tmax(j) + ep * d - if (nio.eq.0) write (6,*) j,tmin(j),tmax(j),'tminmax' + d= tpmax(j)-tpmin(j) + tpmin(j) = tpmin(j) - ep * d + tpmax(j) = tpmax(j) + ep * d + if (nio.eq.0) write (6,*) j,tpmin(j),tpmax(j),'tminmax' enddo endif ! compute distance between tmax and tmin - call sub3(tdis,tmax,tmin,nb) + call sub3(tpdis,tpmax,tpmin,nb) if (nio.eq.0) then do i=1,nb - write (6,*) i,tdis(i),'tdis' + write (6,*) i,tpdis(i),'tdis' enddo endif if (rmode.eq.'ALL'.or.rmode.eq.'OFF'.or.rmode.eq.'AEQ') then - call dump_serial(tmin,nb,'ops/tmin ',nid) - call dump_serial(tmax,nb,'ops/tmax ',nid) + call dump_serial(tpmin,nb,'ops/tmin ',nid) + call dump_serial(tpmax,nb,'ops/tmax ',nid) endif endif diff --git a/code/time.f b/code/time.f index 265402c3..c185d63a 100644 --- a/code/time.f +++ b/code/time.f @@ -67,6 +67,7 @@ subroutine bdfext_step if (ifdecpl) then call copy(hinv(1,2),hlm(1,2),(nb-nplay)**2) call diag(hinv(1,2),wt(1,2),rhs(1,2),nb) + call update_k(uk,ukp,tk,tkp) else call invmat(hinv(1,2),hlu(1,2),hlm(1,2), $ ihlu(1,2),ihlu2(1,2),nb-nplay) @@ -77,7 +78,6 @@ subroutine bdfext_step endif endif lu_time=lu_time+dnekclock()-ttime - call update_k(uk,ukp,tk,tkp) endif call rom_userfop @@ -148,6 +148,7 @@ subroutine bdfext_step if (ifdecpl) then call copy(hinv,hlm,(nb-nplay)**2) call diag(hinv,wt,rhs(1,1),nb) + call update_k(uk,ukp,tk,tkp) else call invmat(hinv,hlu,hlm,ihlu,ihlu2,nb-nplay) if (nio.eq.0) write (6,*) 'check nplay',nplay,'cp3' @@ -158,7 +159,6 @@ subroutine bdfext_step endif endif lu_time=lu_time+dnekclock()-ttime - call update_k(uk,ukp,tk,tkp) endif call rom_userfop