Commits

Satish Balay committed f2f4191 Merge

Merge branch 'balay/fix-nightly-examples'

Comments (0)

Files changed (8)

src/dm/impls/plex/examples/tests/makefile

 
 #--------------------------------------------------------------------------
 runex1:
-	-@${MPIEXEC} -n 1 ./ex1 -dim 3 -ctetgen_verbose 4 -dm_view ::ascii_info_detail -info -info_exclude null > ex1_0.tmp 2>&1;\
+	-@${MPIEXEC} -n 1 ./ex1 -dim 3 -ctetgen_verbose 4 -dm_view ascii::ascii_info_detail -info -info_exclude null > ex1_0.tmp 2>&1;\
 	   if (${DIFF} output/ex1_0.out ex1_0.tmp) then true ;  \
 	   else echo ${PWD} ; echo "Possible problem with with runex1, diffs above \n========================================="; fi ;\
 	   ${RM} -f ex1_0.tmp
 runex1_2:
-	-@${MPIEXEC} -n 1 ./ex1 -dim 3 -ctetgen_verbose 4 -refinement_limit 0.0625 -dm_view ::ascii_info_detail -info -info_exclude null > ex1_1.tmp 2>&1;\
+	-@${MPIEXEC} -n 1 ./ex1 -dim 3 -ctetgen_verbose 4 -refinement_limit 0.0625 -dm_view ascii::ascii_info_detail -info -info_exclude null > ex1_1.tmp 2>&1;\
 	   if (${DIFF} output/ex1_1.out ex1_1.tmp) then true ;  \
 	   else echo ${PWD} ; echo "Possible problem with with runex1_2, diffs above \n========================================="; fi ;\
 	   ${RM} -f ex1_1.tmp

src/ksp/ksp/examples/tutorials/ex8g.c

     ierr = PetscOptionsGetBool(NULL,"-subdomain_view",&flg,NULL);CHKERRQ(ierr);
     if (flg) {
       ierr = PetscPrintf(PETSC_COMM_SELF,"Nmesh points: %D x %D; subdomain partition: %D x %D; overlap: %D; Nsub: %D\n",m,n,M,N,overlap,Nsub);CHKERRQ(ierr);
-      ierr = PetscPrintf(PETSC_COMM_SELF,"IS:\n");CHKERRQ(ierr);
+      ierr = PetscPrintf(PETSC_COMM_SELF,"Outer IS:\n");CHKERRQ(ierr);
       for (i=0; i<Nsub; i++) {
-        ierr = PetscPrintf(PETSC_COMM_SELF,"  IS[%D]\n",i);CHKERRQ(ierr);
-        ierr = ISView(is[i],PETSC_VIEWER_STDOUT_SELF);CHKERRQ(ierr);
+        ierr = PetscPrintf(PETSC_COMM_SELF,"  outer IS[%d]\n",i);CHKERRQ(ierr);
+        ierr = ISView(outeris[i],PETSC_VIEWER_STDOUT_SELF);CHKERRQ(ierr);
       }
-      ierr = PetscPrintf(PETSC_COMM_SELF,"IS_local:\n");CHKERRQ(ierr);
+      ierr = PetscPrintf(PETSC_COMM_SELF,"Inner IS:\n");CHKERRQ(ierr);
       for (i=0; i<Nsub; i++) {
-        ierr = PetscPrintf(PETSC_COMM_SELF,"  IS_local[%D]\n",i);CHKERRQ(ierr);
-        ierr = ISView(is_local[i],PETSC_VIEWER_STDOUT_SELF);CHKERRQ(ierr);
+        ierr = PetscPrintf(PETSC_COMM_SELF,"  inner IS[%d]\n",i);CHKERRQ(ierr);
+        ierr = ISView(inneris[i],PETSC_VIEWER_STDOUT_SELF);CHKERRQ(ierr);
       }
     }
   }

src/ksp/ksp/examples/tutorials/makefile

 	   else echo ${PWD} ; echo "Possible problem with with ex10_cg_singlereduction, diffs above \n========================================="; fi; \
 	   ${RM} -f ex10_20.tmp
 runex10_seqaijcrl:
