Commits

Lisandro Dalcin committed 2e79161

Simplify internal Fortran routines

Comments (0)

Files changed (4)

   do iq=1,inq
      call TensorBasisFuns(&
           order,&
-          ina,ind,iN(:,:,iq),&
+          ina,iN(:,:,iq),&
           N0(  :,iq),&
           N1(:,:,iq),&
           N2(:,:,iq),&
 
 pure subroutine TensorBasisFuns(&
      ord,&
-     ina,ind,iN,&
+     ina,iN,&
      N0,N1,N2,N3)
   implicit none
   integer(kind=IGA_INTEGER_KIND), parameter        :: dim = 1
   integer(kind=IGA_INTEGER_KIND), intent(in),value :: ord
-  integer(kind=IGA_INTEGER_KIND), intent(in),value :: ina, ind
-  real   (kind=IGA_REAL_KIND   ), intent(in)  :: iN(0:ind,ina)
+  integer(kind=IGA_INTEGER_KIND), intent(in),value :: ina
+  real   (kind=IGA_REAL_KIND   ), intent(in)  :: iN(0:ord,ina)
   real   (kind=IGA_REAL_KIND   ), intent(out) :: N0(            ina)
   real   (kind=IGA_REAL_KIND   ), intent(out) :: N1(        dim,ina)
   real   (kind=IGA_REAL_KIND   ), intent(out) :: N2(    dim,dim,ina)
      do iq=1,inq
         call TensorBasisFuns(&
              order,&
-             ina,ind,iN(:,:,iq),&
-             jna,jnd,jN(:,:,jq),&
+             ina,iN(:,:,iq),&
+             jna,jN(:,:,jq),&
              N0(  :,iq,jq),&
              N1(:,:,iq,jq),&
              N2(:,:,iq,jq),&
 
 pure subroutine TensorBasisFuns(&
      ord,&
-     ina,ind,iN,&
-     jna,jnd,jN,&
+     ina,iN,&
+     jna,jN,&
      N0,N1,N2,N3)
   implicit none
   integer(kind=IGA_INTEGER_KIND), parameter        :: dim = 2
   integer(kind=IGA_INTEGER_KIND), intent(in),value :: ord
-  integer(kind=IGA_INTEGER_KIND), intent(in),value :: ina, ind
-  integer(kind=IGA_INTEGER_KIND), intent(in),value :: jna, jnd
-  real   (kind=IGA_REAL_KIND   ), intent(in)  :: iN(0:ind,ina)
-  real   (kind=IGA_REAL_KIND   ), intent(in)  :: jN(0:jnd,jna)
+  integer(kind=IGA_INTEGER_KIND), intent(in),value :: ina
+  integer(kind=IGA_INTEGER_KIND), intent(in),value :: jna
+  real   (kind=IGA_REAL_KIND   ), intent(in)  :: iN(0:ord,ina)
+  real   (kind=IGA_REAL_KIND   ), intent(in)  :: jN(0:ord,jna)
   real   (kind=IGA_REAL_KIND   ), intent(out) :: N0(            ina,jna)
   real   (kind=IGA_REAL_KIND   ), intent(out) :: N1(        dim,ina,jna)
   real   (kind=IGA_REAL_KIND   ), intent(out) :: N2(    dim,dim,ina,jna)
         do iq=1,inq
            call TensorBasisFuns(&
                 order,&
-                ina,ind,iN(:,:,iq),&
-                jna,jnd,jN(:,:,jq),&
-                kna,knd,kN(:,:,kq),&
+                ina,iN(:,:,iq),&
+                jna,jN(:,:,jq),&
+                kna,kN(:,:,kq),&
                 N0(  :,iq,jq,kq),&
                 N1(:,:,iq,jq,kq),&
                 N2(:,:,iq,jq,kq),&
 
 pure subroutine TensorBasisFuns(&
      ord,&
-     ina,ind,iN,&
-     jna,jnd,jN,&
-     kna,knd,kN,&
+     ina,iN,&
+     jna,jN,&
+     kna,kN,&
      N0,N1,N2,N3)
   implicit none
   integer(kind=IGA_INTEGER_KIND), parameter        :: dim = 3
   integer(kind=IGA_INTEGER_KIND), intent(in),value :: ord
-  integer(kind=IGA_INTEGER_KIND), intent(in),value :: ina, ind
-  integer(kind=IGA_INTEGER_KIND), intent(in),value :: jna, jnd
-  integer(kind=IGA_INTEGER_KIND), intent(in),value :: kna, knd
-  real   (kind=IGA_REAL_KIND   ), intent(in)  :: iN(0:ind,ina)
-  real   (kind=IGA_REAL_KIND   ), intent(in)  :: jN(0:jnd,jna)
-  real   (kind=IGA_REAL_KIND   ), intent(in)  :: kN(0:knd,kna)
+  integer(kind=IGA_INTEGER_KIND), intent(in),value :: ina
+  integer(kind=IGA_INTEGER_KIND), intent(in),value :: jna
+  integer(kind=IGA_INTEGER_KIND), intent(in),value :: kna
+  real   (kind=IGA_REAL_KIND   ), intent(in)  :: iN(0:ord,ina)
+  real   (kind=IGA_REAL_KIND   ), intent(in)  :: jN(0:ord,jna)
+  real   (kind=IGA_REAL_KIND   ), intent(in)  :: kN(0:ord,kna)
   real   (kind=IGA_REAL_KIND   ), intent(out) :: N0(            ina,jna,kna)
   real   (kind=IGA_REAL_KIND   ), intent(out) :: N1(        dim,ina,jna,kna)
   real   (kind=IGA_REAL_KIND   ), intent(out) :: N2(    dim,dim,ina,jna,kna)
      N = +N/dS
   endif
 contains
-function normal2(t) result(n)
+pure function normal2(t) result(n)
   implicit none
   real(kind=IGA_REAL_KIND)             :: n(2)
   real(kind=IGA_REAL_KIND), intent(in) :: t(2)
   n(1) = + t(2)
   n(2) = - t(1)
 end function normal2
-function normal3(s,t) result(n)
+pure function normal3(s,t) result(n)
   implicit none
   real(kind=IGA_REAL_KIND)             :: n(3)
   real(kind=IGA_REAL_KIND), intent(in) :: s(3)