![(please configure the [header_logo] section in trac.ini)](/trac/issm/chrome/common/trac_banner.png)
Changeset 4656
- Timestamp:
- 07/19/10 12:34:04 (15 years ago)
- Location:
- issm/trunk
- Files:
-
- 6 added
- 6 edited
-
configs/linux64/linux64.sh.petsc2 (modified) (1 diff)
-
m4/issm_options.m4 (modified) (1 diff)
-
src/c/Makefile.am (modified) (4 diffs)
-
src/c/modules/Scotchx (added)
-
src/c/modules/Scotchx/Scotchx.cpp (added)
-
src/c/modules/Scotchx/Scotchx.h (added)
-
src/c/modules/modules.h (modified) (1 diff)
-
src/mex/Makefile.am (modified) (4 diffs)
-
src/mex/Scotch (added)
-
src/mex/Scotch/Scotch.cpp (added)
-
src/mex/Scotch/Scotch.h (added)
-
test/Verification/test01_IceShelfIceFrontM2d/configuration.m (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/configs/linux64/linux64.sh.petsc2
r4648 r4656 1 1 #!/bin/sh 2 2 3 ./configure --prefix=$ISSM_DIR --with-matlab-dir=$MATLAB_DIR --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install --with-metis-dir=$ISSM_DIR/externalpackages/metis/install --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH -lPLAPACK" --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH/INCLUDE" --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/MUMPS_4.6.3/$ISSM_ARCH --with-fortran-lib="-L/usr/lib/gcc/x86_64-redhat-linux/4.1.1/ -lgfortran" --with-graphics-lib=/usr/lib64/libX11.so --with-cxxoptflags="-march=opteron -O2" --with-numthreads=32 --with-petsc-version=2 3 ./configure --prefix=$ISSM_DIR --with-matlab-dir=$MATLAB_DIR --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install --with-metis-dir=$ISSM_DIR/externalpackages/metis/install --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH -lPLAPACK" --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH/INCLUDE" --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/MUMPS_4.6.3/$ISSM_ARCH --with-fortran-lib="-L/usr/lib/gcc/x86_64-redhat-linux/4.1.1/ -lgfortran" --with-graphics-lib=/usr/lib64/libX11.so --with-cxxoptflags="-march=opteron -O2" --with-numthreads=32 --with-petsc-version=2 --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install -
issm/trunk/m4/issm_options.m4
r4641 r4656 212 212 fi 213 213 AC_MSG_RESULT($HAVE_CHACO) 214 dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%chaco-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 214 dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%chaco-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 215 216 217 218 219 dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%scotch-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 220 AC_ARG_WITH([scotch-dir], 221 AS_HELP_STRING([--with-scotch-dir = DIR], [scotch root directory.]), 222 [SCOTCH_ROOT=$withval],[SCOTCH_ROOT=""]) 223 AC_MSG_CHECKING(for Scotch ) 224 225 if test -d "$SCOTCH_ROOT"; then 226 227 dnl defaults 228 HAVE_SCOTCH=yes 229 SCOTCHINCL="-I$SCOTCH_ROOT/include -DSCOTCH_VERSION=\\\"UNKNOWN\\\"" 230 SCOTCHLIB="-L$SCOTCH_ROOT/lib -lscotch -lscotcherr -lscotcherrexit -lscotchmetis" 231 232 233 AC_DEFINE([_HAVE_SCOTCH_],[1],[with Scotch in ISSM src]) 234 AC_SUBST([SCOTCHINCL]) 235 AC_SUBST([SCOTCHLIB]) 236 237 else 238 HAVE_SCOTCH=no 239 fi 240 AC_MSG_RESULT($HAVE_SCOTCH) 241 dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%scotch-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 242 215 243 216 244 -
issm/trunk/src/c/Makefile.am
r4639 r4656 1 INCLUDES = @DAKOTAINCL@ @PETSCINCL@ @SLEPCINCL@ @MPIINCL@ @MATLABINCL@ @METISINCL@ @CHACOINCL@ @ PLAPACKINCL@ @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@ @TRIANGLEINCL@1 INCLUDES = @DAKOTAINCL@ @PETSCINCL@ @SLEPCINCL@ @MPIINCL@ @MATLABINCL@ @METISINCL@ @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@ @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@ @TRIANGLEINCL@ 2 2 3 3 #Compile serial library, and then try and compile parallel library … … 539 539 ./modules/PenaltySystemMatricesx/PenaltySystemMatricesx.cpp\ 540 540 ./modules/PenaltySystemMatricesx/PenaltySystemMatricesx.h\ 541 ./modules/Scotchx/Scotchx.cpp\ 542 ./modules/Scotchx/Scotchx.h\ 541 543 ./modules/Solverx/Solverx.cpp\ 542 544 ./modules/Solverx/Solverx.h\ … … 1091 1093 ./modules/Solverx/Solverx.cpp\ 1092 1094 ./modules/Solverx/Solverx.h\ 1095 ./modules/Scotchx/Scotchx.cpp\ 1096 ./modules/Scotchx/Scotchx.h\ 1093 1097 ./modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp\ 1094 1098 ./modules/Mergesolutionfromftogx/Mergesolutionfromftogx.h\ … … 1156 1160 endif 1157 1161 1158 LDADD = ./libpISSM.a $(PETSCLIB) $(FLIBS) $(PLAPACKLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLACSLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $( BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) libOverload.a $(MULTITHREADINGLIB)1162 LDADD = ./libpISSM.a $(PETSCLIB) $(FLIBS) $(PLAPACKLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLACSLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) libOverload.a $(MULTITHREADINGLIB) 1159 1163 1160 1164 issm_exe_SOURCES = solutions/issm.cpp -
issm/trunk/src/c/modules/modules.h
r4639 r4656 8 8 /*Modules: */ 9 9 #include "./AddExternalResultx/AddExternalResultx.h" 10 #include "./AverageFilterx/AverageFilterx.h" 11 #include "./Bamgx/Bamgx.h" 12 #include "./BamgConvertMeshx/BamgConvertMeshx.h" 13 #include "./BuildNodeSetsx/BuildNodeSetsx.h" 10 14 #include "./Chacox/Chacox.h" 11 #include "./ModelProcessorx/ModelProcessorx.h" 12 #include "./VerticesDofx/VerticesDofx.h" 13 #include "./NodesDofx/NodesDofx.h" 14 #include "./Dux/Dux.h" 15 #include "./SpcNodesx/SpcNodesx.h" 16 #include "./MpcNodesx/MpcNodesx.h" 15 #include "./ComputeBasalStressx/ComputeBasalStressx.h" 16 #include "./ComputePressurex/ComputePressurex.h" 17 #include "./ComputeStrainRatex/ComputeStrainRatex.h" 18 #include "./ConfigureObjectsx/ConfigureObjectsx.h" 17 19 #include "./ContourToMeshx/ContourToMeshx.h" 18 20 #include "./ContourToNodesx/ContourToNodesx.h" 21 #include "./CostFunctionx/CostFunctionx.h" 22 #include "./DakotaResponsesx/DakotaResponsesx.h" 23 #include "./Dux/Dux.h" 24 #include "./ElementConnectivityx/ElementConnectivityx.h" 25 #include "./FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.h" 26 #include "./FieldDepthAveragex/FieldDepthAveragex.h" 27 #include "./GetSolutionFromInputsx/GetSolutionFromInputsx.h" 28 #include "./GetVectorFromInputsx/GetVectorFromInputsx.h" 29 #include "./Gradjx/Gradjx.h" 30 #include "./HoleFillerx/HoleFillerx.h" 31 #include "./InputAXPYx/InputAXPYx.h" 32 #include "./InputControlConstrainx/InputControlConstrainx.h" 33 #include "./InputConvergencex/InputConvergencex.h" 34 #include "./InputDepthAveragex/InputDepthAveragex.h" 35 #include "./InputDuplicatex/InputDuplicatex.h" 36 #include "./InputScalex/InputScalex.h" 19 37 #include "./InterpFromGridToMeshx/InterpFromGridToMeshx.h" 20 38 #include "./InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.h" 21 39 #include "./InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.h" 22 40 #include "./InterpFromMeshToGridx/InterpFromMeshToGridx.h" 23 #include "./HoleFillerx/HoleFillerx.h" 24 #include "./AverageFilterx/AverageFilterx.h" 25 #include "./MeshPartitionx/MeshPartitionx.h" 26 #include "./BuildNodeSetsx/BuildNodeSetsx.h" 27 #include "./Reducevectorgtosx/Reducevectorgtosx.h" 28 #include "./Reducevectorgtofx/Reducevectorgtofx.h" 29 #include "./NormalizeConstraintsx/NormalizeConstraintsx.h" 30 #include "./ConfigureObjectsx/ConfigureObjectsx.h" 31 #include "./SystemMatricesx/SystemMatricesx.h" 41 #include "./InputExtrudex/InputExtrudex.h" 42 #include "./InputToResultx/InputToResultx.h" 32 43 #include "./InputUpdateFromConstantx/InputUpdateFromConstantx.h" 33 44 #include "./InputUpdateFromSolutionx/InputUpdateFromSolutionx.h" 34 45 #include "./InputUpdateFromDakotax/InputUpdateFromDakotax.h" 35 46 #include "./InputUpdateFromVectorx/InputUpdateFromVectorx.h" 47 #include "./MassFluxx/MassFluxx.h" 48 #include "./MaxAbsVxx/MaxAbsVxx.h" 49 #include "./MaxAbsVyx/MaxAbsVyx.h" 50 #include "./MaxAbsVzx/MaxAbsVzx.h" 51 #include "./MaxVelx/MaxVelx.h" 52 #include "./MaxVxx/MaxVxx.h" 53 #include "./MaxVyx/MaxVyx.h" 54 #include "./MaxVzx/MaxVzx.h" 55 #include "./Mergesolutionfromftogx/Mergesolutionfromftogx.h" 56 #include "./MeshPartitionx/MeshPartitionx.h" 57 #include "./MinVelx/MinVelx.h" 58 #include "./MinVxx/MinVxx.h" 59 #include "./MinVyx/MinVyx.h" 60 #include "./MinVzx/MinVzx.h" 61 #include "./Misfitx/Misfitx.h" 62 #include "./ModelProcessorx/ModelProcessorx.h" 63 #include "./MpcNodesx/MpcNodesx.h" 64 #include "./NodeConnectivityx/NodeConnectivityx.h" 65 #include "./NodesDofx/NodesDofx.h" 66 #include "./NormalizeConstraintsx/NormalizeConstraintsx.h" 67 #include "./Orthx/Orthx.h" 68 #include "./OutputResultsx/OutputResultsx.h" 69 #include "./OutputRiftsx/OutputRiftsx.h" 70 #include "./PenaltyConstraintsx/PenaltyConstraintsx.h" 71 #include "./PenaltySystemMatricesx/PenaltySystemMatricesx.h" 72 #include "./PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h" 73 #include "./Qmux/Qmux.h" 74 #include "./Reduceloadfromgtofx/Reduceloadfromgtofx.h" 75 #include "./Reducematrixfromgtofx/Reducematrixfromgtofx.h" 76 #include "./Reducevectorgtosx/Reducevectorgtosx.h" 77 #include "./Reducevectorgtofx/Reducevectorgtofx.h" 78 #include "./Scotchx/Scotchx.h" 79 #include "./Solverx/Solverx.h" 80 #include "./SpcNodesx/SpcNodesx.h" 81 #include "./SplitSolutionVectorx/SplitSolutionVectorx.h" 82 #include "./SurfaceAreax/SurfaceAreax.h" 83 #include "./SystemMatricesx/SystemMatricesx.h" 36 84 #include "./UpdateGeometryx/UpdateGeometryx.h" 37 85 #include "./UpdateVertexPositionsx/UpdateVertexPositionsx.h" 38 #include "./PenaltySystemMatricesx/PenaltySystemMatricesx.h"39 #include "./Reducematrixfromgtofx/Reducematrixfromgtofx.h"40 #include "./Reduceloadfromgtofx/Reduceloadfromgtofx.h"41 #include "./Solverx/Solverx.h"42 #include "./Mergesolutionfromftogx/Mergesolutionfromftogx.h"43 #include "./PenaltyConstraintsx/PenaltyConstraintsx.h"44 #include "./PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h"45 #include "./Gradjx/Gradjx.h"46 #include "./Orthx/Orthx.h"47 #include "./Misfitx/Misfitx.h"48 #include "./SurfaceAreax/SurfaceAreax.h"49 #include "./CostFunctionx/CostFunctionx.h"50 #include "./InputControlConstrainx/InputControlConstrainx.h"51 #include "./FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.h"52 #include "./FieldDepthAveragex/FieldDepthAveragex.h"53 #include "./ComputeBasalStressx/ComputeBasalStressx.h"54 #include "./ComputePressurex/ComputePressurex.h"55 #include "./ComputeStrainRatex/ComputeStrainRatex.h"56 86 #include "./VecExtrudex/VecExtrudex.h" 57 #include "./Qmux/Qmux.h" 58 #include "./NodeConnectivityx/NodeConnectivityx.h" 59 #include "./ElementConnectivityx/ElementConnectivityx.h" 60 #include "./OutputRiftsx/OutputRiftsx.h" 61 #include "./MassFluxx/MassFluxx.h" 62 #include "./Bamgx/Bamgx.h" 63 #include "./BamgConvertMeshx/BamgConvertMeshx.h" 64 #include "./SplitSolutionVectorx/SplitSolutionVectorx.h" 65 #include "./InputDepthAveragex/InputDepthAveragex.h" 66 #include "./InputExtrudex/InputExtrudex.h" 67 #include "./InputToResultx/InputToResultx.h" 68 #include "./GetSolutionFromInputsx/GetSolutionFromInputsx.h" 69 #include "./OutputResultsx/OutputResultsx.h" 70 #include "./MinVelx/MinVelx.h" 71 #include "./MaxVelx/MaxVelx.h" 72 #include "./MinVxx/MinVxx.h" 73 #include "./MaxVxx/MaxVxx.h" 74 #include "./MaxAbsVxx/MaxAbsVxx.h" 75 #include "./MinVyx/MinVyx.h" 76 #include "./MaxVyx/MaxVyx.h" 77 #include "./MaxAbsVyx/MaxAbsVyx.h" 78 #include "./MinVzx/MinVzx.h" 79 #include "./MaxVzx/MaxVzx.h" 80 #include "./MaxAbsVzx/MaxAbsVzx.h" 81 #include "./InputDuplicatex/InputDuplicatex.h" 82 #include "./InputScalex/InputScalex.h" 83 #include "./InputAXPYx/InputAXPYx.h" 84 #include "./GetVectorFromInputsx/GetVectorFromInputsx.h" 85 #include "./InputConvergencex/InputConvergencex.h" 86 #include "./DakotaResponsesx/DakotaResponsesx.h" 87 #include "./VerticesDofx/VerticesDofx.h" 87 88 88 89 #endif -
issm/trunk/src/mex/Makefile.am
r4640 r4656 1 INCLUDES = @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ 1 INCLUDES = @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ 2 2 EXEEXT=$(MEXEXT) 3 3 … … 61 61 Reducevectorgtos\ 62 62 Reducevectorgtof\ 63 Scotch\ 63 64 SetStructureField\ 64 65 Solver\ … … 82 83 83 84 84 LDADD = $(TRIANGLELIB) ../c/libISSM.a $(PETSCLIB) $(FLIBS) $(PLAPACKLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLACSLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $( BLASLAPACKLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB)85 LDADD = $(TRIANGLELIB) ../c/libISSM.a $(PETSCLIB) $(FLIBS) $(PLAPACKLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLACSLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) 85 86 86 87 AM_LDFLAGS = $(MEXLINK) … … 273 274 Reducevectorgtof/Reducevectorgtof.h 274 275 276 Scotch_SOURCES = Scotch/Scotch.cpp\ 277 Scotch/Scotch.h 278 275 279 SetStructureField_SOURCES = SetStructureField/SetStructureField.cpp\ 276 280 SetStructureField/SetStructureField.h -
issm/trunk/test/Verification/test01_IceShelfIceFrontM2d/configuration.m
r4544 r4656 3 3 4 4 %meshing 5 resolution=5000 0;5 resolution=5000; 6 6 domainname='DomainOutline.exp'; 7 7 riftname='';
Note:
See TracChangeset
for help on using the changeset viewer.