-	-@${MPIEXEC} -n 1 ./ex10 -f0 ${DATAFILESPATH}/matrices/small -ksp_monitor_short -ksp_view -mat_view ::ascii_info -mat_type seqaijcrl > ex10_seqaijcrl.tmp 2>&1; \
+	-@${MPIEXEC} -n 1 ./ex10 -f0 ${DATAFILESPATH}/matrices/small -ksp_monitor_short -ksp_view -mat_view ascii::ascii_info -mat_type seqaijcrl > ex10_seqaijcrl.tmp 2>&1; \
 	   if (${DIFF} output/ex10_seqcrl.out ex10_seqaijcrl.tmp) then true; \
 	   else echo ${PWD} ; echo "Possible problem with with ex10_seqaijcrl, diffs above \n========================================="; fi; \
 	   ${RM} -f ex10_seqaijcrl.tmp
 runex10_mpiaijcrl:
-	-@${MPIEXEC} -n 2 ./ex10 -f0 ${DATAFILESPATH}/matrices/small -ksp_monitor_short -ksp_view -mat_view ::ascii_info -mat_type mpiaijcrl > ex10_mpiaijcrl.tmp 2>&1; \
+	-@${MPIEXEC} -n 2 ./ex10 -f0 ${DATAFILESPATH}/matrices/small -ksp_monitor_short -ksp_view -mat_view ascii::ascii_info -mat_type mpiaijcrl > ex10_mpiaijcrl.tmp 2>&1; \
 	   if (${DIFF} output/ex10_mpiaij.out ex10_mpiaijcrl.tmp) then true; \
 	   else echo ${PWD} ; echo "Possible problem with with ex10_mpiaijcrl, diffs above \n========================================="; fi; \
 	   ${RM} -f ex10_mpiaijcrl.tmp
 runex10_seqaijperm:
-	-@${MPIEXEC} -n 1 ./ex10 -f0 ${DATAFILESPATH}/matrices/small -ksp_monitor_short -ksp_view -mat_view ::ascii_info -mat_type seqaijperm > ex10_seqaijperm.tmp 2>&1; \
+	-@${MPIEXEC} -n 1 ./ex10 -f0 ${DATAFILESPATH}/matrices/small -ksp_monitor_short -ksp_view -mat_view ascii::ascii_info -mat_type seqaijperm > ex10_seqaijperm.tmp 2>&1; \
 	   if (${DIFF} output/ex10_seqcsrperm.out ex10_seqaijperm.tmp) then true; \
 	   else echo ${PWD} ; echo "Possible problem with with ex10_seqaijperm, diffs above \n========================================="; fi; \
 	   ${RM} -f ex10_seqaijperm.tmp
 runex10_mpiaijperm:
-	-@${MPIEXEC} -n 2 ./ex10 -f0 ${DATAFILESPATH}/matrices/small -ksp_monitor_short -ksp_view -mat_view ::ascii_info -mat_type mpiaijperm > ex10_mpiaijperm.tmp 2>&1; \
+	-@${MPIEXEC} -n 2 ./ex10 -f0 ${DATAFILESPATH}/matrices/small -ksp_monitor_short -ksp_view -mat_view ascii::ascii_info -mat_type mpiaijperm > ex10_mpiaijperm.tmp 2>&1; \
 	   if (${DIFF} output/ex10_mpicsrperm.out ex10_mpiaijperm.tmp) then true; \
 	   else echo ${PWD} ; echo "Possible problem with with ex10_mpiaijperm, diffs above \n========================================="; fi; \
 	   ${RM} -f ex10_mpiaijperm.tmp
 runex10_aijcusparse:
-	-@${MPIEXEC} -n 1 ./ex10 -f0 ${DATAFILESPATH}/matrices/medium -ksp_monitor_short -ksp_view -mat_view ::ascii_info -mat_type aijcusparse > ex10_aijcusparse.tmp 2>&1; \
+	-@${MPIEXEC} -n 1 ./ex10 -f0 ${DATAFILESPATH}/matrices/medium -ksp_monitor_short -ksp_view -mat_view ascii::ascii_info -mat_type aijcusparse > ex10_aijcusparse.tmp 2>&1; \
 	   if (${DIFF} output/ex10_aijcusparse.out ex10_aijcusparse.tmp) then true; \
 	   else echo ${PWD} ; echo "Possible problem with with ex10_aijcusparse, diffs above \n========================================="; fi; \
 	   ${RM} -f ex10_aijcusparse.tmp

