Index: /issm/trunk/externalpackages/chaco/chaco.patch =================================================================== --- /issm/trunk/externalpackages/chaco/chaco.patch (revision 4706) +++ /issm/trunk/externalpackages/chaco/chaco.patch (revision 4707) @@ -1,4 +1,5 @@ +Only in src/code/assign: assign.o diff -rc src/code/assign/assign_out.c old/code/assign/assign_out.c -*** src/code/assign/assign_out.c 2010-07-16 16:13:13.106937437 -0700 +*** src/code/assign/assign_out.c 2010-07-16 16:28:47.352242454 -0700 --- old/code/assign/assign_out.c 1995-08-08 14:32:10.000000000 -0700 *************** @@ -12,6 +13,46 @@ --- 3,8 ---- +Only in src/code/assign: assign_out.o +Only in src/code/assign: mapper.o +Only in src/code/assign: median.o +Only in src/code/assign: merge_assign.o +Only in src/code/assign: rec_median.o +Only in src/code/assign: rotate.o +Only in src/code/assign: y2x.o +Only in src/code/bpmatch: checkbp.o +Only in src/code/bpmatch: genvals2d.o +Only in src/code/bpmatch: genvals3d.o +Only in src/code/bpmatch: inits2d.o +Only in src/code/bpmatch: inits3d.o +Only in src/code/bpmatch: map2d.o +Only in src/code/bpmatch: map3d.o +Only in src/code/bpmatch: movevtxs.o +Only in src/code/bpmatch: sorts2d.o +Only in src/code/bpmatch: sorts3d.o +Only in src/code: chacominusblas.a +Only in src/code/coarsen: coarsen1.o +Only in src/code/coarsen: coarsen.o +Only in src/code/coarsen: interpolate.o +Only in src/code/coarsen: makeccoords.o +Only in src/code/coarsen: makefgraph.o +Only in src/code/coarsen: makev2cv.o +Only in src/code/coarsen: maxmatch1.o +Only in src/code/coarsen: maxmatch2.o +Only in src/code/coarsen: maxmatch3.o +Only in src/code/coarsen: maxmatch4.o +Only in src/code/coarsen: maxmatch5.o +Only in src/code/coarsen: maxmatch.o +Only in src/code/connect: add_edges.o +Only in src/code/connect: connected.o +Only in src/code/connect: find_edges.o +Only in src/code/eigen: bidir.o +Only in src/code/eigen: bisect.o +Only in src/code/eigen: checkeig_ext.o +Only in src/code/eigen: checkeig.o +Only in src/code/eigen: checkorth.o +Only in src/code/eigen: cksturmcnt.o +Only in src/code/eigen: eigensolve.o diff -rc src/code/eigen/get_extval.c old/code/eigen/get_extval.c -*** src/code/eigen/get_extval.c 2010-07-16 16:13:13.107937445 -0700 +*** src/code/eigen/get_extval.c 2010-07-16 16:28:47.353242463 -0700 --- old/code/eigen/get_extval.c 1995-08-08 14:32:20.000000000 -0700 *************** @@ -25,6 +66,82 @@ tridiagonal T using using Rafael's bisection technique. */ --- 4,9 ---- +Only in src/code/eigen: get_extval.o +Only in src/code/eigen: get_ritzvals.o +Only in src/code/eigen: lanc_seconds.o +Only in src/code/eigen: lanczos_ext_float.o +Only in src/code/eigen: lanczos_ext.o +Only in src/code/eigen: lanczos_FO.o +Only in src/code/eigen: lanczos_SO_float.o +Only in src/code/eigen: lanczos_SO.o +Only in src/code/eigen: lanpause.o +Only in src/code/eigen: makeorthlnk.o +Only in src/code/eigen: mkeigvecs.o +Only in src/code/eigen: mkscanlist.o +Only in src/code/eigen: orthog1.o +Only in src/code/eigen: orthogonalize.o +Only in src/code/eigen: orthogvec.o +Only in src/code/eigen: ql.o +Only in src/code/eigen: rqi_ext.o +Only in src/code/eigen: rqi.o +Only in src/code/eigen: scale_diag.o +Only in src/code/eigen: scanmax.o +Only in src/code/eigen: scanmin.o +Only in src/code/eigen: solistout.o +Only in src/code/eigen: sorthog.o +Only in src/code/eigen: splarax.o +Only in src/code/eigen: sturmcnt.o +Only in src/code/eigen: Tevec.o +Only in src/code/eigen: tri_solve.o +Only in src/code/eigen: warnings.o +Only in src/code/graph: check_graph.o +Only in src/code/graph: free_graph.o +Only in src/code/graph: graph_out.o +Only in src/code/graph: reformat.o +Only in src/code/graph: subgraph.o +Only in src/code/inertial: eigenvec2.o +Only in src/code/inertial: eigenvec3.o +Only in src/code/inertial: inertial1d.o +Only in src/code/inertial: inertial2d.o +Only in src/code/inertial: inertial3d.o +Only in src/code/inertial: inertial.o +Only in src/code/inertial: make_subgeom.o +Only in src/code/input: check_input.o +Only in src/code/input: input_assign.o +Only in src/code/input: input_geom.o +Only in src/code/input: input_graph.o +Only in src/code/input: input.o +Only in src/code/input: read_params.o +Only in src/code/input: read_val.o +Only in src/code/input: reflect_input.o +Only in src/code/internal: check_internal.o +Only in src/code/internal: force_internal.o +Only in src/code/internal: improve_internal.o +Only in src/code/klspiff: bilistops.o +Only in src/code/klspiff: buckets1.o +Only in src/code/klspiff: buckets_bi.o +Only in src/code/klspiff: buckets.o +Only in src/code/klspiff: coarsen_kl.o +Only in src/code/klspiff: compress_ewgts.o +Only in src/code/klspiff: count_weights.o +Only in src/code/klspiff: kl_init.o +Only in src/code/klspiff: kl_output.o +Only in src/code/klspiff: klspiff.o +Only in src/code/klspiff: make_bndy_list.o +Only in src/code/klspiff: make_kl_list.o +Only in src/code/klspiff: nway_kl.o +Only in src/code/klvspiff: bpm_improve.o +Only in src/code/klvspiff: bucketsv.o +Only in src/code/klvspiff: clear_dvals.o +Only in src/code/klvspiff: coarsen_klv.o +Only in src/code/klvspiff: countup_vtx_sep.o +Only in src/code/klvspiff: find_bndy.o +Only in src/code/klvspiff: flatten.o +Only in src/code/klvspiff: flow.o +Only in src/code/klvspiff: klv_init.o +Only in src/code/klvspiff: klvspiff.o +Only in src/code/klvspiff: make_bpgraph.o +Only in src/code/klvspiff: make_sep_list.o diff -rc src/code/klvspiff/matching.c old/code/klvspiff/matching.c -*** src/code/klvspiff/matching.c 2010-07-16 16:13:13.110937469 -0700 +*** src/code/klvspiff/matching.c 2010-07-16 16:28:47.356242493 -0700 --- old/code/klvspiff/matching.c 1996-03-11 10:24:25.000000000 -0800 *************** @@ -38,6 +155,8 @@ #define FALSE 0 --- 6,11 ---- +Only in src/code/klvspiff: matching.o +Only in src/code/klvspiff: nway_klv.o diff -rc src/code/main/defs.h old/code/main/defs.h -*** src/code/main/defs.h 2010-07-16 16:13:13.112937485 -0700 +*** src/code/main/defs.h 2010-07-16 16:28:47.359242522 -0700 --- old/code/main/defs.h 1995-08-08 14:32:41.000000000 -0700 *************** @@ -94,6 +213,8 @@ ! #define TWOPI 6.283185307179586 ! #define HALFPI 1.570796326794896 +Only in src/code/main: interface.o +Only in src/code/main: main.o diff -rc src/code/main/params.h old/code/main/params.h -*** src/code/main/params.h 2010-07-16 16:13:13.115937510 -0700 +*** src/code/main/params.h 2010-07-16 16:28:47.361242541 -0700 --- old/code/main/params.h 1995-08-08 14:32:43.000000000 -0700 *************** @@ -112,6 +233,7 @@ - #endif //ifndef _CHACO_PARAMS_H_ --- 1,5 ---- +Only in src/code/main: user_params.o diff -rc src/code/Makefile old/code/Makefile -*** src/code/Makefile 2010-07-16 16:13:13.117937526 -0700 +*** src/code/Makefile 2010-07-21 18:22:19.909939194 -0700 --- old/code/Makefile 1997-10-02 10:23:22.000000000 -0700 *************** @@ -124,11 +246,11 @@ ! #OFLAGS = -O2 ! #CFLAGS = -fPIC -fno-omit-frame-pointer -D_GNU_SOURCE -pthread -fexceptions -! CFLAGS = -fPIC -fno-omit-frame-pointer -pthread -fexceptions +! CFLAGS = -fPIC -fno-omit-frame-pointer -pthread -fexceptions -g ! #CFLAGS = -fPIC -fno-omit-frame-pointer -pthread -fexceptions -DMATLAB - OFLAGS = -O2 -- #AR = /usr/ccs/bin/ar rcv # for solaris 2 -- AR = /usr/bin/ar rcv -- #RANLIB = /usr/ccs/bin/ranlib # for solaris 2 -- RANLIB = /usr/bin/ranlib +! OFLAGS = -O2 +! #AR = /usr/ccs/bin/ar rcv # for solaris 2 +! AR = /usr/bin/ar rcv +! #RANLIB = /usr/ccs/bin/ranlib # for solaris 2 +! RANLIB = /usr/bin/ranlib FILES.c= main/user_params.c main/interface.c main/main.c \ @@ -139,22 +261,115 @@ IFLAG = -Imain ! CFLAGS = -O2 - OFLAGS = -O2 +! OFLAGS = -O2 FILES.c= main/user_params.c main/interface.c main/main.c \ submain/balance.c submain/divide.c submain/submain.c \ *************** -*** 99,109 **** +*** 96,196 **** + util/update.c util/vecout.c util/vecran.c \ + util/vecscale.c + +- +- FILESMINUSBLAS.c= main/user_params.c main/interface.c main/main.c \ +- submain/balance.c submain/divide.c submain/submain.c \ +- input/input_assign.c \ +- input/check_input.c input/input.c input/input_geom.c \ +- input/input_graph.c input/read_params.c input/reflect_input.c \ +- input/read_val.c \ +- graph/check_graph.c graph/free_graph.c \ +- graph/reformat.c graph/subgraph.c graph/graph_out.c \ +- inertial/eigenvec2.c inertial/eigenvec3.c inertial/inertial.c \ +- inertial/inertial1d.c inertial/inertial2d.c \ +- inertial/inertial3d.c inertial/make_subgeom.c \ +- klspiff/buckets.c klspiff/buckets_bi.c klspiff/buckets1.c \ +- klspiff/bilistops.c klspiff/coarsen_kl.c klspiff/count_weights.c \ +- klspiff/compress_ewgts.c klspiff/kl_init.c klspiff/kl_output.c \ +- klspiff/klspiff.c klspiff/make_bndy_list.c \ +- klspiff/make_kl_list.c klspiff/nway_kl.c \ +- klvspiff/bpm_improve.c klvspiff/bucketsv.c \ +- klvspiff/clear_dvals.c klvspiff/coarsen_klv.c \ +- klvspiff/countup_vtx_sep.c klvspiff/find_bndy.c klvspiff/flow.c \ +- klvspiff/klv_init.c klvspiff/klvspiff.c klvspiff/make_bpgraph.c \ +- klvspiff/make_sep_list.c klvspiff/matching.c klvspiff/nway_klv.c \ +- klvspiff/flatten.c \ +- coarsen/coarsen.c coarsen/interpolate.c coarsen/makefgraph.c \ +- coarsen/makeccoords.c \ +- coarsen/coarsen1.c coarsen/makev2cv.c \ +- coarsen/maxmatch.c coarsen/maxmatch1.c coarsen/maxmatch2.c \ +- coarsen/maxmatch3.c coarsen/maxmatch4.c coarsen/maxmatch5.c \ +- connect/add_edges.c connect/connected.c connect/find_edges.c \ +- eigen/bidir.c eigen/bisect.c eigen/checkeig.c \ +- eigen/checkeig_ext.c \ +- eigen/checkorth.c eigen/cksturmcnt.c eigen/mkeigvecs.c\ +- eigen/eigensolve.c eigen/get_extval.c eigen/get_ritzvals.c \ +- eigen/lanczos_FO.c eigen/lanczos_SO.c eigen/lanczos_SO_float.c \ +- eigen/lanczos_ext.c eigen/lanczos_ext_float.c eigen/lanc_seconds.c\ +- eigen/lanpause.c eigen/makeorthlnk.c eigen/mkscanlist.c \ +- eigen/orthog1.c eigen/orthogonalize.c eigen/orthogvec.c \ +- eigen/ql.c eigen/rqi.c eigen/rqi_ext.c eigen/scale_diag.c \ +- eigen/scanmax.c eigen/scanmin.c eigen/solistout.c \ +- eigen/sorthog.c eigen/splarax.c eigen/sturmcnt.c \ +- eigen/Tevec.c eigen/tri_solve.c eigen/warnings.c \ +- symmlq/aprod.c symmlq/msolve.c symmlq/pow_dd.c \ +- symmlq/symmlq.c \ +- tinvit/tinvit.c tinvit/pythag.c tinvit/epslon.c \ +- optimize/determinant.c optimize/func2d.c \ +- optimize/func3d.c optimize/opt2d.c optimize/opt3d.c \ +- assign/assign.c assign/assign_out.c assign/mapper.c \ +- assign/median.c assign/merge_assign.c \ +- assign/rec_median.c assign/rotate.c assign/y2x.c \ +- bpmatch/checkbp.c bpmatch/inits2d.c bpmatch/inits3d.c \ +- bpmatch/genvals2d.c bpmatch/genvals3d.c bpmatch/map2d.c \ +- bpmatch/map3d.c bpmatch/movevtxs.c \ +- bpmatch/sorts2d.c bpmatch/sorts3d.c \ +- refine_map/compute_cube_edata.c refine_map/compute_cube_vdata.c \ +- refine_map/refine_cube.c refine_map/update_cube_edata.c \ +- refine_map/update_cube_vdata.c refine_map/find_edge_cube.c \ +- refine_map/init_cube_edata.c refine_map/compute_mesh_edata.c \ +- refine_map/compute_mesh_vdata.c refine_map/find_edge_mesh.c \ +- refine_map/init_mesh_edata.c refine_map/refine_mesh.c \ +- refine_map/update_mesh_edata.c refine_map/update_mesh_vdata.c \ +- refine_map/refine_map.c refine_map/make_comm_graph.c \ +- refine_part/refine_part.c refine_part/kl_refine.c \ +- refine_part/make_maps_ref.c refine_part/make_terms_ref.c \ +- internal/force_internal.c internal/improve_internal.c \ +- internal/check_internal.c \ +- misc/define_subcubes.c misc/define_submeshes.c \ +- misc/divide_procs.c misc/merge_goals.c misc/make_term_props.c \ +- misc/count.c misc/countup.c misc/countup_cube.c \ +- misc/countup_mesh.c misc/make_subgoal.c \ +- misc/find_maxdeg.c misc/make_maps.c misc/make_setlists.c \ +- misc/sequence.c misc/perturb.c misc/simple_part.c \ +- misc/time_kernels.c misc/timing.c \ +- util/affirm.c util/array_alloc_2D.c util/bit_reverse.c \ +- util/checkpnt.c util/cpvec.c util/dot.c \ +- util/doubleout.c util/input_int.c util/gray.c \ +- util/machine_params.c util/makevwsqrt.c util/mkvec.c util/norm.c \ +- util/normalize.c util/mergesort.c \ +- util/randomize.c util/smalloc.c util/bail.c \ +- util/scadd.c util/seconds.c util/setvec.c util/shell_sort.c \ +- util/strout.c util/tri_prod.c util/true_or_false.c \ +- util/update.c util/vecout.c util/vecran.c \ +- util/vecscale.c +- FILES.o= $(FILES.c:.c=.o) - - -! ${DEST}: ${FILES.c} chaco.a Makefile -! ${CC} ${OFLAGS} chaco.a -lm -o ${DEST} -! -! chaco.a: ${FILES.o} -! ${AR} chaco.a ${FILES.o} ; ${RANLIB} chaco.a +- FILESMINUSBLAS.o= $(FILESMINUSBLAS.c:.c=.o) +- +- +- ${DEST}: ${FILES.c} chaco.a Makefile +- ${CC} ${OFLAGS} chaco.a -lm -o ${DEST} + +- chaco.a: ${FILES.o} +- ${AR} chaco.a ${FILES.o} ; ${RANLIB} chaco.a + +! chacominusblas.a: ${FILESMINUSBLAS.o} +! ${AR} chacominusblas.a ${FILESMINUSBLAS.o} ; ${RANLIB} chacominusblas.a lint: lint ${IFLAG} ${FILES.c} -lm ---- 90,97 ---- +--- 87,97 ---- + util/update.c util/vecout.c util/vecran.c \ + util/vecscale.c + FILES.o= $(FILES.c:.c=.o) @@ -165,6 +380,23 @@ lint: lint ${IFLAG} ${FILES.c} -lm +Only in src/code/misc: count.o +Only in src/code/misc: countup_cube.o +Only in src/code/misc: countup_mesh.o +Only in src/code/misc: countup.o +Only in src/code/misc: define_subcubes.o +Only in src/code/misc: define_submeshes.o +Only in src/code/misc: divide_procs.o +Only in src/code/misc: find_maxdeg.o +Only in src/code/misc: make_maps.o +Only in src/code/misc: make_setlists.o +Only in src/code/misc: make_subgoal.o +Only in src/code/misc: make_term_props.o +Only in src/code/misc: merge_goals.o +Only in src/code/misc: perturb.o +Only in src/code/misc: sequence.o +Only in src/code/misc: simple_part.o +Only in src/code/misc: time_kernels.o diff -rc src/code/misc/timing.c old/code/misc/timing.c -*** src/code/misc/timing.c 2010-07-16 16:13:13.119937542 -0700 +*** src/code/misc/timing.c 2010-07-16 16:28:47.366242590 -0700 --- old/code/misc/timing.c 1997-01-03 09:10:52.000000000 -0800 *************** @@ -178,6 +410,65 @@ --- 3,8 ---- +Only in src/code/misc: timing.o +Only in src/code/optimize: determinant.o +Only in src/code/optimize: func2d.o +Only in src/code/optimize: func3d.o +Only in src/code/optimize: opt2d.o +Only in src/code/optimize: opt3d.o +Only in src/code/refine_map: compute_cube_edata.o +Only in src/code/refine_map: compute_cube_vdata.o +Only in src/code/refine_map: compute_mesh_edata.o +Only in src/code/refine_map: compute_mesh_vdata.o +Only in src/code/refine_map: find_edge_cube.o +Only in src/code/refine_map: find_edge_mesh.o +Only in src/code/refine_map: init_cube_edata.o +Only in src/code/refine_map: init_mesh_edata.o +Only in src/code/refine_map: make_comm_graph.o +Only in src/code/refine_map: refine_cube.o +Only in src/code/refine_map: refine_map.o +Only in src/code/refine_map: refine_mesh.o +Only in src/code/refine_map: update_cube_edata.o +Only in src/code/refine_map: update_cube_vdata.o +Only in src/code/refine_map: update_mesh_edata.o +Only in src/code/refine_map: update_mesh_vdata.o +Only in src/code/refine_part: kl_refine.o +Only in src/code/refine_part: make_maps_ref.o +Only in src/code/refine_part: make_terms_ref.o +Only in src/code/refine_part: refine_part.o +Only in src/code/submain: balance.o +Only in src/code/submain: divide.o +Only in src/code/submain: submain.o +Only in src/code/symmlq: aprod.o +Only in src/code/symmlq: msolve.o +Only in src/code/symmlq: pow_dd.o +diff -rc src/code/symmlq/symmlqblas.f old/code/symmlq/symmlqblas.f +*** src/code/symmlq/symmlqblas.f 2010-07-21 18:09:10.370123273 -0700 +--- old/code/symmlq/symmlqblas.f 2010-07-21 14:02:09.633743650 -0700 +*************** +*** 16,22 **** + c uses unrolled loops for increments equal to one. + c jack dongarra, linpack, 3/11/78. + c +! double precision dx(1),dy(1),da + integer i,incx,incy,ix,iy,m,mp1,n + c + if(n.le.0)return +--- 16,22 ---- + c uses unrolled loops for increments equal to one. + c jack dongarra, linpack, 3/11/78. + c +! double precision dx(*),dy(*),da + integer i,incx,incy,ix,iy,m,mp1,n + c + if(n.le.0)return +Only in src/code/symmlq: symmlqblas.o +Only in src/code/symmlq: symmlq.o +Only in src/code/tinvit: epslon.o +Only in src/code/tinvit: pythag.o +Only in src/code/tinvit: tinvit.o +Only in src/code/util: affirm.o +Only in src/code/util: array_alloc_2D.o diff -rc src/code/util/bail.c old/code/util/bail.c -*** src/code/util/bail.c 2010-07-16 16:13:13.121937558 -0700 +*** src/code/util/bail.c 2010-07-16 16:28:47.368242609 -0700 --- old/code/util/bail.c 1995-08-08 14:33:01.000000000 -0700 *************** @@ -201,6 +492,8 @@ if (msg != NULL && (int) strlen(msg) > 0) { printf("%s\n", msg); +Only in src/code/util: bail.o +Only in src/code/util: bit_reverse.o diff -rc src/code/util/checkpnt.c old/code/util/checkpnt.c -*** src/code/util/checkpnt.c 2010-07-16 16:13:13.123937575 -0700 +*** src/code/util/checkpnt.c 2010-07-16 16:28:47.370242629 -0700 --- old/code/util/checkpnt.c 1995-08-08 14:33:01.000000000 -0700 *************** @@ -214,6 +507,9 @@ void checkpnt(tag) --- 4,9 ---- +Only in src/code/util: checkpnt.o +Only in src/code/util: cpvec.o +Only in src/code/util: dot.o diff -rc src/code/util/doubleout.c old/code/util/doubleout.c -*** src/code/util/doubleout.c 2010-07-16 16:13:13.124937583 -0700 +*** src/code/util/doubleout.c 2010-07-16 16:28:47.372242648 -0700 --- old/code/util/doubleout.c 1995-08-08 14:33:02.000000000 -0700 *************** @@ -227,6 +523,20 @@ void doubleout(number, mode) --- 3,8 ---- +Only in src/code/util: doubleout.o +Only in src/code/util: gray.o +Only in src/code/util: input_int.o +Only in src/code/util: machine_params.o +Only in src/code/util: makevwsqrt.o +Only in src/code/util: mergesort.o +Only in src/code/util: mkvec.o +Only in src/code/util: normalize.o +Only in src/code/util: norm.o +Only in src/code/util: randomize.o +Only in src/code/util: scadd.o +Only in src/code/util: seconds.o +Only in src/code/util: setvec.o +Only in src/code/util: shell_sort.o diff -rc src/code/util/smalloc.c old/code/util/smalloc.c -*** src/code/util/smalloc.c 2010-07-16 16:13:13.126937599 -0700 +*** src/code/util/smalloc.c 2010-07-16 16:28:47.375242677 -0700 --- old/code/util/smalloc.c 1996-03-11 10:44:07.000000000 -0800 *************** @@ -240,6 +550,7 @@ static int nfree = 0; /* number of calls to free */ --- 4,9 ---- +Only in src/code/util: smalloc.o diff -rc src/code/util/strout.c old/code/util/strout.c -*** src/code/util/strout.c 2010-07-16 16:13:13.128937615 -0700 +*** src/code/util/strout.c 2010-07-16 16:28:47.377242697 -0700 --- old/code/util/strout.c 1995-08-08 14:33:05.000000000 -0700 *************** @@ -253,2 +564,9 @@ Prints to screen and to output file if there is one. */ --- 4,9 ---- +Only in src/code/util: strout.o +Only in src/code/util: tri_prod.o +Only in src/code/util: true_or_false.o +Only in src/code/util: update.o +Only in src/code/util: vecout.o +Only in src/code/util: vecran.o +Only in src/code/util: vecscale.o Index: /issm/trunk/externalpackages/chaco/install.sh =================================================================== --- /issm/trunk/externalpackages/chaco/install.sh (revision 4706) +++ /issm/trunk/externalpackages/chaco/install.sh (revision 4707) @@ -26,4 +26,5 @@ cd src/code make -j $NUMCPUS +make -j $NUMCPUS chacominusblas.a # Clean up objects (but not library or executable) @@ -42,4 +43,5 @@ mkdir install/lib mv src/code/chaco.a install/lib/libchaco.a +mv src/code/chacominusblas.a install/lib/libchacominusblas.a mkdir install/exec mv src/exec/chaco install/exec