Merged latest changes to genpde_impl from svn dev.

pull/1/head
Salvatore Filippone 9 years ago
parent de8daf2631
commit 98200cf9c2

@ -20,7 +20,7 @@ lib: mpfobjs $(FOBJS) $(FOBJS2) $(COBJS) $(MPFOBJS2) $(MPFOBJS)
$(FOBJS) $(FBOJS2): $(MODDIR)/psi_mod.o $(FOBJS) $(FBOJS2): $(MODDIR)/psi_mod.o
mpfobjs: mpfobjs:
(make $(MPFOBJS) F90="$(MPF90)" FC="$(MPF90)" FCOPT="$(F90COPT)") (make $(MPFOBJS) FC="$(MPFC)")
clean: clean:
/bin/rm -f $(MPFOBJS) $(FOBJS) $(COBJS) $(FOBJS2) $(MPFOBJS2) *$(.mod) /bin/rm -f $(MPFOBJS) $(FOBJS) $(COBJS) $(FOBJS2) $(MPFOBJS2) *$(.mod)

@ -206,9 +206,9 @@ subroutine psb_d_gen_pde3d(ictxt,idim,a,bv,xv,desc_a,afmt,&
endif endif
iz = glob_row-(ix-1)*idim*idim-(iy-1)*idim iz = glob_row-(ix-1)*idim*idim-(iy-1)*idim
! x, y, x coordinates ! x, y, x coordinates
x = ix*deltah x = (ix-1)*deltah
y = iy*deltah y = (iy-1)*deltah
z = iz*deltah z = (iz-1)*deltah
zt(k) = f_(x,y,z) zt(k) = f_(x,y,z)
! internal point: build discretization ! internal point: build discretization
! !
@ -523,8 +523,8 @@ subroutine psb_d_gen_pde2d(ictxt,idim,a,bv,xv,desc_a,afmt,&
endif endif
iy = (glob_row-(ix-1)*idim) iy = (glob_row-(ix-1)*idim)
! x, y ! x, y
x = ix*deltah x = (ix-1)*deltah
y = iy*deltah y = (iy-1)*deltah
zt(k) = f_(x,y) zt(k) = f_(x,y)
! internal point: build discretization ! internal point: build discretization

@ -191,9 +191,9 @@ subroutine psb_s_gen_pde3d(ictxt,idim,a,bv,xv,desc_a,afmt,&
endif endif
iz = glob_row-(ix-1)*idim*idim-(iy-1)*idim iz = glob_row-(ix-1)*idim*idim-(iy-1)*idim
! x, y, x coordinates ! x, y, x coordinates
x = ix*deltah x = (ix-1)*deltah
y = iy*deltah y = (iy-1)*deltah
z = iz*deltah z = (iz-1)*deltah
zt(k) = f_(x,y,z) zt(k) = f_(x,y,z)
! internal point: build discretization ! internal point: build discretization
! !
@ -493,8 +493,8 @@ subroutine psb_s_gen_pde2d(ictxt,idim,a,bv,xv,desc_a,afmt,&
endif endif
iy = (glob_row-(ix-1)*idim) iy = (glob_row-(ix-1)*idim)
! x, y ! x, y
x = ix*deltah x = (ix-1)*deltah
y = iy*deltah y = (iy-1)*deltah
zt(k) = f_(x,y) zt(k) = f_(x,y)
! internal point: build discretization ! internal point: build discretization

Loading…
Cancel
Save