src/mat/examples/tests/makefile

 	   ${RM} -f ex134_1.tmp
 
 runex135:
-	-@${MPIEXEC} -n 4 ./ex135 -n 1000 -mat_view ::ascii_info_detail | ${SED} 's,mem [0-9]\{5\},mem SKIP,' > ex135_1.tmp 2>&1; \
+	-@${MPIEXEC} -n 4 ./ex135 -n 1000 -mat_view ascii::ascii_info_detail | ${SED} 's,mem [0-9]\{5\},mem SKIP,' > ex135_1.tmp 2>&1; \
 	   ${DIFF} output/ex135_1.out ex135_1.tmp || echo ${PWD} "\nPossible problem with ex135, diffs above \n========================================="; \
 	   ${RM} -f ex135_1.tmp
 
 runex136:
-	-@${MPIEXEC} -n 3 ./ex136 -f  ${DATAFILESPATH}/matrices/cfd.2.100 -mat_view ::ascii_info -aij > ex136_1.tmp 2>&1; \
+	-@${MPIEXEC} -n 3 ./ex136 -f  ${DATAFILESPATH}/matrices/cfd.2.100 -mat_view ascii::ascii_info -aij > ex136_1.tmp 2>&1; \
 	   ${DIFF} output/ex136_1.out ex136_1.tmp || echo ${PWD} "\nPossible problem with ex136, diffs above \n========================================="; \
 	   ${RM} -f ex136_1.tmp
 runex136_2:
-	-@${MPIEXEC} -n 5 ./ex136 -f  ${DATAFILESPATH}/matrices/cfd.2.100 -mat_view ::ascii_info -aij > ex136_2.tmp 2>&1; \
+	-@${MPIEXEC} -n 5 ./ex136 -f  ${DATAFILESPATH}/matrices/cfd.2.100 -mat_view ascii::ascii_info -aij > ex136_2.tmp 2>&1; \
 	   ${DIFF} output/ex136_2.out ex136_2.tmp || echo ${PWD} "\nPossible problem with ex136, diffs above \n========================================="; \
 	   ${RM} -f ex136_2.tmp
 runex136_3:
-	-@${MPIEXEC} -n 7 ./ex136 -f  ${DATAFILESPATH}/matrices/cfd.2.100 -mat_view ::ascii_info -aij > ex136_3.tmp 2>&1; \
+	-@${MPIEXEC} -n 7 ./ex136 -f  ${DATAFILESPATH}/matrices/cfd.2.100 -mat_view ascii::ascii_info -aij > ex136_3.tmp 2>&1; \
 	   ${DIFF} output/ex136_3.out ex136_3.tmp || echo ${PWD} "\nPossible problem with ex136, diffs above \n========================================="; \
 	   ${RM} -f ex136_3.tmp
 runex136_4:
-	-@${MPIEXEC} -n 3 ./ex136 -f  ${DATAFILESPATH}/matrices/cfd.2.100 -mat_view ::ascii_info  > ex136_4.tmp 2>&1; \
+	-@${MPIEXEC} -n 3 ./ex136 -f  ${DATAFILESPATH}/matrices/cfd.2.100 -mat_view ascii::ascii_info  > ex136_4.tmp 2>&1; \
 	   ${DIFF} output/ex136_4.out ex136_4.tmp || echo ${PWD} "\nPossible problem with ex136, diffs above \n========================================="; \
 	   ${RM} -f ex136_4.tmp
 runex136_5:
-	-@${MPIEXEC} -n 5 ./ex136 -f  ${DATAFILESPATH}/matrices/cfd.2.100 -mat_view ::ascii_info > ex136_5.tmp 2>&1; \
+	-@${MPIEXEC} -n 5 ./ex136 -f  ${DATAFILESPATH}/matrices/cfd.2.100 -mat_view ascii::ascii_info > ex136_5.tmp 2>&1; \
 	   ${DIFF} output/ex136_5.out ex136_5.tmp || echo ${PWD} "\nPossible problem with ex136, diffs above \n========================================="; \
 	   ${RM} -f ex136_5.tmp
 runex136_6:
