Index: /issm/trunk/configure.ac =================================================================== --- /issm/trunk/configure.ac (revision 22757) +++ /issm/trunk/configure.ac (revision 22758) @@ -2,5 +2,5 @@ #AUTOCONF -AC_INIT([Ice Sheet System Model (ISSM)],[4.12],[issm@jpl.nasa.gov],[issm],[http://issm.jpl.nasa.gov]) #Initializing configure +AC_INIT([Ice Sheet System Model (ISSM)],[4.13],[issm@jpl.nasa.gov],[issm],[http://issm.jpl.nasa.gov]) #Initializing configure AC_CONFIG_AUX_DIR([./aux-config]) #Put config files in aux-config AC_CONFIG_MACRO_DIR([m4]) #m4 macros are located in m4 @@ -20,4 +20,5 @@ AC_PROG_CXX([icpc cl icl g++]) AC_PROG_F77([ifort g77 gfortran]) +AC_PROG_FC([ifort gfortran]) #AUTOMAKE Index: /issm/trunk/etc/environment.csh =================================================================== --- /issm/trunk/etc/environment.csh (revision 22757) +++ /issm/trunk/etc/environment.csh (revision 22758) @@ -18,4 +18,9 @@ setenv PETSC_DIR {$PETSC_DIR} setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$PETSC_DIR/lib +endif + +set SCOTCH_DIR="$ISSM_DIR/externalpackages/scotch/install" +if (-d $SCOTCH_DIR) then + setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$SCOTCH_DIR/lib endif Index: /issm/trunk/etc/environment.sh =================================================================== --- /issm/trunk/etc/environment.sh (revision 22757) +++ /issm/trunk/etc/environment.sh (revision 22758) @@ -96,4 +96,7 @@ libpathappend "$PETSC_DIR/lib" fi + +SCOTCH_DIR="$ISSM_DIR/externalpackages/scotch/install" +libpathappend "$SCOTCH_DIR/lib" SLEPC_DIR="$ISSM_DIR/externalpackages/slepc/install" Index: sm/trunk/examples/Data/Download.sh =================================================================== --- /issm/trunk/examples/Data/Download.sh (revision 22757) +++ (revision ) @@ -1,25 +1,0 @@ -#!/bin/bash - -echo "Downloading Square shelf dataset" -$ISSM_DIR/scripts/DownloadExternalPackage2.py 'http://issm.jpl.nasa.gov/files/workshop2014/SquareShelf.nc' 'SquareShelf.nc' - -echo "Downloading SeaRISE dataset - Antarctica" -$ISSM_DIR/scripts/DownloadExternalPackage2.py 'http://websrv.cs.umt.edu/isis/images/c/cc/Antarctica_5km_withshelves_v0.75.nc' 'Antarctica_5km_withshelves_v0.75.nc' - -echo "Downloading InSAR Antarctic velocities" -$ISSM_DIR/scripts/DownloadExternalPackage2.py 'ftp://n5eil01u.ecs.nsidc.org/SAN/MEASURES/NSIDC-0484.001/1996.01.01/antarctica_ice_velocity_900m.nc' 'Antarctica_ice_velocity.nc' - -echo "Downloading PIG errors" -$ISSM_DIR/scripts/DownloadExternalPackage2.py 'http://issm.jpl.nasa.gov/files/workshop2014/CrossOvers2009.mat' 'CrossOvers2009.mat' - -echo "Downloading SeaRISE dataset - Greenland" -$ISSM_DIR/scripts/DownloadExternalPackage2.py 'http://websrv.cs.umt.edu/isis/images/e/e9/Greenland_5km_dev1.2.nc' 'Greenland_5km_dev1.2.nc' - -echo "Downloading Jason Box's SMB" -$ISSM_DIR/scripts/DownloadExternalPackage2.py 'http://issm.jpl.nasa.gov/files/examples/Box_Greenland_SMB_monthly_1840-2012_5km_cal_ver20141007.nc' 'Box_Greenland_SMB_monthly_1840-2012_5km_cal_ver20141007.nc' - -echo "Downloading IceBridge Jakobshavn bedrock" -$ISSM_DIR/scripts/DownloadExternalPackage2.py 'https://data.cresis.ku.edu/data/grids/old_versions/Jakobshavn_2008_2011_Composite.zip' 'Jakobshavn_2008_2011_Composite.zip' -unzip Jakobshavn_2008_2011_Composite.zip -mv Jakobshavn_2008_2011_Composite/grids/Jakobshavn_2008_2011_Composite_XYZGrid.txt . -rm -rf Jakobshavn_2008_2011_Composite Jakobshavn_2008_2011_Composite.zip Index: /issm/trunk/examples/UncertaintyQuantification/runme.m =================================================================== --- /issm/trunk/examples/UncertaintyQuantification/runme.m (revision 22757) +++ /issm/trunk/examples/UncertaintyQuantification/runme.m (revision 22758) @@ -14,6 +14,6 @@ textpositions{i}=[contour.x(end) contour.y(end)]; end - - plotmodel(md,'data',md.results.StressbalanceSolution.Vel,'log',10,'expdisp',... + vel=md.results.StressbalanceSolution.Vel; vel(vel==0)=nan; + plotmodel(md,'data',vel,'log',10,'expdisp',... {'MassFluxes/MassFlux1.exp','MassFluxes/MassFlux2.exp',... 'MassFluxes/MassFlux3.exp','MassFluxes/MassFlux4.exp',... Index: /issm/trunk/examples/shakti/moulin.par =================================================================== --- /issm/trunk/examples/shakti/moulin.par (revision 22758) +++ /issm/trunk/examples/shakti/moulin.par (revision 22758) @@ -0,0 +1,58 @@ +%Start defining model parameters here + +% Set up bed topography and ice geometry for a tilted 500m thick slab + md.geometry.base = .02*md.mesh.x; + md.geometry.bed = md.geometry.base; + md.geometry.surface = .02*md.mesh.x + 500; + md.geometry.thickness = md.geometry.surface - md.geometry.bed; + +% Define ice sliding velocity (m/yr) + md.initialization.vx = 10^-6*md.constants.yts*ones(md.mesh.numberofvertices,1); + md.initialization.vy = zeros(md.mesh.numberofvertices,1); + md.initialization.pressure=zeros(md.mesh.numberofvertices,1); + +md.initialization.pressure=zeros(md.mesh.numberofvertices,1); + +% Materials + % Ice flow law parameter (note that the standard parameter A=B^(-3)) + md.materials.rheology_B= (5e-25)^(-1/3)*ones(md.mesh.numberofvertices,1); + md.initialization.temperature=(273)*ones(md.mesh.numberofvertices,1); + md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1); + +%Calving +md.calving.calvingrate=zeros(md.mesh.numberofvertices,1); +%md.calving.spclevelset=NaN(md.mesh.numberofvertices,1); + +% Friction law and coefficient + md.friction=frictionsommers(md.friction); + md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1); + + +%Numerical parameters +md.stressbalance.viscosity_overshoot=0.0; +md.masstransport.stabilization=1.; +md.thermal.stabilization=1.; +md.verbose=verbose(0); +md.settings.waitonlock=30; +md.stressbalance.restol=0.05; +md.steadystate.reltol=0.05; +md.stressbalance.reltol=0.05; +md.stressbalance.abstol=NaN; +md.timestepping.time_step=1.; +md.timestepping.final_time=3.; + +%GIA: +md.gia.lithosphere_thickness=100.*ones(md.mesh.numberofvertices,1); % in km +md.gia.mantle_viscosity=1.0*10^21*ones(md.mesh.numberofvertices,1); % in Pa.s +md.materials.lithosphere_shear_modulus=6.7*10^10; % in Pa +md.materials.lithosphere_density=3.32; % in g/cm^-3 +md.materials.mantle_shear_modulus=1.45*10^11; % in Pa +md.materials.mantle_density=3.34; % in g/cm^-3 + +%Boundary conditions: +md=SetIceSheetBC(md); + +%Change name so that no test have the same name +A=dbstack; +if (length(A)>2), md.miscellaneous.name=A(3).file(1:end-2); end + Index: /issm/trunk/examples/shakti/outline.exp =================================================================== --- /issm/trunk/examples/shakti/outline.exp (revision 22758) +++ /issm/trunk/examples/shakti/outline.exp (revision 22758) @@ -0,0 +1,10 @@ +## Name:DomainOutline +## Icon:0 +# Points Count Value +5 1.000000 +# X pos Y pos +0 0 +1000 0 +1000 1000 +0 1000 +0 0 Index: /issm/trunk/examples/shakti/runme.m =================================================================== --- /issm/trunk/examples/shakti/runme.m (revision 22758) +++ /issm/trunk/examples/shakti/runme.m (revision 22758) @@ -0,0 +1,82 @@ +steps=[1:3]; + +if any(steps==1) + disp(' Step 1: Mesh'); + + %Generate unstructured mesh on 1,000 m square with typical element edge length of 20 m + md=triangle(model,'./outline.exp',20); + + save MoulinMesh md +end +if any(steps==2) + disp(' Step 2: Parameterization'); + md=loadmodel('MoulinMesh'); + + md=setmask(md,'',''); + + % Run parameterization script to set up geometry, velocity, material properties, etc. + md=parameterize(md,'moulin.par'); + + % HYDROLOGY SPECIFIC PARAMETERIZATION: + % Change hydrology class to Sommers' SHaKTI model + md.hydrology=hydrologysommers(); + + % Define initial water head such that water pressure is 50% of ice overburden pressure + md.hydrology.head = 0.5*md.materials.rho_ice/md.materials.rho_freshwater*md.geometry.thickness + md.geometry.base; + + % Initial subglacial gap height of 0.01m everywhere + md.hydrology.gap_height = 0.01*ones(md.mesh.numberofelements,1); + + % Typical bed bump bump spacing (2m) + md.hydrology.bump_spacing = 2*ones(md.mesh.numberofelements,1); + + % Typical bed bump height (0.1m) + md.hydrology.bump_height = 0.1*ones(md.mesh.numberofelements,1); + + % Define distributed englacial input to the subglacial system (m/yr) + % Change the value 0.0 to add distributed input + md.hydrology.englacial_input = 0.0*ones(md.mesh.numberofvertices,1); + + % Initial Reynolds number (start at Re=1000 everywhere) + md.hydrology.reynolds= 1000*ones(md.mesh.numberofelements,1); + + % Set up atmospheric pressure Type I boundary condition at left edge of + % domain (outflow, i.e. h=zb at x=xmin) + md.hydrology.spchead = NaN(md.mesh.numberofvertices,1); + pos=find(md.mesh.vertexonboundary & md.mesh.x==min(md.mesh.x)); + md.hydrology.spchead(pos)=md.geometry.base(pos); + + save MoulinParam md; +end +if any(steps==3); + disp(' Step 3: Solve!'); + md=loadmodel('MoulinParam'); + + md.transient=deactivateall(md.transient); + md.transient.ishydrology=1; + + % Specify that you want to run the model on your current computer + % Change the number of processors according to your machine (here np=4) + md.cluster=generic('np',2); + + % Define the time stepping scheme: run for 90 days with a time step of 1 hr + md.timestepping.time_step=3600/md.constants.yts; % Time step (in years) + md.timestepping.final_time=30/365; + + %Add one moulin with steady input at x=500, y=500 + [a,pos] = min(sqrt((md.mesh.x-500).^2+(md.mesh.y-500).^2)); + time=0:md.timestepping.time_step:md.timestepping.final_time; + md.hydrology.moulin_input = zeros(md.mesh.numberofvertices+1,numel(time)); + md.hydrology.moulin_input(end,:)=time; + md.hydrology.moulin_input(pos,:)=4; + + % Specify no-flux Type 2 boundary conditions on all edges (except + % the Type 1 condition set at the outflow above) + md.hydrology.neumannflux=zeros(md.mesh.numberofelements+1,numel(time)); + md.hydrology.neumannflux(end,:)=time; + + md.verbose.solution=1; + md=solve(md,'Transient'); + + save MoulinTransient md +end Index: /issm/trunk/externalpackages/adolc/install-withampi.sh =================================================================== --- /issm/trunk/externalpackages/adolc/install-withampi.sh (revision 22757) +++ /issm/trunk/externalpackages/adolc/install-withampi.sh (revision 22758) @@ -15,4 +15,6 @@ #Compile ADOL-C +export CFLAGS="-O2 -L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" +export CXXFLAGS="-O2 -std=c++11 -L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" cd src ./configure --prefix=$ISSM_DIR/externalpackages/adolc/install \ Index: /issm/trunk/externalpackages/boost/install-1.55-linux.sh =================================================================== --- /issm/trunk/externalpackages/boost/install-1.55-linux.sh (revision 22757) +++ /issm/trunk/externalpackages/boost/install-1.55-linux.sh (revision 22758) @@ -1,4 +1,5 @@ #!/bin/bash -set -eu +#set -eu +#unhook set -eu because some target do fail and it is not a big deal #Note of caution: stop after boostrap phase, and run Index: sm/trunk/externalpackages/boost/install.sh =================================================================== --- /issm/trunk/externalpackages/boost/install.sh (revision 22757) +++ (revision ) @@ -1,35 +1,0 @@ -#!/bin/bash -set -eu - -#Note of caution: stop after boostrap phase, and run -#bjam --debug-configuration, to figure out which paths boost is using to include -#python. make sure everyone of these paths is covered by python. If not, just make -#symlinks in externalpackages/python to what boost is expecting. Ther is NO WAY -#to get the boost library to include python support without doing that. - -#Some cleanup -rm -rf install boost_1_49_0 src -mkdir install src - -#Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/boost_1_49_0.tar.gz' 'boost_1_49_0.tar.gz' - -#Untar -tar -zxvf boost_1_49_0.tar.gz - -#Move boost into install directory -mv boost_1_49_0/* src -rm -rf boost_1_49_0 -#Configure and compile -cd src -./bootstrap.sh \ - --prefix="$ISSM_DIR/externalpackages/boost/install" \ - --with-python=python3.2 \ - --with-python-root="$ISSM_DIR/externalpackages/python/install" - -#Compile boost -./bjam install - -#put bjam into install also: -mkdir ../install/bin -cp bjam ../install/bin Index: /issm/trunk/externalpackages/cython/install-26.sh =================================================================== --- /issm/trunk/externalpackages/cython/install-26.sh (revision 22758) +++ /issm/trunk/externalpackages/cython/install-26.sh (revision 22758) @@ -0,0 +1,13 @@ +#!/bin/bash +set -eu + +#clean up +rm -rf Cython-0.26 + +#download numpy first +$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/Cython-0.26.tar.gz' 'cython.tar.gz' + +#install numpy +tar -zxvf cython.tar.gz +cd Cython-0.26 +python setup.py install Index: /issm/trunk/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.patch =================================================================== --- /issm/trunk/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.patch (revision 22757) +++ /issm/trunk/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.patch (revision 22758) @@ -1,3 +1,3 @@ -67a68,75 +67a68,78 > set( DAKOTA_HAVE_MPI ON > CACHE BOOL "Always build with MPI enabled" FORCE) @@ -8,4 +8,7 @@ > "$ENV{ISSM_DIR}/externalpackages/mpich/install/lib/libmpich.so" > CACHE FILEPATH "Use installed MPI library" FORCE) +> set( MPI_EXTRA_LIBRARY +> "$ENV{ISSM_DIR}/externalpackages/mpich/install/lib/libmpich.so" +> CACHE FILEPATH "Use MPI extra libraries" FORCE) 73,77c73,77 < #set(BOOST_ROOT Index: /issm/trunk/externalpackages/dakota/configs/6.2/CMakeLists.txt.discover16.patch =================================================================== --- /issm/trunk/externalpackages/dakota/configs/6.2/CMakeLists.txt.discover16.patch (revision 22758) +++ /issm/trunk/externalpackages/dakota/configs/6.2/CMakeLists.txt.discover16.patch (revision 22758) @@ -0,0 +1,6 @@ +156c153,155 +< # TODO: Can't this be integrated into the following logic? +--- +> # TODO: Can't this be integrated into the following logic? +> set(BLAS_LIBS "-L/usr/local/intel/2016/compilers_and_libraries_2016.2.181/linux/mkl/lib/intel64/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/usr/lib64/ -lpthread -lm") +> set(LAPACK_LIBS "-L/usr/local/intel/2016/compilers_and_libraries_2016.2.181/linux/mkl/lib/intel64/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/usr/lib64/ -lpthread -lm") Index: /issm/trunk/externalpackages/dakota/configs/6.2/CMakeLists.txt.petsclibs.patch =================================================================== --- /issm/trunk/externalpackages/dakota/configs/6.2/CMakeLists.txt.petsclibs.patch (revision 22758) +++ /issm/trunk/externalpackages/dakota/configs/6.2/CMakeLists.txt.petsclibs.patch (revision 22758) @@ -0,0 +1,6 @@ +156c153,155 +< # TODO: Can't this be integrated into the following logic? +--- +> # TODO: Can't this be integrated into the following logic? +> set(BLAS_LIBS "-L$ENV{ISSM_DIR}/externalpackages/petsc/install/lib -lfblas -L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran") +> set(LAPACK_LIBS "-L$ENV{ISSM_DIR}/externalpackages/petsc/install/lib -lflapack -L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran") Index: /issm/trunk/externalpackages/dakota/configs/6.2/sandia_rules.cpp.patch =================================================================== --- /issm/trunk/externalpackages/dakota/configs/6.2/sandia_rules.cpp.patch (revision 22758) +++ /issm/trunk/externalpackages/dakota/configs/6.2/sandia_rules.cpp.patch (revision 22758) @@ -0,0 +1,4 @@ +24145c24145 +< if ( i_hi < 0 ) +--- +> if ( *i_hi < 0 ) Index: /issm/trunk/externalpackages/dakota/install-6.2-intel16-discover.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-6.2-intel16-discover.sh (revision 22758) +++ /issm/trunk/externalpackages/dakota/install-6.2-intel16-discover.sh (revision 22758) @@ -0,0 +1,58 @@ +#!/bin/bash +set -eu + +#Some cleanup +rm -rf Dakota +rm -rf src +rm -rf build +rm -rf install +mkdir src build install + +#Download from ISSM server +$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz' + +#Untar +tar -zxvf dakota-6.2-public-src.tar.gz + +#Move Dakota to src directory +mv dakota-6.2.0.src/* src +rm -rf dakota-6.2.0.src + +#Set up Dakota cmake variables and config +export DAK_SRC=$ISSM_DIR/externalpackages/dakota/src +export DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build +export MPIHOME=$ISSM_DIR/externalpackages/mpich/install +cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake +patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.discover.patch +patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.patch +patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.discover16.patch + +#Apply patches +patch src/src/NonDSampling.cpp configs/6.2/NonDSampling.cpp.patch +patch src/src/NonDLocalReliability.cpp configs/6.2/NonDLocalReliability.cpp.patch +patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.2/pecos_global_defs.hpp.patch + +#Configure dakota +cd $DAK_BUILD + +cmake -D CMAKE_C_COMPILER=mpicc \ + -D CMAKE_CXX_COMPILER=mpicxx \ + -D CMAKE_Fortran_COMPILER=/usr/bin/gfortran \ + -DHAVE_ACRO=off \ + -DHAVE_JEGA=off \ + -C $DAK_SRC/cmake/BuildDakotaCustom.cmake \ + -C $DAK_SRC/cmake/DakotaDev.cmake \ + $DAK_SRC +cd .. + +#Compile and install dakota +cd $DAK_BUILD +if [ $# -eq 0 ]; +then + make + make install +else + make -j $1 + make -j $1 install +fi +cd .. Index: /issm/trunk/externalpackages/dakota/install-6.2-linux64.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-6.2-linux64.sh (revision 22757) +++ /issm/trunk/externalpackages/dakota/install-6.2-linux64.sh (revision 22758) @@ -26,4 +26,5 @@ patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.patch patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.patch +patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.petsclibs.patch #Apply patches Index: /issm/trunk/externalpackages/dakota/install-6.2-macosx64-highsierra.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-6.2-macosx64-highsierra.sh (revision 22758) +++ /issm/trunk/externalpackages/dakota/install-6.2-macosx64-highsierra.sh (revision 22758) @@ -0,0 +1,70 @@ +#!/bin/bash +set -eu + +#Some cleanup +rm -rf Dakota +rm -rf src +rm -rf build +rm -rf install +mkdir src build install + +#Download from ISSM server +$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz' + +#Untar +tar -zxvf dakota-6.2-public-src.tar.gz + +#Move Dakota to src directory +mv dakota-6.2.0.src/* src +rm -rf dakota-6.2.0.src + +#Set up Dakota cmake variables and config +export DAK_SRC=$ISSM_DIR/externalpackages/dakota/src +export DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build +export MPIHOME=$ISSM_DIR/externalpackages/mpich/install +cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake +patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.mac.patch +patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.patch +patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.patch + +#Apply patches +patch src/src/NonDSampling.cpp configs/6.2/NonDSampling.cpp.patch +patch src/src/NonDLocalReliability.cpp configs/6.2/NonDLocalReliability.cpp.patch +patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.2/pecos_global_defs.hpp.patch +patch src/packages/VPISparseGrid/src/sandia_rules.cpp configs/6.2/sandia_rules.cpp.patch + +export BOOST_ROOT=$ISSM_DIR/externalpackages/boost/install + +#Configure dakota +# Set your local gcc compiler here +cd $DAK_BUILD +cmake -DBoost_NO_BOOST_CMAKE=TRUE \ + -DBoost_NO_SYSTEM_PATHS=TRUE \ + -DBOOST_ROOT:PATHNAME=$BOOST_ROOT \ + -DBoost_LIBRARY_DIRS:FILEPATH=${BOOST_ROOT}/lib \ + -D CMAKE_C_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicc \ + -D CMAKE_CXX_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicxx \ + -D CMAKE_Fortran_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpif77 \ + -D CMAKE_CXX_FLAGS=-fdelayed-template-parsing \ + -DHAVE_ACRO=off \ + -DHAVE_JEGA=off \ + -C $DAK_SRC/cmake/BuildDakotaCustom.cmake \ + -C $DAK_SRC/cmake/DakotaDev.cmake \ + $DAK_SRC +cd .. + +# Snowleopard: Mpi should be made with these compilers +#-DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_CC_COMPILER=/usr/bin/gcc \ +#-DCMAKE_Fortran_COMPILER=/usr/local/gfortran/bin/x86_64-apple-darwin10-gfortran \ + +#Compile and install dakota +cd $DAK_BUILD +if [ $# -eq 0 ]; +then + make + make install +else + make -j $1 + make -j $1 install +fi +cd .. Index: /issm/trunk/externalpackages/emscripten/install.sh =================================================================== --- /issm/trunk/externalpackages/emscripten/install.sh (revision 22757) +++ /issm/trunk/externalpackages/emscripten/install.sh (revision 22758) @@ -2,6 +2,9 @@ set -eu +export CC=gcc +export CXX=g++ + #Some cleanup -rm -rf src +rm -rf install #Download from ISSM server @@ -10,12 +13,13 @@ #Untar and move petsc to install directory tar -zxvf emsdk-portable.tar.gz -mv emsdk_portable src +mv emsdk_portable install -cd src - -export CXX=g++ -export CC=gcc +cd install ./emsdk update -./emsdk install latest -./emsdk activate latest +./emsdk install sdk-tag-1.34.12-64bit +./emsdk activate sdk-tag-1.34.12-64bit + +#Related to moving the install path after installation - However, not safe to install in dir named "install" since a failure would not be noticed by jenkins when triggering +#Not reliable - when executed in subshell without sourcing the install file, this has no effect. Safer to explicitly source for each dependent externalpackage. +source emsdk_env.sh Index: /issm/trunk/externalpackages/gmsh/install.sh =================================================================== --- /issm/trunk/externalpackages/gmsh/install.sh (revision 22757) +++ /issm/trunk/externalpackages/gmsh/install.sh (revision 22758) @@ -7,9 +7,25 @@ #Download latest version -svn co --username gmsh --password gmsh https://geuz.org/svn/gmsh/trunk src +#svn co --username gmsh --password gmsh https://geuz.org/svn/gmsh/trunk src +#git clone http://gitlab.onelab.info/gmsh/gmsh.git src + +#Set gmsh version +GMSH_VER="3.0.5" + +#Remove tarball if it exists +rm -f gmsh-$GMSH_VER-source.tgz + +#Download last stable version that we know works +wget http://gmsh.info/src/gmsh-$GMSH_VER-source.tgz + +#Untar gmsh +tar -xvzf gmsh-$GMSH_VER-source.tgz + +#Rename gmsh source directory +mv gmsh-$GMSH_VER-source src #Configure cd install -cmake ../src -DCMAKE_INSTALL_PREFIX="$ISSM_DIR/externalpackages/gmsh/install" +cmake ../src -DCMAKE_INSTALL_PREFIX="$ISSM_DIR/externalpackages/gmsh/install" -DENABLE_MPI=1 #Compile and install Index: /issm/trunk/externalpackages/gsl/install-javascript.sh =================================================================== --- /issm/trunk/externalpackages/gsl/install-javascript.sh (revision 22757) +++ /issm/trunk/externalpackages/gsl/install-javascript.sh (revision 22758) @@ -1,4 +1,12 @@ #!/bin/bash set -eu + +#Source emscripten to ensure emcc/em++ compiler are in env +source $ISSM_DIR/externalpackages/emscripten/install/emsdk_env.sh +export CC=emcc +export CXX=em++ + +# Issue with variadic function signatures. +export CFLAGS=-DSTDC_HEADERS #Some cleanup @@ -19,11 +27,6 @@ cd src-javascript -export CC=emcc -export CXX=em++ - -# Issue with variadic function signatures. -export CFLAGS=-DSTDC_HEADERS - -./configure --prefix="$ISSM_DIR/externalpackages/gsl/install-javascript" +./configure --prefix="$ISSM_DIR/externalpackages/gsl/install-javascript" \ + --disable-shared #Compile gsl Index: /issm/trunk/externalpackages/gslib/install.sh =================================================================== --- /issm/trunk/externalpackages/gslib/install.sh (revision 22757) +++ /issm/trunk/externalpackages/gslib/install.sh (revision 22758) @@ -18,7 +18,7 @@ #Change compiler to gfortran cd install -cat Makefile | sed -e "s/FC=g95/FC=ifort/g" > Makefile.bak +cat Makefile | sed -e "s/FC=g95/FC=gfortran/g" > Makefile.bak mv Makefile.bak Makefile -cat gslib/Makefile | sed -e "s/FC=g95/FC=ifort/g" > Makefile.bak +cat gslib/Makefile | sed -e "s/FC=g95/FC=gfortran/g" > Makefile.bak mv Makefile.bak gslib/Makefile make Index: /issm/trunk/externalpackages/neopz/install.sh =================================================================== --- /issm/trunk/externalpackages/neopz/install.sh (revision 22757) +++ /issm/trunk/externalpackages/neopz/install.sh (revision 22758) @@ -23,12 +23,7 @@ cd $PROJECT_SOURCE_DIR -#Compile and install -if [ $# -eq 0 ]; then - make - make install -else - make -j $1 - make -j $1 install -fi +make +make install + cd $PROJECT_BINARY_DIR/pzlib mv lib ../ Index: /issm/trunk/externalpackages/petsc/install-3.6-discover.sh =================================================================== --- /issm/trunk/externalpackages/petsc/install-3.6-discover.sh (revision 22757) +++ /issm/trunk/externalpackages/petsc/install-3.6-discover.sh (revision 22758) @@ -21,7 +21,7 @@ --prefix="$ISSM_DIR/externalpackages/petsc/install" \ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \ - --with-blas-lapack-dir="/usr/local/intel/Composer/composer_xe_2015.0.090/mkl/" \ - --with-mpi-lib="/usr/local/intel/mpi/4.0.3.008/lib64/libmpi.so" \ - --with-mpi-include="/usr/local/intel/mpi/4.0.3.008/intel64/include/" \ + --with-blas-lapack-dir="/usr/local/intel/2016/compilers_and_libraries_2016.2.181/linux/mkl/" \ + --with-mpi-lib="/usr/local/intel/2016/impi/5.1.3.181/lib64/libmpi.so" \ + --with-mpi-include="/usr/local/intel/2016/impi/5.1.3.181/include64/" \ --known-mpi-shared-libraries=1 \ --with-debugging=0 \ @@ -42,5 +42,5 @@ #SBATCH -N 1 #SBATCH -n 1 -#SBATCH -A s1010 +#SBATCH -A s1690 #SBATCH -t 00:01:00 # Run time (hh:mm:ss) - 1.5 hours #SBATCH --qos=debug @@ -49,6 +49,7 @@ . /usr/share/modules/init/bash -module load comp/intel-15.0.0.090 -module load mpi/impi-4.0.3.008 +module load comp/intel-16.0.2.181 +module load mpi/impi-5.1.3.181 +module load other/cmake-3.8.2 export PATH="$PATH:." Index: /issm/trunk/externalpackages/petsc/install-3.7-aci.sh =================================================================== --- /issm/trunk/externalpackages/petsc/install-3.7-aci.sh (revision 22758) +++ /issm/trunk/externalpackages/petsc/install-3.7-aci.sh (revision 22758) @@ -0,0 +1,53 @@ +#!/bin/bash +set -eu + +#Some cleanup +rm -rf install petsc-3.7.6 src +mkdir install src + +#Download from ISSM server +$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.7.6.tar.gz' 'petsc-3.7.6.tar.gz' + +#Untar and move petsc to install directory +tar -zxvf petsc-3.7.6.tar.gz +mv petsc-3.7.6/* src/ +rm -rf petsc-3.7.6 + +#configure +cd src +./config/configure.py \ + --prefix="$ISSM_DIR/externalpackages/petsc/install" \ + --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \ + --with-blas-lapack-dir="/opt/intel/compilers_and_libraries_2016.3.210/linux/mkl/lib/" \ + --with-mpi-dir="/opt/intel/compilers_and_libraries_2016.3.210/linux/mpi/intel64/" \ + --known-mpi-shared-libraries=1 \ + --with-debugging=0 \ + --with-valgrind=0 \ + --with-x=0 \ + --with-ssl=0 \ + --with-batch=1 \ + --with-shared-libraries=1 \ + --download-metis=1 \ + --download-parmetis=1 \ + --download-mumps=1 \ + --download-scalapack=1 + +#prepare script to reconfigure petsc +cat > script.queue << EOF +#PBS -A open +#PBS -l nodes=1:ppn=1:stmem +#PBS -l walltime=200 + +module load intel/16.0.3 +module load impi/5.1.3 +module load mkl/11.3.3 + +export PATH="$PATH:." +cd $ISSM_DIR/externalpackages/petsc/src +mpirun -np 1 ./conftest-arch-linux2-c-opt +EOF + +#print instructions +echo "== Now: cd src/ " +echo "== qsub script.queue " +echo "== Then run reconfigure script generated by PETSc and follow instructions" Index: /issm/trunk/externalpackages/petsc/install-3.8-linux64.sh =================================================================== --- /issm/trunk/externalpackages/petsc/install-3.8-linux64.sh (revision 22758) +++ /issm/trunk/externalpackages/petsc/install-3.8-linux64.sh (revision 22758) @@ -0,0 +1,36 @@ +#!/bin/bash +set -eu + +#Some cleanup +rm -rf install petsc-3.8.3 src +mkdir install src + +#Download from ISSM server +$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.8.3.tar.gz' 'petsc-3.8.3.tar.gz' + +#Untar and move petsc to install directory +tar -zxvf petsc-3.8.3.tar.gz +mv petsc-3.8.3/* src/ +rm -rf petsc-3.8.3 + +#configure +cd src +./config/configure.py \ + --prefix="$ISSM_DIR/externalpackages/petsc/install" \ + --with-mpi-dir="$ISSM_DIR/externalpackages/mpich/install" \ + --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \ + --with-debugging=1 \ + --with-valgrind=0 \ + --with-x=0 \ + --with-ssl=0 \ + --with-shared-libraries=1 \ + --download-metis=1 \ + --download-parmetis=1 \ + --download-mumps=1 \ + --download-scalapack=1 \ + --download-fblaslapack=1 \ + --with-pic=1 + +#Compile and intall +make +make install Index: /issm/trunk/externalpackages/petsc/install-3.8-macosx64.sh =================================================================== --- /issm/trunk/externalpackages/petsc/install-3.8-macosx64.sh (revision 22758) +++ /issm/trunk/externalpackages/petsc/install-3.8-macosx64.sh (revision 22758) @@ -0,0 +1,34 @@ +#!/bin/bash +set -eu + +#Some cleanup +rm -rf install petsc-3.8.3 src +mkdir install src + +#Download from ISSM server +$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.8.3.tar.gz' 'petsc-3.8.3.tar.gz' + +#Untar and move petsc to install directory +tar -zxvf petsc-3.8.3.tar.gz +mv petsc-3.8.3/* src/ +rm -rf petsc-3.8.3 + +#configure +cd src +./config/configure.py \ + --prefix="$ISSM_DIR/externalpackages/petsc/install" \ + --with-mpi-dir="$ISSM_DIR/externalpackages/mpich/install" \ + --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \ + --with-debugging=1 \ + --with-valgrind=0 \ + --with-x=0 \ + --with-ssl=0 \ + --with-shared-libraries=1 \ + --download-metis=1 \ + --download-parmetis=1 \ + --download-mumps=1 \ + --download-scalapack=1 + +#Compile and intall +make +make install Index: /issm/trunk/externalpackages/petsc/install-dev-linux64.sh =================================================================== --- /issm/trunk/externalpackages/petsc/install-dev-linux64.sh (revision 22757) +++ /issm/trunk/externalpackages/petsc/install-dev-linux64.sh (revision 22758) @@ -1,26 +1,17 @@ #!/bin/bash -STEP=1 +STEP=2 if [ $STEP -eq 1 ]; then - # Used Mercurial to get code rm -rf src - hg clone http://petsc.cs.iit.edu/petsc/petsc-dev src - cd src - hg clone http://petsc.cs.iit.edu/petsc/BuildSystem config/BuildSystem + git clone https://bitbucket.org/petsc/petsc src fi -# To update (via Mercurial): -# cd petsc-dev -# hg pull -u -# cd config/BuildSystem -# hg pull -u +# To update +# cd src +# git pull # configure script # Note: -# Metis: -using metis from externalpackages did not work... -# -for now download new metis -# -rename metis in externalpackages to metis2 -# # SuperLU: -If download-..-=yes does not work try downloading from # --download-superlu=http://crd.lbl.gov/~xiaoye/SuperLU/superlu_4.3.tar.gz \ @@ -30,27 +21,26 @@ rm -rf install cd src - ./config/configure.py \ - --prefix="$ISSM_DIR/externalpackages/petsc/install" \ - --with-mpi-dir="$ISSM_DIR/externalpackages/mpich/install" \ - --with-clanguage=C++ \ - --PETSC_ARCH=linux-gnu-amd64 \ - --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \ - --with-debugging=0 \ - --with-shared-libraries=1 \ - --download-mumps=yes \ - --download-scalapack=yes \ - --download-blacs=yes \ - --download-blas=yes \ - --download-f-blas-lapack=yes \ - --download-parmetis=yes \ - --download-metis=yes \ - --download-trilinos=yes \ - --download-euclid=yes \ - --download-spooles=yes \ - --download-spai=yes \ - --download-superlu=http://crd.lbl.gov/~xiaoye/SuperLU/superlu_4.3.tar.gz \ - --download-hypre=yes \ - --download-c2html=yes -# --with-pic=1 + ./configure \ + --prefix="$ISSM_DIR/externalpackages/petsc/install" \ + --with-mpi-dir="$ISSM_DIR/externalpackages/mpich/install" \ + --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \ + --with-debugging=1 \ + --with-valgrind=0 \ + --with-x=0 \ + --with-ssl=0 \ + --with-shared-libraries=1 \ + --download-metis=1 \ + --download-parmetis=1 \ + --download-mumps=1 \ + --download-scalapack=1 \ + --download-fblaslapack=1 \ + --with-pic=1 + +# --download-trilinos=yes \ +# --download-euclid=yes \ +# --download-spooles=yes \ +# --download-spai=yes \ +# --download-superlu=http://crd.lbl.gov/~xiaoye/SuperLU/superlu_4.3.tar.gz \ +# --download-hypre=yes \ #Compile petsc and install it Index: sm/trunk/externalpackages/python/install-2.7.3-macosx-lion.sh =================================================================== --- /issm/trunk/externalpackages/python/install-2.7.3-macosx-lion.sh (revision 22757) +++ (revision ) @@ -1,40 +1,0 @@ -#!/bin/bash -set -eu - -#Some cleanup -rm -rf install src -rm -rf Python-2.7.3 -mkdir install src - -#Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.py http://issm.jpl.nasa.gov/files/externalpackages/Python-2.7.3.tgz Python-2.7.3.tgz - -#Untar and move python into install directory -tar -zxvf Python-2.7.3.tgz -mv Python-2.7.3/* src -rm -rf Python-2.7.3 - -#Configure and compile -cd src -./configure \ - --enable-framework="$ISSM_DIR/externalpackages/python/install/Library/Frameworks" -if [ $# -eq 0 ]; then - make -else - make -j $1 -fi -make install - -cd ../install - -#get rid of bin, because it's just a copy of -#Library/Frameworks/Python.framework/Versions/2.7/bin, and will not reflect -#new changes being made -rm -rf bin -ln -s Library/Frameworks/Python.framework/Headers include -ln -s Library/Frameworks/Python.framework/Versions/2.7/lib lib -ln -s Library/Frameworks/Python.framework/Versions/2.7/bin bin - -#Patch pyport.h: -cd include -patch pyport.h $ISSM_DIR/externalpackages/python/patches/pyport.h.patch Index: sm/trunk/externalpackages/python/install-2.7.3-macosx-mlion.sh =================================================================== --- /issm/trunk/externalpackages/python/install-2.7.3-macosx-mlion.sh (revision 22757) +++ (revision ) @@ -1,40 +1,0 @@ -#!/bin/bash -set -eu - -#Some cleanup -rm -rf install src -rm -rf Python-2.7.3 -mkdir install src - -#Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.py http://issm.jpl.nasa.gov/files/externalpackages/Python-2.7.3.tgz Python-2.7.3.tgz - -#Untar and move python into install directory -tar -zxvf Python-2.7.3.tgz -mv Python-2.7.3/* src -rm -rf Python-2.7.3 - -#Configure and compile -cd src -./configure \ - --enable-framework="$ISSM_DIR/externalpackages/python/install/Library/Frameworks" -if [ $# -eq 0 ]; then - make -else - make -j $1 -fi -make install - -cd ../install - -#get rid of bin, because it's just a copy of -#Library/Frameworks/Python.framework/Versions/2.7/bin, and will not reflect -#new changes being made -rm -rf bin -ln -s Library/Frameworks/Python.framework/Headers include -ln -s Library/Frameworks/Python.framework/Versions/2.7/lib lib -ln -s Library/Frameworks/Python.framework/Versions/2.7/bin bin - -#Patch pyport.h: -cd include -patch pyport.h $ISSM_DIR/externalpackages/python/patches/pyport.h.patch Index: /issm/trunk/externalpackages/python/install-2.7.3-macosx.sh =================================================================== --- /issm/trunk/externalpackages/python/install-2.7.3-macosx.sh (revision 22758) +++ /issm/trunk/externalpackages/python/install-2.7.3-macosx.sh (revision 22758) @@ -0,0 +1,40 @@ +#!/bin/bash +set -eu + +#Some cleanup +rm -rf install src +rm -rf Python-2.7.3 +mkdir install src + +#Download from ISSM server +$ISSM_DIR/scripts/DownloadExternalPackage.py http://issm.jpl.nasa.gov/files/externalpackages/Python-2.7.3.tgz Python-2.7.3.tgz + +#Untar and move python into install directory +tar -zxvf Python-2.7.3.tgz +mv Python-2.7.3/* src +rm -rf Python-2.7.3 + +#Configure and compile +cd src +./configure \ + --enable-framework="$ISSM_DIR/externalpackages/python/install/Library/Frameworks" +if [ $# -eq 0 ]; then + make +else + make -j $1 +fi +make install + +cd ../install + +#get rid of bin, because it's just a copy of +#Library/Frameworks/Python.framework/Versions/2.7/bin, and will not reflect +#new changes being made +rm -rf bin +ln -s Library/Frameworks/Python.framework/Headers include +ln -s Library/Frameworks/Python.framework/Versions/2.7/lib lib +ln -s Library/Frameworks/Python.framework/Versions/2.7/bin bin + +#Patch pyport.h: +cd include +patch pyport.h $ISSM_DIR/externalpackages/python/patches/pyport.h.patch Index: sm/trunk/externalpackages/python/install-3.2.2-macosx-lion.sh =================================================================== --- /issm/trunk/externalpackages/python/install-3.2.2-macosx-lion.sh (revision 22757) +++ (revision ) @@ -1,40 +1,0 @@ -#!/bin/bash -set -eu - -#Some cleanup -rm -rf install src -rm -rf Python-3.2.2 -mkdir install src - -#Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.py http://issm.jpl.nasa.gov/files/externalpackages/Python-3.2.2.tgz Python-3.2.2.tgz - -#exports -export CC - -#Untar and move python into install directory -tar -zxvf Python-3.2.2.tgz -mv Python-3.2.2/* src -rm -rf Python-3.2.2 - -#Configure doxygen -cd src -./configure \ - --enable-framework="$ISSM_DIR/externalpackages/python/install/Library/Frameworks" - -#obsolete? -#./configure --prefix="$ISSM_DIR/externalpackages/python/install" --enable-framework="$ISSM_DIR/externalpackages/python/install" - -#make -if [ $# -eq 0 ]; then - make -else - make -j $1 -fi -make install - -cd install/bin -ln -s python3.2 python -cd ../ -ln -s Python.framework/Versions/3.2/include/python3.2m include -ln -s Python.framework/Versions/3.2/lib/ lib Index: /issm/trunk/externalpackages/python/install-3.2.2-macosx.sh =================================================================== --- /issm/trunk/externalpackages/python/install-3.2.2-macosx.sh (revision 22758) +++ /issm/trunk/externalpackages/python/install-3.2.2-macosx.sh (revision 22758) @@ -0,0 +1,40 @@ +#!/bin/bash +set -eu + +#Some cleanup +rm -rf install src +rm -rf Python-3.2.2 +mkdir install src + +#Download from ISSM server +$ISSM_DIR/scripts/DownloadExternalPackage.py http://issm.jpl.nasa.gov/files/externalpackages/Python-3.2.2.tgz Python-3.2.2.tgz + +#exports +export CC + +#Untar and move python into install directory +tar -zxvf Python-3.2.2.tgz +mv Python-3.2.2/* src +rm -rf Python-3.2.2 + +#Configure doxygen +cd src +./configure \ + --enable-framework="$ISSM_DIR/externalpackages/python/install/Library/Frameworks" + +#obsolete? +#./configure --prefix="$ISSM_DIR/externalpackages/python/install" --enable-framework="$ISSM_DIR/externalpackages/python/install" + +#make +if [ $# -eq 0 ]; then + make +else + make -j $1 +fi +make install + +cd install/bin +ln -s python3.2 python +cd ../ +ln -s Python.framework/Versions/3.2/include/python3.2m include +ln -s Python.framework/Versions/3.2/lib/ lib Index: /issm/trunk/externalpackages/scotch/Makefile.inc.mac =================================================================== --- /issm/trunk/externalpackages/scotch/Makefile.inc.mac (revision 22758) +++ /issm/trunk/externalpackages/scotch/Makefile.inc.mac (revision 22758) @@ -0,0 +1,26 @@ +EXE = +LIB = .a +OBJ = .o +MEX = .mexa64 + +MAKE = make +AR = ar +ARFLAGS = -ruv +CAT = cat +CCS = gcc +CCP = mpicc +CCD = mpicc +CCM = ${MATLAB_DIR}/bin/mex +#CFLAGS = -m64 -O3 -std=c99 -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -Du_int32_t=uint32_t -Du_int64_t=uint64_t -DCOMMON_TIMING_OLD -DMATLAB -fPIC -I${MATLAB_DIR}/extern/include +CFLAGS = -m64 -O3 -std=c99 -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -Du_int32_t=uint32_t -Du_int64_t=uint64_t -DCOMMON_TIMING_OLD -fPIC +#LDFLAGS = -lz -lm -L${MATLAB_DIR}/bin/glnxa64 -lmex -lmat +#LDFLAGS = -lz -lm -Wl,-rpath-link,${MATLAB_DIR}/bin/glnxa64 -L${MATLAB_DIR}/bin/glnxa64 -lmex -lmat +LDFLAGS = -lz -lm +MFLAGS = -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -Du_int32_t=uint32_t -Du_int64_t=uint64_t -DCOMMON_TIMING_OLD -DNOFILEIO -DMATLAB -I${MATLAB_DIR}/extern/include -largeArrayDims +CP = cp +LEX = flex +LN = ln +MKDIR = mkdir +MV = mv +RANLIB = ranlib +YACC = yacc Index: /issm/trunk/externalpackages/scotch/install_macosx64.sh =================================================================== --- /issm/trunk/externalpackages/scotch/install_macosx64.sh (revision 22758) +++ /issm/trunk/externalpackages/scotch/install_macosx64.sh (revision 22758) @@ -0,0 +1,57 @@ +#!/bin/bash +set -eu + +# Some cleanup +rm -rf scotch_5.1 +rm -rf src +rm -rf install + +# Create src and install directories +mkdir src install + +#Download from ISSM server +$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/scotch_5.1.6.tar.gz' 'scotch_5.1.6.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/docs/ptscotch_user5.1.pdf' 'ptscotch_user5.1.pdf' +$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/docs/scotch_user5.1.pdf' 'scotch_user5.1.pdf' + +# Untar +tar -xvzf scotch_5.1.6.tar.gz + +# Apply patches (all at once, since many) +# (written by diff -rc old_src new_src > scotch.patch) +patch -p0 < scotch.patch + +# Move scotch to src directory +mv scotch_5.1/* src +rm -rf scotch_5.1 + +# Build scotch +cp -p Makefile.inc.mac src/src/Makefile.inc +cp -p gmap_mex.c src/src/scotch +cp -p gmapx.c src/src/scotch +cd src/src +# For stand-alone scotch modules: +make scotch +make clean +# For no-file-io scotch modules: +make nfioscotch +# Clean up +make clean +cd ../.. + +# Populate install directory +cp -pr src/grf install +cp -pr src/tgt install +cp -pr src/doc install +cp -pr src/man install +mkdir install/include +cp -p src/src/libscotch/module.h install/include/scotch_module.h +cp -p src/src/libscotch/common.h install/include/scotch_common.h +cp -p src/include/scotch.h install/include/ +cp -p src/src/scotch/gmap.h install/include/scotch_gmap.h +mkdir install/lib +mv src/lib/* install/lib +mkdir install/bin +mv src/bin/* install/bin +#cp -p gmap.m install/bin +#cp -p gpart.m install/bin Index: /issm/trunk/externalpackages/scotch/scotch.patch =================================================================== --- /issm/trunk/externalpackages/scotch/scotch.patch (revision 22757) +++ /issm/trunk/externalpackages/scotch/scotch.patch (revision 22758) @@ -2227,10 +2227,9 @@ *************** *** 192,197 **** ---- 192,214 ---- +--- 192,213 ---- stratParserInit ( const char * const string) /*+ Strategy string to parse +*/ { + /* reset static variables from previous runs (jes, 4/29/10) */ -+ yy_current_buffer = 0; + yy_hold_char = (char) 0; + yy_n_chars=0; /* number of characters read into yy_ch_buf */ Index: /issm/trunk/externalpackages/triangle/install-javascript.sh =================================================================== --- /issm/trunk/externalpackages/triangle/install-javascript.sh (revision 22757) +++ /issm/trunk/externalpackages/triangle/install-javascript.sh (revision 22758) @@ -1,4 +1,9 @@ #!/bin/bash set -eu + +#Source emscripten to ensure emcc/em++ compiler are in env +source $ISSM_DIR/externalpackages/emscripten/install/emsdk_env.sh +export CC=emcc +export CXX=em++ #Some cleanup Index: /issm/trunk/externalpackages/valgrind/install-linux64.sh =================================================================== --- /issm/trunk/externalpackages/valgrind/install-linux64.sh (revision 22757) +++ /issm/trunk/externalpackages/valgrind/install-linux64.sh (revision 22758) @@ -3,26 +3,19 @@ #Some cleanup -rm -rf install valgrind-3.10.0 -mkdir install +rm -rf install -#Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/valgrind-3.10.0.tar.bz2' 'valgrind-3.10.0.tar.bz2' - -#Untar -tar -jxvf valgrind-3.10.0.tar.bz2 - -#Move valgrind into install directory -mv valgrind-3.10.0/* install -rm -rf valgrind-3.10.0 +#Download development version +git clone git://sourceware.org/git/valgrind.git install #configure cd install -./configure --prefix="$ISSM_DIR/externalpackages/valgrind/install" +./autogen.sh +./configure --prefix="$ISSM_DIR/externalpackages/valgrind/install" --enable-only64bit #Compile valgrind -make -j 4 -make install - -#final thing: if mpi is compiled in, soft link its target to a simpler name -cd lib -ln -s valgrind/libmpiwrap-* ./libmpidebug.so +if [ $# -eq 0 ]; then + make +else + make -j $1 +fi +make install Index: sm/trunk/externalpackages/valgrind/install-macosx32.sh =================================================================== --- /issm/trunk/externalpackages/valgrind/install-macosx32.sh (revision 22757) +++ (revision ) @@ -1,24 +1,0 @@ -#!/bin/bash -set -eu - -#Some cleanup -rm -rf install valgrind-3.10.0 -mkdir install - -#Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/valgrind-3.10.0.tar.bz2' 'valgrind-3.10.0.tar.bz2' - -#Untar -tar -jxvf valgrind-3.10.0.tar.bz2 - -#Move valgrind into install directory -mv valgrind-3.10.0/* install -rm -rf valgrind-3.10.0 - -#configure -cd install -./configure --prefix="$ISSM_DIR/externalpackages/valgrind/install" --enable-only32bit - -#Compile valgrind -make -j 4 -make install Index: /issm/trunk/externalpackages/valgrind/install-macosx64.sh =================================================================== --- /issm/trunk/externalpackages/valgrind/install-macosx64.sh (revision 22757) +++ /issm/trunk/externalpackages/valgrind/install-macosx64.sh (revision 22758) @@ -6,5 +6,5 @@ #Download development version, the current release never supports the latest OS X releases -svn co svn://svn.valgrind.org/valgrind/trunk install +git clone git://sourceware.org/git/valgrind.git install #configure @@ -14,5 +14,8 @@ #Compile valgrind - -make -j 8 -make install +if [ $# -eq 0 ]; then + make +else + make -j $1 +fi +make install Index: /issm/trunk/externalpackages/valgrind/issm.supp =================================================================== --- /issm/trunk/externalpackages/valgrind/issm.supp (revision 22757) +++ /issm/trunk/externalpackages/valgrind/issm.supp (revision 22758) @@ -51,4 +51,39 @@ obj:/lib/x86_64-linux-gnu/ld-2.15.so obj:* + obj:* + obj:* + obj:* + obj:* +} +{ + + Memcheck:Cond + fun:index + fun:expand_dynamic_string_token + fun:_dl_map_object + fun:map_doit + fun:_dl_catch_error + fun:do_preload + fun:handle_ld_preload + fun:dl_main + fun:_dl_sysdep_start + fun:_dl_start_final + fun:_dl_start + obj:/lib/x86_64-linux-gnu/ld-2.19.so + obj:* + obj:* +} +{ + + Memcheck:Cond + fun:index + fun:expand_dynamic_string_token + fun:fillin_rpath + fun:_dl_init_paths + fun:dl_main + fun:_dl_sysdep_start + fun:_dl_start_final + fun:_dl_start + obj:/lib/x86_64-linux-gnu/ld-2.19.so obj:* obj:* @@ -259,3 +294,35 @@ fun:dmumps_f77_ } +{ + + Memcheck:Cond + fun:MPIC_Waitall + fun:MPIR_Alltoall_intra + fun:MPIR_Alltoall + fun:MPIR_Alltoall_impl + fun:PMPI_Alltoall + fun:PMPI_ALLTOALL + fun:__dmumps_parallel_analysis_MOD_dmumps_build_dist_graph + fun:__dmumps_parallel_analysis_MOD_dmumps_parmetis_ord + fun:__dmumps_parallel_analysis_MOD_dmumps_do_par_ord + fun:__dmumps_parallel_analysis_MOD_dmumps_ana_f_par + fun:dmumps_ana_driver_ + fun:dmumps_ +} +{ + + Memcheck:Cond + fun:MPIC_Waitall + fun:MPIR_Scatterv + fun:MPIR_Scatterv_impl + fun:PMPI_Scatterv + fun:libparmetis__gkMPI_Scatterv + fun:libparmetis__InitMultisection + fun:libparmetis__Order_Partition + fun:libparmetis__Order_Partition_Multiple + fun:libparmetis__MultilevelOrder + fun:ParMETIS_V32_NodeND + fun:ParMETIS_V3_NodeND + fun:mumps_parmetis_ +} #}}} Index: /issm/trunk/externalpackages/vim/addons/vim/syntax/c.vim =================================================================== --- /issm/trunk/externalpackages/vim/addons/vim/syntax/c.vim (revision 22757) +++ /issm/trunk/externalpackages/vim/addons/vim/syntax/c.vim (revision 22758) @@ -410,4 +410,6 @@ "ISSM's objects begin +syn keyword cType AdaptiveMeshRefinement +syn keyword cType AmrBamg syn keyword cType BoolInput syn keyword cType BoolParam @@ -472,4 +474,5 @@ syn keyword cType Matestar syn keyword cType Matice +syn keyword cType Matlitho syn keyword cType Matpar syn keyword cType matrixobjects @@ -481,4 +484,5 @@ syn keyword cType Node syn keyword cType Nodes +syn keyword cType Numberedcostfunction syn keyword cType Numericalflux syn keyword cType Observation @@ -497,4 +501,5 @@ syn keyword cType Profiler syn keyword cType Quadtree +syn keyword cType Regionaloutput syn keyword cType Results syn keyword cType Riftfront @@ -513,4 +518,5 @@ syn keyword cType TetraInput syn keyword cType TetraRef +syn keyword cType TransientArrayParam syn keyword cType TransientInput syn keyword cType TransientParam @@ -535,4 +541,5 @@ syn keyword cType EnthalpyAnalysis syn keyword cType EnumToAnalysis +syn keyword cType EsaAnalysis syn keyword cType ExtrapolationAnalysis syn keyword cType ExtrudeFromBaseAnalysis @@ -540,5 +547,5 @@ syn keyword cType FreeSurfaceBaseAnalysis syn keyword cType FreeSurfaceTopAnalysis -syn keyword cType GiaAnalysis +syn keyword cType GiaIvinsAnalysis syn keyword cType HydrologyDCEfficientAnalysis syn keyword cType HydrologyDCInefficientAnalysis @@ -548,8 +555,7 @@ syn keyword cType L2ProjectionEPLAnalysis syn keyword cType LevelsetAnalysis -syn keyword cType LsfReinitializationAnalysis +syn keyword cType LoveAnalysis syn keyword cType MasstransportAnalysis syn keyword cType MeltingAnalysis -syn keyword cType MeshdeformationAnalysis syn keyword cType SealevelriseAnalysis syn keyword cType SmbAnalysis @@ -562,24 +568,35 @@ "ISSM's objects end "ISSM's Enums begin +syn keyword cConstant FemModelEnum syn keyword cConstant ParametersSTARTEnum -syn keyword cConstant FemModelEnum +syn keyword cConstant AdolcParamEnum +syn keyword cConstant FSSolverEnum syn keyword cConstant FemModelCommEnum syn keyword cConstant WorldCommEnum syn keyword cConstant IcecapToEarthCommEnum +syn keyword cConstant ToMITgcmCommEnum syn keyword cConstant NumModelsEnum syn keyword cConstant ModelIdEnum syn keyword cConstant EarthIdEnum +syn keyword cConstant SolutionTypeEnum +syn keyword cConstant AnalysisTypeEnum +syn keyword cConstant AnalysisCounterEnum +syn keyword cConstant ConfigurationTypeEnum +syn keyword cConstant InputToExtrudeEnum +syn keyword cConstant InputToL2ProjectEnum +syn keyword cConstant InputToDepthaverageInEnum +syn keyword cConstant InputToDepthaverageOutEnum +syn keyword cConstant InputToSmoothEnum +syn keyword cConstant SmoothThicknessMultiplierEnum +syn keyword cConstant LevelsetStabilizationEnum +syn keyword cConstant TimesteppingTypeEnum +syn keyword cConstant FixedTimesteppingEnum +syn keyword cConstant AdaptiveTimesteppingEnum +syn keyword cConstant TimesteppingTimeStepMinEnum +syn keyword cConstant TimesteppingTimeStepMaxEnum syn keyword cConstant AutodiffIsautodiffEnum syn keyword cConstant AutodiffNumDependentsEnum -syn keyword cConstant AutodiffNumDependentObjectsEnum -syn keyword cConstant AutodiffDependentObjectNamesEnum -syn keyword cConstant AutodiffDependentObjectTypesEnum -syn keyword cConstant AutodiffDependentObjectIndicesEnum syn keyword cConstant AutodiffDependentObjectsEnum syn keyword cConstant AutodiffNumIndependentsEnum -syn keyword cConstant AutodiffNumIndependentObjectsEnum -syn keyword cConstant AutodiffIndependentObjectNamesEnum -syn keyword cConstant AutodiffIndependentObjectTypesEnum -syn keyword cConstant AutodiffIndependentObjectsEnum syn keyword cConstant AutodiffJacobianEnum syn keyword cConstant AutodiffXpEnum @@ -588,5 +605,4 @@ syn keyword cConstant AutodiffFovForwardIndicesEnum syn keyword cConstant AutodiffFosReverseIndexEnum -syn keyword cConstant AutodiffMassFluxSegmentsPresentEnum syn keyword cConstant AutodiffKeepEnum syn keyword cConstant AutodiffObufsizeEnum @@ -596,5 +612,4 @@ syn keyword cConstant AutodiffGcTriggerRatioEnum syn keyword cConstant AutodiffGcTriggerMaxSizeEnum -syn keyword cConstant BalancethicknessSpcthicknessEnum syn keyword cConstant BalancethicknessStabilizationEnum syn keyword cConstant BalancethicknessThickeningRateEnum @@ -625,4 +640,15 @@ syn keyword cConstant MismipFloatingMeltRateEnum syn keyword cConstant MantlePlumeGeothermalFluxEnum +syn keyword cConstant BasalforcingsPicoEnum +syn keyword cConstant BasalforcingsPicoNumBasinsEnum +syn keyword cConstant BasalforcingsPicoBasinIdEnum +syn keyword cConstant BasalforcingsPicoMaxboxcountEnum +syn keyword cConstant BasalforcingsPicoBoxIdEnum +syn keyword cConstant BasalforcingsPicoOverturningCoeffEnum +syn keyword cConstant BasalforcingsPicoGammaTEnum +syn keyword cConstant BasalforcingsPicoFarOceantemperatureEnum +syn keyword cConstant BasalforcingsPicoFarOceansalinityEnum +syn keyword cConstant DistanceToGroundinglineEnum +syn keyword cConstant DistanceToCalvingfrontEnum syn keyword cConstant BedEnum syn keyword cConstant BaseEnum @@ -636,25 +662,15 @@ syn keyword cConstant StressbalanceMaxiterEnum syn keyword cConstant StressbalancePenaltyFactorEnum -syn keyword cConstant StressbalanceReferentialEnum syn keyword cConstant StressbalanceReltolEnum syn keyword cConstant StressbalanceNumRequestedOutputsEnum syn keyword cConstant StressbalanceRequestedOutputsEnum syn keyword cConstant StressbalanceRestolEnum -syn keyword cConstant StressbalanceRiftPenaltyLockEnum syn keyword cConstant StressbalanceRiftPenaltyThresholdEnum syn keyword cConstant StressbalanceShelfDampeningEnum -syn keyword cConstant StressbalanceSpcvxEnum -syn keyword cConstant StressbalanceSpcvyEnum -syn keyword cConstant StressbalanceSpcvzEnum syn keyword cConstant StressbalanceFSreconditioningEnum -syn keyword cConstant StressbalanceVertexPairingEnum syn keyword cConstant StressbalanceViscosityOvershootEnum syn keyword cConstant LoadingforceXEnum syn keyword cConstant LoadingforceYEnum syn keyword cConstant LoadingforceZEnum -syn keyword cConstant FlowequationBorderSSAEnum -syn keyword cConstant FlowequationBorderHOEnum -syn keyword cConstant FlowequationBorderFSEnum -syn keyword cConstant FlowequationElementEquationEnum syn keyword cConstant FlowequationIsSIAEnum syn keyword cConstant FlowequationIsSSAEnum @@ -662,11 +678,10 @@ syn keyword cConstant FlowequationIsHOEnum syn keyword cConstant FlowequationIsFSEnum -syn keyword cConstant FlowequationFeSSAEnum -syn keyword cConstant FlowequationFeHOEnum syn keyword cConstant FlowequationFeFSEnum -syn keyword cConstant FlowequationVertexEquationEnum +syn keyword cConstant FlowequationBorderFSEnum syn keyword cConstant FrictionAsEnum syn keyword cConstant FrictionCoefficientEnum syn keyword cConstant FrictionCoefficientcoulombEnum +syn keyword cConstant FrictionPressureAdjustedTemperatureEnum syn keyword cConstant FrictionPEnum syn keyword cConstant FrictionQEnum @@ -681,14 +696,23 @@ syn keyword cConstant GeometryHydrostaticRatioEnum syn keyword cConstant HydrologyModelEnum +syn keyword cConstant HydrologyNumRequestedOutputsEnum +syn keyword cConstant HydrologyRequestedOutputsEnum syn keyword cConstant HydrologyshreveEnum -syn keyword cConstant HydrologyshreveSpcwatercolumnEnum syn keyword cConstant HydrologyshreveStabilizationEnum syn keyword cConstant HydrologydcEnum +syn keyword cConstant HydrologydtEnum +syn keyword cConstant HydrologyStepsPerStepEnum syn keyword cConstant SedimentHeadEnum syn keyword cConstant SedimentHeadOldEnum +syn keyword cConstant SedimentHeadStackedEnum +syn keyword cConstant SedimentHeadTimeAverageEnum syn keyword cConstant SedimentHeadResidualEnum syn keyword cConstant EffectivePressureEnum +syn keyword cConstant EffectivePressureStackedEnum +syn keyword cConstant EffectivePressureTimeAverageEnum syn keyword cConstant EplHeadEnum syn keyword cConstant EplHeadOldEnum +syn keyword cConstant EplHeadStackedEnum +syn keyword cConstant EplHeadTimeAverageEnum syn keyword cConstant EplHeadSlopeXEnum syn keyword cConstant EplHeadSlopeYEnum @@ -696,5 +720,4 @@ syn keyword cConstant HydrologydcMaxIterEnum syn keyword cConstant HydrologydcRelTolEnum -syn keyword cConstant HydrologydcSpcsedimentHeadEnum syn keyword cConstant HydrologydcSedimentCompressibilityEnum syn keyword cConstant HydrologydcSedimentPorosityEnum @@ -702,5 +725,4 @@ syn keyword cConstant HydrologydcSedimentTransmitivityEnum syn keyword cConstant HydrologydcWaterCompressibilityEnum -syn keyword cConstant HydrologydcSpceplHeadEnum syn keyword cConstant HydrologydcMaskEplactiveNodeEnum syn keyword cConstant HydrologydcMaskEplactiveEltEnum @@ -712,4 +734,6 @@ syn keyword cConstant HydrologydcEplThicknessEnum syn keyword cConstant HydrologydcEplThicknessOldEnum +syn keyword cConstant HydrologydcEplThicknessStackedEnum +syn keyword cConstant HydrologydcEplThicknessTimeAverageEnum syn keyword cConstant HydrologydcEplThickCompEnum syn keyword cConstant HydrologydcEplConductivityEnum @@ -718,4 +742,5 @@ syn keyword cConstant HydrologydcSedimentlimitEnum syn keyword cConstant HydrologydcTransferFlagEnum +syn keyword cConstant HydrologydcUnconfinedFlagEnum syn keyword cConstant HydrologydcLeakageFactorEnum syn keyword cConstant HydrologydcPenaltyFactorEnum @@ -723,10 +748,8 @@ syn keyword cConstant HydrologydcEplflipLockEnum syn keyword cConstant HydrologydcBasalMoulinInputEnum -syn keyword cConstant HydrologyLayerEnum -syn keyword cConstant HydrologySedimentEnum -syn keyword cConstant HydrologyEfficientEnum syn keyword cConstant HydrologySedimentKmaxEnum syn keyword cConstant HydrologysommersEnum syn keyword cConstant HydrologyHeadEnum +syn keyword cConstant HydrologyHeadOldEnum syn keyword cConstant HydrologyGapHeightEnum syn keyword cConstant HydrologyBumpSpacingEnum @@ -736,6 +759,8 @@ syn keyword cConstant HydrologyReynoldsEnum syn keyword cConstant HydrologyNeumannfluxEnum -syn keyword cConstant HydrologySpcheadEnum -syn keyword cConstant HydrologyConductivityEnum +syn keyword cConstant HydrologyRelaxationEnum +syn keyword cConstant HydrologyBasalFluxEnum +syn keyword cConstant HydrologyStorageEnum +syn keyword cConstant DegreeOfChannelizationEnum syn keyword cConstant InversionControlParametersEnum syn keyword cConstant InversionControlScalingFactorsEnum @@ -747,5 +772,4 @@ syn keyword cConstant InversionTypeEnum syn keyword cConstant InversionIncompleteAdjointEnum -syn keyword cConstant InversionMaxParametersEnum syn keyword cConstant InversionMaxiterPerStepEnum syn keyword cConstant InversionMaxiterEnum @@ -757,5 +781,4 @@ syn keyword cConstant InversionGttolEnum syn keyword cConstant InversionAlgorithmEnum -syn keyword cConstant InversionMinParametersEnum syn keyword cConstant InversionNstepsEnum syn keyword cConstant InversionDxminEnum @@ -768,4 +791,5 @@ syn keyword cConstant InversionVyObsEnum syn keyword cConstant InversionVzObsEnum +syn keyword cConstant InversionVelObsEnum syn keyword cConstant MaskIceLevelsetEnum syn keyword cConstant MaskOceanLevelsetEnum @@ -780,11 +804,10 @@ syn keyword cConstant MaterialsRheologyLawEnum syn keyword cConstant MaterialsRheologyNEnum -syn keyword cConstant MaterialsRheologyKoEnum -syn keyword cConstant MaterialsRheologyKobarEnum +syn keyword cConstant MaterialsRheologyEEnum +syn keyword cConstant MaterialsRheologyEbarEnum syn keyword cConstant MaterialsRheologyEcEnum syn keyword cConstant MaterialsRheologyEcbarEnum syn keyword cConstant MaterialsRheologyEsEnum syn keyword cConstant MaterialsRheologyEsbarEnum -syn keyword cConstant DamageIsdamageEnum syn keyword cConstant DamageDEnum syn keyword cConstant DamageFEnum @@ -801,5 +824,4 @@ syn keyword cConstant DamageStabilizationEnum syn keyword cConstant DamageMaxiterEnum -syn keyword cConstant DamageSpcdamageEnum syn keyword cConstant DamageMaxDamageEnum syn keyword cConstant DamageEquivStressEnum @@ -812,9 +834,16 @@ syn keyword cConstant CalvingCalvingrateEnum syn keyword cConstant CalvingMeltingrateEnum +syn keyword cConstant CalvingHeightAboveFloatationEnum syn keyword cConstant CalvingLevermannEnum -syn keyword cConstant CalvingDevEnum +syn keyword cConstant CalvingVonmisesEnum syn keyword cConstant CalvingMinthicknessEnum +syn keyword cConstant CalvingHabEnum +syn keyword cConstant CalvingCrevasseDepthEnum +syn keyword cConstant CalvingDev2Enum +syn keyword cConstant SurfaceCrevasseEnum +syn keyword cConstant BasalCrevasseEnum +syn keyword cConstant CrevasseDepthEnum +syn keyword cConstant WaterheightEnum syn keyword cConstant DefaultCalvingEnum -syn keyword cConstant CalvingRequestedOutputsEnum syn keyword cConstant CalvinglevermannCoeffEnum syn keyword cConstant CalvinglevermannMeltingrateEnum @@ -824,4 +853,8 @@ syn keyword cConstant CalvingratexAverageEnum syn keyword cConstant CalvingrateyAverageEnum +syn keyword cConstant CalvingStressThresholdGroundediceEnum +syn keyword cConstant CalvingStressThresholdFloatingiceEnum +syn keyword cConstant CalvingMaxEnum +syn keyword cConstant SigmaVMEnum syn keyword cConstant StrainRateparallelEnum syn keyword cConstant StrainRateperpendicularEnum @@ -840,24 +873,18 @@ syn keyword cConstant MaterialsEarthDensityEnum syn keyword cConstant MeshAverageVertexConnectivityEnum -syn keyword cConstant MeshElements2dEnum +syn keyword cConstant MeshLatEnum +syn keyword cConstant MeshLongEnum +syn keyword cConstant MeshXEnum +syn keyword cConstant MeshYEnum +syn keyword cConstant MeshZEnum +syn keyword cConstant MeshScaleFactorEnum syn keyword cConstant MeshElementsEnum -syn keyword cConstant MeshLowerelementsEnum -syn keyword cConstant MeshNumberofelements2dEnum syn keyword cConstant MeshNumberofelementsEnum syn keyword cConstant MeshNumberoflayersEnum -syn keyword cConstant MeshNumberofvertices2dEnum syn keyword cConstant MeshNumberofverticesEnum -syn keyword cConstant MeshUpperelementsEnum syn keyword cConstant MeshVertexonbaseEnum syn keyword cConstant MeshVertexonsurfaceEnum syn keyword cConstant MeshVertexonboundaryEnum -syn keyword cConstant MeshXEnum -syn keyword cConstant MeshYEnum -syn keyword cConstant MeshZEnum -syn keyword cConstant MeshLatEnum -syn keyword cConstant MeshLongEnum -syn keyword cConstant MeshREnum syn keyword cConstant MeshElementtypeEnum -syn keyword cConstant MeshSegmentsEnum syn keyword cConstant DomainTypeEnum syn keyword cConstant DomainDimensionEnum @@ -866,5 +893,4 @@ syn keyword cConstant Domain3DEnum syn keyword cConstant Domain3DsurfaceEnum -syn keyword cConstant MiscellaneousNameEnum syn keyword cConstant MasstransportHydrostaticAdjustmentEnum syn keyword cConstant MasstransportIsfreesurfaceEnum @@ -873,5 +899,4 @@ syn keyword cConstant MasstransportSpcthicknessEnum syn keyword cConstant MasstransportStabilizationEnum -syn keyword cConstant MasstransportVertexPairingEnum syn keyword cConstant MasstransportNumRequestedOutputsEnum syn keyword cConstant MasstransportRequestedOutputsEnum @@ -879,5 +904,4 @@ syn keyword cConstant MassFluxSegmentsEnum syn keyword cConstant MassFluxSegmentsPresentEnum -syn keyword cConstant QmuMassFluxSegmentsPresentEnum syn keyword cConstant QmuNumberofpartitionsEnum syn keyword cConstant QmuNumberofresponsesEnum @@ -885,6 +909,4 @@ syn keyword cConstant QmuResponsedescriptorsEnum syn keyword cConstant QmuVariabledescriptorsEnum -syn keyword cConstant RiftsNumriftsEnum -syn keyword cConstant RiftsRiftstructEnum syn keyword cConstant SettingsResultsOnNodesEnum syn keyword cConstant SettingsIoGatherEnum @@ -893,4 +915,5 @@ syn keyword cConstant SettingsRecordingFrequencyEnum syn keyword cConstant SettingsWaitonlockEnum +syn keyword cConstant SettingsSolverResidueThresholdEnum syn keyword cConstant DebugProfilingEnum syn keyword cConstant ProfilingCurrentMemEnum @@ -922,6 +945,8 @@ syn keyword cConstant TimesteppingTimeStepEnum syn keyword cConstant TimesteppingInterpForcingsEnum +syn keyword cConstant TimesteppingCouplingTimeEnum syn keyword cConstant TransientIssmbEnum syn keyword cConstant TransientIscouplerEnum +syn keyword cConstant TransientIsoceancouplingEnum syn keyword cConstant TransientIsstressbalanceEnum syn keyword cConstant TransientIsgroundinglineEnum @@ -929,4 +954,5 @@ syn keyword cConstant TransientIsthermalEnum syn keyword cConstant TransientIsgiaEnum +syn keyword cConstant TransientIsesaEnum syn keyword cConstant TransientIsdamageevolutionEnum syn keyword cConstant TransientIshydrologyEnum @@ -935,11 +961,9 @@ syn keyword cConstant TransientNumRequestedOutputsEnum syn keyword cConstant TransientRequestedOutputsEnum -syn keyword cConstant PotentialEnum -syn keyword cConstant BalancethicknessSpcpotentialEnum +syn keyword cConstant BalancethicknessSpcthicknessEnum syn keyword cConstant BalancethicknessApparentMassbalanceEnum -syn keyword cConstant Balancethickness2MisfitEnum syn keyword cConstant BalancethicknessDiffusionCoefficientEnum -syn keyword cConstant BalancethicknessCmuEnum syn keyword cConstant BalancethicknessOmegaEnum +syn keyword cConstant BalancethicknessOmega0Enum syn keyword cConstant BalancethicknessD0Enum syn keyword cConstant SmbEnum @@ -949,4 +973,14 @@ syn keyword cConstant SmbRequestedOutputsEnum syn keyword cConstant SmbIsInitializedEnum +syn keyword cConstant SmbDziniEnum +syn keyword cConstant SmbDiniEnum +syn keyword cConstant SmbReiniEnum +syn keyword cConstant SmbGdniniEnum +syn keyword cConstant SmbGspiniEnum +syn keyword cConstant SmbECiniEnum +syn keyword cConstant SmbWiniEnum +syn keyword cConstant SmbAiniEnum +syn keyword cConstant SmbTiniEnum +syn keyword cConstant SmbSizeiniEnum syn keyword cConstant SMBforcingEnum syn keyword cConstant SmbMassBalanceEnum @@ -958,5 +992,4 @@ syn keyword cConstant SmbDlwrfEnum syn keyword cConstant SmbPEnum -syn keyword cConstant SmbSwfEnum syn keyword cConstant SmbEAirEnum syn keyword cConstant SmbPAirEnum @@ -988,8 +1021,9 @@ syn keyword cConstant SmbGspEnum syn keyword cConstant SmbECEnum -syn keyword cConstant SmbCondensationEnum syn keyword cConstant SmbWEnum syn keyword cConstant SmbAEnum syn keyword cConstant SmbTEnum +syn keyword cConstant SmbAValueEnum +syn keyword cConstant SmbTeValueEnum syn keyword cConstant SmbIsgraingrowthEnum syn keyword cConstant SmbIsalbedoEnum @@ -1000,8 +1034,11 @@ syn keyword cConstant SmbIsdensificationEnum syn keyword cConstant SmbIsturbulentfluxEnum +syn keyword cConstant SmbDz_addEnum +syn keyword cConstant SmbM_addEnum syn keyword cConstant SMBpddEnum syn keyword cConstant SmbDelta18oEnum syn keyword cConstant SmbDelta18oSurfaceEnum syn keyword cConstant SmbIsdelta18oEnum +syn keyword cConstant SmbIssetpddfacEnum syn keyword cConstant SmbIsmungsmEnum syn keyword cConstant SmbIsd18opdEnum @@ -1011,4 +1048,6 @@ syn keyword cConstant SmbTemperaturesLgmEnum syn keyword cConstant SmbPrecipitationEnum +syn keyword cConstant SmbPddfacSnowEnum +syn keyword cConstant SmbPddfacIceEnum syn keyword cConstant SmbDesfacEnum syn keyword cConstant SmbS0pEnum @@ -1021,4 +1060,5 @@ syn keyword cConstant SMBd18opddEnum syn keyword cConstant SmbDpermilEnum +syn keyword cConstant SmbFEnum syn keyword cConstant SMBgradientsEnum syn keyword cConstant SmbMonthlytemperaturesEnum @@ -1036,167 +1076,8 @@ syn keyword cConstant SmbRefreezeEnum syn keyword cConstant SMBgcmEnum -syn keyword cConstant SmbIspddEnum -syn keyword cConstant SmbIssmbgradientsEnum -syn keyword cConstant SolutionTypeEnum -syn keyword cConstant AnalysisTypeEnum -syn keyword cConstant ConfigurationTypeEnum -syn keyword cConstant AdjointBalancethicknessAnalysisEnum -syn keyword cConstant AdjointBalancethickness2AnalysisEnum -syn keyword cConstant AdjointHorizAnalysisEnum -syn keyword cConstant AnalysisCounterEnum -syn keyword cConstant DefaultAnalysisEnum -syn keyword cConstant BalancethicknessAnalysisEnum -syn keyword cConstant BalancethicknessSolutionEnum -syn keyword cConstant Balancethickness2AnalysisEnum -syn keyword cConstant Balancethickness2SolutionEnum -syn keyword cConstant BalancethicknessSoftAnalysisEnum -syn keyword cConstant BalancethicknessSoftSolutionEnum -syn keyword cConstant BalancevelocityAnalysisEnum -syn keyword cConstant BalancevelocitySolutionEnum -syn keyword cConstant L2ProjectionEPLAnalysisEnum -syn keyword cConstant L2ProjectionBaseAnalysisEnum -syn keyword cConstant BedSlopeSolutionEnum -syn keyword cConstant DamageEvolutionSolutionEnum -syn keyword cConstant DamageEvolutionAnalysisEnum -syn keyword cConstant StressbalanceAnalysisEnum -syn keyword cConstant StressbalanceSIAAnalysisEnum -syn keyword cConstant StressbalanceSolutionEnum -syn keyword cConstant StressbalanceVerticalAnalysisEnum -syn keyword cConstant EnthalpyAnalysisEnum -syn keyword cConstant FlaimAnalysisEnum -syn keyword cConstant FlaimSolutionEnum -syn keyword cConstant HydrologyShreveAnalysisEnum -syn keyword cConstant HydrologyDCInefficientAnalysisEnum -syn keyword cConstant HydrologyDCEfficientAnalysisEnum -syn keyword cConstant HydrologySommersAnalysisEnum -syn keyword cConstant HydrologySolutionEnum -syn keyword cConstant MeltingAnalysisEnum -syn keyword cConstant MasstransportAnalysisEnum -syn keyword cConstant MasstransportSolutionEnum -syn keyword cConstant FreeSurfaceBaseAnalysisEnum -syn keyword cConstant FreeSurfaceTopAnalysisEnum -syn keyword cConstant SurfaceNormalVelocityEnum -syn keyword cConstant ExtrudeFromBaseAnalysisEnum -syn keyword cConstant ExtrudeFromTopAnalysisEnum -syn keyword cConstant DepthAverageAnalysisEnum -syn keyword cConstant SteadystateSolutionEnum -syn keyword cConstant SurfaceSlopeSolutionEnum -syn keyword cConstant SmoothAnalysisEnum -syn keyword cConstant ThermalAnalysisEnum -syn keyword cConstant ThermalSolutionEnum -syn keyword cConstant TransientSolutionEnum -syn keyword cConstant UzawaPressureAnalysisEnum -syn keyword cConstant GiaSolutionEnum -syn keyword cConstant GiaAnalysisEnum -syn keyword cConstant MeshdeformationSolutionEnum -syn keyword cConstant MeshdeformationAnalysisEnum -syn keyword cConstant LevelsetAnalysisEnum -syn keyword cConstant LevelsetStabilizationEnum -syn keyword cConstant ExtrapolationAnalysisEnum -syn keyword cConstant LsfReinitializationAnalysisEnum -syn keyword cConstant ApproximationEnum -syn keyword cConstant NoneApproximationEnum -syn keyword cConstant SIAApproximationEnum -syn keyword cConstant SSAApproximationEnum -syn keyword cConstant SSAHOApproximationEnum -syn keyword cConstant SSAFSApproximationEnum -syn keyword cConstant L1L2ApproximationEnum -syn keyword cConstant HOApproximationEnum -syn keyword cConstant HOFSApproximationEnum -syn keyword cConstant FSApproximationEnum -syn keyword cConstant FSvelocityEnum -syn keyword cConstant FSpressureEnum -syn keyword cConstant DataSetEnum -syn keyword cConstant ConstraintsEnum -syn keyword cConstant LoadsEnum -syn keyword cConstant MaterialsEnum -syn keyword cConstant NodesEnum -syn keyword cConstant ContoursEnum -syn keyword cConstant ParametersEnum -syn keyword cConstant VerticesEnum -syn keyword cConstant ResultsEnum -syn keyword cConstant GenericParamEnum -syn keyword cConstant AdolcParamEnum -syn keyword cConstant BoolInputEnum -syn keyword cConstant BoolParamEnum -syn keyword cConstant ContourEnum -syn keyword cConstant ControlInputEnum -syn keyword cConstant DatasetInputEnum -syn keyword cConstant DoubleInputEnum -syn keyword cConstant DoubleArrayInputEnum -syn keyword cConstant DataSetParamEnum -syn keyword cConstant DoubleMatArrayParamEnum -syn keyword cConstant DoubleMatParamEnum -syn keyword cConstant DoubleParamEnum -syn keyword cConstant DoubleVecParamEnum -syn keyword cConstant ElementEnum -syn keyword cConstant ElementHookEnum -syn keyword cConstant HookEnum -syn keyword cConstant ExternalResultEnum -syn keyword cConstant FileParamEnum -syn keyword cConstant InputEnum -syn keyword cConstant IntInputEnum -syn keyword cConstant InputToExtrudeEnum -syn keyword cConstant InputToL2ProjectEnum -syn keyword cConstant InputToDepthaverageEnum -syn keyword cConstant InputToSmoothEnum -syn keyword cConstant SmoothThicknessMultiplierEnum -syn keyword cConstant IntParamEnum -syn keyword cConstant IntVecParamEnum -syn keyword cConstant TransientParamEnum -syn keyword cConstant MaticeEnum -syn keyword cConstant MatdamageiceEnum -syn keyword cConstant MatestarEnum -syn keyword cConstant MatparEnum -syn keyword cConstant NodeEnum -syn keyword cConstant NumericalfluxEnum -syn keyword cConstant NumericalfluxTypeEnum -syn keyword cConstant NeumannfluxEnum -syn keyword cConstant ParamEnum -syn keyword cConstant MoulinEnum -syn keyword cConstant PengridEnum -syn keyword cConstant PenpairEnum -syn keyword cConstant ProfilerEnum -syn keyword cConstant MatrixParamEnum -syn keyword cConstant MassconEnum -syn keyword cConstant MassconNameEnum -syn keyword cConstant MassconDefinitionenumEnum -syn keyword cConstant MassconLevelsetEnum -syn keyword cConstant MassconaxpbyEnum -syn keyword cConstant MassconaxpbyNameEnum -syn keyword cConstant MassconaxpbyDefinitionenumEnum -syn keyword cConstant MassconaxpbyNamexEnum -syn keyword cConstant MassconaxpbyNameyEnum -syn keyword cConstant MassconaxpbyAlphaEnum -syn keyword cConstant MassconaxpbyBetaEnum -syn keyword cConstant NodeSIdEnum -syn keyword cConstant VectorParamEnum -syn keyword cConstant RiftfrontEnum -syn keyword cConstant RiftfrontTypeEnum -syn keyword cConstant SegmentEnum -syn keyword cConstant SegmentRiftfrontEnum -syn keyword cConstant SpcDynamicEnum -syn keyword cConstant SpcStaticEnum -syn keyword cConstant SpcTransientEnum -syn keyword cConstant StringArrayParamEnum -syn keyword cConstant StringParamEnum -syn keyword cConstant SegEnum -syn keyword cConstant SegInputEnum -syn keyword cConstant TriaEnum -syn keyword cConstant TriaInputEnum -syn keyword cConstant TetraEnum -syn keyword cConstant TetraInputEnum -syn keyword cConstant PentaEnum -syn keyword cConstant PentaInputEnum -syn keyword cConstant VertexEnum -syn keyword cConstant VertexPIdEnum -syn keyword cConstant VertexSIdEnum -syn keyword cConstant AirEnum -syn keyword cConstant IceEnum -syn keyword cConstant MelangeEnum -syn keyword cConstant WaterEnum -syn keyword cConstant ClosedEnum -syn keyword cConstant FreeEnum -syn keyword cConstant OpenEnum +syn keyword cConstant SMBgradientselaEnum +syn keyword cConstant SmbElaEnum +syn keyword cConstant SmbBMaxEnum +syn keyword cConstant SmbBMinEnum syn keyword cConstant AdjointpEnum syn keyword cConstant AdjointxEnum @@ -1208,7 +1089,4 @@ syn keyword cConstant BoundaryEnum syn keyword cConstant ConvergedEnum -syn keyword cConstant FillEnum -syn keyword cConstant FractionIncrementEnum -syn keyword cConstant FrictionEnum syn keyword cConstant InternalEnum syn keyword cConstant MassFluxEnum @@ -1219,5 +1097,4 @@ syn keyword cConstant AndroidFrictionCoefficientEnum syn keyword cConstant ResetPenaltiesEnum -syn keyword cConstant SegmentOnIceShelfEnum syn keyword cConstant SurfaceAbsVelMisfitEnum syn keyword cConstant SurfaceAreaEnum @@ -1233,4 +1110,7 @@ syn keyword cConstant ThicknessAbsMisfitEnum syn keyword cConstant SurfaceAbsMisfitEnum +syn keyword cConstant OmegaAbsGradientEnum +syn keyword cConstant EtaDiffEnum +syn keyword cConstant EtaAbsGradientEnum syn keyword cConstant VelEnum syn keyword cConstant VelocityEnum @@ -1261,6 +1141,7 @@ syn keyword cConstant TransientInputEnum syn keyword cConstant WaterfractionEnum +syn keyword cConstant WaterfractionDrainageEnum +syn keyword cConstant WaterfractionDrainageIntegratedEnum syn keyword cConstant WatercolumnEnum -syn keyword cConstant BasalFrictionEnum syn keyword cConstant ViscousHeatingEnum syn keyword cConstant HydrologyWaterVxEnum @@ -1298,27 +1179,4 @@ syn keyword cConstant GiadWdtEnum syn keyword cConstant GiaWEnum -syn keyword cConstant P0Enum -syn keyword cConstant P0ArrayEnum -syn keyword cConstant P1Enum -syn keyword cConstant P1DGEnum -syn keyword cConstant P1bubbleEnum -syn keyword cConstant P1bubblecondensedEnum -syn keyword cConstant P2Enum -syn keyword cConstant P2bubbleEnum -syn keyword cConstant P2bubblecondensedEnum -syn keyword cConstant P2xP1Enum -syn keyword cConstant P1xP2Enum -syn keyword cConstant P1xP3Enum -syn keyword cConstant P2xP4Enum -syn keyword cConstant P1P1Enum -syn keyword cConstant P1P1GLSEnum -syn keyword cConstant MINIEnum -syn keyword cConstant MINIcondensedEnum -syn keyword cConstant TaylorHoodEnum -syn keyword cConstant LATaylorHoodEnum -syn keyword cConstant XTaylorHoodEnum -syn keyword cConstant OneLayerP4zEnum -syn keyword cConstant CrouzeixRaviartEnum -syn keyword cConstant LACrouzeixRaviartEnum syn keyword cConstant SaveResultsEnum syn keyword cConstant BoolExternalResultEnum @@ -1326,4 +1184,5 @@ syn keyword cConstant DoubleMatExternalResultEnum syn keyword cConstant IntExternalResultEnum +syn keyword cConstant IntMatExternalResultEnum syn keyword cConstant JEnum syn keyword cConstant StringExternalResultEnum @@ -1331,4 +1190,6 @@ syn keyword cConstant TimeEnum syn keyword cConstant WaterColumnOldEnum +syn keyword cConstant SurfaceObservationEnum +syn keyword cConstant WeightsSurfaceObservationEnum syn keyword cConstant OutputdefinitionEnum syn keyword cConstant Outputdefinition1Enum @@ -1434,46 +1295,9 @@ syn keyword cConstant OutputdefinitionListEnum syn keyword cConstant MassfluxatgateEnum -syn keyword cConstant MassfluxatgateNameEnum -syn keyword cConstant MassfluxatgateDefinitionenumEnum -syn keyword cConstant MassfluxatgateSegmentsEnum syn keyword cConstant NodalvalueEnum -syn keyword cConstant NodalvalueNameEnum -syn keyword cConstant NodalvalueDefinitionenumEnum -syn keyword cConstant NodalvalueModelEnumEnum -syn keyword cConstant NodalvalueNodeEnum -syn keyword cConstant MisfitNameEnum -syn keyword cConstant MisfitDefinitionenumEnum -syn keyword cConstant MisfitModelEnumEnum -syn keyword cConstant MisfitObservationEnum -syn keyword cConstant MisfitObservationEnumEnum -syn keyword cConstant MisfitLocalEnum -syn keyword cConstant MisfitTimeinterpolationEnum -syn keyword cConstant MisfitWeightsEnum -syn keyword cConstant MisfitWeightsEnumEnum -syn keyword cConstant SurfaceObservationEnum -syn keyword cConstant WeightsSurfaceObservationEnum +syn keyword cConstant RegionaloutputEnum syn keyword cConstant VxObsEnum -syn keyword cConstant WeightsVxObsEnum syn keyword cConstant VyObsEnum -syn keyword cConstant WeightsVyObsEnum -syn keyword cConstant MinVelEnum -syn keyword cConstant MaxVelEnum -syn keyword cConstant MinVxEnum -syn keyword cConstant MaxVxEnum -syn keyword cConstant MaxAbsVxEnum -syn keyword cConstant MinVyEnum -syn keyword cConstant MaxVyEnum -syn keyword cConstant MaxAbsVyEnum -syn keyword cConstant MinVzEnum -syn keyword cConstant MaxVzEnum -syn keyword cConstant MaxAbsVzEnum -syn keyword cConstant FloatingAreaEnum -syn keyword cConstant GroundedAreaEnum -syn keyword cConstant IceMassEnum -syn keyword cConstant IceVolumeEnum -syn keyword cConstant IceVolumeAboveFloatationEnum -syn keyword cConstant TotalFloatingBmbEnum -syn keyword cConstant TotalGroundedBmbEnum -syn keyword cConstant TotalSmbEnum +syn keyword cConstant NumberedcostfunctionEnum syn keyword cConstant AbsoluteEnum syn keyword cConstant IncrementalEnum @@ -1488,12 +1312,9 @@ syn keyword cConstant SubelementMigrationEnum syn keyword cConstant SubelementMigration2Enum +syn keyword cConstant SubelementMigration3Enum +syn keyword cConstant SubelementMigration4Enum syn keyword cConstant ContactEnum syn keyword cConstant GroundingOnlyEnum syn keyword cConstant MaskGroundediceLevelsetEnum -syn keyword cConstant GaussSegEnum -syn keyword cConstant GaussTriaEnum -syn keyword cConstant GaussTetraEnum -syn keyword cConstant GaussPentaEnum -syn keyword cConstant FSSolverEnum syn keyword cConstant AdjointEnum syn keyword cConstant ColinearEnum @@ -1529,10 +1350,4 @@ syn keyword cConstant SeparateEnum syn keyword cConstant SsetEnum -syn keyword cConstant VerboseEnum -syn keyword cConstant TriangleInterpEnum -syn keyword cConstant BilinearInterpEnum -syn keyword cConstant NearestInterpEnum -syn keyword cConstant XYEnum -syn keyword cConstant XYZEnum syn keyword cConstant DenseEnum syn keyword cConstant MpiDenseEnum @@ -1542,8 +1357,4 @@ syn keyword cConstant MumpsEnum syn keyword cConstant GslEnum -syn keyword cConstant OptionEnum -syn keyword cConstant GenericOptionEnum -syn keyword cConstant OptionCellEnum -syn keyword cConstant OptionStructEnum syn keyword cConstant CuffeyEnum syn keyword cConstant BuddJackaEnum @@ -1552,5 +1363,4 @@ syn keyword cConstant ArrheniusEnum syn keyword cConstant LliboutryDuvalEnum -syn keyword cConstant SpclevelsetEnum syn keyword cConstant ExtrapolationVariableEnum syn keyword cConstant IceMaskNodeActivationEnum @@ -1559,25 +1369,303 @@ syn keyword cConstant LevelsetfunctionPicardEnum syn keyword cConstant LevelsetReinitFrequencyEnum -syn keyword cConstant SealevelriseSolutionEnum -syn keyword cConstant SealevelriseAnalysisEnum syn keyword cConstant SealevelEnum +syn keyword cConstant SealevelUmotionEnum +syn keyword cConstant SealevelNmotionEnum +syn keyword cConstant SealevelEmotionEnum +syn keyword cConstant SealevelAbsoluteEnum syn keyword cConstant SealevelEustaticEnum +syn keyword cConstant SealevelInertiaTensorXZEnum +syn keyword cConstant SealevelInertiaTensorYZEnum +syn keyword cConstant SealevelInertiaTensorZZEnum +syn keyword cConstant SealevelObsEnum +syn keyword cConstant SealevelWeightsEnum syn keyword cConstant SealevelriseDeltathicknessEnum syn keyword cConstant SealevelriseMaxiterEnum syn keyword cConstant SealevelriseReltolEnum syn keyword cConstant SealevelriseAbstolEnum -syn keyword cConstant SealevelriseLoveHEnum -syn keyword cConstant SealevelriseLoveKEnum -syn keyword cConstant SealevelriseTideLoveHEnum -syn keyword cConstant SealevelriseTideLoveKEnum syn keyword cConstant SealevelriseRigidEnum syn keyword cConstant SealevelriseElasticEnum syn keyword cConstant SealevelriseRotationEnum +syn keyword cConstant SealevelriseTidalLoveHEnum +syn keyword cConstant SealevelriseTidalLoveKEnum +syn keyword cConstant SealevelriseFluidLoveEnum +syn keyword cConstant SealevelriseEquatorialMoiEnum +syn keyword cConstant SealevelrisePolarMoiEnum +syn keyword cConstant SealevelriseAngularVelocityEnum +syn keyword cConstant SealevelriseOceanAreaScalingEnum +syn keyword cConstant SealevelriseStericRateEnum syn keyword cConstant SealevelriseGElasticEnum -syn keyword cConstant SealevelriseDegaccEnum +syn keyword cConstant SealevelriseUElasticEnum +syn keyword cConstant SealevelriseHElasticEnum syn keyword cConstant SealevelriseTransitionsEnum syn keyword cConstant SealevelriseRequestedOutputsEnum syn keyword cConstant SealevelriseNumRequestedOutputsEnum +syn keyword cConstant LoveNfreqEnum +syn keyword cConstant LoveFrequenciesEnum +syn keyword cConstant LoveShNmaxEnum +syn keyword cConstant LoveShNminEnum +syn keyword cConstant LoveG0Enum +syn keyword cConstant LoveR0Enum +syn keyword cConstant LoveMu0Enum +syn keyword cConstant LoveAllowLayerDeletionEnum +syn keyword cConstant LoveForcingTypeEnum +syn keyword cConstant LoveHrEnum +syn keyword cConstant LoveKrEnum +syn keyword cConstant LoveLrEnum +syn keyword cConstant LoveHiEnum +syn keyword cConstant LoveKiEnum +syn keyword cConstant LoveLiEnum +syn keyword cConstant LoveKernelsEnum +syn keyword cConstant LoveKernelsRealEnum +syn keyword cConstant LoveKernelsImagEnum +syn keyword cConstant EsaUmotionEnum +syn keyword cConstant EsaNmotionEnum +syn keyword cConstant EsaEmotionEnum +syn keyword cConstant EsaXmotionEnum +syn keyword cConstant EsaYmotionEnum +syn keyword cConstant EsaHemisphereEnum +syn keyword cConstant EsaStrainratexxEnum +syn keyword cConstant EsaStrainratexyEnum +syn keyword cConstant EsaStrainrateyyEnum +syn keyword cConstant EsaRotationrateEnum +syn keyword cConstant EsaDeltathicknessEnum +syn keyword cConstant EsaUElasticEnum +syn keyword cConstant EsaHElasticEnum +syn keyword cConstant EsaTransitionsEnum +syn keyword cConstant EsaRequestedOutputsEnum +syn keyword cConstant EsaNumRequestedOutputsEnum +syn keyword cConstant TransientAmrFrequencyEnum +syn keyword cConstant AmrTypeEnum +syn keyword cConstant AmrRestartEnum +syn keyword cConstant AmrNeopzEnum +syn keyword cConstant AmrLevelMaxEnum +syn keyword cConstant AmrLagEnum +syn keyword cConstant AmrBamgEnum +syn keyword cConstant AmrHminEnum +syn keyword cConstant AmrHmaxEnum +syn keyword cConstant AmrFieldEnum +syn keyword cConstant AmrErrEnum +syn keyword cConstant AmrKeepMetricEnum +syn keyword cConstant AmrGradationEnum +syn keyword cConstant AmrGroundingLineResolutionEnum +syn keyword cConstant AmrGroundingLineDistanceEnum +syn keyword cConstant AmrIceFrontResolutionEnum +syn keyword cConstant AmrIceFrontDistanceEnum +syn keyword cConstant AmrThicknessErrorResolutionEnum +syn keyword cConstant AmrThicknessErrorThresholdEnum +syn keyword cConstant AmrThicknessErrorGroupThresholdEnum +syn keyword cConstant AmrThicknessErrorMaximumEnum +syn keyword cConstant AmrDeviatoricErrorResolutionEnum +syn keyword cConstant AmrDeviatoricErrorThresholdEnum +syn keyword cConstant AmrDeviatoricErrorGroupThresholdEnum +syn keyword cConstant AmrDeviatoricErrorMaximumEnum +syn keyword cConstant DeviatoricStressErrorEstimatorEnum +syn keyword cConstant ThicknessErrorEstimatorEnum syn keyword cConstant ParametersENDEnum +syn keyword cConstant XYEnum +syn keyword cConstant XYZEnum +syn keyword cConstant GenericParamEnum +syn keyword cConstant BoolInputEnum +syn keyword cConstant BoolParamEnum +syn keyword cConstant ContourEnum +syn keyword cConstant ControlInputEnum +syn keyword cConstant DatasetInputEnum +syn keyword cConstant DoubleInputEnum +syn keyword cConstant DoubleArrayInputEnum +syn keyword cConstant DataSetParamEnum +syn keyword cConstant DoubleMatArrayParamEnum +syn keyword cConstant DoubleMatParamEnum +syn keyword cConstant DoubleParamEnum +syn keyword cConstant DoubleVecParamEnum +syn keyword cConstant ElementEnum +syn keyword cConstant ElementHookEnum +syn keyword cConstant HookEnum +syn keyword cConstant ExternalResultEnum +syn keyword cConstant FileParamEnum +syn keyword cConstant InputEnum +syn keyword cConstant IntInputEnum +syn keyword cConstant IntParamEnum +syn keyword cConstant IntVecParamEnum +syn keyword cConstant TransientParamEnum +syn keyword cConstant TransientArrayParamEnum +syn keyword cConstant MaticeEnum +syn keyword cConstant MatlithoEnum +syn keyword cConstant MatdamageiceEnum +syn keyword cConstant MatenhancediceEnum +syn keyword cConstant MatestarEnum +syn keyword cConstant MatparEnum +syn keyword cConstant NodeEnum +syn keyword cConstant NumericalfluxEnum +syn keyword cConstant NeumannfluxEnum +syn keyword cConstant ParamEnum +syn keyword cConstant MoulinEnum +syn keyword cConstant PengridEnum +syn keyword cConstant PenpairEnum +syn keyword cConstant ProfilerEnum +syn keyword cConstant MatrixParamEnum +syn keyword cConstant MassconEnum +syn keyword cConstant MassconaxpbyEnum +syn keyword cConstant NodeSIdEnum +syn keyword cConstant ElementSIdEnum +syn keyword cConstant VectorParamEnum +syn keyword cConstant RiftfrontEnum +syn keyword cConstant SegmentEnum +syn keyword cConstant SegmentRiftfrontEnum +syn keyword cConstant SpcDynamicEnum +syn keyword cConstant SpcStaticEnum +syn keyword cConstant SpcTransientEnum +syn keyword cConstant StringArrayParamEnum +syn keyword cConstant StringParamEnum +syn keyword cConstant SegEnum +syn keyword cConstant SegInputEnum +syn keyword cConstant TriaEnum +syn keyword cConstant TriaInputEnum +syn keyword cConstant TetraEnum +syn keyword cConstant TetraInputEnum +syn keyword cConstant PentaEnum +syn keyword cConstant PentaInputEnum +syn keyword cConstant VertexEnum +syn keyword cConstant VertexPIdEnum +syn keyword cConstant VertexSIdEnum +syn keyword cConstant OptionEnum +syn keyword cConstant GenericOptionEnum +syn keyword cConstant AdjointBalancethicknessAnalysisEnum +syn keyword cConstant AdjointBalancethickness2AnalysisEnum +syn keyword cConstant AdjointHorizAnalysisEnum +syn keyword cConstant DefaultAnalysisEnum +syn keyword cConstant BalancethicknessAnalysisEnum +syn keyword cConstant BalancethicknessSolutionEnum +syn keyword cConstant Balancethickness2AnalysisEnum +syn keyword cConstant Balancethickness2SolutionEnum +syn keyword cConstant BalancethicknessSoftAnalysisEnum +syn keyword cConstant BalancethicknessSoftSolutionEnum +syn keyword cConstant BalancevelocityAnalysisEnum +syn keyword cConstant BalancevelocitySolutionEnum +syn keyword cConstant L2ProjectionEPLAnalysisEnum +syn keyword cConstant L2ProjectionBaseAnalysisEnum +syn keyword cConstant BedSlopeSolutionEnum +syn keyword cConstant DamageEvolutionSolutionEnum +syn keyword cConstant DamageEvolutionAnalysisEnum +syn keyword cConstant StressbalanceAnalysisEnum +syn keyword cConstant StressbalanceSIAAnalysisEnum +syn keyword cConstant StressbalanceSolutionEnum +syn keyword cConstant StressbalanceVerticalAnalysisEnum +syn keyword cConstant EnthalpyAnalysisEnum +syn keyword cConstant HydrologyShreveAnalysisEnum +syn keyword cConstant HydrologyDCInefficientAnalysisEnum +syn keyword cConstant HydrologyDCEfficientAnalysisEnum +syn keyword cConstant HydrologySommersAnalysisEnum +syn keyword cConstant HydrologySolutionEnum +syn keyword cConstant MeltingAnalysisEnum +syn keyword cConstant MasstransportAnalysisEnum +syn keyword cConstant MasstransportSolutionEnum +syn keyword cConstant FreeSurfaceBaseAnalysisEnum +syn keyword cConstant FreeSurfaceTopAnalysisEnum +syn keyword cConstant ExtrudeFromBaseAnalysisEnum +syn keyword cConstant ExtrudeFromTopAnalysisEnum +syn keyword cConstant DepthAverageAnalysisEnum +syn keyword cConstant SealevelriseSolutionEnum +syn keyword cConstant SealevelriseAnalysisEnum +syn keyword cConstant SteadystateSolutionEnum +syn keyword cConstant SurfaceSlopeSolutionEnum +syn keyword cConstant SmoothAnalysisEnum +syn keyword cConstant ThermalAnalysisEnum +syn keyword cConstant ThermalSolutionEnum +syn keyword cConstant TransientSolutionEnum +syn keyword cConstant UzawaPressureAnalysisEnum +syn keyword cConstant GiaSolutionEnum +syn keyword cConstant GiaIvinsAnalysisEnum +syn keyword cConstant EsaSolutionEnum +syn keyword cConstant EsaAnalysisEnum +syn keyword cConstant LoveSolutionEnum +syn keyword cConstant LoveAnalysisEnum +syn keyword cConstant LevelsetAnalysisEnum +syn keyword cConstant ExtrapolationAnalysisEnum +syn keyword cConstant ApproximationEnum +syn keyword cConstant NoneApproximationEnum +syn keyword cConstant SIAApproximationEnum +syn keyword cConstant SSAApproximationEnum +syn keyword cConstant SSAHOApproximationEnum +syn keyword cConstant SSAFSApproximationEnum +syn keyword cConstant L1L2ApproximationEnum +syn keyword cConstant HOApproximationEnum +syn keyword cConstant HOFSApproximationEnum +syn keyword cConstant FSApproximationEnum +syn keyword cConstant FSvelocityEnum +syn keyword cConstant FSpressureEnum +syn keyword cConstant GaussSegEnum +syn keyword cConstant GaussTriaEnum +syn keyword cConstant GaussTetraEnum +syn keyword cConstant GaussPentaEnum +syn keyword cConstant TriangleInterpEnum +syn keyword cConstant BilinearInterpEnum +syn keyword cConstant NearestInterpEnum +syn keyword cConstant MinVelEnum +syn keyword cConstant MaxVelEnum +syn keyword cConstant MinVxEnum +syn keyword cConstant MaxVxEnum +syn keyword cConstant MaxAbsVxEnum +syn keyword cConstant MinVyEnum +syn keyword cConstant MaxVyEnum +syn keyword cConstant MaxAbsVyEnum +syn keyword cConstant MinVzEnum +syn keyword cConstant MaxVzEnum +syn keyword cConstant MaxAbsVzEnum +syn keyword cConstant FloatingAreaEnum +syn keyword cConstant FloatingAreaScaledEnum +syn keyword cConstant GroundedAreaEnum +syn keyword cConstant GroundedAreaScaledEnum +syn keyword cConstant IceMassEnum +syn keyword cConstant IceMassScaledEnum +syn keyword cConstant IceVolumeEnum +syn keyword cConstant IceVolumeScaledEnum +syn keyword cConstant IceVolumeAboveFloatationEnum +syn keyword cConstant IceVolumeAboveFloatationScaledEnum +syn keyword cConstant TotalFloatingBmbEnum +syn keyword cConstant TotalFloatingBmbScaledEnum +syn keyword cConstant TotalGroundedBmbEnum +syn keyword cConstant TotalGroundedBmbScaledEnum +syn keyword cConstant TotalSmbEnum +syn keyword cConstant TotalSmbScaledEnum +syn keyword cConstant P0Enum +syn keyword cConstant P0ArrayEnum +syn keyword cConstant P1Enum +syn keyword cConstant P1DGEnum +syn keyword cConstant P1bubbleEnum +syn keyword cConstant P1bubblecondensedEnum +syn keyword cConstant P2Enum +syn keyword cConstant P2bubbleEnum +syn keyword cConstant P2bubblecondensedEnum +syn keyword cConstant P2xP1Enum +syn keyword cConstant P1xP2Enum +syn keyword cConstant P1xP3Enum +syn keyword cConstant P1xP4Enum +syn keyword cConstant P2xP4Enum +syn keyword cConstant P1P1Enum +syn keyword cConstant P1P1GLSEnum +syn keyword cConstant MINIEnum +syn keyword cConstant MINIcondensedEnum +syn keyword cConstant TaylorHoodEnum +syn keyword cConstant LATaylorHoodEnum +syn keyword cConstant XTaylorHoodEnum +syn keyword cConstant OneLayerP4zEnum +syn keyword cConstant CrouzeixRaviartEnum +syn keyword cConstant LACrouzeixRaviartEnum +syn keyword cConstant ClosedEnum +syn keyword cConstant FreeEnum +syn keyword cConstant OpenEnum +syn keyword cConstant AirEnum +syn keyword cConstant IceEnum +syn keyword cConstant MelangeEnum +syn keyword cConstant WaterEnum +syn keyword cConstant DataSetEnum +syn keyword cConstant ConstraintsEnum +syn keyword cConstant LoadsEnum +syn keyword cConstant MaterialsEnum +syn keyword cConstant NodesEnum +syn keyword cConstant ContoursEnum +syn keyword cConstant ParametersEnum +syn keyword cConstant VerticesEnum +syn keyword cConstant ResultsEnum "ISSM's Enums end """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" Index: /issm/trunk/externalpackages/vim/addons/vimrc =================================================================== --- /issm/trunk/externalpackages/vim/addons/vimrc (revision 22757) +++ /issm/trunk/externalpackages/vim/addons/vimrc (revision 22758) @@ -208,5 +208,5 @@ au BufRead,BufNewFile *.html iabbr CO =Eatchar('\s') au BufRead,BufNewFile *.html iabbr PP

=Eatchar('\s') -"au BufRead,BufNewFile *.m iabbr p1 disp('');=Eatchar('\s') +au BufRead,BufNewFile *.m iabbr p1 disp('');=Eatchar('\s') au BufRead,BufNewFile *.m iab p0 "disp('-------------- file: ".expand('%')." line: ".line(".")."');" au BufRead,BufNewFile *.c*,*.h iabbr p1 printf("\n");=Eatchar('\s') Index: /issm/trunk/jenkins/javascript/karma/index.html =================================================================== --- /issm/trunk/jenkins/javascript/karma/index.html (revision 22757) +++ /issm/trunk/jenkins/javascript/karma/index.html (revision 22758) @@ -7,14 +7,11 @@ - - - - - - - - - - + + + + + + +