Commits

Jed Brown  committed 614c1aa Merge

Merge branch 'jed/remove-sieve-harder'

* jed/remove-sieve-harder:
Remove Sieve harder and document removal in dev.html

  • Participants
  • Parent commits 01d24b5, e23472d

Comments (0)

Files changed (10)

File bin/maint/asterix-test.sh

 # basic gcc tests
 ./config/examples/asterix/asterix64.py
 make PETSC_ARCH=asterix64 all alltests tests_DATAFILESPATH DATAFILESPATH=/home/balay/datafiles
-./config/configure.py  CC=gcc FC=gfortran CXX=g++ PETSC_ARCH=asterix64-cxx-sieve --with-clanguage=cxx \
---with-sieve=1 --download-mpich=1 --download-boost=1 --download-chaco=1 \
+./config/configure.py  CC=gcc FC=gfortran CXX=g++ PETSC_ARCH=asterix64-cxx --with-clanguage=cxx \
+--download-mpich=1 --download-boost=1 --download-chaco=1 \
 --download-plapack=1 --download-tetgen=1 --download-triangle=1 --download-hdf5=1
-make PETSC_ARCH=asterix64-cxx-sieve all alltests tests_DATAFILESPATH DATAFILESPATH=/home/balay/datafiles
+make PETSC_ARCH=asterix64-cxx all alltests tests_DATAFILESPATH DATAFILESPATH=/home/balay/datafiles
 ./config/examples/asterix/asterix64-openmpi.py
 make PETSC_ARCH=asterix64-openmpi all alltests tests_DATAFILESPATH DATAFILESPATH=/home/balay/datafiles
 ./config/examples/asterix/asterix64.py --with-clanguage=cxx -PETSC_ARCH=asterix64-cxx-opt --with-debugging=0 --with-log=0

File bin/maint/confignightly/churn2

 set MACH=churn
 set USR=petsc
 set LOC=/sandbox/petsc/${RNAME}-2
-set CONF=arch-linux-cxx-sieve
+set CONF=arch-linux-cxx

File bin/maint/confignightly/crush3

 set MACH=crush
 set USR=petsc
 set LOC=/sandbox/petsc/${RNAME}-3
-set CONF=arch-linux-cxx-sieve-gcov
+set CONF=arch-linux-cxx-gcov

File bin/maint/package-test.sh

 ECHO=
 
 OPT1='--with-shared-libraries=1 --with-debugging=0'
-OPT2='--with-clanguage=cxx --with-sieve=1 --with-log=0'
+OPT2='--with-clanguage=cxx --with-log=0'
 OPT3='--with-scalar-type=complex --with-clanguage=cxx --with-pic=0 --with-log=0'
 
 DATAFILESPATH=/home/petsc/datafiles
 testexamples_HDF5: ${TESTEXAMPLES_HDF5}
 testexamples_CHACO: ${TESTEXAMPLES_CHACO}
 testexamples_TRIANGLE: ${TESTEXAMPLES_TRIANGLE}
-testexamples_SIEVE: ${TESTEXAMPLES_SIEVE}
 
 testexamples_BOOST: ${TESTEXAMPLES_BOOST}
 testexamples_TETGEN: ${TESTEXAMPLES_TETGEN}
 	-@${OMAKE} testexamples_CHACO TESTEXAMPLES_CHACO=`echo ${TESTEXAMPLES_CHACO} | sed s/runex[0-9]*[a-z0-9_]*//g`
 buildexamples_TRIANGLE:
 	-@${OMAKE} testexamples_TRIANGLE TESTEXAMPLES_TRIANGLE=`echo ${TESTEXAMPLES_TRIANGLE} | sed s/runex[0-9]*[a-z0-9_]*//g`
-buildexamples_SIEVE:
-	-@${OMAKE} testexamples_SIEVE TESTEXAMPLES_SIEVE=`echo ${TESTEXAMPLES_SIEVE} | sed s/runex[0-9]*[a-z0-9_]*//g`
 
 buildexamples_BOOST:
 	-@${OMAKE} testexamples_BOOST TESTEXAMPLES_BOOST=`echo ${TESTEXAMPLES_BOOST} | sed s/runex[0-9]*[a-z0-9_]*//g`

File conf/variables

 
 PETSC_MIXED_LIB           = ${C_SH_LIB_PATH} -L${PETSC_LIB_DIR}  -lpetscsnes -lpetscvec -lpetscsys -lpetscksp_single -lpetscmat_single -lpetscvec_single  -lpetscsys_single  ${PETSC_EXTERNAL_LIB_BASIC}
 
-SIEVE_FLAGS = #-DALE_USE_DEBUGGING -DALE_HAVE_CXX_ABI -DALE_USE_LOGGING -DALE_LOGGING_USE_EVENTS -DALE_LOGGING_VERBOSE # -DALE_LOGGING_LOG_MEM
-
 #
 #  Escape codes to change the text color on xterms and terminals
 #

File include/makefile

 SOURCEF  =
 SOURCEH  = petscsys.h
 LIBBASE  = libpetscvec
-DIRS     = finclude petsc-private sieve
+DIRS     = finclude petsc-private
 LOCDIR   = include/
 MANSEC   = Sys
 

File include/petscvec.h

 #define VECMPI         "mpi"
 #define VECSTANDARD    "standard"   /* seq on one process and mpi on several */
 #define VECSHARED      "shared"
-#define VECSIEVE       "sieve"
 #define VECSEQCUSP     "seqcusp"
 #define VECMPICUSP     "mpicusp"
 #define VECCUSP        "cusp"       /* seqcusp on one process and mpicusp on several */

File src/contrib/style/checks/cpp-comments.sh

 # - Remove lines containing http, ftp: or file: as in http:// or https://
 # - Remove C++ comments inside C comments escaped with a Dollar-sign (used for sowing)
 # - Remove HTML doctype declaration
-# - Ignore Sieve in dm/impls/mesh/
 # - Ignore a special string inside src/snes/impls/test/snestest.c
 # - Ignore other special cases
 
 grep -n -H -F "//" "$@" \
  | grep -v "http\|ftp:\|file:" \
  | grep -v -F ":$" \
- | grep -v -F "src/dm/impls/mesh/" \
  | grep -v -F "<!DOCTYPE" \
  | grep -v -F "||//J||" \
  | grep -v -F "\"://\""

File src/docs/website/documentation/changes/dev.html

       <ul>
         <li>The MatType argument is removed from DMCreateMatrix(), you can use DMSetMatType() to indicate the type you want used with a DM, defaults to MATAIJ</li>
       </ul>
-      <h4>DMComplex/DMPlex:</h4>
-      <h4>DMMesh:</h4>
-      <h4>DMMG:</h4>
+      <h4>DMPlex:</h4>
       <h4>PetscViewer:</h4>
       <h4>SYS:</h4>
       <h4>AO:</h4>
       <h4>Sieve:</h4>
+      <ul>
+        <li>Sieve/DMMesh has been removed entirely.  Use DMPlex.</li>
+      </ul>
       <h4>Fortran:</h4>
       <h4>ExternalPackages:</h4>
     </div>