From 10fad4697ae850e67e89d56d70b74a655b8d5084 Mon Sep 17 00:00:00 2001 From: ignis Date: Sun, 1 Sep 2019 02:43:21 +0900 Subject: [PATCH] added vector for additional equation --- code/ysolve.f90 | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/code/ysolve.f90 b/code/ysolve.f90 index 32ddcd9..5aee200 100644 --- a/code/ysolve.f90 +++ b/code/ysolve.f90 @@ -320,11 +320,11 @@ CALL READ_INTRO - ALLOCATE( u(nx),STAT=ierr) ; u=0. - ALLOCATE(y1(nx,2),STAT=ierr) ; y1=0. - ALLOCATE(y2(nx,2),STAT=ierr) ; y2=0. - ALLOCATE(yf(nx,2),STAT=ierr) ; yf=0. - ALLOCATE(yold(nx,2),STAT=ierr) ; yold=0. + ALLOCATE( u(nx),STAT=ierr) ; u=0. + ALLOCATE( y1(nx,3),STAT=ierr) ; y1=0. + ALLOCATE( y2(nx,3),STAT=ierr) ; y2=0. + ALLOCATE( yf(nx,3),STAT=ierr) ; yf=0. + ALLOCATE(yold(nx,3),STAT=ierr) ; yold=0. ALLOCATE(uxt(nx),STAT=ierr) ; uxt=0. ALLOCATE(duxt(nx),STAT=ierr) ; duxt=0. ALLOCATE(dm(nx),STAT=ierr) ; dm=diff @@ -400,19 +400,21 @@ SUBROUTINE fns(r1,f) REAL, INTENT(IN),DIMENSION(:,:) :: r1 REAL, INTENT(OUT),DIMENSION(:,:) :: f - REAL, DIMENSION(2,nx) :: ux, dux, d2ux + REAL, DIMENSION(3,nx) :: ux, dux, d2ux INTEGER :: i,j,k REAL :: wrate,Ly,Dy,Lt,Dt + REAL :: wrate1, wrate2 ! x-direction DO i=1,nx ux(1,i)=r1(i,1) ! Y ux(2,i)=r1(i,2) ! T + ux(3,i)=r1(i,3) ! T ENDDO - CALL dfnonp(nx,hx,ux(:,:),dux(:,:),2,1) + CALL dfnonp(nx,hx,ux(:,:),dux(:,:),3,1) - CALL d2fnonp(nx,hx,ux(:,:),d2ux(:,:),2,1) + CALL d2fnonp(nx,hx,ux(:,:),d2ux(:,:),3,1) DO i=1,nx wrate=rate_1step(ux(1,i), ux(2,i))