-	-@${MPIEXEC} -n 7 ./ex136 -f  ${DATAFILESPATH}/matrices/cfd.2.100 -mat_view ::ascii_info > ex136_6.tmp 2>&1; \
+	-@${MPIEXEC} -n 7 ./ex136 -f  ${DATAFILESPATH}/matrices/cfd.2.100 -mat_view ascii::ascii_info > ex136_6.tmp 2>&1; \
 	   ${DIFF} output/ex136_6.out ex136_6.tmp || echo ${PWD} "\nPossible problem with ex136, diffs above \n========================================="; \
 	   ${RM} -f ex136_6.tmp
 runex137:

src/snes/examples/tutorials/ex15.c

             /* boundary conditions are all zero Dirichlet */
             x[j][i] = 0.0 + bij;
           } else {
-            u = x[j][i];
             const PetscScalar
               u_E = x[j][i+1],
               u_W = x[j][i-1],
               uy_W   = 0.25*dhy*(x[j+1][i-1]+x[j+1][i]-x[j-1][i-1]-x[j-1][i]),
               ux_N   = 0.25*dhx*(x[j][i+1]+x[j+1][i+1]-x[j][i-1]-x[j+1][i-1]),
               ux_S   = 0.25*dhx*(x[j-1][i+1]+x[j][i+1]-x[j-1][i-1]-x[j][i-1]);
+            u = x[j][i];
             for (k=0; k<its; k++) {
               const PetscScalar
                 ux_E   = dhx*(u_E-u),

src/sys/objects/mpinit.c

 @*/
 PetscErrorCode  PetscHMPISpawn(PetscMPIInt nodesize)
 {
+
+  SETERRQ(PETSC_COMM_SELF,PETSC_ERR_SUP,"HMPI functionality is currently broken");
+#if defined(broken_functionality_commented_out)
   PetscErrorCode ierr;
   PetscMPIInt    size;
   MPI_Comm       parent,children;
     PetscEnd();  /* cannot continue into user code */
   }
   PetscFunctionReturn(0);
+#endif
 }
 #endif
 
 @*/
 PetscErrorCode  PetscHMPIMerge(PetscMPIInt nodesize,PetscErrorCode (*func)(void*),void *ctx)
 {
+
+  SETERRQ(PETSC_COMM_SELF,PETSC_ERR_SUP,"HMPI functionality is currently broken");
+#if defined(broken_functionality_commented_out)
   PetscErrorCode ierr;
   PetscMPIInt    size,rank,*ranks,i;
   MPI_Group      group,newgroup;
     ierr = (*func)(ctx);CHKERRQ(ierr);
   }
   PetscFunctionReturn(0);
+#endif
 }
 
 #undef __FUNCT__

src/sys/threadcomm/interface/threadcomm.c

 PetscErrorCode  PetscThreadCommStackDestroy(void)
 {
   PetscFunctionBegin;
+  PETSC_THREAD_COMM_WORLD = NULL;
   PetscFunctionReturn(0);
 }
 

src/ts/examples/tutorials/ex22f.F

      &     PETSC_NULL_INTEGER,PETSC_NULL_INTEGER,PETSC_NULL_INTEGER,    &
      &     PETSC_NULL_INTEGER,PETSC_NULL_INTEGER,                       &
      &     PETSC_NULL_INTEGER,PETSC_NULL_INTEGER,PETSC_NULL_INTEGER,    &
-     &     PETSC_NULL_INTEGER,PETSC_NULL_INTEGER,ierr)
+     &     PETSC_NULL_INTEGER,ierr)
       call DMDAGetCorners(da,xs,PETSC_NULL_INTEGER,PETSC_NULL_INTEGER,  &
      &     xm,PETSC_NULL_INTEGER,PETSC_NULL_INTEGER,ierr)
       call DMDAGetGhostCorners(da,                                      &