Changed to use procedure alias (when names too long).

This commit was SVN r10144.

ompi/mpi/f90/scripts/mpi_file_read_ordered_begin_f90.f90.sh

@@ -39,11 +39,10 @@ allranks="0 $ranks"
 
 
 output() {
-    short_procedure=$1
-    full_procedure=$2
+    procedure=$1
     rank=$3
     type=$5
-    proc="$1$3D$4"
+    proc="$2$3D$4"
 
     cat <<EOF
 
@@ -54,7 +53,7 @@ subroutine ${proc}(fh, buf, count, datatype, ierr)
   integer, intent(in) :: count
   integer, intent(in) :: datatype
   integer, intent(out) :: ierr
-  call ${full_procedure}(fh, buf, count, datatype, ierr)
+  call ${procedure}(fh, buf, count, datatype, ierr)
 end subroutine ${proc}
 
 EOF
@@ -71,18 +70,18 @@ do
   case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
   case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
 
-  output MPI_File_read_ord_begin MPI_File_read_ordered_begin ${rank} CH "character${dim}"
-  output MPI_File_read_ord_begin MPI_File_read_ordered_begin ${rank} L "logical${dim}"
+  output MPI_File_read_ordered_begin MPI_File_read_ord_begin ${rank} CH "character${dim}"
+  output MPI_File_read_ordered_begin MPI_File_read_ord_begin ${rank} L "logical${dim}"
   for kind in $ikinds
   do
-    output MPI_File_read_ord_begin MPI_File_read_ordered_begin ${rank} I${kind} "integer*${kind}${dim}"
+    output MPI_File_read_ordered_begin MPI_File_read_ord_begin ${rank} I${kind} "integer*${kind}${dim}"
   done
   for kind in $rkinds
   do
-    output MPI_File_read_ord_begin MPI_File_read_ordered_begin ${rank} R${kind} "real*${kind}${dim}"
+    output MPI_File_read_ordered_begin MPI_File_read_ord_begin ${rank} R${kind} "real*${kind}${dim}"
   done
   for kind in $ckinds
   do
-    output MPI_File_read_ord_begin MPI_File_read_ordered_begin ${rank} C${kind} "complex*${kind}${dim}"
+    output MPI_File_read_ordered_begin MPI_File_read_ord_begin ${rank} C${kind} "complex*${kind}${dim}"
   done
 done

ompi/mpi/f90/scripts/mpi_file_write_at_all_begin_f90.f90.sh

@@ -39,11 +39,10 @@ allranks="0 $ranks"
 
 
 output() {
-    short_procedure=$1
-    full_procedure=$2
+    procedure=$1
     rank=$3
     type=$5
-    proc="$1$3D$4"
+    proc="$2$3D$4"
 
     cat <<EOF
 
@@ -56,7 +55,7 @@ subroutine ${proc}(fh, offset, buf, count, datatype&
   integer, intent(in) :: count
   integer, intent(in) :: datatype
   integer, intent(out) :: ierr
-  call ${full_procedure}(fh, offset, buf, count, datatype&
+  call ${procedure}(fh, offset, buf, count, datatype&
         , ierr)
 end subroutine ${proc}
 
@@ -74,18 +73,18 @@ do
   case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
   case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
 
-  output MPI_File_wr_at_all_begin MPI_File_write_at_all_begin ${rank} CH "character${dim}"
-  output MPI_File_wr_at_all_begin MPI_File_write_at_all_begin ${rank} L "logical${dim}"
+  output MPI_File_write_at_all_begin MPI_File_wr_at_all_begin ${rank} CH "character${dim}"
+  output MPI_File_write_at_all_begin MPI_File_wr_at_all_begin ${rank} L "logical${dim}"
   for kind in $ikinds
   do
-    output MPI_File_wr_at_all_begin MPI_File_write_at_all_begin ${rank} I${kind} "integer*${kind}${dim}"
+    output MPI_File_write_at_all_begin MPI_File_wr_at_all_begin ${rank} I${kind} "integer*${kind}${dim}"
   done
   for kind in $rkinds
   do
-    output MPI_File_wr_at_all_begin MPI_File_write_at_all_begin ${rank} R${kind} "real*${kind}${dim}"
+    output MPI_File_write_at_all_begin MPI_File_wr_at_all_begin ${rank} R${kind} "real*${kind}${dim}"
   done
   for kind in $ckinds
   do
-    output MPI_File_wr_at_all_begin MPI_File_write_at_all_begin ${rank} C${kind} "complex*${kind}${dim}"
+    output MPI_File_write_at_all_begin MPI_File_wr_at_all_begin ${rank} C${kind} "complex*${kind}${dim}"
   done
 done