Index: sm/trunk/CMakeLists.txt =================================================================== --- /issm/trunk/CMakeLists.txt (revision 17805) +++ (revision ) @@ -1,57 +1,0 @@ -# CMake version check. Version 2.6 is considered standard. -cmake_minimum_required (VERSION 2.6) - -# Project Information {{{ -# Project Name -project(ISSM) -set(ISSM_VERSION_MAJOR 4) -set(ISSM_VERSION_MINOR 1) -# }}} -# Contact Information {{{ -set(ISSM_EMAIL "issm@jpl.nasa.gov") -set(ISSM_WEBSITE "http://issm.jpl.nasa.gov") -# }}} - -# CMake Modules {{{ -include(CheckLanguage) -include(./m4/issm_options.cmake) -# }}} - -# Language Checks {{{ - -# 'C' language check. -include(CheckLanguage) - -check_language(C) -if(CMAKE_C_COMPILER) - enable_language(C) -else(CMAKE_C_COMPILER) - message(FATAL_ERROR "No C support found!") -endif(CMAKE_C_COMPILER) - -# 'C++' language check. -check_language(CXX) -if(CMAKE_CXX_COMPILER) - enable_language(CXX) -else(CMAKE_CXX_COMPILER) - message(FATA_ERROR "No C++ support found!") -endif(CMAKE_CXX_COMPILER) - -# 'Fortran' language check. -#check_language(Fortran) -#if(CMAKE_Fortran_COMPILER) -# enable_language(Fortran) -#else(CMAKE_Fortran_COMPILER) -# message(FATA_ERROR "No Fortran support") -#endif(CMAKE_Fortran_COMPILER) -# }}} - -# Subdirectories {{{ -add_subdirectory(src) -# }}} - -# Options {{{ -option(SHARED_LIBS "Set whether to produce shared libraries, or not. Default is no." - OFF) -# Questionable whether all options should be contained within this file or included from some other file. -# }}} Index: /issm/trunk/configs/config-linux64-acenet.sh =================================================================== --- /issm/trunk/configs/config-linux64-acenet.sh (revision 17806) +++ /issm/trunk/configs/config-linux64-acenet.sh (revision 17806) @@ -0,0 +1,17 @@ +#!/bin/bash + +./configure \ + --prefix=/home/klemorza/issm/trunk-jpl \ + --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \ + --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install + --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-mpi-include=$OPENMPI/include \ + --with-mpi-libflags="-L$OPENMPI/lib -lmpi" \ + --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \ + --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \ + --with-cxxoptflags="-O2" \ + --with-numthreads=32 \ + --with-serial=no \ + --with-modules=no \ + --enable-debugging CC=mpicc CXX=mpiCC F77=mpif77 Index: /issm/trunk/configs/config-linux64-pleiades-ampi-gcc.sh =================================================================== --- /issm/trunk/configs/config-linux64-pleiades-ampi-gcc.sh (revision 17805) +++ /issm/trunk/configs/config-linux64-pleiades-ampi-gcc.sh (revision 17806) @@ -5,15 +5,18 @@ --with-wrappers=no \ --with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \ - --with-mpi-include="/nasa/mvapich2/1.6.sles11/gcc/include" \ - --with-mpi-libflags="-L/nasa/mvapich2/1.6.sles11/gcc/lib -llmpe -lmpe -lmpich" \ + --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \ + --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich -lmpl " \ --with-adolc-dir="$ISSM_DIR/externalpackages/adolc/install"\ --with-ampi-dir="$ISSM_DIR/externalpackages/adjoinablempi/install"\ + --with-metis-dir="$ISSM_DIR/externalpackages/petsc/install" \ --with-blas-lapack-dir="$ISSM_DIR/externalpackages/petsc/install" \ --with-gsl-dir="$ISSM_DIR/externalpackages/gsl/install" \ - --with-metis-dir="$ISSM_DIR/externalpackages/petsc/install" \ --with-mumps-dir="$ISSM_DIR/externalpackages/petsc/install" \ --with-scalapack-dir="$ISSM_DIR/externalpackages/petsc/install" \ --with-hypre-dir="$ISSM_DIR/externalpackages/petsc/install" \ --with-graphics-lib="/usr/lib64/libX11.so" \ - --with-cxxoptflags="-g -O2" \ - --with-vendor="intel-pleiades-gcc" + --with-cxxoptflags=" -O3 -march=corei7-avx" \ + --with-vendor="intel-pleiades-gcc" \ + CFLAGS="-O3 -march=corei7-avx" \ + CXXFLAGS="-O3 -march=corei7-avx" \ + FFLAGS="-O3 -march=corei7-avx" Index: /issm/trunk/configs/config-linux64-pleiades-intel2012.0.032-mpt.2.06rp16.sh =================================================================== --- /issm/trunk/configs/config-linux64-pleiades-intel2012.0.032-mpt.2.06rp16.sh (revision 17806) +++ /issm/trunk/configs/config-linux64-pleiades-intel2012.0.032-mpt.2.06rp16.sh (revision 17806) @@ -0,0 +1,18 @@ +#!/bin/csh +./configure \ + --prefix=$ISSM_DIR \ + --without-kriging \ + --with-matlab-dir="$ISSM_DIR/externalpackages/matlab/install" \ + --with-petsc-dir="$ISSM_DIR/externalpackages/petsc/install" \ + --with-petsc-arch=$ISSM_ARCH \ + --with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \ + --with-mpi-include="/nasa/sgi/mpt/2.06rp16/include" \ + --with-mpi-libflags="-L/nasa/sgi/mpt/2.06rp16/ -lmpi" \ + --with-mkl-dir="/nasa/intel/Compiler/2012.0.032/composer_xe_2011_sp1/mkl/lib/intel64"\ + --with-metis-dir="$ISSM_DIR/externalpackages/petsc/install" \ + --with-mumps-dir="$ISSM_DIR/externalpackages/petsc/install" \ + --with-scalapack-dir="$ISSM_DIR/externalpackages/petsc/install" \ + --with-hypre-dir="$ISSM_DIR/externalpackages/petsc/install" \ + --with-graphics-lib="/usr/lib64/libX11.so" \ + --with-cxxoptflags="-g -O2" \ + --with-vendor="intel-pleiades" Index: /issm/trunk/configs/config-linux64-skylla.sh =================================================================== --- /issm/trunk/configs/config-linux64-skylla.sh (revision 17805) +++ /issm/trunk/configs/config-linux64-skylla.sh (revision 17806) @@ -15,4 +15,5 @@ --with-petsc-arch=$ISSM_ARCH \ --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-tao-dir=$ISSM_DIR/externalpackages/tao/install/ \ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \ Index: /issm/trunk/configure.ac =================================================================== --- /issm/trunk/configure.ac (revision 17805) +++ /issm/trunk/configure.ac (revision 17806) @@ -2,5 +2,5 @@ #AUTOCONF -AC_INIT([Ice Sheet System Model (ISSM)],[4.5],[issm@jpl.nasa.gov],[issm],[http://issm.jpl.nasa.gov]) #Initializing configure +AC_INIT([Ice Sheet System Model (ISSM)],[4.6],[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 Index: /issm/trunk/etc/environment.csh =================================================================== --- /issm/trunk/etc/environment.csh (revision 17805) +++ /issm/trunk/etc/environment.csh (revision 17806) @@ -13,5 +13,5 @@ #MPI -set MPI_DIR="$ISSM_DIR/externalpackages/mpich2/install" +set MPI_DIR="$ISSM_DIR/externalpackages/mpich/install" if (-d $MPI_DIR) then setenv MPI_DIR {$MPI_DIR} @@ -96,2 +96,8 @@ setenv PATH {$PATH}:{$YAMS_DIR}/bin endif + +#SHELL2JUNIT +set SHELL2JUNIT_DIR="$ISSM_DIR/externalpackages/shell2junit" +if (-d $SHELL2JUNIT_DIR) then + setenv PATH {$PATH}:{$SHELL2JUNIT_DIR}/install +endif Index: /issm/trunk/etc/environment.sh =================================================================== --- /issm/trunk/etc/environment.sh (revision 17805) +++ /issm/trunk/etc/environment.sh (revision 17806) @@ -3,10 +3,20 @@ pathprepend(){ #{{{ if [ -d "$1" ] && [[ ":$PATH:" != *":$1:"* ]]; then - export PATH="$1:$PATH" + name=$1 + if [[ "$ISSM_ARCH" == "cygwin-intel" ]]; then + #export path using the cygwin convention + name=`cygpath -u $1` + fi + export PATH="$name:$PATH" fi } #}}} pathappend(){ #{{{ if [ -d "$1" ] && [[ ":$PATH:" != *":$1:"* ]]; then - export PATH="$PATH:$1" + name=$1 + if [[ "$ISSM_ARCH" == "cygwin-intel" ]]; then + #export path in cygwin convention + name=`cygpath -u $1` + fi + export PATH="$PATH:$name" fi } #}}} @@ -116,5 +126,6 @@ PROJ4_DIR="$ISSM_DIR/externalpackages/proj.4/install" -libpathappend "$PROJ4_DIR/lib" +dylibpathprepend "$PROJ4_DIR/lib" +libpathprepend "$PROJ4_DIR/lib" MERCURIAL_DIR="$ISSM_DIR/externalpackages/mercurial/install" @@ -287,2 +298,9 @@ #INISHELL pathappend "$ISSM_DIR/externalpackages/inishell/install" + +#SHELL2JUNIT +pathappend "$ISSM_DIR/externalpackages/shell2junit/install" + +#EXPAT +libpathprepend "$ISSM_DIR/externalpackages/expat/install" +dylibpathprepend "$ISSM_DIR/externalpackages/expat/install" Index: /issm/trunk/examples/Jakobshavn/Jks.par =================================================================== --- /issm/trunk/examples/Jakobshavn/Jks.par (revision 17805) +++ /issm/trunk/examples/Jakobshavn/Jks.par (revision 17806) @@ -22,8 +22,8 @@ disp(' Interpolating bedrock topography'); -md.geometry.bed=InterpFromGridToMesh(x1,y1,topg,md.mesh.x,md.mesh.y,0); +md.geometry.base = InterpFromGridToMesh(x1,y1,topg,md.mesh.x,md.mesh.y,0); disp(' Constructing surface elevation'); -md.geometry.surface=md.geometry.thickness+md.geometry.bed; +md.geometry.surface=md.geometry.thickness+md.geometry.base; disp(' Interpolating velocities'); @@ -51,4 +51,5 @@ md.materials.rheology_n=3*ones(md.mesh.numberofelements,1); md.materials.rheology_B=paterson(md.initialization.temperature); +md.damage.D=zeros(md.mesh.numberofvertices,1); %Reduce viscosity along the shear margins weakb=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,'WeakB.exp','node',2); Index: /issm/trunk/examples/Jakobshavn/runme.m =================================================================== --- /issm/trunk/examples/Jakobshavn/runme.m (revision 17805) +++ /issm/trunk/examples/Jakobshavn/runme.m (revision 17806) @@ -1,3 +1,3 @@ -steps=[1]; +steps=[1:3]; if any(steps==1) @@ -52,5 +52,5 @@ %Cost functions - md.inversion.cost_functions=[101*ones(md.inversion.nsteps,1) 103*ones(md.inversion.nsteps,1)]; + md.inversion.cost_functions=[101 103]; md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,1)=40; Index: /issm/trunk/examples/SquareIceShelf/Square.par =================================================================== --- /issm/trunk/examples/SquareIceShelf/Square.par (revision 17805) +++ /issm/trunk/examples/SquareIceShelf/Square.par (revision 17806) @@ -6,7 +6,7 @@ ymin=min(md.mesh.y); ymax=max(md.mesh.y); -md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin); -md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness; -md.geometry.surface=md.geometry.bed+md.geometry.thickness; +md.geometry.thickness = hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin); +md.geometry.base = -md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness; +md.geometry.surface = md.geometry.base+md.geometry.thickness; disp(' creating drag'); @@ -25,4 +25,5 @@ md.materials.rheology_B=paterson((273-20)*ones(md.mesh.numberofvertices,1)); md.materials.rheology_n=3*ones(md.mesh.numberofelements,1); +md.damage.D=zeros(md.mesh.numberofvertices,1); disp(' creating boundary conditions'); Index: /issm/trunk/externalpackages/adjoinablempi/install-pleaides-gcc.sh =================================================================== --- /issm/trunk/externalpackages/adjoinablempi/install-pleaides-gcc.sh (revision 17806) +++ /issm/trunk/externalpackages/adjoinablempi/install-pleaides-gcc.sh (revision 17806) @@ -0,0 +1,27 @@ +#!/bin/bash +set -eu + +#Some cleanup +rm -rf src install + +#Mercurial cloning: +hg clone http://mercurial.mcs.anl.gov//ad/AdjoinableMPI src + +#Configure adjoinablempi +cd src +autoreconf -fi + +./configure \ + --prefix="$ISSM_DIR/externalpackages/adjoinablempi/install" \ + --libdir="$ISSM_DIR/externalpackages/adjoinablempi/install/lib" \ + --with-mpi-root="$ISSM_DIR/externalpackages/mpich/install" \ + --enable-requestOnTrace CFLAGS="-g -O0" + +#Compile adjoinablempi +make clean +if [ $# -eq 0 ]; then + make +else + make -j $1 +fi +make install Index: /issm/trunk/externalpackages/adolc/install-withampi-macosx64.sh =================================================================== --- /issm/trunk/externalpackages/adolc/install-withampi-macosx64.sh (revision 17805) +++ /issm/trunk/externalpackages/adolc/install-withampi-macosx64.sh (revision 17806) @@ -20,4 +20,5 @@ --enable-ampi \ --with-ampi=$ISSM_DIR/externalpackages/adjoinablempi/install \ + --with-soname=adolc \ --disable-tapedoc-values Index: /issm/trunk/externalpackages/adolc/install-withampi-pleiades-gcc.sh =================================================================== --- /issm/trunk/externalpackages/adolc/install-withampi-pleiades-gcc.sh (revision 17805) +++ /issm/trunk/externalpackages/adolc/install-withampi-pleiades-gcc.sh (revision 17806) @@ -14,7 +14,8 @@ ./configure --prefix=$ISSM_DIR/externalpackages/adolc/install \ --libdir=$ISSM_DIR/externalpackages/adolc/install/lib \ - --with-mpi-root="/nasa/mvapich2/1.6.sles11/gcc" \ + --with-mpi-root=$ISSM_DIR/externalpackages/mpich/install \ --enable-ampi \ --with-ampi=$ISSM_DIR/externalpackages/adjoinablempi/install \ + --with-soname=adolc \ --disable-tapedoc-values Index: /issm/trunk/externalpackages/adolc/install-withampi-pleiades.sh =================================================================== --- /issm/trunk/externalpackages/adolc/install-withampi-pleiades.sh (revision 17805) +++ /issm/trunk/externalpackages/adolc/install-withampi-pleiades.sh (revision 17806) @@ -17,4 +17,5 @@ --enable-ampi \ --with-ampi=$ISSM_DIR/externalpackages/adjoinablempi/install \ + --with-soname=adolc \ --disable-tapedoc-values Index: /issm/trunk/externalpackages/adolc/install-withampi.sh =================================================================== --- /issm/trunk/externalpackages/adolc/install-withampi.sh (revision 17805) +++ /issm/trunk/externalpackages/adolc/install-withampi.sh (revision 17806) @@ -1,5 +1,5 @@ #!/bin/bash set -eu - + #Some cleanup rm -rf install src @@ -17,4 +17,5 @@ --enable-ampi \ --with-ampi=$ISSM_DIR/externalpackages/adjoinablempi/install \ + --with-soname=adolc \ --disable-tapedoc-values Index: /issm/trunk/externalpackages/cccl/install-win7.sh =================================================================== --- /issm/trunk/externalpackages/cccl/install-win7.sh (revision 17805) +++ /issm/trunk/externalpackages/cccl/install-win7.sh (revision 17806) @@ -9,2 +9,3 @@ #Move cccl into install directory cp issm/cccl install/bin +chmod 755 install/bin/cccl Index: /issm/trunk/externalpackages/cython/install-18.sh =================================================================== --- /issm/trunk/externalpackages/cython/install-18.sh (revision 17806) +++ /issm/trunk/externalpackages/cython/install-18.sh (revision 17806) @@ -0,0 +1,13 @@ +#!/bin/bash +set -eu + +#clean up +rm -rf Cython-0.18 + +#download numpy first +$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/Cython-0.18.tar.gz' 'cython.tar.gz' + +#install numpy +tar -zxvf cython.tar.gz +cd Cython-0.18 +python setup.py install Index: /issm/trunk/externalpackages/cython/install-19.2.sh =================================================================== --- /issm/trunk/externalpackages/cython/install-19.2.sh (revision 17806) +++ /issm/trunk/externalpackages/cython/install-19.2.sh (revision 17806) @@ -0,0 +1,13 @@ +#!/bin/bash +set -eu + +#clean up +rm -rf Cython-0.19.2 + +#download numpy first +$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/Cython-0.19.2.tar.gz' 'cython.tar.gz' + +#install numpy +tar -zxvf cython.tar.gz +cd Cython-0.19.2 +python setup.py install Index: /issm/trunk/externalpackages/cython/install.sh =================================================================== --- /issm/trunk/externalpackages/cython/install.sh (revision 17805) +++ /issm/trunk/externalpackages/cython/install.sh (revision 17806) @@ -3,11 +3,10 @@ #clean up -rm -rf Cython-0.18 +rm -rf cython -#download numpy first -$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/Cython-0.18.tar.gz' 'cython.tar.gz' +#download cython first +git clone https://github.com/cython/cython.git -#install numpy -tar -zxvf cython.tar.gz -cd Cython-0.18 +#install cython +cd cython python setup.py install Index: /issm/trunk/externalpackages/fti/Makefile =================================================================== --- /issm/trunk/externalpackages/fti/Makefile (revision 17806) +++ /issm/trunk/externalpackages/fti/Makefile (revision 17806) @@ -0,0 +1,90 @@ +## * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +##* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +##======================================================================= +##Copyright (C) 2010-2013 Leonardo A. BAUTISTA GOMEZ +##This program is free software; you can redistribute it and/or modify +##it under the terms of the GNU General Public License (GPL) as published +##of the License, or (at your option) any later version. +## +##This program is distributed in the hope that it will be useful, +##but WITHOUT ANY WARRANTY; without even the implied warranty of +##MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +##GNU General Public License for more details. +## +##To read the license please visit http://www.gnu.org/copyleft/gpl.html +##======================================================================= + +##======================================================================= +## PLEASE SET THESE VARIABLES BEFORE COMPILING +##======================================================================= + +FTIPATH = $(ISSM_DIR)/externalpackages/fti/install +MPIPATH = $(ISSM_DIR)/externalpackages/mpich/install + +##======================================================================= +## DIRECTORY TREE +##======================================================================= + +LIB = lib +OBJ = obj +SRC = src +DOC = doc +INC = include + +##======================================================================= +## COMPILERS +##======================================================================= + +CC = gcc +MPICC = mpicc + +##======================================================================= +## FLAGS +##======================================================================= + +FTIFLAGS = -fPIC -g -Iinclude/ -c +MPIFLAGS = -I$(MPIPATH)/include -L$(MPIPATH)/lib -lmpich -lpmpich + +##======================================================================= +## TARGETS +##======================================================================= + + +OBJS = $(OBJ)/galois.o $(OBJ)/jerasure.o $(OBJ)/dictionary.o $(OBJ)/iniparser.o \ + $(OBJ)/recover.o $(OBJ)/tools.o $(OBJ)/checkpoint.o $(OBJ)/topo.o \ + $(OBJ)/api.o + +SHARED = libfti.so +STATIC = libfti.a + +all: $(SHARED) $(STATIC) + +doc: + doxygen $(DOC)/Doxyfile + +$(OBJ)/%.o: $(SRC)/%.c + $(MPICC) $(FTIFLAGS) $< -o $@ + +$(SHARED): $(OBJS) + $(CC) $(MPIFLAGS) -shared -o $(LIB)/$(SHARED) $(OBJS) -lc + +$(STATIC): $(OBJS) + $(AR) -cvq $(LIB)/$(STATIC) $(OBJS) +install: + if [ ! -d "$(FTIPATH)/FTI" ]; then mkdir $(FTIPATH)/FTI; fi + if [ ! -d "$(FTIPATH)/FTI/$(LIB)" ]; then mkdir $(FTIPATH)/FTI/$(LIB); fi + if [ ! -d "$(FTIPATH)/FTI/$(INC)" ]; then mkdir $(FTIPATH)/FTI/$(INC); fi + rm -f $(FTIPATH)/FTI/$(LIB)/* $(FTIPATH)/FTI/$(INC)/* + cp $(INC)/* $(FTIPATH)/FTI/$(INC)/ + cp $(LIB)/* $(FTIPATH)/FTI/$(LIB)/ + +uninstall: + rm -f $(FTIPATH)/FTI/$(LIB)/* $(FTIPATH)/FTI/$(INC)/* + if [ -d "$(FTIPATH)/FTI/$(LIB)" ]; then rmdir $(FTIPATH)/FTI/$(LIB); fi + if [ -d "$(FTIPATH)/FTI/$(INC)" ]; then rmdir $(FTIPATH)/FTI/$(INC); fi + if [ -d "$(FTIPATH)/FTI" ]; then rmdir $(FTIPATH)/FTI; fi + +clean: + rm -f $(OBJ)/* $(LIB)/* + +.PHONY: $(SHARED) $(STATIC) doc install uninstall clean Index: /issm/trunk/externalpackages/fti/install.sh =================================================================== --- /issm/trunk/externalpackages/fti/install.sh (revision 17806) +++ /issm/trunk/externalpackages/fti/install.sh (revision 17806) @@ -0,0 +1,24 @@ +#!/bin/bash +set -eu + +#Some cleanup +rm -rf install fti-0.9.2 +mkdir install + +#Download from ISSM server +$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/fti-0.9.2.tgz' 'fti-0.9.2.tgz' + +#Untar +tar -zxvf fti-0.9.2.tgz + +#Move mpich into src directory +mv fti/* install +rm -rf fti + +#Configure mpich +cd install +cp ../Makefile . + +#Compile mpich (this new version supports parallel make) +make +make install Index: /issm/trunk/externalpackages/gdal/install-1.10-macosx64.sh =================================================================== --- /issm/trunk/externalpackages/gdal/install-1.10-macosx64.sh (revision 17805) +++ /issm/trunk/externalpackages/gdal/install-1.10-macosx64.sh (revision 17806) @@ -25,5 +25,6 @@ --with-netcdf=no \ --with-libiconv-prefix="/usr/lib/" \ - --without-hdf5 + --without-hdf5 \ + --with-expat=$ISSM_DIR/externalpackages/expat/install #Note: # look for libiconv in /usr/lib/ because there seemed to be a conflict with port's library Index: /issm/trunk/externalpackages/gdal/install-1.6-macosx64.sh =================================================================== --- /issm/trunk/externalpackages/gdal/install-1.6-macosx64.sh (revision 17805) +++ /issm/trunk/externalpackages/gdal/install-1.6-macosx64.sh (revision 17806) @@ -27,6 +27,7 @@ --with-jasper=no \ --without-ld-shared \ + --without-hdf5 \ --with-unix-stdio-64=no \ - --with-expat-lib=/usr/lib64/libexpat.so + --with-expat=$ISSM_DIR/externalpackages/expat/install #Compile and install gdal Index: /issm/trunk/externalpackages/git/install.sh =================================================================== --- /issm/trunk/externalpackages/git/install.sh (revision 17805) +++ /issm/trunk/externalpackages/git/install.sh (revision 17806) @@ -18,5 +18,5 @@ #install cd src -./configure --prefix="$ISSM_DIR/externalpackages/git/install" +./configure --prefix="$ISSM_DIR/externalpackages/git/install" #--with-python="$ISSM_DIR/externalpackages/python/install/bin/python" #Do we really need this line? Index: /issm/trunk/externalpackages/gmsh/install.sh =================================================================== --- /issm/trunk/externalpackages/gmsh/install.sh (revision 17806) +++ /issm/trunk/externalpackages/gmsh/install.sh (revision 17806) @@ -0,0 +1,21 @@ +#!/bin/bash +set -eu + +#Some cleanup +rm -rf install src +mkdir install + +#Download latest version +svn --username gmsh --password gmsh co https://geuz.org/svn/gmsh/trunk src + +#Configure +cd install +cmake ../src -DCMAKE_INSTALL_PREFIX="$ISSM_DIR/externalpackages/gmsh/install" + +#Compile and install +if [ $# -eq 0 ]; then + make +else + make -j $1 +fi +make install Index: /issm/trunk/externalpackages/modules/install-macosx64.sh =================================================================== --- /issm/trunk/externalpackages/modules/install-macosx64.sh (revision 17805) +++ /issm/trunk/externalpackages/modules/install-macosx64.sh (revision 17806) @@ -4,36 +4,36 @@ #Some cleanup rm -rf install -rm -rf modules-3.2.9 +rm -rf modules-3.2.10 mkdir install #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/modules-3.2.9.tar.gz' 'modules-3.2.9.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/modules-3.2.10.tar.gz' 'modules-3.2.10.tar.gz' #Untar -tar -zxvf modules-3.2.9.tar.gz +tar -zxvf modules-3.2.10.tar.gz #Move modules into src directory #Configure modules -cd modules-3.2.9 -./configure \ - --prefix=$ISSM_DIR/externalpackages/modules/install\ - --with-module-path=$ISSM_DIR/externalpackages/modules/install/modules/files\ - --with-version-path=$ISSM_DIR/externalpackages/modules/install/modules/versions\ +cd modules-3.2.10 +sudo ./configure \ + --prefix=/usr/local/modules \ --with-tcl-lib=$ISSM_DIR/externalpackages/tcl/install/Library/Frameworks/Tcl.framework/Versions/8.5\ --with-tcl-inc=$ISSM_DIR/externalpackages/tcl/install/Library/Frameworks/Tcl.framework/Versions/8.5/Headers\ - --with-tcl-ver=8.5\ + --with-tcl-ver=8.5 \ --with-tclx-lib=$ISSM_DIR/externalpackages/tclx/install/lib/tclx8.4\ --with-tclx-inc=$ISSM_DIR/externalpackages/tclx/install/include\ - --with-tclx-ver=8.4\ - --with-etc-path=$ISSM_DIR/externalpackages/modules/install/modules/etc\ - --with-skel-path=$ISSM_DIR/externalpackages/modules/install/modules/etc/skel\ + --with-tclx-ver=8.4 \ + --with-version-path=/usr/local/modules/versions \ + --with-skel-path=/usr/local/modules/etc/skel \ + --with-etc-path=/usr/local/modules/etc \ + --with-module-path=/usr/local/modules/files \ --disable-dependency-tracking #Compile and install modules if [ $# -eq 0 ]; then - make + sudo make else - make -j $1 + sudo make -j $1 fi -make install +sudo make install Index: /issm/trunk/externalpackages/mpich/install-2_1.5-linux64.sh =================================================================== --- /issm/trunk/externalpackages/mpich/install-2_1.5-linux64.sh (revision 17805) +++ /issm/trunk/externalpackages/mpich/install-2_1.5-linux64.sh (revision 17806) @@ -22,5 +22,5 @@ --enable-shared \ --enable-sharedlibs=gcc \ - --enable-f91=gfortran + --enable-f91=gfortran CC=gcc FC=gfortran #Compile mpich2 (this new version supports parallel make) Index: /issm/trunk/externalpackages/mpich/install-3.0-macosx64.sh =================================================================== --- /issm/trunk/externalpackages/mpich/install-3.0-macosx64.sh (revision 17805) +++ /issm/trunk/externalpackages/mpich/install-3.0-macosx64.sh (revision 17806) @@ -20,8 +20,7 @@ ./configure \ --prefix="$ISSM_DIR/externalpackages/mpich/install" \ - --enable-shared \ - CC=llvm-gcc \ - FC=gfortran \ - F77=gfortran + --enable-shared + + #CC=llvm-gcc \ #Compile mpich (this new version supports parallel make) Index: /issm/trunk/externalpackages/nose/install-linux64-python2.sh =================================================================== --- /issm/trunk/externalpackages/nose/install-linux64-python2.sh (revision 17805) +++ /issm/trunk/externalpackages/nose/install-linux64-python2.sh (revision 17806) @@ -2,5 +2,5 @@ #Install Python nose module -rm -rf src +rm -rf src install #Download from ISSM server @@ -13,2 +13,8 @@ python ./setup.py build python ./setup.py install + +#to be flagged by jenkins, we create an empty install dir: +cd ../ +mkdir install +touch install/emptyfile + Index: /issm/trunk/externalpackages/nose/install-linux64-python3.sh =================================================================== --- /issm/trunk/externalpackages/nose/install-linux64-python3.sh (revision 17805) +++ /issm/trunk/externalpackages/nose/install-linux64-python3.sh (revision 17806) @@ -2,5 +2,5 @@ #Install Python nose module -rm -rf src +rm -rf src install svn checkout http://python-nose.googlecode.com/svn/branches/py3k @@ -10,2 +10,7 @@ python ./setup.py build python ./setup.py install + +#to be flagged by jenkins, we create an empty install dir: +cd ../ +mkdir install +touch install/emptyfile Index: /issm/trunk/externalpackages/nose/install-macosx64-python2.sh =================================================================== --- /issm/trunk/externalpackages/nose/install-macosx64-python2.sh (revision 17805) +++ /issm/trunk/externalpackages/nose/install-macosx64-python2.sh (revision 17806) @@ -2,5 +2,5 @@ #Install Python nose module -rm -rf src +rm -rf src install #Download from ISSM server @@ -13,2 +13,7 @@ python ./setup.py build python ./setup.py install + +#to be flagged by jenkins, we create an empty install dir: +cd ../ +mkdir install +touch install/emptyfile Index: /issm/trunk/externalpackages/nose/install-macosx64-python3.sh =================================================================== --- /issm/trunk/externalpackages/nose/install-macosx64-python3.sh (revision 17805) +++ /issm/trunk/externalpackages/nose/install-macosx64-python3.sh (revision 17806) @@ -2,5 +2,5 @@ #Install Python nose module -rm -rf src +rm -rf src install svn checkout http://python-nose.googlecode.com/svn/branches/py3k @@ -10,2 +10,7 @@ python ./setup.py build python ./setup.py install + +#to be flagged by jenkins, we create an empty install dir: +cd ../ +mkdir install +touch install/emptyfile Index: /issm/trunk/externalpackages/numpy/install-linux64.sh =================================================================== --- /issm/trunk/externalpackages/numpy/install-linux64.sh (revision 17805) +++ /issm/trunk/externalpackages/numpy/install-linux64.sh (revision 17806) @@ -1,4 +1,6 @@ #!/bin/bash set -eu + +rm -rf install export CC="gcc -fPIC" @@ -25,2 +27,7 @@ python -c "import numpy; print 'Installed NumPy', numpy.__version__" python -c "import numpy; numpy.test()" + +#to be flagged by jenkins, we create an empty install dir: +mkdir install +touch install/emptyfile + Index: /issm/trunk/externalpackages/numpy/install-macosx-lion.sh =================================================================== --- /issm/trunk/externalpackages/numpy/install-macosx-lion.sh (revision 17805) +++ /issm/trunk/externalpackages/numpy/install-macosx-lion.sh (revision 17806) @@ -1,4 +1,6 @@ #!/bin/bash set -eu + +rm -rf install export CC=gcc @@ -23,2 +25,7 @@ python -c "import numpy; print 'Installed NumPy', numpy.__version__" python -c "import numpy; numpy.test()" + +#to be flagged by jenkins, we create an empty install dir: +mkdir install +touch install/emptyfile + Index: /issm/trunk/externalpackages/numpy/install-macosx-mlion.sh =================================================================== --- /issm/trunk/externalpackages/numpy/install-macosx-mlion.sh (revision 17805) +++ /issm/trunk/externalpackages/numpy/install-macosx-mlion.sh (revision 17806) @@ -1,4 +1,6 @@ #!/bin/bash set -eu + +rm -rf install export CC=gcc @@ -23,2 +25,7 @@ python -c "import numpy; print 'Installed NumPy', numpy.__version__" python -c "import numpy; numpy.test()" + +#to be flagged by jenkins, we create an empty install dir: +mkdir install +touch install/emptyfile + Index: /issm/trunk/externalpackages/numpy/install-macosx-snowleopard.sh =================================================================== --- /issm/trunk/externalpackages/numpy/install-macosx-snowleopard.sh (revision 17805) +++ /issm/trunk/externalpackages/numpy/install-macosx-snowleopard.sh (revision 17806) @@ -1,4 +1,6 @@ #!/bin/bash set -eu + +rm -rf install # On OSX 10.6, gfortran gets installed in /usr/local/gfortran @@ -16,2 +18,7 @@ python -c "import numpy; print 'Installed NumPy', numpy.__version__" python -c "import numpy; numpy.test()" + +#to be flagged by jenkins, we create an empty install dir: +mkdir install +touch install/emptyfile + Index: /issm/trunk/externalpackages/petsc/install-3.1-win7.sh =================================================================== --- /issm/trunk/externalpackages/petsc/install-3.1-win7.sh (revision 17805) +++ /issm/trunk/externalpackages/petsc/install-3.1-win7.sh (revision 17806) @@ -14,11 +14,14 @@ rm -rf petsc-3.1-p7 +export PETSC_DIR=`cygpath -u "$ISSM_DIR/externalpackages/petsc/src"` +export PREFIX_DIR=`cygpath -u "$ISSM_DIR/externalpackages/petsc/install"` + #configure cd src ./config/configure.py \ --with-parallel-no \ - --prefix="$ISSM_DIR/externalpackages/petsc/install" \ + --prefix=$PREFIX_DIR \ --PETSC_ARCH=cygwin-intel \ - --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \ + --PETSC_DIR=$PETSC_DIR \ --with-debugging=0 \ --with-mpi=0 \ Index: /issm/trunk/externalpackages/petsc/install-3.4-acenet.sh =================================================================== --- /issm/trunk/externalpackages/petsc/install-3.4-acenet.sh (revision 17806) +++ /issm/trunk/externalpackages/petsc/install-3.4-acenet.sh (revision 17806) @@ -0,0 +1,33 @@ +#!/bin/bash +set -eu + +#Some cleanup +rm -rf install petsc-3.4.3 src +mkdir install src + +#Download from ISSM server +$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.4.3.tar.gz' 'petsc-3.4.3.tar.gz' + +#Untar and move petsc to install directory +tar -zxvf petsc-3.4.3.tar.gz +mv petsc-3.4.3/* src/ +rm -rf petsc-3.4.3 + +#configure +cd src +./config/configure.py \ + --prefix="$ISSM_DIR/externalpackages/petsc/install" \ + --PETSC_ARCH="linux-gnu-amd64" \ + --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \ + --with-debugging=0 \ + --with-shared-libraries=1 \ + --known-mpi-shared-libraries=1 \ + --with-mpi-dir=$OPENMPI \ + --with-blas-lapack-dir=/usr/local/intel/composer_xe_2011_sp1.13.367/mkl/ \ + --download-scalapack=yes \ + --download-mumps=yes \ + --download-metis=yes \ + --download-parmetis=yes + +make +make install Index: /issm/trunk/externalpackages/petsc/install-3.4-pleiades-intel2012.0.032-mpt.2.06rp16 =================================================================== --- /issm/trunk/externalpackages/petsc/install-3.4-pleiades-intel2012.0.032-mpt.2.06rp16 (revision 17806) +++ /issm/trunk/externalpackages/petsc/install-3.4-pleiades-intel2012.0.032-mpt.2.06rp16 (revision 17806) @@ -0,0 +1,61 @@ +#!/bin/bash + +#Some cleanup +rm -rf install petsc-3.4.2 src +mkdir install src + +#Download from ISSM server +$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.4.2.tar.gz' 'petsc-3.4.2.tar.gz' + +#Untar and move petsc to install directory +tar -zxvf petsc-3.4.2.tar.gz +mv petsc-3.4.2/* src/ +rm -rf petsc-3.4.2 + +#configure +cd src +./config/configure.py \ + --prefix="$ISSM_DIR/externalpackages/petsc/install" \ + --PETSC_ARCH="$ISSM_ARCH" \ + --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \ + --with-batch=1 \ + --with-debugging=0 \ + --with-shared-libraries=1 \ + --known-mpi-shared-libraries=1 \ + --with-mpi=1 \ + --with-mpi-lib="/nasa/sgi/mpt/2.06rp16/lib/libmpi.so" \ + --with-mpi-include="/nasa/sgi/mpt/2.06rp16/include" \ + --with-blas-lapack-dir="/nasa/intel/Compiler/2012.0.032/composer_xe_2011_sp1/mkl/lib/intel64" \ + --download-scalapack=yes \ + --download-blacs=yes \ + --download-mumps=yes \ + --download-metis=yes \ + --download-parmetis=yes \ + --download-trilinos=yes \ + --download-euclid=yes \ + --download-hypre=yes \ + --COPTFLAGS="-lmpi -O3" \ + --FOPTFLAGS="-lmpi -O3" \ + --CXXOPTFLAGS="-lmpi -O3" + +#prepare script to reconfigure petsc +cat > script.queue << EOF +#PBS -S /bin/bash +#PBS -l select=1:ncpus=1:model=wes +#PBS -l walltime=200 +#PBS -W group_list=s1010 +#PBS -m e + +. /usr/share/modules/init/bash +module load comp-intel/2012.0.032 +module load mpi-sgi/mpt.2.06rp16 + +export PATH="$PATH:." +export MPI_GROUP_MAX=64 +mpiexec -np 1 ./conftest-linux-gnu-ia64-intel.py +EOF + +#print instructions +echo "== Now: cd src/ " +echo "== qsub -q devel script.queue " +echo "== Then run reconfigure script generated by PETSc and follow instructions" Index: /issm/trunk/externalpackages/petsc/install-3.4-pleiades-mpich2.sh =================================================================== --- /issm/trunk/externalpackages/petsc/install-3.4-pleiades-mpich2.sh (revision 17806) +++ /issm/trunk/externalpackages/petsc/install-3.4-pleiades-mpich2.sh (revision 17806) @@ -0,0 +1,68 @@ +#!/bin/bash + +#Some cleanup +rm -rf install petsc-3.4.2 src +mkdir install src + +export cc=gcc +alias cc='gcc' + +#Download from ISSM server +$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.4.2.tar.gz' 'petsc-3.4.2.tar.gz' + +#Untar and move petsc to install directory +tar -zxvf petsc-3.4.2.tar.gz +mv petsc-3.4.2/* src/ +rm -rf petsc-3.4.2 + +#configure +cd src +./config/configure.py \ + --prefix="$ISSM_DIR/externalpackages/petsc/install" \ + --PETSC_ARCH="$ISSM_ARCH" \ + --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \ + --with-batch=1 \ + --with-debugging=0 \ + --with-shared-libraries=1 \ + --with-mpi=1 \ + --with-mpi-lib="$ISSM_DIR/externalpackages/mpich/install/lib/libmpich.so"\ + --with-mpi-include="$ISSM_DIR/externalpackages/mpich/install/include" \ + --known-mpi-shared-libraries=1 \ + --download-f-blas-lapack=yes \ + --download-scalapack=yes \ + --download-metis=yes \ + --download-parmetis=yes \ + --download-blacs=yes \ + --download-mumps=yes \ + --download-trilinos=yes \ + --download-euclid=yes \ + --download-hypre=yes \ + --COPTFLAGS=" -O3 -march=corei7-avx" \ + --FOPTFLAGS=" -O3 -march=corei7-avx" \ + --CXXOPTFLAGS=" -O3 -march=corei7-avx" + +#--with-mpi-lib="/nasa/mvapich2/1.4.1/gcc.sles11/lib/libmpich.a" \ +# --with-mpi-include="/nasa/mvapich2/1.4.1/gcc.sles11/include" \ + + +#prepare script to reconfigure petsc +cat > script.queue << EOF +#PBS -S /bin/bash +#PBS -l select=1:ncpus=1:model=wes +#PBS -l walltime=200 +#PBS -W group_list=s1010 +#PBS -m e + +. /usr/share/modules/init/bash +module load mpi-mvapich2/1.6/gcc +module load gcc/4.7.0 + +export PATH="$PATH:." +export MPI_GROUP_MAX=64 +mpiexec -np 1 ./conftest-linux-gnu-ia64-intel.py +EOF + +#print instructions +echo "== Now: cd src/ " +echo "== qsub -q devel script.queue " +echo "== Then run reconfigure script generated by PETSc and follow instructions" Index: /issm/trunk/externalpackages/petsc/install-3.4-pleiades2.sh =================================================================== --- /issm/trunk/externalpackages/petsc/install-3.4-pleiades2.sh (revision 17806) +++ /issm/trunk/externalpackages/petsc/install-3.4-pleiades2.sh (revision 17806) @@ -0,0 +1,61 @@ +#!/bin/bash + +#Some cleanup +rm -rf install petsc-3.4.3 src +mkdir install src + +#Download from ISSM server +$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.4.3.tar.gz' 'petsc-3.4.3.tar.gz' + +#Untar and move petsc to install directory +tar -zxvf petsc-3.4.3.tar.gz +mv petsc-3.4.3/* src/ +rm -rf petsc-3.4.3 + +#configure +cd src +./config/configure.py \ + --prefix="$ISSM_DIR/externalpackages/petsc/install" \ + --PETSC_ARCH="$ISSM_ARCH" \ + --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \ + --with-batch=1 \ + --with-debugging=0 \ + --with-shared-libraries=1 \ + --known-mpi-shared-libraries=1 \ + --with-mpi=1 \ + --with-mpi-lib="/nasa/sgi/mpt/2.06rp16/lib/libmpi.so" \ + --with-mpi-include="/nasa/sgi/mpt/2.06rp16/include" \ + --with-blas-lapack-dir="/nasa/intel/Compiler/2013.1.117/composer_xe_2013.1.117/mkl/lib/intel64" \ + --download-scalapack=yes \ + --download-blacs=yes \ + --download-mumps=yes \ + --download-metis=yes \ + --download-parmetis=yes \ + --download-trilinos=yes \ + --download-euclid=yes \ + --download-hypre=yes \ + --COPTFLAGS="-lmpi -O3" \ + --FOPTFLAGS="-lmpi -O3" \ + --CXXOPTFLAGS="-lmpi -O3" + +#prepare script to reconfigure petsc +cat > script.queue << EOF +#PBS -S /bin/bash +#PBS -l select=1:ncpus=1:model=wes +#PBS -l walltime=200 +#PBS -W group_list=s1010 +#PBS -m e + +. /usr/share/modules/init/bash +module load comp-intel/2013.1.117 +module load mpi-sgi/mpt.2.06rp16 + +export PATH="$PATH:." +export MPI_GROUP_MAX=64 +mpiexec -np 1 ./conftest-linux-gnu-ia64-intel.py +EOF + +#print instructions +echo "== Now: cd src/ " +echo "== qsub -q devel script.queue " +echo "== Then run reconfigure script generated by PETSc and follow instructions" Index: /issm/trunk/externalpackages/scipy/install-linux64.sh =================================================================== --- /issm/trunk/externalpackages/scipy/install-linux64.sh (revision 17805) +++ /issm/trunk/externalpackages/scipy/install-linux64.sh (revision 17806) @@ -10,5 +10,4 @@ #clean up rm -rf scipy - #download scipy export GIT_SSL_NO_VERIFY=true Index: /issm/trunk/externalpackages/shell2junit/README =================================================================== --- /issm/trunk/externalpackages/shell2junit/README (revision 17806) +++ /issm/trunk/externalpackages/shell2junit/README (revision 17806) @@ -0,0 +1,9 @@ +http://code.google.com/p/shell2junit/ + +Shell2junit + +Shell2junit is a simple utility which facilitates to generate junit reports for batch processes executed in shell scripts. + +The reports can be easily parsed in Hudson and other CI software in order to monitor and generate trends and alerts. + +This page teaches how to do it in Hudson. Index: /issm/trunk/externalpackages/shell2junit/install.sh =================================================================== --- /issm/trunk/externalpackages/shell2junit/install.sh (revision 17806) +++ /issm/trunk/externalpackages/shell2junit/install.sh (revision 17806) @@ -0,0 +1,9 @@ +#!/bin/bash +set -eu + + +#Some cleanup +rm -rf install +mkdir install + +cp patch/sh2ju.sh install/ Index: /issm/trunk/externalpackages/shell2junit/install.sh.old =================================================================== --- /issm/trunk/externalpackages/shell2junit/install.sh.old (revision 17806) +++ /issm/trunk/externalpackages/shell2junit/install.sh.old (revision 17806) @@ -0,0 +1,20 @@ +#!/bin/bash +set -eu + +#Some cleanup +rm -rf install src +rm -rf shell2junit +mkdir install src + +#Download from ISSM server +$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/shell2junit-1.0.0.zip' 'shell2junit-1.0.0.zip' + +#Untar +unzip shell2junit-1.0.0.zip + +#Move shell2junit into install directory +mv shell2junit/* src +rm -rf shell2junit + +#Copy executable: +cp src/sh2ju.sh install Index: /issm/trunk/externalpackages/shell2junit/patch/sh2ju.sh =================================================================== --- /issm/trunk/externalpackages/shell2junit/patch/sh2ju.sh (revision 17806) +++ /issm/trunk/externalpackages/shell2junit/patch/sh2ju.sh (revision 17806) @@ -0,0 +1,131 @@ +#!/bin/sh +### Copyright 2010 Manuel Carrasco MoƱino. (manolo at apache.org) +### +### Licensed under the Apache License, Version 2.0. +### You may obtain a copy of it at +### http://www.apache.org/licenses/LICENSE-2.0 + +### +### A library for shell scripts which creates reports in jUnit format. +### These reports can be used in Hudson, or any other CI. +### +### Usage: +### - Include this file in your shell script +### - Use juLog to call your command any time you want to produce a new report +### Usage: juLog command arguments +### options: +### -name="TestName" : the test name which will be shown in the junit report +### -error="RegExp" : a regexp which sets the test as failure when the output matches it +### -ierror="RegExp" : same as -error but case insensitive +### - Junit reports are left in the folder 'result' under the directory where the script is executed. +### - Configure hudson to parse junit files from the generated folder +### + +asserts=00; errors=0; total=0; content="" + +# create output folder +juDIR=`pwd`/results +mkdir -p $juDIR || exit + +# The name of the suite is calculated based in your script name +suite=`basename $0 | sed -e 's/.sh$//' | tr "." "_"` + +# A wrapper for the eval method witch allows catching seg-faults and use tee +errfile=/tmp/evErr.$$.log +eVal() { + eval "$1" + echo $? | tr -d "\n" >$errfile +} + +# Method to clean old tests +juLogClean() { + echo "+++ Removing old junit reports from: $juDIR " + rm -f $juDIR/TEST-* +} + +# Execute a command and record its results +juLog() { + + # parse arguments + ya=""; icase=""; testname=""; + while [ -z "$ya" ]; do + case "$1" in + -name=*) name=$asserts-`echo "$1" | sed -e 's/-name=//'`; shift;; + -ierror=*) ereg=`echo "$1" | sed -e 's/-ierror=//'`; icase="-i"; shift;; + -error=*) ereg=`echo "$1" | sed -e 's/-error=//'`; shift;; + -test=*) testname=`echo "$1" | sed -e 's/-test=//'`; shift;; + *) ya=1;; + esac + done + + # use first arg as name if it was not given + if [ -z "$name" ]; then + name="$asserts-$1" + shift + fi + + # calculate command to eval + [ -z "$1" ] && return + cmd="$1"; shift + while [ -n "$1" ] + do + cmd="$cmd \"$1\"" + shift + done + + # eval the command sending output to a file + outf=/var/tmp/ju$$.txt + >$outf + echo "" | tee -a $outf + echo "+++ Running case: $testname " | tee -a $outf + echo "+++ working dir: "`pwd` | tee -a $outf + #echo "+++ command: $cmd" | tee -a $outf + ini=`date +%s` + eVal "$cmd" 2>&1 | tee -a $outf + evErr=`cat $errfile` + rm -f $errfile + end=`date +%s` + echo "+++ exit code: $evErr" | tee -a $outf + + # set the appropriate error, based in the exit code and the regex + [ $evErr != 0 ] && err=1 || err=0 + out=`cat $outf | sed -e 's/^\([^+]\)/| \1/g'` + if [ $err = 0 -a -n "$ereg" ]; then + H=`echo "$out" | egrep $icase "$ereg"` + [ -n "$H" ] && err=1 + fi + echo "+++ error: $err" | tee -a $outf + rm -f $outf + + # calculate vars + asserts=`expr $asserts + 1` + asserts=`printf "%.2d" $asserts` + errors=`expr $errors + $err` + time=`expr $end - $ini` + total=`expr $total + $time` + + # write the junit xml report + ## failure tag + [ $err = 0 ] && failure="" || failure=" + + " + ## testcase tag + content="$content + + $failure + + + + + " + ## testsuite block + cat <$juDIR/TEST-$suite.xml + + $content + +EOF + +} + Index: /issm/trunk/externalpackages/tao/install-2.2.sh =================================================================== --- /issm/trunk/externalpackages/tao/install-2.2.sh (revision 17805) +++ /issm/trunk/externalpackages/tao/install-2.2.sh (revision 17806) @@ -1,21 +1,21 @@ #!/bin/bash set -eu -#http://www.mcs.anl.gov/research/projects/tao/download/tao-2.2-pre1.tar.gz +#http://www.mcs.anl.gov/research/projects/tao/download/tao-2.2.2.tar.gz #compatible with PETSc 3.4 #Some cleanup -rm -rf install tao-2.2-pre1 +rm -rf install tao-2.2.2 mkdir install #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/tao-2.2-pre1.tar.gz' 'tao-2.2-pre1.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/tao-2.2.2.tar.gz' 'tao-2.2.2.tar.gz' #Untar -tar -zxvf tao-2.2-pre1.tar.gz +tar -zxvf tao-2.2.2.tar.gz #move into place -mv tao-2.2-pre1/* install/ -rm -rf tao-2.2-pre1 +mv tao-2.2.2/* install/ +rm -rf tao-2.2.2 #compile Index: /issm/trunk/externalpackages/vim/addons/vim/syntax/c.vim =================================================================== --- /issm/trunk/externalpackages/vim/addons/vim/syntax/c.vim (revision 17805) +++ /issm/trunk/externalpackages/vim/addons/vim/syntax/c.vim (revision 17806) @@ -412,4 +412,5 @@ syn keyword cType BoolInput syn keyword cType BoolParam +syn keyword cType classes syn keyword cType Constraint syn keyword cType Constraints @@ -417,6 +418,6 @@ syn keyword cType Contours syn keyword cType ControlInput +syn keyword cType DatasetInput syn keyword cType DataSetParam -syn keyword cType DatasetInput syn keyword cType Definition syn keyword cType DependentObject @@ -431,6 +432,6 @@ syn keyword cType ElementHook syn keyword cType ElementMatrix +syn keyword cType Elements syn keyword cType ElementVector -syn keyword cType Elements syn keyword cType ExponentialVariogram syn keyword cType ExternalResult @@ -438,8 +439,11 @@ syn keyword cType FileParam syn keyword cType Friction +syn keyword cType Gauss +syn keyword cType GaussianVariogram +syn keyword cType gaussobjects syn keyword cType GaussPenta syn keyword cType GaussSeg +syn keyword cType GaussTetra syn keyword cType GaussTria -syn keyword cType GaussianVariogram syn keyword cType GenericExternalResult syn keyword cType GenericOption @@ -455,4 +459,5 @@ syn keyword cType IntVecParam syn keyword cType IoModel +syn keyword cType krigingobjects syn keyword cType Load syn keyword cType Loads @@ -462,5 +467,7 @@ syn keyword cType Matice syn keyword cType Matpar +syn keyword cType matrixobjects syn keyword cType MatrixParam +syn keyword cType Misfit syn keyword cType Node syn keyword cType Nodes @@ -469,6 +476,6 @@ syn keyword cType Observations syn keyword cType Option +syn keyword cType Options syn keyword cType OptionUtilities -syn keyword cType Options syn keyword cType Param syn keyword cType Parameters @@ -482,10 +489,10 @@ syn keyword cType Quadtree syn keyword cType Results +syn keyword cType Riftfront syn keyword cType RiftStruct -syn keyword cType Riftfront syn keyword cType Seg syn keyword cType SegInput +syn keyword cType Segment syn keyword cType SegRef -syn keyword cType Segment syn keyword cType SpcDynamic syn keyword cType SpcStatic @@ -494,4 +501,7 @@ syn keyword cType StringArrayParam syn keyword cType StringParam +syn keyword cType Tetra +syn keyword cType TetraInput +syn keyword cType TetraRef syn keyword cType TransientInput syn keyword cType TransientParam @@ -504,8 +514,4 @@ syn keyword cType Vertex syn keyword cType Vertices -syn keyword cType classes -syn keyword cType gaussobjects -syn keyword cType krigingobjects -syn keyword cType matrixobjects syn keyword cType AdjointBalancethicknessAnalysis syn keyword cType AdjointHorizAnalysis @@ -515,6 +521,8 @@ syn keyword cType BalancevelocityAnalysis syn keyword cType DamageEvolutionAnalysis +syn keyword cType DepthAverageAnalysis syn keyword cType EnthalpyAnalysis syn keyword cType EnumToAnalysis +syn keyword cType ExtrapolationAnalysis syn keyword cType ExtrudeFromBaseAnalysis syn keyword cType ExtrudeFromTopAnalysis @@ -526,4 +534,7 @@ syn keyword cType HydrologyShreveAnalysis syn keyword cType L2ProjectionBaseAnalysis +syn keyword cType L2ProjectionEPLAnalysis +syn keyword cType LevelsetAnalysis +syn keyword cType LsfReinitializationAnalysis syn keyword cType MasstransportAnalysis syn keyword cType MeltingAnalysis @@ -569,6 +580,6 @@ syn keyword cConstant BasalforcingsMeltingRateCorrectionEnum syn keyword cConstant BasalforcingsMeltingRateEnum -syn keyword cConstant BathymetryEnum syn keyword cConstant BedEnum +syn keyword cConstant BaseEnum syn keyword cConstant ConstantsGEnum syn keyword cConstant ConstantsReferencetemperatureEnum @@ -628,4 +639,7 @@ syn keyword cConstant EplHeadEnum syn keyword cConstant EplHeadOldEnum +syn keyword cConstant EplHeadSlopeXEnum +syn keyword cConstant EplHeadSlopeYEnum +syn keyword cConstant HydrologydcMaxIterEnum syn keyword cConstant HydrologydcRelTolEnum syn keyword cConstant HydrologydcSpcsedimentHeadEnum @@ -636,9 +650,12 @@ syn keyword cConstant HydrologydcWaterCompressibilityEnum syn keyword cConstant HydrologydcSpceplHeadEnum -syn keyword cConstant HydrologydcMaskEplactiveEnum +syn keyword cConstant HydrologydcMaskEplactiveNodeEnum +syn keyword cConstant HydrologydcMaskEplactiveEltEnum syn keyword cConstant HydrologydcEplCompressibilityEnum syn keyword cConstant HydrologydcEplPorosityEnum +syn keyword cConstant HydrologydcEplInitialThicknessEnum syn keyword cConstant HydrologydcEplThicknessEnum -syn keyword cConstant HydrologydcEplTransmitivityEnum +syn keyword cConstant HydrologydcEplThicknessOldEnum +syn keyword cConstant HydrologydcEplConductivityEnum syn keyword cConstant HydrologydcIsefficientlayerEnum syn keyword cConstant HydrologydcSedimentlimitFlagEnum @@ -647,9 +664,10 @@ syn keyword cConstant HydrologydcLeakageFactorEnum syn keyword cConstant HydrologydcPenaltyFactorEnum +syn keyword cConstant HydrologydcPenaltyLockEnum +syn keyword cConstant HydrologydcBasalMoulinInputEnum syn keyword cConstant HydrologyLayerEnum syn keyword cConstant HydrologySedimentEnum syn keyword cConstant HydrologyEfficientEnum syn keyword cConstant HydrologySedimentKmaxEnum -syn keyword cConstant WaterTransferEnum syn keyword cConstant IndependentObjectEnum syn keyword cConstant InversionControlParametersEnum @@ -684,4 +702,5 @@ syn keyword cConstant MaterialsRheologyNEnum syn keyword cConstant DamageDEnum +syn keyword cConstant DamageFEnum syn keyword cConstant QmuDamageDEnum syn keyword cConstant DamageDbarEnum @@ -700,4 +719,7 @@ syn keyword cConstant DamageSpcdamageEnum syn keyword cConstant DamageMaxDamageEnum +syn keyword cConstant DamageEquivStressEnum +syn keyword cConstant DamageEvolutionNumRequestedOutputsEnum +syn keyword cConstant DamageEvolutionRequestedOutputsEnum syn keyword cConstant MaterialsRhoIceEnum syn keyword cConstant MaterialsRhoWaterEnum @@ -706,4 +728,5 @@ syn keyword cConstant MaterialsThermalExchangeVelocityEnum syn keyword cConstant MaterialsThermalconductivityEnum +syn keyword cConstant MaterialsTemperateiceconductivityEnum syn keyword cConstant MaterialsLithosphereShearModulusEnum syn keyword cConstant MaterialsLithosphereDensityEnum @@ -711,5 +734,5 @@ syn keyword cConstant MaterialsMantleDensityEnum syn keyword cConstant MeshAverageVertexConnectivityEnum -syn keyword cConstant MeshElementonbedEnum +syn keyword cConstant MeshElementonbaseEnum syn keyword cConstant MeshElementonsurfaceEnum syn keyword cConstant MeshElements2dEnum @@ -722,13 +745,15 @@ syn keyword cConstant MeshNumberofverticesEnum syn keyword cConstant MeshUpperelementsEnum -syn keyword cConstant MeshVertexonbedEnum +syn keyword cConstant MeshVertexonbaseEnum syn keyword cConstant MeshVertexonsurfaceEnum syn keyword cConstant MeshXEnum syn keyword cConstant MeshYEnum syn keyword cConstant MeshZEnum -syn keyword cConstant MeshTypeEnum -syn keyword cConstant Mesh2DhorizontalEnum -syn keyword cConstant Mesh2DverticalEnum -syn keyword cConstant Mesh3DEnum +syn keyword cConstant MeshElementtypeEnum +syn keyword cConstant DomainTypeEnum +syn keyword cConstant DomainDimensionEnum +syn keyword cConstant Domain2DhorizontalEnum +syn keyword cConstant Domain2DverticalEnum +syn keyword cConstant Domain3DEnum syn keyword cConstant MiscellaneousNameEnum syn keyword cConstant MasstransportHydrostaticAdjustmentEnum @@ -737,4 +762,5 @@ syn keyword cConstant MasstransportPenaltyFactorEnum syn keyword cConstant MasstransportSpcthicknessEnum +syn keyword cConstant MasstransportCalvingrateEnum syn keyword cConstant MasstransportStabilizationEnum syn keyword cConstant MasstransportVertexPairingEnum @@ -753,14 +779,9 @@ syn keyword cConstant RiftsNumriftsEnum syn keyword cConstant RiftsRiftstructEnum +syn keyword cConstant SettingsResultsOnNodesEnum syn keyword cConstant SettingsIoGatherEnum syn keyword cConstant SettingsLowmemEnum syn keyword cConstant SettingsOutputFrequencyEnum syn keyword cConstant SettingsWaitonlockEnum -syn keyword cConstant SurfaceforcingsDelta18oEnum -syn keyword cConstant SurfaceforcingsDelta18oSurfaceEnum -syn keyword cConstant SurfaceforcingsIsdelta18oEnum -syn keyword cConstant SurfaceforcingsPrecipitationsPresentdayEnum -syn keyword cConstant SurfaceforcingsTemperaturesPresentdayEnum -syn keyword cConstant SurfaceforcingsTemperaturesLgmEnum syn keyword cConstant DebugProfilingEnum syn keyword cConstant ProfilingCurrentMemEnum @@ -773,15 +794,4 @@ syn keyword cConstant SteadystateRequestedOutputsEnum syn keyword cConstant SurfaceEnum -syn keyword cConstant SurfaceforcingsPrecipitationEnum -syn keyword cConstant SurfaceforcingsMassBalanceEnum -syn keyword cConstant SurfaceforcingsIspddEnum -syn keyword cConstant SurfaceforcingsDesfacEnum -syn keyword cConstant SurfaceforcingsS0pEnum -syn keyword cConstant SurfaceforcingsIssmbgradientsEnum -syn keyword cConstant SurfaceforcingsMonthlytemperaturesEnum -syn keyword cConstant SurfaceforcingsHrefEnum -syn keyword cConstant SurfaceforcingsSmbrefEnum -syn keyword cConstant SurfaceforcingsBPosEnum -syn keyword cConstant SurfaceforcingsBNegEnum syn keyword cConstant ThermalIsenthalpyEnum syn keyword cConstant ThermalIsdynamicbasalspcEnum @@ -807,7 +817,29 @@ syn keyword cConstant TransientIsthermalEnum syn keyword cConstant TransientIsgiaEnum -syn keyword cConstant TransientIsdamageEnum +syn keyword cConstant TransientIsdamageevolutionEnum syn keyword cConstant TransientNumRequestedOutputsEnum syn keyword cConstant TransientRequestedOutputsEnum +syn keyword cConstant SurfaceforcingsEnum +syn keyword cConstant SMBEnum +syn keyword cConstant SurfaceforcingsMassBalanceEnum +syn keyword cConstant SMBpddEnum +syn keyword cConstant SurfaceforcingsDelta18oEnum +syn keyword cConstant SurfaceforcingsDelta18oSurfaceEnum +syn keyword cConstant SurfaceforcingsIsdelta18oEnum +syn keyword cConstant SurfaceforcingsPrecipitationsPresentdayEnum +syn keyword cConstant SurfaceforcingsTemperaturesPresentdayEnum +syn keyword cConstant SurfaceforcingsTemperaturesLgmEnum +syn keyword cConstant SurfaceforcingsPrecipitationEnum +syn keyword cConstant SurfaceforcingsDesfacEnum +syn keyword cConstant SurfaceforcingsS0pEnum +syn keyword cConstant SMBgradientsEnum +syn keyword cConstant SurfaceforcingsMonthlytemperaturesEnum +syn keyword cConstant SurfaceforcingsHrefEnum +syn keyword cConstant SurfaceforcingsSmbrefEnum +syn keyword cConstant SurfaceforcingsBPosEnum +syn keyword cConstant SurfaceforcingsBNegEnum +syn keyword cConstant SMBhenningEnum +syn keyword cConstant SurfaceforcingsIspddEnum +syn keyword cConstant SurfaceforcingsIssmbgradientsEnum syn keyword cConstant SolutionTypeEnum syn keyword cConstant AnalysisTypeEnum @@ -823,4 +855,5 @@ syn keyword cConstant BalancevelocityAnalysisEnum syn keyword cConstant BalancevelocitySolutionEnum +syn keyword cConstant L2ProjectionEPLAnalysisEnum syn keyword cConstant L2ProjectionBaseAnalysisEnum syn keyword cConstant BedSlopeSolutionEnum @@ -843,8 +876,9 @@ 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 L2ProjectionTopAnalysisEnum syn keyword cConstant SurfaceSlopeSolutionEnum syn keyword cConstant SmoothedSurfaceSlopeXAnalysisEnum @@ -857,4 +891,7 @@ syn keyword cConstant MeshdeformationSolutionEnum syn keyword cConstant MeshdeformationAnalysisEnum +syn keyword cConstant LevelsetAnalysisEnum +syn keyword cConstant ExtrapolationAnalysisEnum +syn keyword cConstant LsfReinitializationAnalysisEnum syn keyword cConstant ApproximationEnum syn keyword cConstant NoneApproximationEnum @@ -897,4 +934,5 @@ syn keyword cConstant InputToExtrudeEnum syn keyword cConstant InputToL2ProjectEnum +syn keyword cConstant InputToDepthaverageEnum syn keyword cConstant IntParamEnum syn keyword cConstant IntVecParamEnum @@ -908,6 +946,4 @@ syn keyword cConstant PengridEnum syn keyword cConstant PenpairEnum -syn keyword cConstant PentaEnum -syn keyword cConstant PentaInputEnum syn keyword cConstant ProfilerEnum syn keyword cConstant MatrixParamEnum @@ -927,4 +963,8 @@ 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 @@ -961,5 +1001,5 @@ syn keyword cConstant QmuVzEnum syn keyword cConstant QmuThicknessEnum -syn keyword cConstant QmuBedEnum +syn keyword cConstant QmuBaseEnum syn keyword cConstant QmuSurfaceEnum syn keyword cConstant QmuMeltingEnum @@ -1020,4 +1060,19 @@ syn keyword cConstant StressTensoryzEnum syn keyword cConstant StressTensorzzEnum +syn keyword cConstant DeviatoricStressEnum +syn keyword cConstant DeviatoricStressxxEnum +syn keyword cConstant DeviatoricStressxyEnum +syn keyword cConstant DeviatoricStressxzEnum +syn keyword cConstant DeviatoricStressyyEnum +syn keyword cConstant DeviatoricStressyzEnum +syn keyword cConstant DeviatoricStresszzEnum +syn keyword cConstant StrainRateEnum +syn keyword cConstant StrainRatexxEnum +syn keyword cConstant StrainRatexyEnum +syn keyword cConstant StrainRatexzEnum +syn keyword cConstant StrainRateyyEnum +syn keyword cConstant StrainRateyzEnum +syn keyword cConstant StrainRatezzEnum +syn keyword cConstant DivergenceEnum syn keyword cConstant GiaCrossSectionShapeEnum syn keyword cConstant GiadWdtEnum @@ -1031,4 +1086,6 @@ syn keyword cConstant P2xP1Enum syn keyword cConstant P1xP2Enum +syn keyword cConstant P1xP3Enum +syn keyword cConstant P2xP4Enum syn keyword cConstant P1P1Enum syn keyword cConstant P1P1GLSEnum @@ -1036,4 +1093,6 @@ syn keyword cConstant MINIcondensedEnum syn keyword cConstant TaylorHoodEnum +syn keyword cConstant XTaylorHoodEnum +syn keyword cConstant OneLayerP4zEnum syn keyword cConstant SaveResultsEnum syn keyword cConstant BoolExternalResultEnum @@ -1051,4 +1110,13 @@ syn keyword cConstant MassfluxatgateNameEnum syn keyword cConstant MassfluxatgateSegmentsEnum +syn keyword cConstant MisfitNameEnum +syn keyword cConstant MisfitModelEnumEnum +syn keyword cConstant MisfitObservationEnum +syn keyword cConstant MisfitObservationEnumEnum +syn keyword cConstant MisfitTimeinterpolationEnum +syn keyword cConstant MisfitWeightsEnum +syn keyword cConstant MisfitWeightsEnumEnum +syn keyword cConstant SurfaceObservationEnum +syn keyword cConstant WeightsSurfaceObservationEnum syn keyword cConstant MinVelEnum syn keyword cConstant MaxVelEnum @@ -1067,11 +1135,18 @@ syn keyword cConstant AbsoluteEnum syn keyword cConstant IncrementalEnum +syn keyword cConstant AugmentedLagrangianREnum +syn keyword cConstant AugmentedLagrangianThetaEnum +syn keyword cConstant NoneEnum syn keyword cConstant AgressiveMigrationEnum -syn keyword cConstant NoneEnum syn keyword cConstant SoftMigrationEnum syn keyword cConstant SubelementMigrationEnum syn keyword cConstant SubelementMigration2Enum +syn keyword cConstant ContactEnum syn keyword cConstant MaskGroundediceLevelsetEnum syn keyword cConstant QmuMaskGroundediceLevelsetEnum +syn keyword cConstant GaussSegEnum +syn keyword cConstant GaussTriaEnum +syn keyword cConstant GaussTetraEnum +syn keyword cConstant GaussPentaEnum syn keyword cConstant FSSolverEnum syn keyword cConstant AdjointEnum @@ -1119,7 +1194,14 @@ syn keyword cConstant OptionCellEnum syn keyword cConstant OptionStructEnum +syn keyword cConstant CuffeyEnum syn keyword cConstant PatersonEnum syn keyword cConstant ArrheniusEnum syn keyword cConstant LliboutryDuvalEnum +syn keyword cConstant TransientIslevelsetEnum +syn keyword cConstant ExtrapolationVariableEnum +syn keyword cConstant IceMaskNodeActivationEnum +syn keyword cConstant LevelsetfunctionSlopeXEnum +syn keyword cConstant LevelsetfunctionSlopeYEnum +syn keyword cConstant LevelsetfunctionPicardEnum "ISSM's Enums end """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" Index: /issm/trunk/jenkins/execute_shell =================================================================== --- /issm/trunk/jenkins/execute_shell (revision 17806) +++ /issm/trunk/jenkins/execute_shell (revision 17806) @@ -0,0 +1,22 @@ +#!/bin/bash + +#some exports required +export ISSM_DIR="$WORKSPACE" + +#which configuration are we using? +case $Platform in + master ) + configfile=linux64_murdo ;; + imac-012301-gil ) + configfile=imac-012301-gil ;; + larsen ) + configfile=linux64_larsen ;; + windows ) + configfile=windows + export PATH=/cygdrive/c/Cygwin/usr/bin:/cygdrive/c/Cygwin/bin:$PATH ;; + +esac + +#run +cd "$WORKSPACE" +source $ISSM_DIR/jenkins/jenkins.sh $ISSM_DIR/jenkins/$configfile Index: /issm/trunk/jenkins/execute_shell_ad =================================================================== --- /issm/trunk/jenkins/execute_shell_ad (revision 17806) +++ /issm/trunk/jenkins/execute_shell_ad (revision 17806) @@ -0,0 +1,16 @@ +#!/bin/bash + +#some exports required +export ISSM_DIR="$WORKSPACE" + +#which configuration are we using? +case $AMPI in + ampion ) + configfile=linux64_murdo_ampi ;; + ampioff ) + configfile=linux64_murdo_ad ;; +esac + +#run +cd "$WORKSPACE" +source $ISSM_DIR/jenkins/jenkins.sh $ISSM_DIR/jenkins/$configfile Index: /issm/trunk/jenkins/imac-012301-gil =================================================================== --- /issm/trunk/jenkins/imac-012301-gil (revision 17806) +++ /issm/trunk/jenkins/imac-012301-gil (revision 17806) @@ -0,0 +1,110 @@ +# +########### Configuration file for Eric Larour's Jenkins run on MaxOSX ############ + +#-------------------------------# +# 1: ISSM general configuration # +#-------------------------------# + +#Nightly run name +NAME="ISSM matlab tests on MacOSX" + +#ISSM Architecture +ISSM_ARCH="macosx-gnu" + +#ISSM CONFIGURATION +ISSM_CONFIG='--prefix=$ISSM_DIR \ + --with-matlab-dir=$MATLAB_DIR \ + --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \ + --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \ + --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \ + --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \ + --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \ + --with-math-lib="/usr/lib/libm.dylib" \ + --with-graphics-lib="/usr/X11/lib/libX11.dylib" \ + --with-cxxoptflags=" -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w "\ + --with-numthreads=8 \ + --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-petsc-arch=$ISSM_ARCH \ + --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \ + --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \ + --enable-development' + +#MATLAB path +MATLAB_PATH="/Applications/MATLAB_R2011b.app/" + +#PYTHON and MATLAB testing +MATLAB_TEST=1 +PYTHON_TEST=0 + +#execution path used for parallel runs +EXECUTION_PATH=$ISSM_DIR/execution + +#repo: +REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" + +#-----------------------------------# +# 3: External packages installation # +#-----------------------------------# + +#ISSM_EXTERNALPACKAGES can have 3 values: +# - "install" install all external packages listed below +# - "copy" copy existing directories (EXTERNALPACKAGESDIR) +# - "none" leave external packages as is +# ->skip to section 4 +ISSM_EXTERNALPACKAGES="install" +EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages + +#List of external pakages to be installed and their installation scripts +EXTERNALPACKAGES="autotools install.sh + matlab install.sh + mpich install-3.0-macosx64.sh + cmake install.sh + petsc install-3.4-macosx64.sh + tao install-2.2.sh + triangle install-macosx64.sh + shell2junit install.sh " + + +#---------------------# +# 4: ISSM Compilation # +#---------------------# + +#ISSM_COMPILATION can have 2 values: +# - "yes" compile ISSM +# - "no" do not compile ISSM +ISSM_COMPILATION="yes" + +#----------------------# +# 5: Mail notification # +#----------------------# + +#Mail delivery. If SKIPMAIL="no", the html nightly run report will be +#sent to the adresses present in $ISSM_DIR/cron/mailinglist. +SKIPMAIL="no" + +#Sender email address +EMAIL_ADRESS="eric.larour@jpl.nasa.gov" + +#Mailing list +MAILINGLIST="eric.larour@jpl.nasa.gov" + +#------------------------# +# 6: Nightly run options # +#------------------------# + +#number of cpus used in ISSM installation and compilation (one is usually +#safer as some packages are very sensitive to parallel compilation) +NUMCPUS_INSTALL=8 + +#number of cpus used in the nightly runs. +NUMCPUS_RUN=1 + +#Nightly run options. The matlab routine runme.m will be called +#as follows: runme($MATLAB_NROPTIONS). The options must be understandable +#by Matlab and runme.m +#ex: "'id',[101 102 103]" +## bamg mesh FS +MATLAB_NROPTIONS="'exclude',[218 234 235 412 413 414 417 418 420 514 701 702 703 422 404 421 503 507 510]" +PYTHON_NROPTIONS="" Index: /issm/trunk/jenkins/jenkins.sh =================================================================== --- /issm/trunk/jenkins/jenkins.sh (revision 17806) +++ /issm/trunk/jenkins/jenkins.sh (revision 17806) @@ -0,0 +1,382 @@ +#!/bin/bash +#This bash script calls the nightlyrun.m matlab file to run our nightly test decks. +#It then processes the results and sends an email to the Ice developpers. + +#some functions +function timer() #{{{ +{ + if [[ $# -eq 0 ]]; then + echo $(date '+%s') + else + local stime=$1 + etime=$(date '+%s') + + if [[ -z "$stime" ]]; then stime=$etime; fi + + dt=$((etime - stime)) + ds=$((dt % 60)) + dm=$(((dt / 60) % 60)) + dh=$((dt / 3600)) + printf '%d:%02d:%02d' $dh $dm $ds + fi +} #}}} +function todaydate() #{{{ +{ + suffix=`date | awk '{printf("%s-%s-%s %s",$2,$3,$6,$4);}'` + echo $suffix; +} #}}} +function host_name() #{{{ +{ + #return host name depending on the OS + if [ "$1" = "win7" ] + then + HOST_NAME=`hostname | sed 's/-//g'`; + else + HOST_NAME=`hostname -s | sed 's/-//g'`; + fi + echo $HOST_NAME; +} #}}} +function pause() #{{{ +{ +pid=`ps aux -W | grep $1 | awk '{printf("%s\n",$1);}'` + +while [ -n "$pid" ] +do + pid=`ps aux -W | grep $1 | awk '{printf("%s\n",$1);}'` +done +} +#}}} + +#Get configuration +#Source config file{{{ +if [ $# -ne 1 ]; +then + #no config file specified: exit + echo "no config file specified. Exiting..." >&2 # Error message to stderr. + exit 1 +fi +if [ ! -f "$1" ] +then + echo "File $1 not found!" >&2 # Error message to stderr. + exit 1 +fi +source $1; +#}}} +#Initialize variables {{{ +TODAY=$(todaydate); +OS=$(uname -s) +if [[ $OS == "CYGWIN_NT-6.1-WOW64" ]]; then + OS="win7"; +fi +HOST_NAME=$(host_name $OS); +START_TIME=$(timer); +ISSM_RELEASE=$(basename $(echo $REPOSITORY)); +USER=$(whoami); +INIT_PATH=$(pwd); +#}}} + +#Installation ISSM +#create matlab's installation sript {{{ +cat << END > $ISSM_DIR/externalpackages/matlab/install.sh +#!/bin/bash +rm -rf install +ln -s $MATLAB_PATH install +END +#}}} +#install/copy/none external packages (ISSM_EXTERNALPACKAGES){{{ +if [ "$ISSM_EXTERNALPACKAGES" == "install" ] +then + + cd $ISSM_DIR/externalpackages + + #number of packages: + NUMPACKAGES=$(($(echo $EXTERNALPACKAGES | wc -w )/2)) + + for ((i=1;i<=$NUMPACKAGES;i++)) + do + NUM1=$((2*$i-1)) + NUM2=$((2*$i)) + PACKAGENAME=$(echo $EXTERNALPACKAGES | cut -d " " -f $NUM1-$NUM1) + PACKAGEINST=$(echo $EXTERNALPACKAGES | cut -d " " -f $NUM2-$NUM2) + + cd $PACKAGENAME + + #tricky part here. We do not want to reinstall this package if it's already installed + #and the svn file which does the install has not be modified! To keep track of + #this, we check the current svn version against the "last changed" revision number. If they + #are the same, we reinstall the package. + current_version=`svnversion` + last_changed_version=`svn info $PACKAGEINST | grep "Last Changed Rev" | awk '{printf("%s\n",$4);}'` + + if [[ $current_version == $last_changed_version ]]; then + #go ahead and reinstall. + echo "For $PACKAGENAME: svn current_version is $current_version and last changed version is $last_changed_version" + echo "Triggering new install of $PACKAGENAME" + install_test=1 + else + #ok, we want to skip, unless the package is not installed: + if [ -d install ]; then + #could be empty, signaling a failed previous install: + if [ "$(ls -A install)" ];then + echo "For $PACKAGENAME: svn current_version is $current_version and last changed version is $last_changed_version" + echo "and install directory exists, so skipping install of $PACKAGENAME" + install_test=0; + else + echo "For $PACKAGENAME: svn current_version is $current_version and last changed version is $last_changed_version" + echo "and install directory exists, however, it is empty, so triggering install of $PACKAGENAME" + install_test=1; + fi + else + echo "For $PACKAGENAME: svn current_version is $current_version and last changed version is $last_changed_version" + echo "However, install directory does not exist, so triggering install of $PACKAGENAME" + install_test=1; + fi + fi + + if [[ $install_test == 1 ]]; then + echo "======================================================"; + echo " Installing $PACKAGENAME "; + echo "======================================================"; + ./$PACKAGEINST | tee compil.log + if [ $? -ne 0 ]; then + echo "======================================================"; + echo " ERROR: installation of $PACKAGENAME failed "; + echo "======================================================"; + #erase install directory, so that next time, we still try and compile this! + rm -rf install + fi + source $ISSM_DIR/etc/environment.sh + else + echo "======================================================"; + echo " Skipping install of $PACKAGENAME "; + echo "======================================================"; + source $ISSM_DIR/etc/environment.sh #for good measure :) + fi + cd .. + done + +elif [ "$ISSM_EXTERNALPACKAGES" == "copy" ] +then + cd $ISSM_DIR + rm -rf externalpackages + cp -Rf $EXTERNALPACKAGESDIR ./ +elif [ "$ISSM_EXTERNALPACKAGES" == "link" ] +then + cd $ISSM_DIR + rm -rf externalpackages + ln -s $EXTERNALPACKAGESDIR . +elif [ "$ISSM_EXTERNALPACKAGES" == "none" ] +then + echo "Skipping external packages installation" +else + echo "ISSM_EXTERNALPACKAGES supported values are: install, copy and none. Exiting..." >&2 # Error message to stderr. + exit 1 +fi +source $ISSM_DIR/etc/environment.sh +#}}} +#ISSM compilation yes/no (ISSM_COMPILATION) {{{ +if [ "$ISSM_COMPILATION" == "yes" ] +then + cd $ISSM_DIR + make uninstall + make clean + make distclean + ./scripts/automakererun.sh + cat > configure.sh << EOF +./configure $ISSM_CONFIG +EOF + chmod 700 configure.sh + ./configure.sh + + #4: compile and install ISSM + if [ $NUMCPUS_INSTALL -gt 1 ] + then + echo "Making with " $NUMCPUS_INSTALL " cpus" + make -j $NUMCPUS_INSTALL install + else + make install + fi + if [ $? -ne 0 ]; then + echo "ISSM_COMPILATION failed!" + exit 1 + fi +elif [ "$ISSM_COMPILATION" == "no" ] +then + echo "Skipping ISSM compilation" +else + echo "ISSM_COMPILATION supported values are: yes and no. Exiting..." >&2 # Error message to stderr. + exit 1 +fi +#}}} +echo "Cleaning up execution directory" +rm -rf $ISSM_DIR/execution/* + +#Prepare info.log +#{{{ +rm -rf $ISSM_DIR/nightlylog +mkdir $ISSM_DIR/nightlylog +INSTALL_TIME=$(timer) +ELAPSED=$(timer $START_TIME) +VERSION=$(svnversion $ISSM_DIR) +cat << END > $ISSM_DIR/nightlylog/info.log +name: $(echo $NAME) +today: $(echo $TODAY) +user: $(echo $USER) +host: $(echo $HOST_NAME) +OS: $(echo $OS) +release: $(echo $ISSM_RELEASE) +init_path: $(echo $INIT_PATH) +is_matlab: $(echo $MATLAB_TEST) +is_python: $(echo $PYTHON_TEST) +elapsed_install: $(echo $ELAPSED) +version: $(echo $VERSION) +END +#}}} + +#matlab tests +if [ $MATLAB_TEST -eq 1 ]; then +#Launch all tests on different cpus {{{ +MATLAB_START_TIME=$(timer); +for (( i=1;i<=$NUMCPUS_RUN;i++ )) +do + #Launch matlab and the nightly run script + cat > $ISSM_DIR/nightlylog/matlab_run$i.m << EOF + warning off %necessary to avoid a info.log of several Go for parallel runs + try, + $(if [ "$MATLAB_NROPTIONS" = "" ] + then + echo "runme('output','nightly','rank',$i,'numprocs',$NUMCPUS_RUN);" + else + echo "runme($MATLAB_NROPTIONS,'output','nightly','rank',$i,'numprocs',$NUMCPUS_RUN);" + fi + ) + catch me, + %An error occured, get report and exit + message=getReport(me) + directory=strsplit(pwd,'/'); + fid=fopen([issmdir '/nightlylog/matlaberror.log'], 'at'); + fprintf(fid,'\nMatlab error occured in: %s\n\n',directory{end}); + fprintf(fid,'%s',message); + fclose(fid); + end + disp('MATLABEXITEDCORRECTLY'); + exit +EOF + cd $ISSM_DIR/test/NightlyRun + matlab -nojvm -nosplash -r "addpath $ISSM_DIR/src/m/dev; devpath; addpath $ISSM_DIR/nightlylog/; matlab_run$i" -logfile $ISSM_DIR/nightlylog/matlab_log$i.log & +done + +#wait until matlab closes +if [ "$OS" = "win7" ]; then + pause MATLAB +else + wait +fi + +#concatenate reports +cd $ISSM_DIR/nightlylog/ +rm matlab_log.log +for (( i=1;i<=$NUMCPUS_RUN;i++ )) +do + cat matlab_log$i.log >> matlab_log.log +done + +#filter out windows characters: +cat matlab_log.log | tr -cd '\11\12\40-\176' > matlab_log.log2 && mv matlab_log.log2 matlab_log.log + +#}}} +#Complete info.log {{{ +if [ $(cat matlab_log.log | grep "MATLABEXITEDCORRECTLY" | wc -l) -eq $NUMCPUS_RUN ] +then + MATLABCRASH=0 +else + MATLABCRASH=1 +fi +ELAPSED=$(timer $MATLAB_START_TIME) +cat << END >> $ISSM_DIR/nightlylog/info.log +elapsed_matlab: $(echo $ELAPSED) +matlab_crash: $(echo $MATLABCRASH) +END +#}}} +fi + +#python tests +if [ $PYTHON_TEST -eq 1 ]; then +#Launch all tests on different cpus {{{ +PYTHON_START_TIME=$(timer); +export PYTHONSTARTUP=$ISSM_DIR/src/m/dev/devpath.py +for (( i=1;i<=$NUMCPUS_RUN;i++ )) +do + cd $ISSM_DIR/test/NightlyRun + ./runme.py --output=nightly --rank=$i --numprocs=$NUMCPUS_RUN $PYTHON_NROPTIONS 2>&1 > $ISSM_DIR/nightlylog/python_log$i.log & +done + +#wait until python closes +if [ "$OS" = "win7" ]; then + pause MATLAB +else + wait +fi + +#concatenate reports +cd $ISSM_DIR/nightlylog/ +rm python_log.log +for (( i=1;i<=$NUMCPUS_RUN;i++ )) +do + cat python_log$i.log >> python_log.log +done +#}}} +#Complete info.log {{{ +if [ $(cat python_log.log | grep "PYTHONEXITEDCORRECTLY" | wc -l) -eq $NUMCPUS_RUN ] +then + PYTHONCRASH=0 +else + PYTHONCRASH=1 +fi +ELAPSED=$(timer $PYTHON_START_TIME) +cat << END >> $ISSM_DIR/nightlylog/info.log +elapsed_python: $(echo $ELAPSED) +python_crash: $(echo $PYTHONCRASH) +END +#}}} +fi + +#complete info.log +#{{{ +ELAPSED=$(timer $START_TIME) +cat << END >> $ISSM_DIR/nightlylog/info.log +elapsed_total: $(echo $ELAPSED) +END +#}}} + +#process logs to be junit compatible +#{{{ +cd $ISSM_DIR/nightlylog/ +source $ISSM_DIR/externalpackages/shell2junit/install/sh2ju.sh +juLogClean + +if [ $MATLAB_TEST -eq 1 ]; then + #number tests: + numtests=`cat matlab_log.log | grep "\-\-\-\-\-\-\-\-starting" | wc -l` + testlist=`cat matlab_log.log | grep "\-\-\-\-\-\-\-\-starting" | sed 's/----------------starting://g' | sed 's/-//g'` + + #look through numtests: + for i in `echo $testlist` + do + juLog -test=MATLAB-$i -name=Error -error=ERROR awk "/starting:$i/{flag=1;next}/finished/{flag=0} flag{print}" matlab_log.log + juLog -test=MATLAB-$i -name=Failure -error=FAILURE awk "/starting:$i/{flag=1;next}/finished/{flag=0} flag{print}" matlab_log.log + done +fi +if [ $PYTHON_TEST -eq 1 ]; then + #number tests: + numtests=`cat python_log.log | grep "\-\-\-\-\-\-\-\-starting" | wc -l` + testlist=`cat python_log.log | grep "\-\-\-\-\-\-\-\-starting" | sed 's/----------------starting://g' | sed 's/-//g'` + + #look through numtests: + for i in `echo $testlist` + do + juLog -test=PYTHON-$i -name=Error -error=ERROR awk "/starting:$i/{flag=1;next}/finished/{flag=0} flag{print}" python_log.log + juLog -test=PYTHON-$i -name=Failure -error=FAILURE awk "/starting:$i/{flag=1;next}/finished/{flag=0} flag{print}" python_log.log + done +fi +#}}} Index: /issm/trunk/jenkins/linux64_larsen =================================================================== --- /issm/trunk/jenkins/linux64_larsen (revision 17806) +++ /issm/trunk/jenkins/linux64_larsen (revision 17806) @@ -0,0 +1,112 @@ +# +########### Configuration file for Eric Larour's Jenkins run on Murdo ############ + +#-------------------------------# +# 1: ISSM general configuration # +#-------------------------------# + +#Nightly run name +NAME="ISSM matlab tests on Linux64 (murdo)" + +#ISSM Architecture +ISSM_ARCH="linux-gnu-amd64" + +#ISSM CONFIGURATION +ISSM_CONFIG='--prefix=$ISSM_DIR\ + --with-matlab-dir=$MATLAB_DIR \ + --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \ + --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \ + --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \ + --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich" \ + --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-petsc-arch=$ISSM_ARCH \ + --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \ + --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \ + --with-boost-dir=$ISSM_DIR/externalpackages/boost/install/ \ + --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \ + --with-numthreads=18 \ + --with-cxxoptflags="-mtune=barcelona -ffast-math -O3 -msse4.2 -Wno-write-strings "\ + --with-graphics-lib="/usr/lib/x86_64-linux-gnu/libX11.so" \ + --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \ + --enable-development \ + --enable-debugging ' + +#MATLAB path +MATLAB_PATH="/usr/local/matlab80/" + +#PYTHON and MATLAB testing +MATLAB_TEST=1 +PYTHON_TEST=0 + +#execution path used for parallel runs +EXECUTION_PATH=$ISSM_DIR/execution + +#repo: +REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" + +#-----------------------------------# +# 3: External packages installation # +#-----------------------------------# + +#ISSM_EXTERNALPACKAGES can have 3 values: +# - "install" install all external packages listed below +# - "copy" copy existing directories (EXTERNALPACKAGESDIR) +# - "none" leave external packages as is +# ->skip to section 4 +ISSM_EXTERNALPACKAGES="install" +EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages + +#List of external pakages to be installed and their installation scripts +EXTERNALPACKAGES="autotools install.sh + matlab install.sh + mpich install-3.0-linux64.sh + cmake install.sh + petsc install-3.4-linux64.sh + triangle install-linux64.sh + boost install.sh + dakota install-5.3.1-linux64.sh + tao install-2.2.sh + chaco install.sh + shell2junit install.sh" + +#---------------------# +# 4: ISSM Compilation # +#---------------------# + +#ISSM_COMPILATION can have 2 values: +# - "yes" compile ISSM +# - "no" do not compile ISSM +ISSM_COMPILATION="yes" + +#----------------------# +# 5: Mail notification # +#----------------------# + +#Mail delivery. If SKIPMAIL="no", the html nightly run report will be +#sent to the adresses present in $ISSM_DIR/cron/mailinglist. +SKIPMAIL="no" + +#Sender email address +EMAIL_ADRESS="eric.larour@jpl.nasa.gov" + +#Mailing list +MAILINGLIST="eric.larour@jpl.nasa.gov" + +#------------------------# +# 6: Nightly run options # +#------------------------# + +#number of cpus used in ISSM installation and compilation (one is usually +#safer as some packages are very sensitive to parallel compilation) +NUMCPUS_INSTALL=8 + +#number of cpus used in the nightly runs. +NUMCPUS_RUN=8 + +#Nightly run options. The matlab routine runme.m will be called +#as follows: runme($MATLAB_NROPTIONS). The options must be understandable +#by Matlab and runme.m +#ex: "'id',[101 102 103]" +MATLAB_NROPTIONS="" +PYTHON_NROPTIONS="" Index: /issm/trunk/jenkins/linux64_murdo =================================================================== --- /issm/trunk/jenkins/linux64_murdo (revision 17806) +++ /issm/trunk/jenkins/linux64_murdo (revision 17806) @@ -0,0 +1,125 @@ +# +########### Configuration file for Eric Larour's Jenkins run on Murdo ############ + +#-------------------------------# +# 1: ISSM general configuration # +#-------------------------------# + +#Nightly run name +NAME="ISSM matlab tests on Linux64 (murdo)" + +#ISSM Architecture +ISSM_ARCH="linux-gnu-amd64" + +#ISSM CONFIGURATION +ISSM_CONFIG='--prefix=$ISSM_DIR\ + --with-matlab-dir=$MATLAB_DIR \ + --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \ + --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \ + --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \ + --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich" \ + --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-petsc-arch=$ISSM_ARCH \ + --with-python-dir=$ISSM_DIR/externalpackages/python/install\ + --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/lib/python2.7/site-packages/numpy/core/include/numpy\ + --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \ + --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \ + --with-numthreads=18 \ + --with-cxxoptflags="-mtune=barcelona -ffast-math -O3 -msse4.2 -Wno-write-strings "\ + --with-graphics-lib="/usr/lib/x86_64-linux-gnu/libX11.so" \ + --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \ + --with-boost-dir=$ISSM_DIR/externalpackages/boost/install/ \ + --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \ + --enable-development \ + --enable-debugging ' + +#MATLAB path +MATLAB_PATH="/usr/local/matlab80/" + +#PYTHON and MATLAB testing +MATLAB_TEST=1 +PYTHON_TEST=1 + +#execution path used for parallel runs +EXECUTION_PATH=$ISSM_DIR/execution + +#repo: +REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" + +#-----------------------------------# +# 3: External packages installation # +#-----------------------------------# + +#ISSM_EXTERNALPACKAGES can have 3 values: +# - "install" install all external packages listed below +# - "copy" copy existing directories (EXTERNALPACKAGESDIR) +# - "none" leave external packages as is +# ->skip to section 4 +ISSM_EXTERNALPACKAGES="install" +EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages + +#List of external pakages to be installed and their installation scripts +EXTERNALPACKAGES="autotools install.sh + matlab install.sh + mpich install-3.0-linux64.sh + cmake install.sh + petsc install-3.4-linux64.sh + triangle install-linux64.sh + boost install.sh + dakota install-5.3.1-linux64.sh + tao install-2.2.sh + chaco install.sh + python install-2.7.3-linux64.sh + nose install-linux64-python2.sh + blas install-linux64.sh + lapack install-linux64.sh + git install.sh + numpy install-linux64.sh + scipy install-linux64.sh + hdf5 install.sh + netcdf install.sh + netcdf-python install.sh + shell2junit install.sh" + + +#---------------------# +# 4: ISSM Compilation # +#---------------------# + +#ISSM_COMPILATION can have 2 values: +# - "yes" compile ISSM +# - "no" do not compile ISSM +ISSM_COMPILATION="yes" + +#----------------------# +# 5: Mail notification # +#----------------------# + +#Mail delivery. If SKIPMAIL="no", the html nightly run report will be +#sent to the adresses present in $ISSM_DIR/cron/mailinglist. +SKIPMAIL="no" + +#Sender email address +EMAIL_ADRESS="eric.larour@jpl.nasa.gov" + +#Mailing list +MAILINGLIST="eric.larour@jpl.nasa.gov" + +#------------------------# +# 6: Nightly run options # +#------------------------# + +#number of cpus used in ISSM installation and compilation (one is usually +#safer as some packages are very sensitive to parallel compilation) +NUMCPUS_INSTALL=8 + +#number of cpus used in the nightly runs. +NUMCPUS_RUN=8 + +#Nightly run options. The matlab routine runme.m will be called +#as follows: runme($MATLAB_NROPTIONS). The options must be understandable +#by Matlab and runme.m +#ex: "'id',[101 102 103]" +MATLAB_NROPTIONS="'exclude',[119,514,701,702,435]" +PYTHON_NROPTIONS="--exclude 119 514 701 702 435" Index: /issm/trunk/jenkins/linux64_murdo_ad =================================================================== --- /issm/trunk/jenkins/linux64_murdo_ad (revision 17806) +++ /issm/trunk/jenkins/linux64_murdo_ad (revision 17806) @@ -0,0 +1,99 @@ +########### Configuration file for Eric Larour's Jenkins runs on Linux. Automatic differentiation ############ + +#-------------------------------# +# 1: ISSM general configuration # +#-------------------------------# + +#Nightly run name +NAME="ISSM tests on Linux64 (murdo). Automatic differentiation validation tests" + +#ISSM Architecture +ISSM_ARCH="linux-gnu-amd64" + +#ISSM CONFIGURATION +ISSM_CONFIG='--prefix=$ISSM_DIR\ + --prefix=$ISSM_DIR \ + --without-kriging \ + --without-kml \ + --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \ + --with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \ + --with-matlab-dir=$MATLAB_DIR \ + --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install ' +#MATLAB path +MATLAB_PATH="/usr/local/matlab80/" + +#PYTHON and MATLAB testing +MATLAB_TEST=1 +PYTHON_TEST=0 + +#execution path used for parallel runs +EXECUTION_PATH=$ISSM_DIR/execution + +#repo: +REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" + +#-----------------------------------# +# 3: External packages installation # +#-----------------------------------# + +#ISSM_EXTERNALPACKAGES can have 3 values: +# - "install" install all external packages listed below +# - "copy" copy existing directories (EXTERNALPACKAGESDIR) +# - "none" leave external packages as is +# ->skip to section 4 +ISSM_EXTERNALPACKAGES="install" +EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages + +#List of external pakages to be installed and their installation scripts +EXTERNALPACKAGES="autotools install.sh + git install.sh + cmake install.sh + matlab install.sh + mpich install-3.0-linux64.sh + petsc install-3.4-linux64.sh + metis install-5.0.1-linux64.sh + triangle install-linux64.sh + gsl install-linux64.sh + adolc install.sh + shell2junit install.sh" + +#---------------------# +# 4: ISSM Compilation # +#---------------------# + +#ISSM_COMPILATION can have 2 values: +# - "yes" compile ISSM +# - "no" do not compile ISSM +ISSM_COMPILATION="yes" + +#----------------------# +# 5: Mail notification # +#----------------------# + +#Mail delivery. If SKIPMAIL="no", the html nightly run report will be +#sent to the adresses present in $ISSM_DIR/cron/mailinglist. +SKIPMAIL="no" + +#Sender email address +EMAIL_ADRESS="eric.larour@jpl.nasa.gov" + +#Mailing list +MAILINGLIST="eric.larour@jpl.nasa.gov" + +#------------------------# +# 6: Nightly run options # +#------------------------# + +#number of cpus used in ISSM installation and compilation (one is usually +#safer as some packages are very sensitive to parallel compilation) +NUMCPUS_INSTALL=8 + +#number of cpus used in the nightly runs. +NUMCPUS_RUN=8 + +#Nightly run options. The matlab routine runme.m will be called +#as follows: runme($MATLAB_NROPTIONS). The options must be understandable +#by Matlab and runme.m +#ex: "'id',[101 102 103]" +MATLAB_NROPTIONS="'benchmark','adolc','id',[3001:3019]" +PYTHON_NROPTIONS="" Index: /issm/trunk/jenkins/linux64_murdo_ampi =================================================================== --- /issm/trunk/jenkins/linux64_murdo_ampi (revision 17806) +++ /issm/trunk/jenkins/linux64_murdo_ampi (revision 17806) @@ -0,0 +1,112 @@ +# +########### Configuration file for Eric Larour's Jenkins run on Murdo ############ + +#-------------------------------# +# 1: ISSM general configuration # +#-------------------------------# + +#Nightly run name +NAME="ISSM tests on Linux64 (murdo). Automatic differentiation validation tests with ampi" + +#ISSM Architecture +ISSM_ARCH="linux-gnu-amd64" + +#ISSM CONFIGURATION +ISSM_CONFIG='--prefix=$ISSM_DIR\ + --without-kriging \ + --without-kml \ + --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \ + --with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \ + --with-ampi-dir=$ISSM_DIR/externalpackages/adjoinablempi/install \ + --with-matlab-dir=$MATLAB_DIR \ + --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \ + --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich" \ + --with-graphics-lib="/usr/lib/x86_64-linux-gnu/libX11.so" \ + --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \ + --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-numthreads=18 \ + --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \ + --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \ + --enable-development \ + --enable-debugging CXXFLAGS="-g -O0" ' +#MATLAB path +MATLAB_PATH="/usr/local/matlab80/" + +#PYTHON and MATLAB testing +MATLAB_TEST=1 +PYTHON_TEST=0 + +#execution path used for parallel runs +EXECUTION_PATH=$ISSM_DIR/execution + +#repo: +REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" + +#-----------------------------------# +# 3: External packages installation # +#-----------------------------------# + +#ISSM_EXTERNALPACKAGES can have 3 values: +# - "install" install all external packages listed below +# - "copy" copy existing directories (EXTERNALPACKAGESDIR) +# - "none" leave external packages as is +# ->skip to section 4 +ISSM_EXTERNALPACKAGES="install" +EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages + +#List of external pakages to be installed and their installation scripts +EXTERNALPACKAGES="autotools install.sh + git install.sh + cmake install.sh + matlab install.sh + mpich install-3.0-linux64.sh + petsc install-3.4-linux64.sh + metis install-5.0.1-linux64.sh + triangle install-linux64.sh + gsl install-linux64.sh + mercurial install.sh + adjoinablempi install.sh + adolc install-withampi.sh + shell2junit install.sh" + +#---------------------# +# 4: ISSM Compilation # +#---------------------# + +#ISSM_COMPILATION can have 2 values: +# - "yes" compile ISSM +# - "no" do not compile ISSM +ISSM_COMPILATION="yes" + +#----------------------# +# 5: Mail notification # +#----------------------# + +#Mail delivery. If SKIPMAIL="no", the html nightly run report will be +#sent to the adresses present in $ISSM_DIR/cron/mailinglist. +SKIPMAIL="no" + +#Sender email address +EMAIL_ADRESS="eric.larour@jpl.nasa.gov" + +#Mailing list +MAILINGLIST="eric.larour@jpl.nasa.gov" + +#------------------------# +# 6: Nightly run options # +#------------------------# + +#number of cpus used in ISSM installation and compilation (one is usually +#safer as some packages are very sensitive to parallel compilation) +NUMCPUS_INSTALL=8 + +#number of cpus used in the nightly runs. +NUMCPUS_RUN=8 + +#Nightly run options. The matlab routine runme.m will be called +#as follows: runme($MATLAB_NROPTIONS). The options must be understandable +#by Matlab and runme.m +#ex: "'id',[101 102 103]" +MATLAB_NROPTIONS="'benchmark','adolc','id',[3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3101, 3102, 3103, 3104, 3105, 3106, 3107, 3108, 3109, 3119]" +PYTHON_NROPTIONS="" Index: /issm/trunk/jenkins/parsing_rules =================================================================== --- /issm/trunk/jenkins/parsing_rules (revision 17806) +++ /issm/trunk/jenkins/parsing_rules (revision 17806) @@ -0,0 +1,15 @@ +ok /not really/ + +# match line starting with 'error ', case-insensitive +error /.*\\berror:\\b.*/ + +# list of warnings here... +warning /[Ww]arning/ +warning /WARNING/ + +# create a quick access link to lines in the report containing 'INFO' +info /INFO/ + +# each line containing 'BUILD' represents the start of a section for grouping errors and warnings found after the line. +# also creates a quick access link. +start /BUILD/ Index: /issm/trunk/jenkins/windows =================================================================== --- /issm/trunk/jenkins/windows (revision 17806) +++ /issm/trunk/jenkins/windows (revision 17806) @@ -0,0 +1,105 @@ +# +########### Configuration file for Eric Larour's Jenkins run on Windows ############ + +#-------------------------------# +# 1: ISSM general configuration # +#-------------------------------# + +#Nightly run name +NAME="ISSM matlab tests on Windows" + +#ISSM Architecture +ISSM_ARCH="cygwin-intel" + +#ISSM CONFIGURATION +ISSM_CONFIG='--prefix=$ISSM_DIR \ + --disable-static \ + --with-vendor=intel-win7-64 \ + --with-matlab-dir=""$ISSM_DIR/externalpackages/matlab/install"" \ + --with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \ + --with-metis-dir="$ISSM_DIR/externalpackages/metis/install" \ + --with-petsc-dir="$ISSM_DIR/externalpackages/petsc/install" \ + --with-petsc-arch=$ISSM_ARCH \ + --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/lib/ \ + --with-mpi-libdir="$ISSM_DIR/externalpackages/petsc/install/lib" \ + --with-mpi-libflags="-Wl,libpetsc.lib" \ + --with-mpi-include="$ISSM_DIR/externalpackages/petsc/install/include/mpiuni" \ + --enable-development' + +#MATLAB path +MATLAB_PATH="C:/MATLAB/R2013a/" + +#PYTHON and MATLAB testing +MATLAB_TEST=1 +PYTHON_TEST=0 + +#execution path used for parallel runs +EXECUTION_PATH=$ISSM_DIR/execution + +#repo: +REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" + +#-----------------------------------# +# 3: External packages installation # +#-----------------------------------# + +#ISSM_EXTERNALPACKAGES can have 3 values: +# - "install" install all external packages listed below +# - "copy" copy existing directories (EXTERNALPACKAGESDIR) +# - "none" leave external packages as is +# ->skip to section 4 +ISSM_EXTERNALPACKAGES="install" +EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages + +#List of external pakages to be installed and their installation scripts +EXTERNALPACKAGES=" cccl install-win7.sh + petsc install-3.1-win7.sh + triangle install-win7.sh + matlab install.sh + metis install-4.0-win7.sh + shell2junit install.sh" + +#---------------------# +# 4: ISSM Compilation # +#---------------------# + +#ISSM_COMPILATION can have 2 values: +# - "yes" compile ISSM +# - "no" do not compile ISSM +ISSM_COMPILATION="yes" + +#----------------------# +# 5: Mail notification # +#----------------------# + +#Mail delivery. If SKIPMAIL="no", the html nightly run report will be +#sent to the adresses present in $ISSM_DIR/cron/mailinglist. +SKIPMAIL="no" + +#Sender email address +EMAIL_ADRESS="eric.larour@jpl.nasa.gov" + +#Mailing list +MAILINGLIST="eric.larour@jpl.nasa.gov" + +#------------------------# +# 6: Nightly run options # +#------------------------# + +#number of cpus used in ISSM installation and compilation (one is usually +#safer as some packages are very sensitive to parallel compilation) +NUMCPUS_INSTALL=8 + +#number of cpus used in the nightly runs. +NUMCPUS_RUN=1 + +#Nightly run options. The matlab routine runme.m will be called +#as follows: runme($MATLAB_NROPTIONS). The options must be understandable +#by Matlab and runme.m +#ex: "'id',[101 102 103]" + +#In Windows, we don't yet have MUMPS, can't do full stokes, so exclude all FS runs. Also exclude all runs with Dakota. And exclude higher order runs that have penalties. +MATLAB_NROPTIONS="'exclude',[104, 124, 204, 211, 215, 220, 221, 285, 290, 308, 322, 404, 421, 422, 503, 507, 510, 511, 701, 702, 703, 218, 234, 235, 412, 413, 414, 417, 418, 420, 205, 274, 331, 405, 409, 455, 612, 514, 435]" +PYTHON_NROPTIONS="" + + Index: /issm/trunk/m4/analyses.m4 =================================================================== --- /issm/trunk/m4/analyses.m4 (revision 17806) +++ /issm/trunk/m4/analyses.m4 (revision 17806) @@ -0,0 +1,433 @@ + +dnl WARNING: DO NOT MODIFY THIS FILE +dnl this file has been automatically generated by Synchronize.sh +dnl Please read README for more information + +# AX_ANALYSES_SELECTION +# ----------------- +# Check for analyses compilation +AC_DEFUN([AX_ANALYSES_SELECTION], +[ + +dnl with-AdjointBalancethickness{{{ +AC_ARG_WITH([AdjointBalancethickness], + AS_HELP_STRING([--with-AdjointBalancethickness = YES], [compile with AdjointBalancethickness capabilities (default is yes)]), + [ADJOINTBALANCETHICKNESS=$withval],[ADJOINTBALANCETHICKNESS=yes]) +AC_MSG_CHECKING(for AdjointBalancethickness capability compilation) + +HAVE_ADJOINTBALANCETHICKNESS=no +if test "x$ADJOINTBALANCETHICKNESS" = "xyes"; then + HAVE_ADJOINTBALANCETHICKNESS=yes + AC_DEFINE([_HAVE_ADJOINTBALANCETHICKNESS_],[1],[with AdjointBalancethicknesscapability]) +fi +AM_CONDITIONAL([ADJOINTBALANCETHICKNESS], [test x$HAVE_ADJOINTBALANCETHICKNESS = xyes]) +AC_MSG_RESULT($HAVE_ADJOINTBALANCETHICKNESS) +dnl }}} +dnl with-AdjointHoriz{{{ +AC_ARG_WITH([AdjointHoriz], + AS_HELP_STRING([--with-AdjointHoriz = YES], [compile with AdjointHoriz capabilities (default is yes)]), + [ADJOINTHORIZ=$withval],[ADJOINTHORIZ=yes]) +AC_MSG_CHECKING(for AdjointHoriz capability compilation) + +HAVE_ADJOINTHORIZ=no +if test "x$ADJOINTHORIZ" = "xyes"; then + HAVE_ADJOINTHORIZ=yes + AC_DEFINE([_HAVE_ADJOINTHORIZ_],[1],[with AdjointHorizcapability]) +fi +AM_CONDITIONAL([ADJOINTHORIZ], [test x$HAVE_ADJOINTHORIZ = xyes]) +AC_MSG_RESULT($HAVE_ADJOINTHORIZ) +dnl }}} +dnl with-Balancethickness{{{ +AC_ARG_WITH([Balancethickness], + AS_HELP_STRING([--with-Balancethickness = YES], [compile with Balancethickness capabilities (default is yes)]), + [BALANCETHICKNESS=$withval],[BALANCETHICKNESS=yes]) +AC_MSG_CHECKING(for Balancethickness capability compilation) + +HAVE_BALANCETHICKNESS=no +if test "x$BALANCETHICKNESS" = "xyes"; then + HAVE_BALANCETHICKNESS=yes + AC_DEFINE([_HAVE_BALANCETHICKNESS_],[1],[with Balancethicknesscapability]) +fi +AM_CONDITIONAL([BALANCETHICKNESS], [test x$HAVE_BALANCETHICKNESS = xyes]) +AC_MSG_RESULT($HAVE_BALANCETHICKNESS) +dnl }}} +dnl with-BalancethicknessSoft{{{ +AC_ARG_WITH([BalancethicknessSoft], + AS_HELP_STRING([--with-BalancethicknessSoft = YES], [compile with BalancethicknessSoft capabilities (default is yes)]), + [BALANCETHICKNESSSOFT=$withval],[BALANCETHICKNESSSOFT=yes]) +AC_MSG_CHECKING(for BalancethicknessSoft capability compilation) + +HAVE_BALANCETHICKNESSSOFT=no +if test "x$BALANCETHICKNESSSOFT" = "xyes"; then + HAVE_BALANCETHICKNESSSOFT=yes + AC_DEFINE([_HAVE_BALANCETHICKNESSSOFT_],[1],[with BalancethicknessSoftcapability]) +fi +AM_CONDITIONAL([BALANCETHICKNESSSOFT], [test x$HAVE_BALANCETHICKNESSSOFT = xyes]) +AC_MSG_RESULT($HAVE_BALANCETHICKNESSSOFT) +dnl }}} +dnl with-Balancevelocity{{{ +AC_ARG_WITH([Balancevelocity], + AS_HELP_STRING([--with-Balancevelocity = YES], [compile with Balancevelocity capabilities (default is yes)]), + [BALANCEVELOCITY=$withval],[BALANCEVELOCITY=yes]) +AC_MSG_CHECKING(for Balancevelocity capability compilation) + +HAVE_BALANCEVELOCITY=no +if test "x$BALANCEVELOCITY" = "xyes"; then + HAVE_BALANCEVELOCITY=yes + AC_DEFINE([_HAVE_BALANCEVELOCITY_],[1],[with Balancevelocitycapability]) +fi +AM_CONDITIONAL([BALANCEVELOCITY], [test x$HAVE_BALANCEVELOCITY = xyes]) +AC_MSG_RESULT($HAVE_BALANCEVELOCITY) +dnl }}} +dnl with-L2ProjectionEPL{{{ +AC_ARG_WITH([L2ProjectionEPL], + AS_HELP_STRING([--with-L2ProjectionEPL = YES], [compile with L2ProjectionEPL capabilities (default is yes)]), + [L2PROJECTIONEPL=$withval],[L2PROJECTIONEPL=yes]) +AC_MSG_CHECKING(for L2ProjectionEPL capability compilation) + +HAVE_L2PROJECTIONEPL=no +if test "x$L2PROJECTIONEPL" = "xyes"; then + HAVE_L2PROJECTIONEPL=yes + AC_DEFINE([_HAVE_L2PROJECTIONEPL_],[1],[with L2ProjectionEPLcapability]) +fi +AM_CONDITIONAL([L2PROJECTIONEPL], [test x$HAVE_L2PROJECTIONEPL = xyes]) +AC_MSG_RESULT($HAVE_L2PROJECTIONEPL) +dnl }}} +dnl with-L2ProjectionBase{{{ +AC_ARG_WITH([L2ProjectionBase], + AS_HELP_STRING([--with-L2ProjectionBase = YES], [compile with L2ProjectionBase capabilities (default is yes)]), + [L2PROJECTIONBASE=$withval],[L2PROJECTIONBASE=yes]) +AC_MSG_CHECKING(for L2ProjectionBase capability compilation) + +HAVE_L2PROJECTIONBASE=no +if test "x$L2PROJECTIONBASE" = "xyes"; then + HAVE_L2PROJECTIONBASE=yes + AC_DEFINE([_HAVE_L2PROJECTIONBASE_],[1],[with L2ProjectionBasecapability]) +fi +AM_CONDITIONAL([L2PROJECTIONBASE], [test x$HAVE_L2PROJECTIONBASE = xyes]) +AC_MSG_RESULT($HAVE_L2PROJECTIONBASE) +dnl }}} +dnl with-DamageEvolution{{{ +AC_ARG_WITH([DamageEvolution], + AS_HELP_STRING([--with-DamageEvolution = YES], [compile with DamageEvolution capabilities (default is yes)]), + [DAMAGEEVOLUTION=$withval],[DAMAGEEVOLUTION=yes]) +AC_MSG_CHECKING(for DamageEvolution capability compilation) + +HAVE_DAMAGEEVOLUTION=no +if test "x$DAMAGEEVOLUTION" = "xyes"; then + HAVE_DAMAGEEVOLUTION=yes + AC_DEFINE([_HAVE_DAMAGEEVOLUTION_],[1],[with DamageEvolutioncapability]) +fi +AM_CONDITIONAL([DAMAGEEVOLUTION], [test x$HAVE_DAMAGEEVOLUTION = xyes]) +AC_MSG_RESULT($HAVE_DAMAGEEVOLUTION) +dnl }}} +dnl with-Stressbalance{{{ +AC_ARG_WITH([Stressbalance], + AS_HELP_STRING([--with-Stressbalance = YES], [compile with Stressbalance capabilities (default is yes)]), + [STRESSBALANCE=$withval],[STRESSBALANCE=yes]) +AC_MSG_CHECKING(for Stressbalance capability compilation) + +HAVE_STRESSBALANCE=no +if test "x$STRESSBALANCE" = "xyes"; then + HAVE_STRESSBALANCE=yes + AC_DEFINE([_HAVE_STRESSBALANCE_],[1],[with Stressbalancecapability]) +fi +AM_CONDITIONAL([STRESSBALANCE], [test x$HAVE_STRESSBALANCE = xyes]) +AC_MSG_RESULT($HAVE_STRESSBALANCE) +dnl }}} +dnl with-StressbalanceSIA{{{ +AC_ARG_WITH([StressbalanceSIA], + AS_HELP_STRING([--with-StressbalanceSIA = YES], [compile with StressbalanceSIA capabilities (default is yes)]), + [STRESSBALANCESIA=$withval],[STRESSBALANCESIA=yes]) +AC_MSG_CHECKING(for StressbalanceSIA capability compilation) + +HAVE_STRESSBALANCESIA=no +if test "x$STRESSBALANCESIA" = "xyes"; then + HAVE_STRESSBALANCESIA=yes + AC_DEFINE([_HAVE_STRESSBALANCESIA_],[1],[with StressbalanceSIAcapability]) +fi +AM_CONDITIONAL([STRESSBALANCESIA], [test x$HAVE_STRESSBALANCESIA = xyes]) +AC_MSG_RESULT($HAVE_STRESSBALANCESIA) +dnl }}} +dnl with-StressbalanceVertical{{{ +AC_ARG_WITH([StressbalanceVertical], + AS_HELP_STRING([--with-StressbalanceVertical = YES], [compile with StressbalanceVertical capabilities (default is yes)]), + [STRESSBALANCEVERTICAL=$withval],[STRESSBALANCEVERTICAL=yes]) +AC_MSG_CHECKING(for StressbalanceVertical capability compilation) + +HAVE_STRESSBALANCEVERTICAL=no +if test "x$STRESSBALANCEVERTICAL" = "xyes"; then + HAVE_STRESSBALANCEVERTICAL=yes + AC_DEFINE([_HAVE_STRESSBALANCEVERTICAL_],[1],[with StressbalanceVerticalcapability]) +fi +AM_CONDITIONAL([STRESSBALANCEVERTICAL], [test x$HAVE_STRESSBALANCEVERTICAL = xyes]) +AC_MSG_RESULT($HAVE_STRESSBALANCEVERTICAL) +dnl }}} +dnl with-Enthalpy{{{ +AC_ARG_WITH([Enthalpy], + AS_HELP_STRING([--with-Enthalpy = YES], [compile with Enthalpy capabilities (default is yes)]), + [ENTHALPY=$withval],[ENTHALPY=yes]) +AC_MSG_CHECKING(for Enthalpy capability compilation) + +HAVE_ENTHALPY=no +if test "x$ENTHALPY" = "xyes"; then + HAVE_ENTHALPY=yes + AC_DEFINE([_HAVE_ENTHALPY_],[1],[with Enthalpycapability]) +fi +AM_CONDITIONAL([ENTHALPY], [test x$HAVE_ENTHALPY = xyes]) +AC_MSG_RESULT($HAVE_ENTHALPY) +dnl }}} +dnl with-HydrologyShreve{{{ +AC_ARG_WITH([HydrologyShreve], + AS_HELP_STRING([--with-HydrologyShreve = YES], [compile with HydrologyShreve capabilities (default is yes)]), + [HYDROLOGYSHREVE=$withval],[HYDROLOGYSHREVE=yes]) +AC_MSG_CHECKING(for HydrologyShreve capability compilation) + +HAVE_HYDROLOGYSHREVE=no +if test "x$HYDROLOGYSHREVE" = "xyes"; then + HAVE_HYDROLOGYSHREVE=yes + AC_DEFINE([_HAVE_HYDROLOGYSHREVE_],[1],[with HydrologyShrevecapability]) +fi +AM_CONDITIONAL([HYDROLOGYSHREVE], [test x$HAVE_HYDROLOGYSHREVE = xyes]) +AC_MSG_RESULT($HAVE_HYDROLOGYSHREVE) +dnl }}} +dnl with-HydrologyDCInefficient{{{ +AC_ARG_WITH([HydrologyDCInefficient], + AS_HELP_STRING([--with-HydrologyDCInefficient = YES], [compile with HydrologyDCInefficient capabilities (default is yes)]), + [HYDROLOGYDCINEFFICIENT=$withval],[HYDROLOGYDCINEFFICIENT=yes]) +AC_MSG_CHECKING(for HydrologyDCInefficient capability compilation) + +HAVE_HYDROLOGYDCINEFFICIENT=no +if test "x$HYDROLOGYDCINEFFICIENT" = "xyes"; then + HAVE_HYDROLOGYDCINEFFICIENT=yes + AC_DEFINE([_HAVE_HYDROLOGYDCINEFFICIENT_],[1],[with HydrologyDCInefficientcapability]) +fi +AM_CONDITIONAL([HYDROLOGYDCINEFFICIENT], [test x$HAVE_HYDROLOGYDCINEFFICIENT = xyes]) +AC_MSG_RESULT($HAVE_HYDROLOGYDCINEFFICIENT) +dnl }}} +dnl with-HydrologyDCEfficient{{{ +AC_ARG_WITH([HydrologyDCEfficient], + AS_HELP_STRING([--with-HydrologyDCEfficient = YES], [compile with HydrologyDCEfficient capabilities (default is yes)]), + [HYDROLOGYDCEFFICIENT=$withval],[HYDROLOGYDCEFFICIENT=yes]) +AC_MSG_CHECKING(for HydrologyDCEfficient capability compilation) + +HAVE_HYDROLOGYDCEFFICIENT=no +if test "x$HYDROLOGYDCEFFICIENT" = "xyes"; then + HAVE_HYDROLOGYDCEFFICIENT=yes + AC_DEFINE([_HAVE_HYDROLOGYDCEFFICIENT_],[1],[with HydrologyDCEfficientcapability]) +fi +AM_CONDITIONAL([HYDROLOGYDCEFFICIENT], [test x$HAVE_HYDROLOGYDCEFFICIENT = xyes]) +AC_MSG_RESULT($HAVE_HYDROLOGYDCEFFICIENT) +dnl }}} +dnl with-Melting{{{ +AC_ARG_WITH([Melting], + AS_HELP_STRING([--with-Melting = YES], [compile with Melting capabilities (default is yes)]), + [MELTING=$withval],[MELTING=yes]) +AC_MSG_CHECKING(for Melting capability compilation) + +HAVE_MELTING=no +if test "x$MELTING" = "xyes"; then + HAVE_MELTING=yes + AC_DEFINE([_HAVE_MELTING_],[1],[with Meltingcapability]) +fi +AM_CONDITIONAL([MELTING], [test x$HAVE_MELTING = xyes]) +AC_MSG_RESULT($HAVE_MELTING) +dnl }}} +dnl with-Masstransport{{{ +AC_ARG_WITH([Masstransport], + AS_HELP_STRING([--with-Masstransport = YES], [compile with Masstransport capabilities (default is yes)]), + [MASSTRANSPORT=$withval],[MASSTRANSPORT=yes]) +AC_MSG_CHECKING(for Masstransport capability compilation) + +HAVE_MASSTRANSPORT=no +if test "x$MASSTRANSPORT" = "xyes"; then + HAVE_MASSTRANSPORT=yes + AC_DEFINE([_HAVE_MASSTRANSPORT_],[1],[with Masstransportcapability]) +fi +AM_CONDITIONAL([MASSTRANSPORT], [test x$HAVE_MASSTRANSPORT = xyes]) +AC_MSG_RESULT($HAVE_MASSTRANSPORT) +dnl }}} +dnl with-FreeSurfaceBase{{{ +AC_ARG_WITH([FreeSurfaceBase], + AS_HELP_STRING([--with-FreeSurfaceBase = YES], [compile with FreeSurfaceBase capabilities (default is yes)]), + [FREESURFACEBASE=$withval],[FREESURFACEBASE=yes]) +AC_MSG_CHECKING(for FreeSurfaceBase capability compilation) + +HAVE_FREESURFACEBASE=no +if test "x$FREESURFACEBASE" = "xyes"; then + HAVE_FREESURFACEBASE=yes + AC_DEFINE([_HAVE_FREESURFACEBASE_],[1],[with FreeSurfaceBasecapability]) +fi +AM_CONDITIONAL([FREESURFACEBASE], [test x$HAVE_FREESURFACEBASE = xyes]) +AC_MSG_RESULT($HAVE_FREESURFACEBASE) +dnl }}} +dnl with-FreeSurfaceTop{{{ +AC_ARG_WITH([FreeSurfaceTop], + AS_HELP_STRING([--with-FreeSurfaceTop = YES], [compile with FreeSurfaceTop capabilities (default is yes)]), + [FREESURFACETOP=$withval],[FREESURFACETOP=yes]) +AC_MSG_CHECKING(for FreeSurfaceTop capability compilation) + +HAVE_FREESURFACETOP=no +if test "x$FREESURFACETOP" = "xyes"; then + HAVE_FREESURFACETOP=yes + AC_DEFINE([_HAVE_FREESURFACETOP_],[1],[with FreeSurfaceTopcapability]) +fi +AM_CONDITIONAL([FREESURFACETOP], [test x$HAVE_FREESURFACETOP = xyes]) +AC_MSG_RESULT($HAVE_FREESURFACETOP) +dnl }}} +dnl with-ExtrudeFromBase{{{ +AC_ARG_WITH([ExtrudeFromBase], + AS_HELP_STRING([--with-ExtrudeFromBase = YES], [compile with ExtrudeFromBase capabilities (default is yes)]), + [EXTRUDEFROMBASE=$withval],[EXTRUDEFROMBASE=yes]) +AC_MSG_CHECKING(for ExtrudeFromBase capability compilation) + +HAVE_EXTRUDEFROMBASE=no +if test "x$EXTRUDEFROMBASE" = "xyes"; then + HAVE_EXTRUDEFROMBASE=yes + AC_DEFINE([_HAVE_EXTRUDEFROMBASE_],[1],[with ExtrudeFromBasecapability]) +fi +AM_CONDITIONAL([EXTRUDEFROMBASE], [test x$HAVE_EXTRUDEFROMBASE = xyes]) +AC_MSG_RESULT($HAVE_EXTRUDEFROMBASE) +dnl }}} +dnl with-ExtrudeFromTop{{{ +AC_ARG_WITH([ExtrudeFromTop], + AS_HELP_STRING([--with-ExtrudeFromTop = YES], [compile with ExtrudeFromTop capabilities (default is yes)]), + [EXTRUDEFROMTOP=$withval],[EXTRUDEFROMTOP=yes]) +AC_MSG_CHECKING(for ExtrudeFromTop capability compilation) + +HAVE_EXTRUDEFROMTOP=no +if test "x$EXTRUDEFROMTOP" = "xyes"; then + HAVE_EXTRUDEFROMTOP=yes + AC_DEFINE([_HAVE_EXTRUDEFROMTOP_],[1],[with ExtrudeFromTopcapability]) +fi +AM_CONDITIONAL([EXTRUDEFROMTOP], [test x$HAVE_EXTRUDEFROMTOP = xyes]) +AC_MSG_RESULT($HAVE_EXTRUDEFROMTOP) +dnl }}} +dnl with-DepthAverage{{{ +AC_ARG_WITH([DepthAverage], + AS_HELP_STRING([--with-DepthAverage = YES], [compile with DepthAverage capabilities (default is yes)]), + [DEPTHAVERAGE=$withval],[DEPTHAVERAGE=yes]) +AC_MSG_CHECKING(for DepthAverage capability compilation) + +HAVE_DEPTHAVERAGE=no +if test "x$DEPTHAVERAGE" = "xyes"; then + HAVE_DEPTHAVERAGE=yes + AC_DEFINE([_HAVE_DEPTHAVERAGE_],[1],[with DepthAveragecapability]) +fi +AM_CONDITIONAL([DEPTHAVERAGE], [test x$HAVE_DEPTHAVERAGE = xyes]) +AC_MSG_RESULT($HAVE_DEPTHAVERAGE) +dnl }}} +dnl with-SmoothedSurfaceSlopeX{{{ +AC_ARG_WITH([SmoothedSurfaceSlopeX], + AS_HELP_STRING([--with-SmoothedSurfaceSlopeX = YES], [compile with SmoothedSurfaceSlopeX capabilities (default is yes)]), + [SMOOTHEDSURFACESLOPEX=$withval],[SMOOTHEDSURFACESLOPEX=yes]) +AC_MSG_CHECKING(for SmoothedSurfaceSlopeX capability compilation) + +HAVE_SMOOTHEDSURFACESLOPEX=no +if test "x$SMOOTHEDSURFACESLOPEX" = "xyes"; then + HAVE_SMOOTHEDSURFACESLOPEX=yes + AC_DEFINE([_HAVE_SMOOTHEDSURFACESLOPEX_],[1],[with SmoothedSurfaceSlopeXcapability]) +fi +AM_CONDITIONAL([SMOOTHEDSURFACESLOPEX], [test x$HAVE_SMOOTHEDSURFACESLOPEX = xyes]) +AC_MSG_RESULT($HAVE_SMOOTHEDSURFACESLOPEX) +dnl }}} +dnl with-SmoothedSurfaceSlopeY{{{ +AC_ARG_WITH([SmoothedSurfaceSlopeY], + AS_HELP_STRING([--with-SmoothedSurfaceSlopeY = YES], [compile with SmoothedSurfaceSlopeY capabilities (default is yes)]), + [SMOOTHEDSURFACESLOPEY=$withval],[SMOOTHEDSURFACESLOPEY=yes]) +AC_MSG_CHECKING(for SmoothedSurfaceSlopeY capability compilation) + +HAVE_SMOOTHEDSURFACESLOPEY=no +if test "x$SMOOTHEDSURFACESLOPEY" = "xyes"; then + HAVE_SMOOTHEDSURFACESLOPEY=yes + AC_DEFINE([_HAVE_SMOOTHEDSURFACESLOPEY_],[1],[with SmoothedSurfaceSlopeYcapability]) +fi +AM_CONDITIONAL([SMOOTHEDSURFACESLOPEY], [test x$HAVE_SMOOTHEDSURFACESLOPEY = xyes]) +AC_MSG_RESULT($HAVE_SMOOTHEDSURFACESLOPEY) +dnl }}} +dnl with-Thermal{{{ +AC_ARG_WITH([Thermal], + AS_HELP_STRING([--with-Thermal = YES], [compile with Thermal capabilities (default is yes)]), + [THERMAL=$withval],[THERMAL=yes]) +AC_MSG_CHECKING(for Thermal capability compilation) + +HAVE_THERMAL=no +if test "x$THERMAL" = "xyes"; then + HAVE_THERMAL=yes + AC_DEFINE([_HAVE_THERMAL_],[1],[with Thermalcapability]) +fi +AM_CONDITIONAL([THERMAL], [test x$HAVE_THERMAL = xyes]) +AC_MSG_RESULT($HAVE_THERMAL) +dnl }}} +dnl with-Gia{{{ +AC_ARG_WITH([Gia], + AS_HELP_STRING([--with-Gia = YES], [compile with Gia capabilities (default is yes)]), + [GIA=$withval],[GIA=yes]) +AC_MSG_CHECKING(for Gia capability compilation) + +HAVE_GIA=no +if test "x$GIA" = "xyes"; then + HAVE_GIA=yes + AC_DEFINE([_HAVE_GIA_],[1],[with Giacapability]) +fi +AM_CONDITIONAL([GIA], [test x$HAVE_GIA = xyes]) +AC_MSG_RESULT($HAVE_GIA) +dnl }}} +dnl with-Meshdeformation{{{ +AC_ARG_WITH([Meshdeformation], + AS_HELP_STRING([--with-Meshdeformation = YES], [compile with Meshdeformation capabilities (default is yes)]), + [MESHDEFORMATION=$withval],[MESHDEFORMATION=yes]) +AC_MSG_CHECKING(for Meshdeformation capability compilation) + +HAVE_MESHDEFORMATION=no +if test "x$MESHDEFORMATION" = "xyes"; then + HAVE_MESHDEFORMATION=yes + AC_DEFINE([_HAVE_MESHDEFORMATION_],[1],[with Meshdeformationcapability]) +fi +AM_CONDITIONAL([MESHDEFORMATION], [test x$HAVE_MESHDEFORMATION = xyes]) +AC_MSG_RESULT($HAVE_MESHDEFORMATION) +dnl }}} +dnl with-Levelset{{{ +AC_ARG_WITH([Levelset], + AS_HELP_STRING([--with-Levelset = YES], [compile with Levelset capabilities (default is yes)]), + [LEVELSET=$withval],[LEVELSET=yes]) +AC_MSG_CHECKING(for Levelset capability compilation) + +HAVE_LEVELSET=no +if test "x$LEVELSET" = "xyes"; then + HAVE_LEVELSET=yes + AC_DEFINE([_HAVE_LEVELSET_],[1],[with Levelsetcapability]) +fi +AM_CONDITIONAL([LEVELSET], [test x$HAVE_LEVELSET = xyes]) +AC_MSG_RESULT($HAVE_LEVELSET) +dnl }}} +dnl with-Extrapolation{{{ +AC_ARG_WITH([Extrapolation], + AS_HELP_STRING([--with-Extrapolation = YES], [compile with Extrapolation capabilities (default is yes)]), + [EXTRAPOLATION=$withval],[EXTRAPOLATION=yes]) +AC_MSG_CHECKING(for Extrapolation capability compilation) + +HAVE_EXTRAPOLATION=no +if test "x$EXTRAPOLATION" = "xyes"; then + HAVE_EXTRAPOLATION=yes + AC_DEFINE([_HAVE_EXTRAPOLATION_],[1],[with Extrapolationcapability]) +fi +AM_CONDITIONAL([EXTRAPOLATION], [test x$HAVE_EXTRAPOLATION = xyes]) +AC_MSG_RESULT($HAVE_EXTRAPOLATION) +dnl }}} +dnl with-LsfReinitialization{{{ +AC_ARG_WITH([LsfReinitialization], + AS_HELP_STRING([--with-LsfReinitialization = YES], [compile with LsfReinitialization capabilities (default is yes)]), + [LSFREINITIALIZATION=$withval],[LSFREINITIALIZATION=yes]) +AC_MSG_CHECKING(for LsfReinitialization capability compilation) + +HAVE_LSFREINITIALIZATION=no +if test "x$LSFREINITIALIZATION" = "xyes"; then + HAVE_LSFREINITIALIZATION=yes + AC_DEFINE([_HAVE_LSFREINITIALIZATION_],[1],[with LsfReinitializationcapability]) +fi +AM_CONDITIONAL([LSFREINITIALIZATION], [test x$HAVE_LSFREINITIALIZATION = xyes]) +AC_MSG_RESULT($HAVE_LSFREINITIALIZATION) +dnl }}} + +]) Index: sm/trunk/m4/issm_options.cmake =================================================================== --- /issm/trunk/m4/issm_options.cmake (revision 17805) +++ (revision ) @@ -1,37 +1,0 @@ -# ISSM Options {{{ -option(DAKOTA "DAKOTA" OFF) -option(PETSC "PETSC" OFF) -option(MUMPS "MUMPS" OFF) -#option(GSL "GSL" OFF) -option(TRANSIENT "TRANSIENT" ON) -option(STEADYSTATE "STEADYSTATE" ON) -option(PROGNOSTIC "PROGNOSTIC" ON) -option(THERMAL "THERMAL" ON) -option(GIA "GIA" OFF) -option(CONTROL "CONTROL" ON) -option(HYDROLOGY "HYDROLOGY" ON) -option(DIAGNOSTIC "DIAGNOSTIC" ON) -option(BALANCED "BALANCED" ON) -option(SLOPE "SLOPE" ON) -option(GROUNDINGLINE "GROUNDINGLINE" ON) -option(RIFTS "RIFTS" ON) -option(ANDROID "ANDROID" OFF) -option(THREED "THREED" ON) -option(MPI "MPI" OFF) -option(METIS "METIS" OFF) -option(KRIGING "KRIGING" OFF) -# }}} - -if(NOT GSL_DIR) - message(FATAL_ERROR "Non GSL build not supported") -else(NOT GSL_DIR) - find_path(GSL lib ${GSL_DIR}) - - if(GSL) - message("Found GSL: ${GSL_DIR}") - set(GSL_INC_DIR ${GSL_DIR}/include) - set(GSL_LIB_DIR ${GSL_DIR}/lib) - else(GSL) - message(FATAL_ERROR "GSL installation directory not found!") - endif(GSL) -endif(NOT GSL_DIR) Index: /issm/trunk/m4/issm_options.m4 =================================================================== --- /issm/trunk/m4/issm_options.m4 (revision 17805) +++ /issm/trunk/m4/issm_options.m4 (revision 17806) @@ -15,5 +15,5 @@ PACKAGE_DATE=`date` else - PACKAGE_DATE="unknown date" + PACKAGE_DATE="unknown" fi AC_DEFINE_UNQUOTED(PACKAGE_BUILD_DATE,"$PACKAGE_DATE", Build date) @@ -39,4 +39,7 @@ AC_MSG_CHECKING(for development support) + if test "x$enable_development" = xyes; then + AC_DEFINE([_DEVELOPMENT_],[1],[Macro to enable development version in ISSM]) + fi AM_CONDITIONAL([DEVELOPMENT], [test x$enable_development = xyes]) AC_MSG_RESULT($enable_development) @@ -118,9 +121,14 @@ export CXXFLAGS=" -O3 -D_INTEL_LINUX_ " export CFLAGS=" -O3 -D_INTEL_LINUX_ " + elif test $VENDOR = intel-acenet; then + export CC=icc + export CXX=icpc + export CXXFLAGS=" -D_INTEL_LINUX_ " + export CFLAGS=" -D_INTEL_LINUX_ " elif test $VENDOR = intel-pleiades-gcc; then export CC=gcc export CXX=g++ - export CXXFLAGS=" -g -O2 " - export CFLAGS=" -g -O2 " + export CXXFLAGS="-O3 -march=corei7-avx" + export CFLAGS="-O3 -march=corei7-avx" else AC_MSG_ERROR([unknown compiler vendor!]) @@ -173,9 +181,13 @@ ;; *) - MEXLINK=$(mex -v 2>&1 < /dev/null | grep LDFLAGS | sed -e "s/ LDFLAGS = //g") - MEXLIB=$( mex -v 2>&1 < /dev/null | grep CXXLIBS | sed -e "s/ CXXLIBS = //g") - MEXEXT=$( mex -v 2>&1 < /dev/null | grep LDEXTENSION | sed -e "s/ LDEXTENSION = //g") + MEXLINK=$($MATLAB_ROOT/bin/mex -v 2>&1 < /dev/null | grep LDFLAGS | sed -e "s/ LDFLAGS = //g") + MEXLIB=$( $MATLAB_ROOT/bin/mex -v 2>&1 < /dev/null | grep CXXLIBS | sed -e "s/ CXXLIBS = //g") + MEXEXT=$( $MATLAB_ROOT/bin/mex -v 2>&1 < /dev/null | grep LDEXTENSION | sed -e "s/ LDEXTENSION = //g") ;; esac + if test "x$MEXEXT" = "x" ; then + AC_MSG_ERROR([Couldn't find mex... check your installation of matlab]) + fi + AC_SUBST([MATLABINCL]) AC_SUBST([MEX]) @@ -1071,4 +1083,6 @@ if test x$VENDOR = xintel-pleiades; then MKLLIB=-L"$MKL_ROOT -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread" + elif test x$VENDOR = xintel-acenet; then + MKLLIB=-L"$MKL_ROOT -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm" else MKLLIB=-L"$MKL_ROOT -lmkl -lmkl_lapack -lmkl_scalapack_ilp64 -lmkl_blacs_sgimpt_ilp64 -lguide -lpthread" @@ -1549,9 +1563,8 @@ AC_MSG_CHECKING(for kml capability compilation) + HAVE_KML=no if test "x$KML" = "xyes"; then HAVE_KML=yes AC_DEFINE([_HAVE_KML_],[1],[with kml capability]) - else - HAVE_KML=no fi AM_CONDITIONAL([KML], [test x$HAVE_KML = xyes]) @@ -1564,288 +1577,33 @@ AC_MSG_CHECKING(for kriging capability compilation) + HAVE_KRIGING=no if test "x$KRIGING" = "xyes"; then HAVE_KRIGING=yes AC_DEFINE([_HAVE_KRIGING_],[1],[with kriging capability]) - else - HAVE_KRIGING=no fi AM_CONDITIONAL([KRIGING], [test x$HAVE_KRIGING = xyes]) AC_MSG_RESULT($HAVE_KRIGING) dnl }}} - dnl with-steadystate{{{ - AC_ARG_WITH([steadystate], - AS_HELP_STRING([--with-steadystate = YES],[compile with steadystate capabilities (default is yes)]), - [STEADYSTATE=$withval],[STEADYSTATE=yes]) - AC_MSG_CHECKING(for steadystate capability compilation) - - if test "x$STEADYSTATE" = "xyes"; then - - dnl defaults - HAVE_STEADYSTATE=yes - - AC_DEFINE([_HAVE_STEADYSTATE_],[1],[with steadystate capability]) - else - HAVE_STEADYSTATE=no - fi - AM_CONDITIONAL([STEADYSTATE], [test x$HAVE_STEADYSTATE = xyes]) - AC_MSG_RESULT($HAVE_STEADYSTATE) - dnl }}} - dnl with-transient{{{ - AC_ARG_WITH([transient], - AS_HELP_STRING([--with-transient = YES], [compile with transient capabilities (default is yes)]), - [TRANSIENT=$withval],[TRANSIENT=yes]) - AC_MSG_CHECKING(for transient capability compilation) - - if test "x$TRANSIENT" = "xyes"; then - - dnl defaults - HAVE_TRANSIENT=yes - - AC_DEFINE([_HAVE_TRANSIENT_],[1],[with transient capability]) - else - HAVE_TRANSIENT=no - fi - AM_CONDITIONAL([TRANSIENT], [test x$HAVE_TRANSIENT = xyes]) - AC_MSG_RESULT($HAVE_TRANSIENT) - dnl }}} - dnl with-thermal{{{ - AC_ARG_WITH([thermal], - AS_HELP_STRING([--with-thermal = YES], [compile with thermal capabilities (default is yes)]), - [THERMAL=$withval],[THERMAL=yes]) - AC_MSG_CHECKING(for thermal capability compilation) - - if test "x$THERMAL" = "xyes"; then - - dnl defaults - HAVE_THERMAL=yes - - AC_DEFINE([_HAVE_THERMAL_],[1],[with thermal capability]) - else - HAVE_THERMAL=no - fi - AM_CONDITIONAL([THERMAL], [test x$HAVE_THERMAL = xyes]) - AC_MSG_RESULT($HAVE_THERMAL) - dnl }}} - dnl with-masstransport{{{ - AC_ARG_WITH([masstransport], - AS_HELP_STRING([--with-masstransport = YES], [compile with masstransport capabilities (default is yes)]), - [MASSTRANSPORT=$withval],[MASSTRANSPORT=yes]) - AC_MSG_CHECKING(for masstransport capability compilation) - - if test "x$MASSTRANSPORT" = "xyes"; then - - dnl defaults - HAVE_MASSTRANSPORT=yes - - AC_DEFINE([_HAVE_MASSTRANSPORT_],[1],[with masstransport capability]) - else - HAVE_MASSTRANSPORT=no - fi - AM_CONDITIONAL([MASSTRANSPORT], [test x$HAVE_MASSTRANSPORT = xyes]) - AC_MSG_RESULT($HAVE_MASSTRANSPORT) - dnl }}} - dnl with-control{{{ - AC_ARG_WITH([control], - AS_HELP_STRING([--with-control = YES], [compile with control capabilities (default is yes)]), - [CONTROL=$withval],[CONTROL=yes]) - AC_MSG_CHECKING(for control capability compilation) - - if test "x$CONTROL" = "xyes"; then - - dnl defaults - HAVE_CONTROL=yes - - AC_DEFINE([_HAVE_CONTROL_],[1],[with control capability]) - else - HAVE_CONTROL=no - fi - AM_CONDITIONAL([CONTROL], [test x$HAVE_CONTROL = xyes]) - AC_MSG_RESULT($HAVE_CONTROL) - dnl }}} - dnl with-hydrology{{{ - AC_ARG_WITH([hydrology], - AS_HELP_STRING([--with-hydrology = YES], [compile with hydrology capabilities (default is yes)]), - [HYDROLOGY=$withval],[HYDROLOGY=yes]) - AC_MSG_CHECKING(for hydrology capability compilation) - - if test "x$HYDROLOGY" = "xyes"; then - - dnl defaults - HAVE_HYDROLOGY=yes - - AC_DEFINE([_HAVE_HYDROLOGY_],[1],[with hydrology capability]) - else - HAVE_HYDROLOGY=no - fi - AM_CONDITIONAL([HYDROLOGY], [test x$HAVE_HYDROLOGY = xyes]) - AC_MSG_RESULT($HAVE_HYDROLOGY) - dnl }}} - dnl with-stressbalance{{{ - AC_ARG_WITH([stressbalance], - AS_HELP_STRING([--with-stressbalance = YES], [compile with stressbalance capabilities (default is yes)]), - [STRESSBALANCE=$withval],[STRESSBALANCE=yes]) - AC_MSG_CHECKING(for stressbalance capability compilation) - - if test "x$STRESSBALANCE" = "xyes"; then - - dnl defaults - HAVE_STRESSBALANCE=yes - - AC_DEFINE([_HAVE_STRESSBALANCE_],[1],[with stressbalance capability]) - else - HAVE_STRESSBALANCE=no - fi - AM_CONDITIONAL([STRESSBALANCE], [test x$HAVE_STRESSBALANCE = xyes]) - AC_MSG_RESULT($HAVE_STRESSBALANCE) - dnl }}} - dnl with-balanced{{{ - AC_ARG_WITH([balanced], - AS_HELP_STRING([--with-balanced = YES], [compile with balanced capabilities (default is yes)]), - [BALANCED=$withval],[BALANCED=yes]) - AC_MSG_CHECKING(for balanced capability compilation) - - if test "x$BALANCED" = "xyes"; then - - dnl defaults - HAVE_BALANCED=yes - - AC_DEFINE([_HAVE_BALANCED_],[1],[with balanced capability]) - else - HAVE_BALANCED=no - fi - AM_CONDITIONAL([BALANCED], [test x$HAVE_BALANCED = xyes]) - AC_MSG_RESULT($HAVE_BALANCED) - dnl }}} - dnl with-damage{{{ - AC_ARG_WITH([damage], - AS_HELP_STRING([--with-damage = YES], [compile with damage capabilities (default is yes)]), - [DAMAGE=$withval],[DAMAGE=yes]) - AC_MSG_CHECKING(for damage capability compilation) - - if test "x$DAMAGE" = "xyes"; then - - dnl defaults - HAVE_DAMAGE=yes - - AC_DEFINE([_HAVE_DAMAGE_],[1],[with damage capability]) - else - HAVE_DAMAGE=no - fi - AM_CONDITIONAL([DAMAGE], [test x$HAVE_DAMAGE = xyes]) - AC_MSG_RESULT($HAVE_DAMAGE) - dnl }}} - dnl with-responses{{{ - AC_ARG_WITH([responses], - AS_HELP_STRING([--with-responses = YES], [compile with responses capabilities (default is yes)]), - [RESPONSES=$withval],[RESPONSES=yes]) - AC_MSG_CHECKING(for responses capability compilation) - - if test "x$RESPONSES" = "xyes"; then - - dnl defaults - HAVE_RESPONSES=yes - - AC_DEFINE([_HAVE_RESPONSES_],[1],[with responses capability]) - else - HAVE_RESPONSES=no - fi - AM_CONDITIONAL([RESPONSES], [test x$HAVE_RESPONSES = xyes]) - AC_MSG_RESULT($HAVE_RESPONSES) - dnl }}} - dnl with-slope{{{ - AC_ARG_WITH([slope], - AS_HELP_STRING([--with-slope = YES], [compile with slope capabilities (default is yes)]), - [SLOPE=$withval],[SLOPE=yes]) - AC_MSG_CHECKING(for slope capability compilation) - - if test "x$SLOPE" = "xyes"; then - - dnl defaults - HAVE_SLOPE=yes - - AC_DEFINE([_HAVE_SLOPE_],[1],[with slope capability]) - else - HAVE_SLOPE=no - fi - AM_CONDITIONAL([SLOPE], [test x$HAVE_SLOPE = xyes]) - AC_MSG_RESULT($HAVE_SLOPE) - dnl }}} - dnl with-meshdeformation{{{ - AC_ARG_WITH([meshdeformation], - AS_HELP_STRING([--with-meshdeformation = YES], [compile with meshdeformation capabilities (default is yes)]), - [MESHDEFORMATION=$withval],[MESHDEFORMATION=yes]) - AC_MSG_CHECKING(for meshdeformation capability compilation) - - if test "x$MESHDEFORMATION" = "xyes"; then - - dnl defaults - HAVE_MESHDEFORMATION=yes - - AC_DEFINE([_HAVE_MESHDEFORMATION_],[1],[with meshdeformation capability]) - else - HAVE_MESHDEFORMATION=no - fi - AM_CONDITIONAL([MESHDEFORMATION], [test x$HAVE_MESHDEFORMATION = xyes]) - AC_MSG_RESULT($HAVE_MESHDEFORMATION) - dnl }}} - dnl with-groundingline{{{ - AC_ARG_WITH([groundingline], - AS_HELP_STRING([--with-groundingline = YES], [compile with groundingline capabilities (default is yes)]), - [GROUNDINGLINE=$withval],[GROUNDINGLINE=yes]) - AC_MSG_CHECKING(for groundingline capability compilation) - - if test "x$GROUNDINGLINE" = "xyes"; then - - dnl defaults - HAVE_GROUNDINGLINE=yes - - AC_DEFINE([_HAVE_GROUNDINGLINE_],[1],[with groundingline capability]) - else - HAVE_GROUNDINGLINE=no - fi - AM_CONDITIONAL([GROUNDINGLINE], [test x$HAVE_GROUNDINGLINE = xyes]) - AC_MSG_RESULT($HAVE_GROUNDINGLINE) - dnl }}} - dnl with-rifts{{{ - AC_ARG_WITH([rifts], - AS_HELP_STRING([--with-rifts = YES], [compile with rifts capabilities (default is yes)]), - [RIFTS=$withval],[RIFTS=yes]) - AC_MSG_CHECKING(for rifts capability compilation) - - if test "x$RIFTS" = "xyes"; then - - dnl defaults - HAVE_RIFTS=yes - - AC_DEFINE([_HAVE_RIFTS_],[1],[with rifts capability]) - else - HAVE_RIFTS=no - fi - AM_CONDITIONAL([RIFTS], [test x$HAVE_RIFTS = xyes]) - AC_MSG_RESULT($HAVE_RIFTS) - dnl }}} dnl with-gia{{{ - AC_ARG_WITH([gia], - AS_HELP_STRING([--with-gia = YES], [compile with gia capabilities (default is yes)]), + AC_ARG_WITH([gia], + AS_HELP_STRING([--with-gia = YES], [compile with gia capabilities (default is no)]), [GIA=$withval],[GIA=no]) - AC_MSG_CHECKING(for gia capability compilation) - - if test "x$GIA" = "xyes"; then - - if test "x$HAVE_MATH77" = "xno"; then - HAVE_GIA=no - AC_MSG_ERROR([gia requires compilation of math77 library! Reconfigure with --with-math77 option on]); - else - dnl defaults - HAVE_GIA=yes - AC_DEFINE([_HAVE_GIA_],[1],[with gia capability]) - fi - - else + AC_MSG_CHECKING(for gia capability compilation) + HAVE_GIA=no - fi - AM_CONDITIONAL([GIA], [test x$HAVE_GIA = xyes]) - AC_MSG_RESULT($HAVE_GIA) - dnl }}} + if test "x$GIA" = "xyes"; then + if test "x$HAVE_MATH77" = "xno"; then + AC_MSG_ERROR([gia requires compilation of math77 library! Reconfigure with --with-math77 option on]); + else + HAVE_GIA=yes + AC_DEFINE([_HAVE_GIA_],[1],[with gia capability]) + fi + fi + AM_CONDITIONAL([GIA], [test x$HAVE_GIA = xyes]) + AC_MSG_RESULT($HAVE_GIA) + dnl }}} + AX_ANALYSES_SELECTION + + dnl Platform specifics dnl with-ios{{{ AC_ARG_WITH([ios], @@ -1911,22 +1669,4 @@ fi AC_MSG_RESULT($HAVE_ANDROID_NDK) - dnl }}} - dnl with-3d{{{ - AC_ARG_WITH([3d], - AS_HELP_STRING([--with-3d = YES], [compile with 3d capabilities (default is yes)]), - [THREED=$withval],[THREED=yes]) - AC_MSG_CHECKING(for 3d capability compilation) - - if test "x$THREED" = "xyes"; then - - dnl defaults - HAVE_3D=yes - - AC_DEFINE([_HAVE_3D_],[1],[with 3d capability]) - else - HAVE_3D=no - fi - AM_CONDITIONAL([THREED], [test x$HAVE_3D = xyes]) - AC_MSG_RESULT($HAVE_3D) dnl }}} @@ -1990,38 +1730,33 @@ dnl check that if petsc is requested , mpi should be specified if test "$HAVE_PETSC" = "yes" ; then - if test "$HAVE_MPI" = "NO"; then - AC_MSG_ERROR([petsc requires mpi!]); - fi + if test "$HAVE_MPI" = "NO"; then + AC_MSG_ERROR([petsc requires mpi!]); + fi fi dnl check that we have either python or matlab support if we compile the modules if test "$MODULES_VALUE" = "yes" && test "$HAVE_MATLAB" = "no" && test "$HAVE_PYTHON" = "no"; then - AC_MSG_ERROR([need at least python or matlab support to compile modules (or use --with-modules=no)]); - fi + AC_MSG_ERROR([need at least python or matlab support to compile modules (or use --with-modules=no)]); + fi dnl check that if we have MPI, we have metis if test "$HAVE_METIS" = "yes" && test "$HAVE_MPI" = "no" ; then - AC_MSG_ERROR([need mpi if using the metis partitioner!]); - fi + AC_MSG_ERROR([need mpi if using the metis partitioner!]); + fi dnl check that if we run adolc, we don't compile krigging.exe - if test "$HAVE_ADOLC" = "yes" && test "$HAVE_KRIGING" = "yes" ; then + if test "$HAVE_ADOLC" = "yes" && test "$HAVE_KRIGING" = "yes" ; then AC_MSG_ERROR([cannot compile kriging.exe under adolc conditions!]); fi dnl check that if we run meteoio, we have snowpack also - if test "$HAVE_METEOIO" = "yes" && test "$HAVE_SNOWPACK" = "no" ; then + if test "$HAVE_METEOIO" = "yes" && test "$HAVE_SNOWPACK" = "no" ; then AC_MSG_ERROR([cannot compile MeteoIO package without Snowpack!]); fi dnl check that if we run snowpack, we have meteoio also - if test "$HAVE_METEOIO" = "no" && test "$HAVE_SNOWPACK" = "yes" ; then + if test "$HAVE_METEOIO" = "no" && test "$HAVE_SNOWPACK" = "yes" ; then AC_MSG_ERROR([cannot compile Snowpack package without MeteoIO!]); fi - - - - - - AC_MSG_RESULT(done) - dnl }}} + AC_MSG_RESULT(done) + dnl }}} ]) Index: /issm/trunk/packagers/win7/package32.sh =================================================================== --- /issm/trunk/packagers/win7/package32.sh (revision 17805) +++ /issm/trunk/packagers/win7/package32.sh (revision 17806) @@ -16,5 +16,5 @@ END -ls $ISSM_DIR_WIN/scripts/*.bat startup.m $ISSM_DIR_WIN/bin/*.h | awk '{printf("AddFile APPDIR %s\n",$1);}' | sed 's/\//\\/g' >> ISSM.aic +ls $ISSM_DIR_WIN/scripts/*.bat startup.m | awk '{printf("AddFile APPDIR %s\n",$1);}' | sed 's/\//\\/g' >> ISSM.aic cat << END >> ISSM.aic @@ -33,5 +33,5 @@ #Run installer: -"C:/Program Files (x86)/Caphyon/Advanced Installer 10.1/bin/x86/AdvancedInstaller.com" /execute ./ISSM.aip ./ISSM.aic +"C:/Program Files (x86)/Caphyon/Advanced Installer 10.8/bin/x86/AdvancedInstaller.com" /execute ./ISSM.aip ./ISSM.aic #Get rid of temporary files: Index: /issm/trunk/packagers/win7/package64.sh =================================================================== --- /issm/trunk/packagers/win7/package64.sh (revision 17805) +++ /issm/trunk/packagers/win7/package64.sh (revision 17806) @@ -19,5 +19,5 @@ END -ls $ISSM_DIR_WIN/scripts/*.bat startup.m $ISSM_DIR_WIN/bin/*.h | awk '{printf("AddFile APPDIR %s\n",$1);}' | sed 's/\//\\/g' >> ISSM.aic +ls $ISSM_DIR_WIN/scripts/*.bat startup.m | awk '{printf("AddFile APPDIR %s\n",$1);}' | sed 's/\//\\/g' >> ISSM.aic cat << END >> ISSM.aic @@ -38,5 +38,5 @@ #Run installer: -"C:/Program Files (x86)/Caphyon/Advanced Installer 10.1/bin/x86/AdvancedInstaller.com" /execute ./ISSM.aip ./ISSM.aic +"C:/Program Files (x86)/Caphyon/Advanced Installer 10.8/bin/x86/AdvancedInstaller.com" /execute ./ISSM.aip ./ISSM.aic #Get rid of temporary files: @@ -44,5 +44,4 @@ rm -rf ISSM.aip ISSM-SetupFiles ISSM.aic -#Upload?: +#To upload to website: #scp ISSM.msi websites:/home/larour/files/ISSM64.msi -#cp ISSM.msi /cygrdive/z/Desktop/ISSM64.msi Index: /issm/trunk/packagers/win7/startup.m =================================================================== --- /issm/trunk/packagers/win7/startup.m (revision 17805) +++ /issm/trunk/packagers/win7/startup.m (revision 17806) @@ -25,4 +25,5 @@ addpath(pwd); %add current path first addpath([pwd '\bin']); +addpath([pwd '\lib']); %Check on any warning messages that might indicate that the paths were not correct. Index: /issm/trunk/scripts/vie =================================================================== --- /issm/trunk/scripts/vie (revision 17805) +++ /issm/trunk/scripts/vie (revision 17806) @@ -3,5 +3,5 @@ if [ -z "$EXECUTION_DIR" ]; then - EXECUTION_DIR=$ISSM_DIR/execution + EXECUTION_DIR="$ISSM_DIR/execution" fi Index: /issm/trunk/scripts/vil =================================================================== --- /issm/trunk/scripts/vil (revision 17805) +++ /issm/trunk/scripts/vil (revision 17806) @@ -2,5 +2,5 @@ if [ -z $EXECUTION_DIR ]; then - EXECUTION_DIR=$ISSM_DIR/execution + EXECUTION_DIR="$ISSM_DIR/execution" fi Index: sm/trunk/src/CMakeLists.txt =================================================================== --- /issm/trunk/src/CMakeLists.txt (revision 17805) +++ (revision ) @@ -1,8 +1,0 @@ -# Subdirectories {{{ -add_subdirectory(c) -#add_subdirectory(m) -#add_subdirectory(wrappers) -#Android Dir {{{ -# add_subdirectory(android) -#}}} -# }}} Index: sm/trunk/src/c/CMakeLists.txt =================================================================== --- /issm/trunk/src/c/CMakeLists.txt (revision 17805) +++ (revision ) @@ -1,728 +1,0 @@ -# config.h {{{ -set(CPP_FLAGS -DHAVE_CONFIG_H) -# }}} -# Include Directory {{{ -include_directories(AFTER $ENV{ISSM_DIR}/ - $ENV{ISSM_DIR}/src/c - $ENV{ISSM_DIR}/src/c/main - $ENV{ISSM_DIR}/src/c/datastructure - $ENV{ISSM_DIR}/src/c/classes - $ENV{ISSM_DIR}/src/c/classes/Options - $ENV{ISSM_DIR}/src/c/classes/ExternalResults - $ENV{ISSM_DIR}/src/c/classes/Elements - $ENV{ISSM_DIR}/src/c/classes/Inputs - $ENV{ISSM_DIR}/src/c/classes/Materials - $ENV{ISSM_DIR}/src/c/classes/Constraints - $ENV{ISSM_DIR}/src/c/classes/Loads - $ENV{ISSM_DIR}/src/c/classes/matrix - $ENV{ISSM_DIR}/src/c/classes/Params - $ENV{ISSM_DIR}/src/c/classes/Params - $ENV{ISSM_DIR}/src/c/shared - $ENV{ISSM_DIR}/src/c/shared/MemOps - $ENV{ISSM_DIR}/src/c/shared/Matrix - $ENV{ISSM_DIR}/src/c/shared/io - $ENV{ISSM_DIR}/src/c/shared/io/Disk - $ENV{ISSM_DIR}/src/c/shared/io/Print - $ENV{ISSM_DIR}/src/c/shared/io/Comm - $ENV{ISSM_DIR}/src/c/shared/LatLong - $ENV{ISSM_DIR}/src/c/shared/Enum - $ENV{ISSM_DIR}/src/c/shared/Numerics - $ENV{ISSM_DIR}/src/c/shared/Exceptions - $ENV{ISSM_DIR}/src/c/shared/Sorting - $ENV{ISSM_DIR}/src/c/shared/Elements - $ENV{ISSM_DIR}/src/c/shared/String - $ENV{ISSM_DIR}/src/c/toolkits - $ENV{ISSM_DIR}/src/c/toolkits/metis - $ENV{ISSM_DIR}/src/c/toolkits/issm - $ENV{ISSM_DIR}/src/c/toolkits/adolc - $ENV{ISSM_DIR}/src/c/toolkits/triangle - $ENV{ISSM_DIR}/src/c/toolkits/objects - $ENV{ISSM_DIR}/src/c/modules - $ENV{ISSM_DIR}/src/c/modules/ModelProcessorx - $ENV{ISSM_DIR}/src/c/modules/ParseToolkitsOptionsx - $ENV{ISSM_DIR}/src/c/modules/NodesDofx - $ENV{ISSM_DIR}/src/c/modules/NodalValuex - $ENV{ISSM_DIR}/src/c/modules/VerticesDofx - $ENV{ISSM_DIR}/src/c/modules/VertexCoordinatesx - $ENV{ISSM_DIR}/src/c/modules/OutputResultsx - $ENV{ISSM_DIR}/src/c/modules/InputDuplicatex - $ENV{ISSM_DIR}/src/c/modules/InputScalex - $ENV{ISSM_DIR}/src/c/modules/SurfaceAreax - $ENV{ISSM_DIR}/src/c/modules/CreateNodalConstraintsx - $ENV{ISSM_DIR}/src/c/modules/UpdateDynamicConstraintsx - $ENV{ISSM_DIR}/src/c/modules/IoModelToConstraintsx - $ENV{ISSM_DIR}/src/c/modules/InputUpdateFromConstantx - $ENV{ISSM_DIR}/src/c/modules/GetSolutionFromInputsx - $ENV{ISSM_DIR}/src/c/modules/GetVectorFromInputsx - $ENV{ISSM_DIR}/src/c/modules/InputUpdateFromVectorx - $ENV{ISSM_DIR}/src/c/modules/ConfigureObjectsx - $ENV{ISSM_DIR}/src/c/modules/ComputeBasalStressx - $ENV{ISSM_DIR}/src/c/modules/ComputeStrainRatex - $ENV{ISSM_DIR}/src/c/modules/SpcNodesx - $ENV{ISSM_DIR}/src/c/modules/PositiveDegreeDayx - $ENV{ISSM_DIR}/src/c/modules/Delta18oParameterizationx - $ENV{ISSM_DIR}/src/c/modules/SmbGradientsx - $ENV{ISSM_DIR}/src/c/modules/MeshPartitionx - $ENV{ISSM_DIR}/src/c/modules/Reducevectorgtofx - $ENV{ISSM_DIR}/src/c/modules/Reduceloadx - $ENV{ISSM_DIR}/src/c/modules/ConstraintsStatex - $ENV{ISSM_DIR}/src/c/modules/ResetConstraintsx - $ENV{ISSM_DIR}/src/c/modules/ResetCoordinateSystemx - $ENV{ISSM_DIR}/src/c/modules/Solverx - $ENV{ISSM_DIR}/src/c/modules/VecMergex - $ENV{ISSM_DIR}/src/c/modules/Mergesolutionfromftogx - $ENV{ISSM_DIR}/src/c/cores - $ENV{ISSM_DIR}/src/c/solutionsequences - $ENV{ISSM_DIR}/src/c/solutionsequences) -# }}} - -# Core Sources {{{ -set(core_sources ./datastructures/DataSet.cpp - ./classes/gauss/GaussTria.cpp - ./classes/FemModel.cpp - ./classes/Loads/Friction.cpp - ./classes/Inputs/TransientInput.cpp - ./classes/Constraints/SpcTransient.cpp - ./classes/IndependentObject.cpp - ./classes/DependentObject.cpp - ./classes/DofIndexing.cpp - ./classes/IoModel.cpp - ./classes/Contours.cpp - ./classes/Nodes.cpp - ./classes/Vertices.cpp - ./classes/Node.cpp - ./classes/Vertex.cpp - ./classes/Hook.cpp - ./classes/ExternalResults/Results.cpp - ./classes/Elements/Elements.cpp - ./classes/Elements/ElementHook.cpp - ./classes/Elements/Tria.cpp - ./classes/Elements/TriaRef.cpp - ./classes/Inputs/Inputs.cpp - ./classes/Inputs/TriaInput.cpp - ./classes/Inputs/BoolInput.cpp - ./classes/Inputs/IntInput.cpp - ./classes/Inputs/DoubleInput.cpp - ./classes/Inputs/DatasetInput.cpp - ./classes/Materials/Materials.cpp - ./classes/Materials/Matice.cpp - ./classes/Materials/Matdamageice.cpp - ./classes/Materials/Matpar.cpp - ./classes/Constraints/Constraints.cpp - ./classes/Constraints/SpcStatic.cpp - ./classes/Constraints/SpcDynamic.cpp - ./classes/Loads/Loads.cpp - ./classes/Loads/Penpair.cpp - ./classes/Loads/Pengrid.cpp - ./classes/Loads/Icefront.cpp - ./classes/Loads/Numericalflux.cpp - ./classes/matrix/ElementMatrix.cpp - ./classes/matrix/ElementVector.cpp - ./classes/Params/Parameters.cpp - ./classes/Params/BoolParam.cpp - ./classes/Params/IntParam.cpp - ./classes/Params/IntVecParam.cpp - ./classes/Params/IntMatParam.cpp - ./classes/Params/DoubleParam.cpp - ./classes/Params/FileParam.cpp - ./classes/Params/StringArrayParam.cpp - ./classes/Params/DoubleMatParam.cpp - ./classes/Params/DoubleTransientMatParam.cpp - ./classes/Params/DoubleMatArrayParam.cpp - ./classes/Params/DoubleVecParam.cpp - ./classes/Params/StringParam.cpp - ./classes/Params/MatrixParam.cpp - ./classes/Params/VectorParam.cpp - ./classes/Params/TransientParam.cpp - ./classes/Params/DataSetParam.cpp - ./classes/Profiler.cpp - ./shared/Matrix/MatrixUtils.cpp - ./shared/io/Disk/pfopen.cpp - ./shared/io/Disk/pfclose.cpp - ./shared/io/Disk/WriteLockFile.cpp - ./shared/io/Print/PrintfFunction.cpp - ./shared/io/Comm/IssmComm.cpp - ./shared/LatLong/Ll2xyx.cpp - ./shared/LatLong/Xy2llx.cpp - ./shared/Enum/EnumToStringx.cpp - ./shared/Enum/StringToEnumx.cpp - ./shared/Numerics/Verbosity.cpp - ./shared/Numerics/GaussPoints.cpp - ./shared/Numerics/cross.cpp - ./shared/Numerics/isnan.cpp - ./shared/Numerics/cubic.cpp - ./shared/Numerics/extrema.cpp - ./shared/Numerics/XZvectorsToCoordinateSystem.cpp - ./shared/Exceptions/Exceptions.cpp - ./shared/Exceptions/exprintf.cpp - ./shared/Sorting/binary_search.cpp - ./shared/Elements/Paterson.cpp - ./shared/Elements/Arrhenius.cpp - ./shared/Elements/PrintArrays.cpp - ./shared/Elements/PddSurfaceMassBalance.cpp - ./shared/Elements/ComputeDelta18oTemperaturePrecipitation.cpp - ./shared/String/DescriptorIndex.cpp - ./toolkits/issm/IssmToolkitUtils.cpp - ./toolkits/issm/IssmSolver.cpp - ./toolkits/ToolkitOptions.cpp - ./modules/ModelProcessorx/ModelProcessorx.cpp - ./modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp - ./modules/ModelProcessorx/NodesPartitioning.cpp - ./modules/ModelProcessorx/EdgesPartitioning.cpp - ./modules/ModelProcessorx/SortDataSets.cpp - ./modules/ModelProcessorx/UpdateCounters.cpp - ./modules/ModelProcessorx/CreateDataSets.cpp - ./modules/ModelProcessorx/CreateParameters.cpp - ./modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp - ./modules/ModelProcessorx/CreateEdges.cpp - ./modules/ModelProcessorx/CreateElementToEdgeConnectivity.cpp - ./modules/ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp - ./modules/ModelProcessorx/CreateNumberNodeToElementConnectivity.cpp - ./modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp - ./modules/ModelProcessorx/CreateNodes.cpp - ./modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.cpp - ./modules/NodesDofx/NodesDofx.cpp - ./modules/NodalValuex/NodalValuex.cpp - ./modules/VerticesDofx/VerticesDofx.cpp - ./modules/VertexCoordinatesx/VertexCoordinatesx.cpp - ./modules/OutputResultsx/OutputResultsx.cpp - ./modules/InputDuplicatex/InputDuplicatex.cpp - ./modules/InputScalex/InputScalex.cpp - ./modules/SurfaceAreax/SurfaceAreax.cpp - ./modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp - ./modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp - ./modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp - ./modules/InputUpdateFromConstantx/InputUpdateFromConstantx.cpp - ./modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.cpp - ./modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp - ./modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp - ./modules/InputUpdateFromVectorx/InputUpdateFromVectorx.cpp - ./modules/ConfigureObjectsx/ConfigureObjectsx.cpp - ./modules/ComputeBasalStressx/ComputeBasalStressx.cpp - ./modules/ComputeStrainRatex/ComputeStrainRatex.cpp - ./modules/SpcNodesx/SpcNodesx.cpp - ./modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp - ./modules/Delta18oParameterizationx/Delta18oParameterizationx.cpp - ./modules/SmbGradientsx/SmbGradientsx.cpp - ./modules/Reducevectorgtofx/Reducevectorgtofx.cpp - ./modules/Reduceloadx/Reduceloadx.cpp - ./modules/ConstraintsStatex/ConstraintsStatex.cpp - ./modules/ResetConstraintsx/ResetConstraintsx.cpp - ./modules/ResetCoordinateSystemx/ResetCoordinateSystemx.cpp - ./modules/Solverx/Solverx.cpp - ./modules/VecMergex/VecMergex.cpp - ./modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp - ./cores/ProcessArguments.cpp - ./cores/ResetBoundaryConditions.cpp - ./cores/AnalysisConfiguration.cpp - ./cores/WrapperCorePointerFromSolutionEnum.cpp - ./cores/CorePointerFromSolutionEnum.cpp - ./cores/EnvironmentInit.cpp - ./cores/EnvironmentFinalize.cpp - ./cores/ad_core.cpp - ./solutionsequences/solutionsequence_linear.cpp - ./solutionsequences/solutionsequence_nonlinear.cpp - ./solutionsequences/solutionsequence_newton.cpp - ./solutionsequences/convergence.cpp - ./classes/Options/Options.cpp - ./classes/Options/OptionUtilities.cpp - ./classes/RiftStruct.cpp) -set(issm_sources ${core_sources}) -# }}} - -# DAKOTA sources {{{ -set(dakota_sources ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp - ./modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp - ./modules/InputUpdateFromMatrixDakotax/InputUpdateFromMatrixDakotax.cpp - ./modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp - ./modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp - ./cores/dakota_core.cpp - ./cores/DakotaSpawnCore.cpp) -#}}} -#Transient sources {{{ -set(transient_sources ./modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp - ./cores/transient_core.cpp) -#}}} -#Steadystate sources {{{ -set(steadystate_sources ./cores/steadystate_core.cpp) -#}}} -#Prognostic sources {{{ -set(prognostic_sources ./modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp - ./modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp - ./modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp - ./modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp - ./cores/prognostic_core.cpp) -#}}} -#Thermal sources {{{ -set(thermal_sources ./modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp - ./modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp - ./modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp - ./modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp - ./modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp - ./modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp - ./modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp - ./modules/ModelProcessorx/Enthalpy/CreateLoadsEnthalpy.cpp - ./modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp - ./modules/ModelProcessorx/Melting/CreateNodesMelting.cpp - ./modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp - ./modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp - ./modules/ConstraintsStatex/ThermalConstraintsState.cpp - ./modules/ConstraintsStatex/ThermalIsPresent.cpp - ./modules/ResetConstraintsx/ThermalConstraintsReset.cpp - ./cores/thermal_core.cpp - ./solutionsequences/solutionsequence_thermal_nonlinear.cpp) -#}}} -#Control sources {{{ -set(control_sources ./modules/ControlInputGetGradientx/ControlInputGetGradientx.cpp - ./modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp - ./modules/ControlInputScaleGradientx/ControlInputScaleGradientx.cpp - ./modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp - ./modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.cpp - ./modules/ModelProcessorx/Control/CreateParametersControl.cpp - ./modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp - ./modules/InputControlUpdatex/InputControlUpdatex.cpp - ./modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.cpp - ./modules/SurfaceRelVelMisfitx/SurfaceRelVelMisfitx.cpp - ./modules/SurfaceLogVelMisfitx/SurfaceLogVelMisfitx.cpp - ./modules/SurfaceLogVxVyMisfitx/SurfaceLogVxVyMisfitx.cpp - ./modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.cpp - ./modules/ThicknessAbsMisfitx/ThicknessAbsMisfitx.cpp - ./modules/Orthx/Orthx.cpp - ./modules/Gradjx/Gradjx.cpp - ./modules/DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.cpp - ./modules/ThicknessAlongGradientx/ThicknessAlongGradientx.cpp - ./modules/ThicknessAcrossGradientx/ThicknessAcrossGradientx.cpp - ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.cpp - ./classes/Inputs/ControlInput.cpp - ./shared/Numerics/BrentSearch.cpp - ./shared/Numerics/OptimalSearch.cpp - ./cores/control_core.cpp - ./cores/controltao_core.cpp - ./cores/objectivefunction.cpp - ./cores/gradient_core.cpp - ./cores/adjointdiagnostic_core.cpp - ./cores/adjointbalancethickness_core.cpp - ./cores/AdjointCorePointerFromSolutionEnum.cpp - ./solutionsequences/solutionsequence_adjoint_linear.cpp) -#}}} -#Hydrology sources {{{ -set(hydrology_sources ./modules/ModelProcessorx/HydrologyShreve/UpdateElementsHydrologyShreve.cpp - ./modules/ModelProcessorx/HydrologyShreve/CreateNodesHydrologyShreve.cpp - ./modules/ModelProcessorx/HydrologyShreve/CreateConstraintsHydrologyShreve.cpp - ./modules/ModelProcessorx/HydrologyShreve/CreateLoadsHydrologyShreve.cpp - ./modules/ModelProcessorx/HydrologyShreve/CreateParametersHydrologyShreve.cpp - ./modules/ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp - ./modules/ModelProcessorx/HydrologyDCInefficient/CreateNodesHydrologyDCInefficient.cpp - ./modules/ModelProcessorx/HydrologyDCInefficient/CreateConstraintsHydrologyDCInefficient.cpp - ./modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp - ./modules/ModelProcessorx/HydrologyDCInefficient/CreateParametersHydrologyDCInefficient.cpp - ./modules/ModelProcessorx/HydrologyDCEfficient/UpdateElementsHydrologyDCEfficient.cpp - ./modules/ModelProcessorx/HydrologyDCEfficient/CreateNodesHydrologyDCEfficient.cpp - ./modules/ModelProcessorx/HydrologyDCEfficient/CreateConstraintsHydrologyDCEfficient.cpp - ./modules/ModelProcessorx/HydrologyDCEfficient/CreateLoadsHydrologyDCEfficient.cpp - ./modules/ModelProcessorx/HydrologyDCEfficient/CreateParametersHydrologyDCEfficient.cpp - ./cores/hydrology_core.cpp - ./solutionsequences/solutionsequence_hydro_nonlinear.cpp) -#}}} -#Diagnostic sources {{{ -set(diagnostic_sources ./modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp - ./modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp - ./modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp - ./modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp - ./modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp - ./modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp - ./modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp - ./modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp - ./modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp - ./modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp - ./modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp - ./modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp - ./cores/diagnostic_core.cpp - ./solutionsequences/solutionsequence_stokescoupling_nonlinear.cpp) -#}}} -#Balanced sources {{{ -set(balanced_sources ./modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp - ./modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp - ./modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp - ./modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp - ./cores/balancethickness_core.cpp - ./cores/dummy_core.cpp) -#}}} -#Slope sources {{{ -set(slope_sources ./modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp - ./modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp - ./modules/ModelProcessorx/BedSlope/CreateConstraintsBedSlope.cpp - ./modules/ModelProcessorx/BedSlope/CreateLoadsBedSlope.cpp - ./modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp - ./modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp - ./modules/ModelProcessorx/SurfaceSlope/CreateConstraintsSurfaceSlope.cpp - ./modules/ModelProcessorx/SurfaceSlope/CreateLoadsSurfaceSlope.cpp - ./cores/surfaceslope_core.cpp - ./cores/bedslope_core.cpp) -#}}} -#Gia sources {{{ -set(gia_sources ./cores/gia_core.cpp - ./modules/ModelProcessorx/Gia/UpdateElementsGia.cpp - ./modules/ModelProcessorx/Gia/CreateNodesGia.cpp - ./modules/ModelProcessorx/Gia/CreateConstraintsGia.cpp - ./modules/ModelProcessorx/Gia/CreateLoadsGia.cpp - ./modules/GiaDeflectionCorex/GiaDeflectionCorex.cpp - ./modules/GiaDeflectionCorex/distme.f - ./modules/GiaDeflectionCorex/freed.f - ./modules/GiaDeflectionCorex/ojrule.f - ./modules/GiaDeflectionCorex/pwise.f - ./modules/GiaDeflectionCorex/qwise.f - ./modules/GiaDeflectionCorex/stot.f - ./modules/GiaDeflectionCorex/what0.f - ) -#}}} -#Groundingline sources {{{ -set(groundingline_sources ./modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp - ) -#}}} -#Rifts sources {{{ -set(rifts_sources ./classes/Loads/Riftfront.cpp - ./modules/ConstraintsStatex/RiftConstraintsState.cpp) -#}}} -#Android sources {{{ -set(android_sources ) -#}}} -#3D sources {{{ -set(threed_sources ./classes/gauss/GaussPenta.cpp - ./classes/Inputs/PentaInput.cpp - ./classes/Elements/Penta.cpp - ./classes/Elements/PentaRef.cpp) -#}}} -#Bamg sources {{{ -set(bamg_sources ./bamg/BamgGeom.cpp - ./bamg/BamgMesh.cpp - ./bamg/BamgOpts.cpp - ./bamg/CrackedEdge.cpp - ./bamg/Curve.cpp - ./bamg/Direction.cpp - ./bamg/Edge.cpp - ./bamg/GeomEdge.cpp - ./bamg/GeomSubDomain.cpp - ./bamg/GeomVertex.cpp - ./bamg/Geometry.cpp - ./bamg/ListofIntersectionTriangles.cpp - ./bamg/EigenMetric.cpp - ./bamg/Metric.cpp - ./bamg/BamgQuadtree.cpp - ./bamg/SetOfE4.cpp - ./bamg/SubDomain.cpp - ./bamg/AdjacentTriangle.cpp - ./bamg/Triangle.cpp - ./bamg/det.h - ./bamg/BamgVertex.cpp - ./bamg/VertexOnEdge.cpp - ./bamg/VertexOnGeom.cpp - ./bamg/VertexOnVertex.cpp - ./bamg/Mesh.cpp - ./shared/Bamg/Abs.h - ./shared/Bamg/BigPrimeNumber.cpp - ./shared/Bamg/BinaryRand.h - ./shared/Bamg/Exchange.h - ./shared/Bamg/extrema.h - ./shared/Bamg/HeapSort.h - ./shared/Bamg/OppositeAngle.h - ./modules/Bamgx/Bamgx.cpp - ./modules/BamgConvertMeshx/BamgConvertMeshx.cpp - ./modules/BamgTriangulatex/BamgTriangulatex.cpp - ) -#}}} -#Kriging sources {{{ -set(kriging_sources ./classes/kriging/Observations.cpp - ./classes/kriging/Variogram.h - ./classes/kriging/GaussianVariogram.cpp - ./classes/kriging/ExponentialVariogram.cpp - ./classes/kriging/SphericalVariogram.cpp - ./classes/kriging/PowerVariogram.cpp - ./classes/kriging/Quadtree.cpp - ./classes/kriging/Observation.cpp - ./modules/Krigingx/Krigingx.cpp - ./modules/Krigingx/Kriging -#For parallel kriging, only difference is ./modules/Krigingx/pKrigingx.cpp with no multithreading -set(pkriging_sources ./classes/kriging/Observations.cpp - ./classes/kriging/Variogram.h - ./classes/kriging/GaussianVariogram.cpp - ./classes/kriging/ExponentialVariogram.cpp - ./classes/kriging/SphericalVariogram.cpp - ./classes/kriging/PowerVariogram.cpp - ./classes/kriging/Quadtree.cpp - ./classes/kriging/Observation.cpp - ./modules/Krigingx/pKrigingx.cpp - ) -#}}} -#Kml sources {{{ -set(kml_sources ./modules/Exp2Kmlx/Exp2Kmlx.cpp - ./modules/Kml2Expx/Kml2Expx.cpp - ./modules/Shp2Expx/Shp2Expx.cpp - ./modules/Shp2Kmlx/Shp2Kmlx.cpp - ./modules/KMLFileReadx/KMLFileReadx.cpp - ./modules/KMLMeshWritex/KMLMeshWritex.cpp - ./modules/KMLOverlayx/KMLOverlayx.cpp - ./kml/KML_Attribute.cpp - ./kml/KML_Comment.cpp - ./kml/KML_ColorStyle.cpp - ./kml/KML_Container.cpp - ./kml/KML_Document.cpp - ./kml/KML_Feature.cpp - ./kml/KML_File.cpp - ./kml/KML_Folder.cpp - ./kml/KML_Geometry.cpp - ./kml/KML_GroundOverlay.cpp - ./kml/KML_Icon.cpp - ./kml/KML_LatLonBox.cpp - ./kml/KML_LinearRing.cpp - ./kml/KML_LineString.cpp - ./kml/KML_LineStyle.cpp - ./kml/KML_MultiGeometry.cpp - ./kml/KML_Object.cpp - ./kml/KML_Overlay.cpp - ./kml/KML_Point.cpp - ./kml/KML_Placemark.cpp - ./kml/KML_Polygon.cpp - ./kml/KML_PolyStyle.cpp - ./kml/KML_Style.cpp - ./kml/KML_StyleSelector.cpp - ./kml/KML_SubStyle.cpp - ./kml/KML_Unknown.cpp - ./kml/KMLFileReadUtils.cpp - ) -#}}} -#Petsc sources {{{ -petsc_sources= ./toolkits/petsc - ./toolkits/petsc/patches - ./toolkits/petsc/patches/VecToMPISerial.cpp - ./toolkits/petsc/patches/MatToSerial.cpp - ./toolkits/petsc/patches/VecMerge.cpp - ./toolkits/petsc/patches/NewVec.cpp - ./toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp - ./toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp - ./toolkits/petsc/patches/NewMat.cpp - ./toolkits/petsc/patches/VecFree.cpp - ./toolkits/petsc/patches/KSPFree.cpp - ./toolkits/petsc/patches/MatFree.cpp - ./toolkits/petsc/patches/MatMultPatch.cpp - ./toolkits/petsc/patches/ISSMToPetscMatrixType.cpp - ./toolkits/petsc/patches/ISSMToPetscInsertMode.cpp - ./toolkits/petsc/patches/ISSMToPetscNormMode.cpp - ./toolkits/petsc/objects/PetscMat.cpp - ./toolkits/petsc/objects/PetscVec.cpp - ./toolkits/petsc/objects/PetscSolver.cpp - ) -#}}} -#Mumps sources {{{ -set(mumps_sources ./toolkits/mumps - ./toolkits/mumps/MpiDenseMumpsSolve.cpp) -#}}} -#Gsl sources {{{ -set(gsl_sources ./toolkits/gsl/DenseGslSolve.cpp) -#}}} -#Mpi sources {{{ -set(mpi_sources ./toolkits/mpi/patches/DetermineLocalSize.cpp - ./toolkits/mpi/patches/DetermineGlobalSize.cpp - ./toolkits/mpi/patches/DetermineRowRankFromLocalSize.cpp - ./toolkits/mpi/patches/GetOwnershipBoundariesFromRange.cpp - ) -#}}} -#Metis sources {{{ -set(metis_sources ./toolkits/metis/patches/METIS_PartMeshNodalPatch.cpp) -#}}} - -# API Print {{{ -if(NOT PYTHON AND NOT MATLAB) - add_library(ISSMOverload STATIC ./shared/String/ApiPrintf.cpp) - list(APPEND issm_deps ISSMOverload) -else(NOT PYTHON AND NOT MATLAB) - message(FATAL_ERROR "Python and Matlab are not supported yet.") -endif(NOT PYTHON AND NOT MATLAB) -# }}} - -# Modules Sources {{{ -set(modules_sources ./shared/Threads/LaunchThread.cpp - ./shared/Threads/PartitionRange.cpp - ./shared/Exp/exp.cpp - ./shared/TriMesh/AssociateSegmentToElement.cpp - ./shared/TriMesh/GridInsideHole.cpp - ./shared/TriMesh/OrderSegments.cpp - ./shared/TriMesh/SplitMeshForRifts.cpp - ./shared/TriMesh/TriMeshUtils.cpp - ./modules/Chacox/Chacox.cpp - ./modules/Chacox/input_parse.cpp - ./modules/Chacox/chaco_seconds.cpp - ./modules/Chacox/user_params.cpp - ./modules/TriaSearchx/TriaSearchx.cpp - ./modules/TriMeshx/TriMeshx.cpp - ./modules/TriMeshProcessRiftsx/TriMeshProcessRiftsx.cpp - ./modules/PointCloudFindNeighborsx/PointCloudFindNeighborsx.cpp - ./modules/PointCloudFindNeighborsx/PointCloudFindNeighborsxt.cpp - ./modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp - ./modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp - ./modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp - ./modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp - ./modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp - ./modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp - ./modules/HoleFillerx/HoleFillerx.cpp - ./modules/EdgeDetectionx/EdgeDetectionx.cpp - ./modules/AverageFilterx/AverageFilterx.cpp - ./modules/MeshProfileIntersectionx/MeshProfileIntersectionx.cpp - ./modules/ContourToMeshx/ContourToMeshx.cpp - ./modules/ContourToMeshx/ContourToMeshxt.cpp - ./modules/ContourToNodesx/ContourToNodesx.cpp - ./modules/Reducevectorgtosx/Reducevectorgtosx.cpp - ./modules/NodeConnectivityx/NodeConnectivityx.cpp - ./modules/ElementConnectivityx/ElementConnectivityx.cpp - ./modules/Scotchx/Scotchx.cpp - ./modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.cpp) -# }}} - -#{{{ Conditional build-up of sources -#ISSM sources are a combination of core sources and sources related to specific capabilities. - -if(DAKOTA) -list(APPEND CPP_FLAGS '-D_HAVE_DAKOTA_') -list(APPEND issm_sources ${dakota_sources}) -endif(DAKOTA) - -if(PETSC) -list(APPEND CPP_FLAGS '-D_HAVE_PETSC_') -list(APPEND issm_sources ${petsc_sources}) -endif(PETSC) - -if(MUMPS) -list(APPEND CPP_FLAGS '-D_HAVE_MUMPS_') -list(APPEND issm_sources ${mumps_sources}) -endif(MUMPS) - -if(GSL) -list(APPEND CPP_FLAGS '-D_HAVE_GSL_') -list(APPEND issm_sources ${gsl_sources}) -list(APPEND issm_deps gsl gslcblas) -list(APPEND issm_lib_paths ${GSL_LIB_DIR}) -include_directories(AFTER ${GSL_INC_DIR}) -message("GSL_INC: ${GSL_INC_DIR}") -message("GSL_LIB: ${GSL_LIB_DIR}") -endif(GSL) - -if(TRANSIENT) -list(APPEND CPP_FLAGS '-D_HAVE_TRANSIENT_') -list(APPEND issm_sources ${transient_sources}) -endif(TRANSIENT) - -if(STEADYSTATE) -list(APPEND CPP_FLAGS '-D_HAVE_STEADYSTATE_') -list(APPEND issm_sources ${steadystate_sources}) -endif(STEADYSTATE) - -if(PROGNOSTIC) -list(APPEND CPP_FLAGS '-D_HAVE_PROGNOSTIC_') -list(APPEND issm_sources ${prognostic_sources}) -endif(PROGNOSTIC) - -if(THERMAL) -list(APPEND CPP_FLAGS '-D_HAVE_THERMAL_') -list(APPEND issm_sources ${thermal_sources}) -endif(THERMAL) - -if(GIA) -list(APPEND CPP_FLAGS '-D_HAVE_GIA_') -list(APPEND issm_sources ${gia_sources}) -endif(GIA) - -if(CONTROL) -list(APPEND CPP_FLAGS '-D_HAVE_CONTROL_') -list(APPEND issm_sources ${control_sources}) -endif(CONTROL) - -if(HYDROLOGY) -list(APPEND CPP_FLAGS '-D_HAVE_HYDROLOGY_') -list(APPEND issm_sources ${hydrology_sources}) -endif(HYDROLOGY) - -if(DIAGNOSTIC) -list(APPEND CPP_FLAGS '-D_HAVE_DIAGNOSTIC_') -list(APPEND issm_sources ${diagnostic_sources}) -endif(DIAGNOSTIC) - -if(BALANCED) -list(APPEND CPP_FLAGS '-D_HAVE_BALANCED_') -list(APPEND issm_sources ${balanced_sources}) -endif(BALANCED) - -if(SLOPE) -list(APPEND CPP_FLAGS '-D_HAVE_SLOPE_') -list(APPEND issm_sources ${slope_sources}) -endif(SLOPE) - -if(GROUNDINGLINE) -list(APPEND CPP_FLAGS '-D_HAVE_GROUNDINGLINE_') -list(APPEND issm_sources ${groundingline_sources}) -endif(GROUNDINGLINE) - -if(RIFTS) -list(APPEND CPP_FLAGS '-D_HAVE_RIFTS_') -list(APPEND issm_sources ${rifts_sources}) -endif(RIFTS) - -if(ANDROID) -list(APPEND CPP_FLAGS '-D_HAVE_ANDROID_') -list(APPEND issm_sources ${android_sources}) -endif(ANDROID) - -if(THREED) -list(APPEND CPP_FLAGS '-D_HAVE_THREED_') -list(APPEND issm_sources ${threed_sources}) -endif(THREED) - -if(MPI) -list(APPEND CPP_FLAGS '-D_HAVE_MPI_') -list(APPEND issm_sources ${mpi_sources}) -endif(MPI) - -if(METIS) -list(APPEND CPP_FLAGS '-D_HAVE_METIS_') -list(APPEND issm_sources ${metis_sources}) -endif(METIS) - -if(KRIGING) -list(APPEND CPP_FLAGS '-D_HAVE_KRIGING_') -list(APPEND issm_sources ${pkriging_sources}) -endif(KRIGING) -#}}} - -add_library(ISSMCore STATIC ${issm_sources}) -add_library(ISSMModules STATIC ${modules_sources}) - -list(INSERT issm_deps 0 ISSMCore ISSMModules) -add_executable(issm ./main/issm.cpp) - -# Definitions {{{ -add_definitions(${CPP_FLAGS}) -# }}} -# Compilation Flags {{{ -# }}} -# Linking Flags {{{ -link_directories($ENV{ISSM_DIR}/src/c ) -target_link_libraries(issm ${issm_deps}) -message("ISSM_DEPS: ${issm_deps}") -# }}} - -# Install Targets {{{ -# Install 'issm.exe' -install(TARGETS issm RUNTIME DESTINATION $ENV{ISSM_DIR}/bin) - -# Install 'libISSMCore.a' and 'libISSMOverload.a' -install(TARGETS ISSMCore - ISSMModules - ISSMOverload - ARCHIVE DESTINATION $ENV{ISSM_DIR}/lib) -# }}} -# Optional Install {{{ -#if(${SHARED_LIBS} IS ON) -# install(TARGETS ISSMCore -# ISSMOverload -# LIBRARY) -#endif(${SHARED_LIBS} IS ON) -# }}} Index: /issm/trunk/src/c/Makefile.am =================================================================== --- /issm/trunk/src/c/Makefile.am (revision 17805) +++ /issm/trunk/src/c/Makefile.am (revision 17806) @@ -18,17 +18,21 @@ #}}} -#sources +#Core sources #Core sources{{{ -core_sources = ./datastructures/DataSet.h\ +issm_sources = ./datastructures/DataSet.h\ ./datastructures/DataSet.cpp\ ./datastructures/Object.h\ ./datastructures/datastructures.h\ ./classes/classes.h\ + ./classes/gauss/Gauss.h\ ./classes/gauss/GaussSeg.h\ ./classes/gauss/GaussSeg.cpp\ ./classes/gauss/GaussTria.h\ ./classes/gauss/GaussTria.cpp\ + ./classes/gauss/GaussTetra.h\ + ./classes/gauss/GaussTetra.cpp\ + ./classes/gauss/GaussPenta.h\ + ./classes/gauss/GaussPenta.cpp\ ./classes/Update.h\ - ./classes/Element.h\ ./classes/FemModel.h\ ./classes/FemModel.cpp\ @@ -67,4 +71,6 @@ ./classes/ExternalResults/ExternalResult.h\ ./classes/ExternalResults/GenericExternalResult.h\ + ./classes/Elements/Element.h\ + ./classes/Elements/Element.cpp\ ./classes/Elements/Elements.h\ ./classes/Elements/Elements.cpp\ @@ -79,4 +85,12 @@ ./classes/Elements/TriaRef.h\ ./classes/Elements/TriaRef.cpp\ + ./classes/Elements/Tetra.h\ + ./classes/Elements/Tetra.cpp\ + ./classes/Elements/TetraRef.h\ + ./classes/Elements/TetraRef.cpp\ + ./classes/Elements/Penta.h\ + ./classes/Elements/Penta.cpp\ + ./classes/Elements/PentaRef.h\ + ./classes/Elements/PentaRef.cpp\ ./classes/Inputs/Inputs.h\ ./classes/Inputs/Inputs.cpp\ @@ -175,4 +189,6 @@ ./shared/LatLong/Ll2xyx.cpp\ ./shared/LatLong/Xy2llx.cpp\ + ./shared/FSanalyticals/fsanalyticals.h\ + ./shared/FSanalyticals/fsanalyticals.cpp\ ./shared/Enum/Enum.h\ ./shared/Enum/EnumDefinitions.h\ @@ -190,4 +206,5 @@ ./shared/Numerics/isnan.cpp\ ./shared/Numerics/cubic.cpp\ + ./shared/Numerics/NewtonSolveDnorm.cpp\ ./shared/Numerics/extrema.cpp\ ./shared/Numerics/XZvectorsToCoordinateSystem.cpp\ @@ -199,4 +216,5 @@ ./shared/Sorting/sorting.h\ ./shared/Elements/elements.h\ + ./shared/Elements/Cuffey.cpp\ ./shared/Elements/Paterson.cpp\ ./shared/Elements/Arrhenius.cpp\ @@ -284,4 +302,6 @@ ./modules/IoModelToConstraintsx/IoModelToConstraintsx.h\ ./modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp\ + ./modules/SetActiveNodesLSMx/SetActiveNodesLSMx.h\ + ./modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp\ ./modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h\ ./modules/InputUpdateFromConstantx/InputUpdateFromConstantx.cpp\ @@ -302,10 +322,6 @@ ./modules/SpcNodesx/SpcNodesx.h\ ./modules/SpcNodesx/SpcNodesx.cpp\ - ./modules/PositiveDegreeDayx/PositiveDegreeDayx.h\ - ./modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp\ - ./modules/Delta18oParameterizationx/Delta18oParameterizationx.h\ - ./modules/Delta18oParameterizationx/Delta18oParameterizationx.cpp\ - ./modules/SmbGradientsx/SmbGradientsx.h\ - ./modules/SmbGradientsx/SmbGradientsx.cpp\ + ./modules/SurfaceMassBalancex/SurfaceMassBalancex.h\ + ./modules/SurfaceMassBalancex/SurfaceMassBalancex.cpp\ ./modules/MeshPartitionx/MeshPartitionx.h\ ./modules/Reducevectorgtofx/Reducevectorgtofx.cpp\ @@ -318,6 +334,6 @@ ./modules/ResetConstraintsx/ResetConstraintsx.h\ ./modules/ResetConstraintsx/ResetConstraintsx.cpp\ - ./modules/ResetCoordinateSystemx/ResetCoordinateSystemx.h\ - ./modules/ResetCoordinateSystemx/ResetCoordinateSystemx.cpp\ + ./modules/ResetFSBasalBoundaryConditionx/ResetFSBasalBoundaryConditionx.h\ + ./modules/ResetFSBasalBoundaryConditionx/ResetFSBasalBoundaryConditionx.cpp\ ./modules/Solverx/Solverx.cpp\ ./modules/Solverx/Solverx.h\ @@ -340,4 +356,5 @@ ./solutionsequences/solutionsequence_nonlinear.cpp\ ./solutionsequences/solutionsequence_newton.cpp\ + ./solutionsequences/solutionsequence_la_theta.cpp\ ./solutionsequences/convergence.cpp\ ./classes/Options/Options.h\ @@ -348,8 +365,93 @@ ./classes/Options/OptionUtilities.h\ ./classes/RiftStruct.cpp\ - ./classes/RiftStruct.h -#}}} + ./classes/RiftStruct.h\ + ./modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp \ + ./cores/transient_core.cpp\ + ./cores/steadystate_core.cpp\ + ./cores/masstransport_core.cpp\ + ./cores/depthaverage_core.cpp\ + ./cores/extrudefrombase_core.cpp\ + ./cores/extrudefromtop_core.cpp\ + ./cores/thermal_core.cpp\ + ./solutionsequences/solutionsequence_thermal_nonlinear.cpp\ + ./modules/ControlInputGetGradientx/ControlInputGetGradientx.cpp\ + ./modules/ControlInputGetGradientx/ControlInputGetGradientx.h\ + ./modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp\ + ./modules/ControlInputSetGradientx/ControlInputSetGradientx.h\ + ./modules/ControlInputScaleGradientx/ControlInputScaleGradientx.cpp\ + ./modules/ControlInputScaleGradientx/ControlInputScaleGradientx.h\ + ./modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp\ + ./modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.h\ + ./modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.cpp\ + ./modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.h\ + ./modules/ModelProcessorx/Control/CreateParametersControl.cpp\ + ./modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp\ + ./modules/InputControlUpdatex/InputControlUpdatex.h\ + ./modules/InputControlUpdatex/InputControlUpdatex.cpp\ + ./modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.h\ + ./modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.cpp\ + ./modules/SurfaceRelVelMisfitx/SurfaceRelVelMisfitx.h\ + ./modules/SurfaceRelVelMisfitx/SurfaceRelVelMisfitx.cpp\ + ./modules/SurfaceLogVelMisfitx/SurfaceLogVelMisfitx.h\ + ./modules/SurfaceLogVelMisfitx/SurfaceLogVelMisfitx.cpp\ + ./modules/SurfaceLogVxVyMisfitx/SurfaceLogVxVyMisfitx.h\ + ./modules/SurfaceLogVxVyMisfitx/SurfaceLogVxVyMisfitx.cpp\ + ./modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.h\ + ./modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.cpp\ + ./modules/ThicknessAbsMisfitx/ThicknessAbsMisfitx.h\ + ./modules/ThicknessAbsMisfitx/ThicknessAbsMisfitx.cpp\ + ./modules/Orthx/Orthx.h\ + ./modules/Orthx/Orthx.cpp\ + ./modules/Gradjx/Gradjx.h\ + ./modules/Gradjx/Gradjx.cpp\ + ./modules/DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.cpp\ + ./modules/DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.h\ + ./modules/ThicknessAlongGradientx/ThicknessAlongGradientx.cpp\ + ./modules/ThicknessAlongGradientx/ThicknessAlongGradientx.h\ + ./modules/ThicknessAcrossGradientx/ThicknessAcrossGradientx.cpp\ + ./modules/ThicknessAcrossGradientx/ThicknessAcrossGradientx.h\ + ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.cpp\ + ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h\ + ./classes/Inputs/ControlInput.h\ + ./classes/Inputs/ControlInput.cpp\ + ./shared/Numerics/BrentSearch.cpp\ + ./shared/Numerics/OptimalSearch.cpp \ + ./cores/control_core.cpp\ + ./cores/controltao_core.cpp\ + ./cores/objectivefunction.cpp\ + ./cores/gradient_core.cpp\ + ./cores/adjointstressbalance_core.cpp\ + ./cores/adjointbalancethickness_core.cpp\ + ./cores/AdjointCorePointerFromSolutionEnum.cpp\ + ./solutionsequences/solutionsequence_adjoint_linear.cpp\ + ./cores/hydrology_core.cpp\ + ./solutionsequences/solutionsequence_hydro_nonlinear.cpp\ + ./cores/stressbalance_core.cpp\ + ./solutionsequences/solutionsequence_stokescoupling_nonlinear.cpp\ + ./cores/balancethickness_core.cpp \ + ./cores/balancevelocity_core.cpp \ + ./cores/dummy_core.cpp\ + ./cores/surfaceslope_core.cpp\ + ./cores/bedslope_core.cpp\ + ./cores/meshdeformation_core.cpp\ + ./cores/damage_core.cpp\ + ./cores/levelsetfunctionslope_core.cpp\ + ./analyses/DamageEvolutionAnalysis.cpp\ + ./modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp\ + ./classes/Loads/Riftfront.cpp\ + ./modules/ConstraintsStatex/RiftConstraintsState.cpp\ + ./classes/Massfluxatgate.h \ + ./classes/Misfit.h \ + ./modules/ModelProcessorx/CreateOutputDefinitions.cpp\ + ./modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.h\ + ./modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.cpp\ + ./classes/Inputs/PentaInput.h\ + ./classes/Inputs/PentaInput.cpp\ + ./classes/Inputs/TetraInput.h\ + ./classes/Inputs/TetraInput.cpp\ + #}}} #DAKOTA sources {{{ -dakota_sources = ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h\ +if DAKOTA +issm_sources += ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h\ ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp\ ./modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h\ @@ -364,371 +466,9 @@ ./cores/DakotaSpawnCore.h\ ./cores/DakotaSpawnCore.cpp -#}}} -#Transient sources {{{ -transient_sources = ./modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp \ - ./cores/transient_core.cpp -#}}} -#Steadystate sources {{{ -steadystate_sources = ./cores/steadystate_core.cpp -#}}} -#Masstransport sources {{{ -masstransport_sources = ./analyses/ExtrudeFromBaseAnalysis.h\ - ./analyses/ExtrudeFromBaseAnalysis.cpp\ - ./analyses/ExtrudeFromTopAnalysis.h\ - ./analyses/ExtrudeFromTopAnalysis.cpp\ - ./analyses/MasstransportAnalysis.h\ - ./analyses/MasstransportAnalysis.cpp\ - ./analyses/FreeSurfaceBaseAnalysis.h\ - ./analyses/FreeSurfaceBaseAnalysis.cpp\ - ./analyses/FreeSurfaceTopAnalysis.h\ - ./analyses/FreeSurfaceTopAnalysis.cpp\ - ./cores/masstransport_core.cpp\ - ./cores/extrudefrombase_core.cpp\ - ./cores/extrudefromtop_core.cpp - -#}}} -#Thermal sources {{{ -thermal_sources = ./modules/PostprocessingEnthalpyx/PostprocessingEnthalpyx.h\ - ./modules/PostprocessingEnthalpyx/PostprocessingEnthalpyx.cpp\ - ./analyses/ThermalAnalysis.h\ - ./analyses/ThermalAnalysis.cpp\ - ./analyses/EnthalpyAnalysis.h\ - ./analyses/EnthalpyAnalysis.cpp\ - ./analyses/MeltingAnalysis.h\ - ./analyses/MeltingAnalysis.cpp\ - ./cores/thermal_core.cpp\ - ./solutionsequences/solutionsequence_thermal_nonlinear.cpp -#}}} -#Control sources {{{ -control_sources= ./modules/ControlInputGetGradientx/ControlInputGetGradientx.cpp\ - ./modules/ControlInputGetGradientx/ControlInputGetGradientx.h\ - ./modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp\ - ./modules/ControlInputSetGradientx/ControlInputSetGradientx.h\ - ./modules/ControlInputScaleGradientx/ControlInputScaleGradientx.cpp\ - ./modules/ControlInputScaleGradientx/ControlInputScaleGradientx.h\ - ./modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp\ - ./modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.h\ - ./modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.cpp\ - ./modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.h\ - ./modules/ModelProcessorx/Control/CreateParametersControl.cpp\ - ./modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp\ - ./modules/InputControlUpdatex/InputControlUpdatex.h\ - ./modules/InputControlUpdatex/InputControlUpdatex.cpp\ - ./modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.h\ - ./modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.cpp\ - ./modules/SurfaceRelVelMisfitx/SurfaceRelVelMisfitx.h\ - ./modules/SurfaceRelVelMisfitx/SurfaceRelVelMisfitx.cpp\ - ./modules/SurfaceLogVelMisfitx/SurfaceLogVelMisfitx.h\ - ./modules/SurfaceLogVelMisfitx/SurfaceLogVelMisfitx.cpp\ - ./modules/SurfaceLogVxVyMisfitx/SurfaceLogVxVyMisfitx.h\ - ./modules/SurfaceLogVxVyMisfitx/SurfaceLogVxVyMisfitx.cpp\ - ./modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.h\ - ./modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.cpp\ - ./modules/ThicknessAbsMisfitx/ThicknessAbsMisfitx.h\ - ./modules/ThicknessAbsMisfitx/ThicknessAbsMisfitx.cpp\ - ./modules/Orthx/Orthx.h\ - ./modules/Orthx/Orthx.cpp\ - ./modules/Gradjx/Gradjx.h\ - ./modules/Gradjx/Gradjx.cpp\ - ./modules/DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.cpp\ - ./modules/DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.h\ - ./modules/ThicknessAlongGradientx/ThicknessAlongGradientx.cpp\ - ./modules/ThicknessAlongGradientx/ThicknessAlongGradientx.h\ - ./modules/ThicknessAcrossGradientx/ThicknessAcrossGradientx.cpp\ - ./modules/ThicknessAcrossGradientx/ThicknessAcrossGradientx.h\ - ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.cpp\ - ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h\ - ./classes/Inputs/ControlInput.h\ - ./classes/Inputs/ControlInput.cpp\ - ./shared/Numerics/BrentSearch.cpp\ - ./shared/Numerics/OptimalSearch.cpp \ - ./cores/control_core.cpp\ - ./cores/controltao_core.cpp\ - ./cores/objectivefunction.cpp\ - ./cores/gradient_core.cpp\ - ./cores/adjointstressbalance_core.cpp\ - ./cores/adjointbalancethickness_core.cpp\ - ./cores/AdjointCorePointerFromSolutionEnum.cpp\ - ./analyses/AdjointBalancethicknessAnalysis.h\ - ./analyses/AdjointBalancethicknessAnalysis.cpp\ - ./analyses/AdjointHorizAnalysis.h\ - ./analyses/AdjointHorizAnalysis.cpp\ - ./solutionsequences/solutionsequence_adjoint_linear.cpp - -#}}} -#Hydrology sources {{{ -hydrology_sources = ./analyses/HydrologyDCEfficientAnalysis.h\ - ./analyses/HydrologyDCEfficientAnalysis.cpp\ - ./analyses/HydrologyDCInefficientAnalysis.h\ - ./analyses/HydrologyDCInefficientAnalysis.cpp\ - ./analyses/HydrologyShreveAnalysis.h\ - ./analyses/HydrologyShreveAnalysis.cpp\ - ./cores/hydrology_core.cpp\ - ./solutionsequences/solutionsequence_hydro_nonlinear.cpp -#}}} -#Stressbalance sources {{{ -stressbalance_sources = ./analyses/StressbalanceAnalysis.h\ - ./analyses/StressbalanceAnalysis.cpp\ - ./analyses/StressbalanceSIAAnalysis.h\ - ./analyses/StressbalanceSIAAnalysis.cpp\ - ./analyses/StressbalanceVerticalAnalysis.h\ - ./analyses/StressbalanceVerticalAnalysis.cpp\ - ./cores/stressbalance_core.cpp\ - ./solutionsequences/solutionsequence_stokescoupling_nonlinear.cpp -#}}} -#Balanced sources {{{ -balanced_sources = ./analyses/BalancevelocityAnalysis.h\ - ./analyses/BalancevelocityAnalysis.cpp\ - ./analyses/SmoothedSurfaceSlopeXAnalysis.h\ - ./analyses/SmoothedSurfaceSlopeXAnalysis.cpp\ - ./analyses/SmoothedSurfaceSlopeYAnalysis.h\ - ./analyses/SmoothedSurfaceSlopeYAnalysis.cpp\ - ./analyses/BalancethicknessAnalysis.h\ - ./analyses/BalancethicknessAnalysis.cpp\ - ./analyses/BalancethicknessSoftAnalysis.h\ - ./analyses/BalancethicknessSoftAnalysis.cpp\ - ./cores/balancethickness_core.cpp \ - ./cores/balancevelocity_core.cpp \ - ./cores/dummy_core.cpp -#}}} -#Slope sources {{{ -slope_sources = ./analyses/L2ProjectionBaseAnalysis.h\ - ./analyses/L2ProjectionBaseAnalysis.cpp\ - ./cores/surfaceslope_core.cpp\ - ./cores/bedslope_core.cpp -#}}} -#MeshDeformation sources {{{ -meshdeformation_sources = ./analyses/MeshdeformationAnalysis.h\ - ./analyses/MeshdeformationAnalysis.cpp\ - ./cores/meshdeformation_core.cpp -#}}} -#Gia sources {{{ -gia_sources = ./cores/gia_core.cpp\ - ./analyses/GiaAnalysis.h\ - ./analyses/GiaAnalysis.cpp\ - ./modules/GiaDeflectionCorex/GiaDeflectionCorex.cpp\ - ./modules/GiaDeflectionCorex/GiaDeflectionCorex.h\ - ./modules/GiaDeflectionCorex/distme.f\ - ./modules/GiaDeflectionCorex/freed.f\ - ./modules/GiaDeflectionCorex/ojrule.f\ - ./modules/GiaDeflectionCorex/pwise.f\ - ./modules/GiaDeflectionCorex/qwise.f\ - ./modules/GiaDeflectionCorex/stot.f\ - ./modules/GiaDeflectionCorex/what0.f\ - ./classes/GiaDeflectionCoreArgs.h - -#}}} -#Damage sources {{{ -damage_sources = ./cores/damage_core.cpp\ - ./analyses/DamageEvolutionAnalysis.h\ - ./analyses/DamageEvolutionAnalysis.cpp\ - ./solutionsequences/solutionsequence_damage_nonlinear.cpp - -#}}} -#Groundingline sources {{{ -groundingline_sources= ./modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp\ - ./modules/GroundinglineMigrationx/GroundinglineMigrationx.h -#}}} -#Rifts sources {{{ -rifts_sources = ./classes/Loads/Riftfront.cpp\ - ./classes/Loads/Riftfront.h\ - ./modules/ConstraintsStatex/RiftConstraintsState.cpp -#}}} -#Responses sources {{{ -responses_sources= ./classes/Massfluxatgate.h \ - ./modules/ModelProcessorx/CreateOutputDefinitions.cpp\ - ./modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.h\ - ./modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.cpp -#}}} -#Android sources {{{ -android_sources = -#}}} -#3D sources {{{ -threed_sources = ./classes/gauss/GaussPenta.h\ - ./classes/gauss/GaussPenta.cpp\ - ./classes/Inputs/PentaInput.h\ - ./classes/Inputs/PentaInput.cpp\ - ./classes/Elements/Penta.h\ - ./classes/Elements/Penta.cpp\ - ./classes/Elements/PentaRef.h\ - ./classes/Elements/PentaRef.cpp -#}}} -#Bamg sources {{{ -bamg_sources = ./bamg/bamgobjects.h\ - ./bamg/BamgGeom.h\ - ./bamg/BamgGeom.cpp\ - ./bamg/BamgMesh.h\ - ./bamg/BamgMesh.cpp\ - ./bamg/BamgOpts.h\ - ./bamg/BamgOpts.cpp\ - ./bamg/CrackedEdge.h\ - ./bamg/CrackedEdge.cpp\ - ./bamg/Curve.h\ - ./bamg/Curve.cpp\ - ./bamg/Direction.h\ - ./bamg/Direction.cpp\ - ./bamg/DoubleAndInt.h\ - ./bamg/Edge.h\ - ./bamg/Edge.cpp\ - ./bamg/GeomEdge.h\ - ./bamg/GeomEdge.cpp\ - ./bamg/GeomSubDomain.h\ - ./bamg/GeomSubDomain.cpp\ - ./bamg/GeomVertex.h\ - ./bamg/GeomVertex.cpp\ - ./bamg/Geometry.cpp\ - ./bamg/Geometry.h\ - ./bamg/ListofIntersectionTriangles.cpp\ - ./bamg/ListofIntersectionTriangles.h\ - ./bamg/EigenMetric.cpp\ - ./bamg/Metric.cpp\ - ./bamg/Metric.h\ - ./bamg/BamgQuadtree.cpp\ - ./bamg/BamgQuadtree.h\ - ./bamg/R2.h\ - ./bamg/SetOfE4.cpp\ - ./bamg/SetOfE4.h\ - ./bamg/SubDomain.h\ - ./bamg/SubDomain.cpp\ - ./bamg/AdjacentTriangle.h\ - ./bamg/AdjacentTriangle.cpp\ - ./bamg/Triangle.cpp\ - ./bamg/det.h \ - ./bamg/Triangle.h\ - ./bamg/BamgVertex.cpp\ - ./bamg/BamgVertex.h\ - ./bamg/VertexOnEdge.h\ - ./bamg/VertexOnEdge.cpp\ - ./bamg/VertexOnGeom.h\ - ./bamg/VertexOnGeom.cpp\ - ./bamg/VertexOnVertex.h\ - ./bamg/VertexOnVertex.cpp\ - ./bamg/Mesh.cpp\ - ./bamg/Mesh.h\ - ./shared/Bamg/Abs.h \ - ./shared/Bamg/BigPrimeNumber.h\ - ./shared/Bamg/BigPrimeNumber.cpp\ - ./shared/Bamg/BinaryRand.h \ - ./shared/Bamg/Exchange.h \ - ./shared/Bamg/extrema.h \ - ./shared/Bamg/HeapSort.h \ - ./shared/Bamg/OppositeAngle.h \ - ./modules/Bamgx/Bamgx.cpp\ - ./modules/Bamgx/Bamgx.h\ - ./modules/BamgConvertMeshx/BamgConvertMeshx.cpp\ - ./modules/BamgConvertMeshx/BamgConvertMeshx.h\ - ./modules/BamgTriangulatex/BamgTriangulatex.cpp\ - ./modules/BamgTriangulatex/BamgTriangulatex.h -#}}} -#Kriging sources {{{ -kriging_sources = ./classes/kriging/Observations.h\ - ./classes/kriging/Observations.cpp\ - ./classes/kriging/Variogram.h \ - ./classes/kriging/GaussianVariogram.h\ - ./classes/kriging/GaussianVariogram.cpp\ - ./classes/kriging/ExponentialVariogram.h\ - ./classes/kriging/ExponentialVariogram.cpp\ - ./classes/kriging/SphericalVariogram.h\ - ./classes/kriging/SphericalVariogram.cpp\ - ./classes/kriging/PowerVariogram.h\ - ./classes/kriging/PowerVariogram.cpp\ - ./classes/kriging/Quadtree.h\ - ./classes/kriging/Quadtree.cpp\ - ./classes/kriging/Observation.h\ - ./classes/kriging/Observation.cpp\ - ./modules/Krigingx/Krigingx.cpp\ - ./modules/Krigingx/Krigingx.h - -#For parallel kriging, only difference is ./modules/Krigingx/pKrigingx.cpp with no multithreading -pkriging_sources = ./classes/kriging/Observations.h\ - ./classes/kriging/Observations.cpp\ - ./classes/kriging/Variogram.h \ - ./classes/kriging/GaussianVariogram.h\ - ./classes/kriging/GaussianVariogram.cpp\ - ./classes/kriging/ExponentialVariogram.h\ - ./classes/kriging/ExponentialVariogram.cpp\ - ./classes/kriging/SphericalVariogram.h\ - ./classes/kriging/SphericalVariogram.cpp\ - ./classes/kriging/PowerVariogram.h\ - ./classes/kriging/PowerVariogram.cpp\ - ./classes/kriging/Quadtree.h\ - ./classes/kriging/Quadtree.cpp\ - ./classes/kriging/Observation.h\ - ./classes/kriging/Observation.cpp\ - ./modules/Krigingx/pKrigingx.cpp\ - ./modules/Krigingx/Krigingx.h - -#}}} -#Kml sources {{{ -kml_sources = ./modules/Exp2Kmlx/Exp2Kmlx.h\ - ./modules/Exp2Kmlx/Exp2Kmlx.cpp\ - ./modules/Kml2Expx/Kml2Expx.h\ - ./modules/Kml2Expx/Kml2Expx.cpp\ - ./modules/Shp2Kmlx/Shp2Kmlx.h\ - ./modules/Shp2Kmlx/Shp2Kmlx.cpp\ - ./modules/KMLFileReadx/KMLFileReadx.h\ - ./modules/KMLFileReadx/KMLFileReadx.cpp\ - ./modules/KMLMeshWritex/KMLMeshWritex.h\ - ./modules/KMLMeshWritex/KMLMeshWritex.cpp\ - ./modules/KMLOverlayx/KMLOverlayx.h\ - ./modules/KMLOverlayx/KMLOverlayx.cpp\ - ./kml/kmlobjects.h\ - ./kml/KML_Attribute.cpp\ - ./kml/KML_Attribute.h\ - ./kml/KML_Comment.cpp\ - ./kml/KML_Comment.h\ - ./kml/KML_ColorStyle.cpp\ - ./kml/KML_ColorStyle.h\ - ./kml/KML_Container.cpp\ - ./kml/KML_Container.h\ - ./kml/KML_Document.cpp\ - ./kml/KML_Document.h\ - ./kml/KML_Feature.cpp\ - ./kml/KML_Feature.h\ - ./kml/KML_File.cpp\ - ./kml/KML_File.h\ - ./kml/KML_Folder.cpp\ - ./kml/KML_Folder.h\ - ./kml/KML_Geometry.cpp\ - ./kml/KML_Geometry.h\ - ./kml/KML_GroundOverlay.cpp\ - ./kml/KML_GroundOverlay.h\ - ./kml/KML_Icon.cpp\ - ./kml/KML_Icon.h\ - ./kml/KML_LatLonBox.cpp\ - ./kml/KML_LatLonBox.h\ - ./kml/KML_LinearRing.cpp\ - ./kml/KML_LinearRing.h\ - ./kml/KML_LineString.cpp\ - ./kml/KML_LineString.h\ - ./kml/KML_LineStyle.cpp\ - ./kml/KML_LineStyle.h\ - ./kml/KML_MultiGeometry.cpp\ - ./kml/KML_MultiGeometry.h\ - ./kml/KML_Object.cpp\ - ./kml/KML_Object.h\ - ./kml/KML_Overlay.cpp\ - ./kml/KML_Overlay.h\ - ./kml/KML_Point.cpp\ - ./kml/KML_Point.h\ - ./kml/KML_Placemark.cpp\ - ./kml/KML_Placemark.h\ - ./kml/KML_Polygon.cpp\ - ./kml/KML_Polygon.h\ - ./kml/KML_PolyStyle.cpp\ - ./kml/KML_PolyStyle.h\ - ./kml/KML_Style.cpp\ - ./kml/KML_Style.h\ - ./kml/KML_StyleSelector.cpp\ - ./kml/KML_StyleSelector.h\ - ./kml/KML_SubStyle.cpp\ - ./kml/KML_SubStyle.h\ - ./kml/KML_Unknown.cpp\ - ./kml/KML_Unknown.h\ - ./kml/KMLFileReadUtils.cpp\ - ./kml/KMLFileReadUtils.h +endif #}}} #Petsc sources {{{ -petsc_sources= ./toolkits/petsc\ +if PETSC +issm_sources += ./toolkits/petsc\ ./toolkits/petsc/patches\ ./toolkits/petsc/patches/SolverEnum.h\ @@ -756,23 +496,295 @@ ./toolkits/petsc/objects/PetscSolver.h\ ./toolkits/petsc/petscincludes.h - +endif #}}} #Mumps sources {{{ -mumps_sources= ./toolkits/mumps\ +if MUMPS +issm_sources += ./toolkits/mumps\ ./toolkits/mumps/mumpsincludes.h\ ./toolkits/mumps/MumpsSolve.cpp +endif #}}} #Gsl sources {{{ -gsl_sources= ./toolkits/gsl\ +if GSL +issm_sources += ./toolkits/gsl\ ./toolkits/gsl/gslincludes.h\ ./toolkits/gsl/DenseGslSolve.cpp +endif +#}}} +#Analyses{{{ +if ADJOINTBALANCETHICKNESS +issm_sources += ./analyses/AdjointBalancethicknessAnalysis.cpp +endif +if ADJOINTHORIZ +issm_sources += ./analyses/AdjointHorizAnalysis.cpp +endif +if BALANCETHICKNESS +issm_sources += ./analyses/BalancethicknessAnalysis.cpp +endif +if BALANCETHICKNESSSOFT +issm_sources += ./analyses/BalancethicknessSoftAnalysis.cpp +endif +if BALANCEVELOCITY +issm_sources += ./analyses/BalancevelocityAnalysis.cpp +endif +if L2PROJECTIONBASE +issm_sources += ./analyses/L2ProjectionBaseAnalysis.cpp +endif +if DAMAGEEVOLUTION +issm_sources += ./analyses/DamageEvolutionAnalysis.cpp +endif +if STRESSBALANCE +issm_sources += ./analyses/StressbalanceAnalysis.cpp +endif +if STRESSBALANCESIA +issm_sources += ./analyses/StressbalanceSIAAnalysis.cpp +endif +if STRESSBALANCEVERTICAL +issm_sources += ./analyses/StressbalanceVerticalAnalysis.cpp +endif +if ENTHALPY +issm_sources += ./analyses/EnthalpyAnalysis.cpp +endif +if HYDROLOGYSHREVE +issm_sources += ./analyses/HydrologyShreveAnalysis.cpp +endif +if HYDROLOGYDCINEFFICIENT +issm_sources += ./analyses/HydrologyDCInefficientAnalysis.cpp +endif +if HYDROLOGYDCEFFICIENT +issm_sources += ./analyses/HydrologyDCEfficientAnalysis.cpp +endif +if L2PROJECTIONEPL +issm_sources += ./analyses/L2ProjectionEPLAnalysis.cpp +endif +if MELTING +issm_sources += ./analyses/MeltingAnalysis.cpp +endif +if MASSTRANSPORT +issm_sources += ./analyses/MasstransportAnalysis.cpp +endif +if FREESURFACEBASE +issm_sources += ./analyses/FreeSurfaceBaseAnalysis.cpp +endif +if FREESURFACETOP +issm_sources += ./analyses/FreeSurfaceTopAnalysis.cpp +endif +if EXTRUDEFROMBASE +issm_sources += ./analyses/ExtrudeFromBaseAnalysis.cpp +endif +if EXTRUDEFROMTOP +issm_sources += ./analyses/ExtrudeFromTopAnalysis.cpp +endif +if DEPTHAVERAGE +issm_sources += ./analyses/DepthAverageAnalysis.cpp +endif +if THERMAL +issm_sources += ./analyses/ThermalAnalysis.cpp +endif +if SMOOTHEDSURFACESLOPEX +issm_sources += ./analyses/SmoothedSurfaceSlopeXAnalysis.cpp +endif +if SMOOTHEDSURFACESLOPEY +issm_sources += ./analyses/SmoothedSurfaceSlopeYAnalysis.cpp +endif +if MESHDEFORMATION +issm_sources += ./analyses/MeshdeformationAnalysis.cpp +endif +if LEVELSET +issm_sources += ./analyses/LevelsetAnalysis.cpp +endif +if EXTRAPOLATION +issm_sources += ./analyses/ExtrapolationAnalysis.cpp +endif +if LSFREINITIALIZATION +issm_sources += ./analyses/LsfReinitializationAnalysis.cpp +endif +#}}} +#Gia sources {{{ +if GIA +issm_sources += ./cores/gia_core.cpp\ + ./analyses/GiaAnalysis.cpp\ + ./modules/GiaDeflectionCorex/GiaDeflectionCorex.cpp\ + ./modules/GiaDeflectionCorex/distme.f\ + ./modules/GiaDeflectionCorex/freed.f\ + ./modules/GiaDeflectionCorex/ojrule.f\ + ./modules/GiaDeflectionCorex/pwise.f\ + ./modules/GiaDeflectionCorex/qwise.f\ + ./modules/GiaDeflectionCorex/stot.f\ + ./modules/GiaDeflectionCorex/what0.f +endif #}}} #Mpi sources {{{ -mpi_sources= ./toolkits/issm/IssmMpiDenseMat.h\ - ./toolkits/issm/IssmMpiVec.h +if MPI +issm_sources += ./toolkits/issm/IssmMpiDenseMat.h\ + ./toolkits/issm/IssmMpiVec.h +endif #}}} #Metis sources {{{ -metis_sources= ./toolkits/metis/patches/metispatches.h\ +if METIS +issm_sources += ./toolkits/metis/patches/metispatches.h\ ./toolkits/metis/patches/METIS_PartMeshNodalPatch.cpp +endif +#}}} + +#Wrapper sources +#Bamg sources {{{ +bamg_sources = ./bamg/bamgobjects.h\ + ./bamg/BamgGeom.h\ + ./bamg/BamgGeom.cpp\ + ./bamg/BamgMesh.h\ + ./bamg/BamgMesh.cpp\ + ./bamg/BamgOpts.h\ + ./bamg/BamgOpts.cpp\ + ./bamg/CrackedEdge.h\ + ./bamg/CrackedEdge.cpp\ + ./bamg/Curve.h\ + ./bamg/Curve.cpp\ + ./bamg/Direction.h\ + ./bamg/Direction.cpp\ + ./bamg/DoubleAndInt.h\ + ./bamg/Edge.h\ + ./bamg/Edge.cpp\ + ./bamg/GeomEdge.h\ + ./bamg/GeomEdge.cpp\ + ./bamg/GeomSubDomain.h\ + ./bamg/GeomSubDomain.cpp\ + ./bamg/GeomVertex.h\ + ./bamg/GeomVertex.cpp\ + ./bamg/Geometry.cpp\ + ./bamg/Geometry.h\ + ./bamg/ListofIntersectionTriangles.cpp\ + ./bamg/ListofIntersectionTriangles.h\ + ./bamg/EigenMetric.cpp\ + ./bamg/Metric.cpp\ + ./bamg/Metric.h\ + ./bamg/BamgQuadtree.cpp\ + ./bamg/BamgQuadtree.h\ + ./bamg/R2.h\ + ./bamg/SetOfE4.cpp\ + ./bamg/SetOfE4.h\ + ./bamg/SubDomain.h\ + ./bamg/SubDomain.cpp\ + ./bamg/AdjacentTriangle.h\ + ./bamg/AdjacentTriangle.cpp\ + ./bamg/Triangle.cpp\ + ./bamg/det.h \ + ./bamg/Triangle.h\ + ./bamg/BamgVertex.cpp\ + ./bamg/BamgVertex.h\ + ./bamg/VertexOnEdge.h\ + ./bamg/VertexOnEdge.cpp\ + ./bamg/VertexOnGeom.h\ + ./bamg/VertexOnGeom.cpp\ + ./bamg/VertexOnVertex.h\ + ./bamg/VertexOnVertex.cpp\ + ./bamg/Mesh.cpp\ + ./bamg/Mesh.h\ + ./shared/Bamg/Abs.h \ + ./shared/Bamg/BigPrimeNumber.h\ + ./shared/Bamg/BigPrimeNumber.cpp\ + ./shared/Bamg/BinaryRand.h \ + ./shared/Bamg/Exchange.h \ + ./shared/Bamg/extrema.h \ + ./shared/Bamg/HeapSort.h \ + ./shared/Bamg/OppositeAngle.h \ + ./modules/Bamgx/Bamgx.cpp\ + ./modules/Bamgx/Bamgx.h\ + ./modules/BamgConvertMeshx/BamgConvertMeshx.cpp\ + ./modules/BamgConvertMeshx/BamgConvertMeshx.h\ + ./modules/BamgTriangulatex/BamgTriangulatex.cpp\ + ./modules/BamgTriangulatex/BamgTriangulatex.h +#}}} +#Kriging sources {{{ +if KRIGING +kriging_sources = ./classes/kriging/Observations.h\ + ./classes/kriging/Observations.cpp\ + ./classes/kriging/Variogram.h \ + ./classes/kriging/GaussianVariogram.h\ + ./classes/kriging/GaussianVariogram.cpp\ + ./classes/kriging/ExponentialVariogram.h\ + ./classes/kriging/ExponentialVariogram.cpp\ + ./classes/kriging/SphericalVariogram.h\ + ./classes/kriging/SphericalVariogram.cpp\ + ./classes/kriging/PowerVariogram.h\ + ./classes/kriging/PowerVariogram.cpp\ + ./classes/kriging/Quadtree.h\ + ./classes/kriging/Quadtree.cpp\ + ./classes/kriging/Observation.h\ + ./classes/kriging/Observation.cpp\ + ./modules/Krigingx/Krigingx.cpp\ + ./modules/Krigingx/Krigingx.h +issm_sources +=$(kriging_sources) +issm_sources +=./modules/Krigingx/pKrigingx.cpp +endif +#}}} +#Kml sources {{{ +kml_sources = ./modules/Exp2Kmlx/Exp2Kmlx.h\ + ./modules/Exp2Kmlx/Exp2Kmlx.cpp\ + ./modules/Kml2Expx/Kml2Expx.h\ + ./modules/Kml2Expx/Kml2Expx.cpp\ + ./modules/Shp2Kmlx/Shp2Kmlx.h\ + ./modules/Shp2Kmlx/Shp2Kmlx.cpp\ + ./modules/KMLFileReadx/KMLFileReadx.h\ + ./modules/KMLFileReadx/KMLFileReadx.cpp\ + ./modules/KMLMeshWritex/KMLMeshWritex.h\ + ./modules/KMLMeshWritex/KMLMeshWritex.cpp\ + ./modules/KMLOverlayx/KMLOverlayx.h\ + ./modules/KMLOverlayx/KMLOverlayx.cpp\ + ./kml/kmlobjects.h\ + ./kml/KML_Attribute.cpp\ + ./kml/KML_Attribute.h\ + ./kml/KML_Comment.cpp\ + ./kml/KML_Comment.h\ + ./kml/KML_ColorStyle.cpp\ + ./kml/KML_ColorStyle.h\ + ./kml/KML_Container.cpp\ + ./kml/KML_Container.h\ + ./kml/KML_Document.cpp\ + ./kml/KML_Document.h\ + ./kml/KML_Feature.cpp\ + ./kml/KML_Feature.h\ + ./kml/KML_File.cpp\ + ./kml/KML_File.h\ + ./kml/KML_Folder.cpp\ + ./kml/KML_Folder.h\ + ./kml/KML_Geometry.cpp\ + ./kml/KML_Geometry.h\ + ./kml/KML_GroundOverlay.cpp\ + ./kml/KML_GroundOverlay.h\ + ./kml/KML_Icon.cpp\ + ./kml/KML_Icon.h\ + ./kml/KML_LatLonBox.cpp\ + ./kml/KML_LatLonBox.h\ + ./kml/KML_LinearRing.cpp\ + ./kml/KML_LinearRing.h\ + ./kml/KML_LineString.cpp\ + ./kml/KML_LineString.h\ + ./kml/KML_LineStyle.cpp\ + ./kml/KML_LineStyle.h\ + ./kml/KML_MultiGeometry.cpp\ + ./kml/KML_MultiGeometry.h\ + ./kml/KML_Object.cpp\ + ./kml/KML_Object.h\ + ./kml/KML_Overlay.cpp\ + ./kml/KML_Overlay.h\ + ./kml/KML_Point.cpp\ + ./kml/KML_Point.h\ + ./kml/KML_Placemark.cpp\ + ./kml/KML_Placemark.h\ + ./kml/KML_Polygon.cpp\ + ./kml/KML_Polygon.h\ + ./kml/KML_PolyStyle.cpp\ + ./kml/KML_PolyStyle.h\ + ./kml/KML_Style.cpp\ + ./kml/KML_Style.h\ + ./kml/KML_StyleSelector.cpp\ + ./kml/KML_StyleSelector.h\ + ./kml/KML_SubStyle.cpp\ + ./kml/KML_SubStyle.h\ + ./kml/KML_Unknown.cpp\ + ./kml/KML_Unknown.h\ + ./kml/KMLFileReadUtils.cpp\ + ./kml/KMLFileReadUtils.h #}}} #Modules sources{{{ @@ -841,108 +853,4 @@ endif #}}} - -#{{{ Conditional build-up of sources -#ISSM sources are a combination of core sources and sources related to specific capabilities (which can -#be activated by autotools conditionals - -#First the core -issm_sources = $(core_sources) - -#Now the optional source -if DAKOTA -issm_sources += $(dakota_sources) -endif - -if PETSC -issm_sources += $(petsc_sources) -endif - -if MUMPS -issm_sources += $(mumps_sources) -endif - -if GSL -issm_sources += $(gsl_sources) -endif - -if TRANSIENT -issm_sources += $(transient_sources) -endif - -if STEADYSTATE -issm_sources += $(steadystate_sources) -endif - -if MASSTRANSPORT -issm_sources += $(masstransport_sources) -endif - -if THERMAL -issm_sources += $(thermal_sources) -endif - -if GIA -issm_sources += $(gia_sources) -endif - -if CONTROL -issm_sources += $(control_sources) -endif - -if HYDROLOGY -issm_sources += $(hydrology_sources) -endif - -if STRESSBALANCE -issm_sources += $(stressbalance_sources) -endif - -if BALANCED -issm_sources += $(balanced_sources) -endif - -if SLOPE -issm_sources += $(slope_sources) -endif - -if MESHDEFORMATION -issm_sources += $(meshdeformation_sources) -endif - -if GROUNDINGLINE -issm_sources += $(groundingline_sources) -endif - -if RIFTS -issm_sources += $(rifts_sources) -endif - -if RESPONSES -issm_sources += $(responses_sources) -endif - -if ANDROID -issm_sources += $(android_sources) -endif - -if THREED -issm_sources += $(threed_sources) -endif - -if MPI -issm_sources += $(mpi_sources) -endif - -if METIS -issm_sources += $(metis_sources) -endif - -if KRIGING -issm_sources += $(pkriging_sources) -endif - -if DAMAGE -issm_sources += $(damage_sources) -endif #}}} #Library flags and sources {{{ @@ -1020,5 +928,5 @@ endif #}}} -#Automatic differentiation: append this fold to the end of the src/c/Makefile.am to get this Makefile.am {{{ +#Automatic differentiation (must be done at the end) {{{ if ADIC2 lib_LIBRARIES += libAD.a libISSMRose.a @@ -1028,5 +936,4 @@ libAD_a_SOURCES = libAD_a_CFLAGS = -fPIC -D_C_ $(COPTFLAGS) - #test rose preprocessing @@ -1036,11 +943,7 @@ libISSMRose_a_CXXFLAGS= -fPIC -D_C_ $(CXXOPTFLAGS) - - #Automatic differentiation rules: %.ad.c: %.c adic2 -mforward $< --nary - - #Executable Index: /issm/trunk/src/c/analyses/AdjointBalancethicknessAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/AdjointBalancethicknessAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/AdjointBalancethicknessAnalysis.cpp (revision 17806) @@ -6,5 +6,5 @@ /*Model processor*/ -int AdjointBalancethicknessAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int AdjointBalancethicknessAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ return 1; }/*}}}*/ @@ -24,2 +24,146 @@ _error_("not implemented yet"); }/*}}}*/ + +/*Finite Element Analysis*/ +void AdjointBalancethicknessAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* AdjointBalancethicknessAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* AdjointBalancethicknessAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* AdjointBalancethicknessAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + BalancethicknessAnalysis* analysis = new BalancethicknessAnalysis(); + ElementMatrix* Ke = analysis->CreateKMatrix(element); + delete analysis; + + /*Transpose and return Ke*/ + Ke->Transpose(); + return Ke; +}/*}}}*/ +ElementVector* AdjointBalancethicknessAnalysis::CreatePVector(Element* element){/*{{{*/ + + /*Intermediaries*/ + int domaintype; + Element* basalelement; + + /*Get basal element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + break; + case Domain3DEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Initialize Element vector and vectors*/ + ElementVector* pe = basalelement->NewElementVector(SSAApproximationEnum); + IssmDouble* basis = xNew(numnodes); + IssmDouble* dbasis = xNew(2*numnodes); + + /*Retrieve all inputs and parameters*/ + basalelement->GetVerticesCoordinates(&xyz_list); + basalelement->FindParam(&num_responses,InversionNumCostFunctionsEnum); + basalelement->FindParam(&responses,NULL,InversionCostFunctionsEnum); + Input* thickness_input = basalelement->GetInput(ThicknessEnum); _assert_(thickness_input); + Input* thicknessobs_input = basalelement->GetInput(InversionThicknessObsEnum); _assert_(thicknessobs_input); + Input* weights_input = basalelement->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input); + Input* vx_input = basalelement->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input = basalelement->GetInput(VyEnum); _assert_(vy_input); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=basalelement->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + basalelement->JacobianDeterminant(&Jdet,xyz_list,gauss); + basalelement->NodalFunctions(basis,gauss); + basalelement->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + thickness_input->GetInputValue(&thickness, gauss); + thickness_input->GetInputDerivativeValue(&dH[0],xyz_list,gauss); + thicknessobs_input->GetInputValue(&thicknessobs, gauss); + + /*Loop over all requested responses*/ + for(int resp=0;respGetInputValue(&weight,gauss,responses[resp]); + + switch(responses[resp]){ + case ThicknessAbsMisfitEnum: + for(i=0;ivalues[i]+=(thicknessobs-thickness)*weight*Jdet*gauss->weight*basis[i]; + break; + case ThicknessAbsGradientEnum: + for(i=0;ivalues[i]+= - weight*dH[0]*dbasis[0*numnodes+i]*Jdet*gauss->weight; + for(i=0;ivalues[i]+= - weight*dH[1]*dbasis[1*numnodes+i]*Jdet*gauss->weight; + break; + case ThicknessAlongGradientEnum: + vx_input->GetInputValue(&vx,gauss); + vy_input->GetInputValue(&vy,gauss); + vel = sqrt(vx*vx+vy*vy); + vx = vx/(vel+1.e-9); + vy = vy/(vel+1.e-9); + for(i=0;ivalues[i]+= - weight*(dH[0]*vx+dH[1]*vy)*(dbasis[0*numnodes+i]*vx+dbasis[1*numnodes+i]*vy)*Jdet*gauss->weight; + break; + case ThicknessAcrossGradientEnum: + vx_input->GetInputValue(&vx,gauss); + vy_input->GetInputValue(&vy,gauss); + vel = sqrt(vx*vx+vy*vy); + vx = vx/(vel+1.e-9); + vy = vy/(vel+1.e-9); + for(i=0;ivalues[i]+= - weight*(dH[0]*(-vy)+dH[1]*vx)*(dbasis[0*numnodes+i]*(-vy)+dbasis[1*numnodes+i]*vx)*Jdet*gauss->weight; + break; + default: + _error_("response " << EnumToStringx(responses[resp]) << " not supported yet"); + } + } + } + + /*Clean up and return*/ + xDelete(responses); + xDelete(xyz_list); + xDelete(basis); + xDelete(dbasis); + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + delete gauss; + return pe; +}/*}}}*/ +void AdjointBalancethicknessAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void AdjointBalancethicknessAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + + int domaintype; + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + element->InputUpdateFromSolutionOneDof(solution,AdjointEnum); + break; + case Domain3DEnum: + element->InputUpdateFromSolutionOneDofCollapsed(solution,AdjointEnum); + break; + default: _error_("mesh "<* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); }; #endif Index: /issm/trunk/src/c/analyses/AdjointHorizAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/AdjointHorizAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/AdjointHorizAnalysis.cpp (revision 17806) @@ -6,5 +6,5 @@ /*Model processing*/ -int AdjointHorizAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int AdjointHorizAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ _error_("not implemented"); }/*}}}*/ @@ -24,2 +24,973 @@ _error_("not implemented yet"); }/*}}}*/ + +/*Finite Element Analysis*/ +void AdjointHorizAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* AdjointHorizAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* AdjointHorizAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* AdjointHorizAnalysis::CreateKMatrix(Element* element){/*{{{*/ + int approximation; + element->GetInputValue(&approximation,ApproximationEnum); + switch(approximation){ + case SSAApproximationEnum: + return CreateKMatrixSSA(element); + case HOApproximationEnum: + return CreateKMatrixHO(element); + case FSApproximationEnum: + return CreateKMatrixFS(element); + case NoneApproximationEnum: + return NULL; + default: + _error_("Approximation "<FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + break; + case Domain3DEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Initialize Jacobian with regular SSA (first part of the Gateau derivative)*/ + basalelement->FindParam(&incomplete_adjoint,InversionIncompleteAdjointEnum); + StressbalanceAnalysis* analysis = new StressbalanceAnalysis(); + ElementMatrix* Ke=analysis->CreateKMatrix(element); + delete analysis; + if(incomplete_adjoint){ + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + return Ke; + } + + /*Retrieve all inputs and parameters*/ + basalelement->GetVerticesCoordinates(&xyz_list); + Input* vx_input = basalelement->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input = basalelement->GetInput(VyEnum); _assert_(vy_input); + Input* thickness_input = basalelement->GetInput(ThicknessEnum); _assert_(thickness_input); + + /*Allocate dbasis*/ + IssmDouble* dbasis = xNew(2*numnodes); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=basalelement->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + basalelement->JacobianDeterminant(&Jdet,xyz_list,gauss); + basalelement->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + thickness_input->GetInputValue(&thickness, gauss); + basalelement->StrainRateSSA(&epsilon[0],xyz_list,gauss,vx_input,vy_input); + basalelement->ViscositySSADerivativeEpsSquare(&mu_prime,&epsilon[0]); + eps1[0]=2.*epsilon[0]+epsilon[1]; eps2[0]=epsilon[2]; + eps1[1]=epsilon[2]; eps2[1]=epsilon[0]+2*epsilon[1]; + + for(int i=0;ivalues[2*numnodes*(2*i+0)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*thickness*eps1dotdphij*eps1dotdphii; + Ke->values[2*numnodes*(2*i+0)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*thickness*eps2dotdphij*eps1dotdphii; + Ke->values[2*numnodes*(2*i+1)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*thickness*eps1dotdphij*eps2dotdphii; + Ke->values[2*numnodes*(2*i+1)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*thickness*eps2dotdphij*eps2dotdphii; + } + } + } + + /*Transform Coordinate System*/ + basalelement->TransformStiffnessMatrixCoord(Ke,XYEnum); + + /*Clean up and return*/ + delete gauss; + xDelete(dbasis); + xDelete(xyz_list); + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + return Ke; +}/*}}}*/ +ElementMatrix* AdjointHorizAnalysis::CreateKMatrixHO(Element* element){/*{{{*/ + + /*Intermediaries */ + bool incomplete_adjoint; + IssmDouble Jdet,mu_prime; + IssmDouble eps1dotdphii,eps1dotdphij,eps2dotdphii,eps2dotdphij; + IssmDouble eps1[3],eps2[3],epsilon[5];/* epsilon=[exx,eyy,exy,exz,eyz];*/ + IssmDouble *xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Jacobian with regular HO (first part of the Gateau derivative)*/ + element->FindParam(&incomplete_adjoint,InversionIncompleteAdjointEnum); + StressbalanceAnalysis* analysis = new StressbalanceAnalysis(); + ElementMatrix* Ke=analysis->CreateKMatrix(element); + delete analysis; + if(incomplete_adjoint) return Ke; + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + Input* vx_input = element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input = element->GetInput(VyEnum); _assert_(vy_input); + + /*Allocate dbasis*/ + IssmDouble* dbasis = xNew(3*numnodes); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(5); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + element->StrainRateHO(&epsilon[0],xyz_list,gauss,vx_input,vy_input); + element->ViscosityHODerivativeEpsSquare(&mu_prime,&epsilon[0]); + eps1[0]=2.*epsilon[0]+epsilon[1]; eps2[0]=epsilon[2]; + eps1[1]=epsilon[2]; eps2[1]=epsilon[0]+2.*epsilon[1]; + eps1[2]=epsilon[3]; eps2[2]=epsilon[4]; + + for(int i=0;ivalues[2*numnodes*(2*i+0)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps1dotdphii; + Ke->values[2*numnodes*(2*i+0)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps1dotdphii; + Ke->values[2*numnodes*(2*i+1)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps2dotdphii; + Ke->values[2*numnodes*(2*i+1)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps2dotdphii; + } + } + } + + /*Transform Coordinate System*/ + element->TransformStiffnessMatrixCoord(Ke,XYEnum); + + /*Clean up and return*/ + delete gauss; + xDelete(dbasis); + xDelete(xyz_list); + return Ke; +}/*}}}*/ +ElementMatrix* AdjointHorizAnalysis::CreateKMatrixFS(Element* element){/*{{{*/ + + /*Intermediaries */ + bool incomplete_adjoint; + IssmDouble Jdet,mu_prime; + IssmDouble eps1dotdphii,eps1dotdphij,eps2dotdphii,eps2dotdphij,eps3dotdphii,eps3dotdphij; + IssmDouble eps1[3],eps2[3],eps3[3],epsilon[5];/* epsilon=[exx,eyy,exy,exz,eyz];*/ + IssmDouble *xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int vnumnodes = element->NumberofNodesVelocity(); + int pnumnodes = element->NumberofNodesPressure(); + int numdof = vnumnodes*3 + pnumnodes; + + /*Initialize Jacobian with regular FS (first part of the Gateau derivative)*/ + element->FindParam(&incomplete_adjoint,InversionIncompleteAdjointEnum); + StressbalanceAnalysis* analysis = new StressbalanceAnalysis(); + ElementMatrix* Ke=analysis->CreateKMatrix(element); + delete analysis; + if(incomplete_adjoint) return Ke; + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + Input* vx_input = element->GetInput(VxEnum);_assert_(vx_input); + Input* vy_input = element->GetInput(VyEnum);_assert_(vy_input); + Input* vz_input = element->GetInput(VzEnum);_assert_(vz_input); + + /*Allocate dbasis*/ + IssmDouble* dbasis = xNew(3*vnumnodes); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(5); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + element->StrainRateHO(&epsilon[0],xyz_list,gauss,vx_input,vy_input); + element->ViscosityFSDerivativeEpsSquare(&mu_prime,&epsilon[0]); + eps1[0]=epsilon[0]; eps2[0]=epsilon[2]; eps3[0]=epsilon[3]; + eps1[1]=epsilon[2]; eps2[1]=epsilon[1]; eps3[1]=epsilon[4]; + eps1[2]=epsilon[3]; eps2[2]=epsilon[4]; eps3[2]= -epsilon[0] -epsilon[1]; + + for(int i=0;ivalues[numdof*(4*i+0)+4*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps1dotdphii; + Ke->values[numdof*(4*i+0)+4*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps1dotdphii; + Ke->values[numdof*(4*i+0)+4*j+2]+=gauss->weight*Jdet*2*mu_prime*eps3dotdphij*eps1dotdphii; + + Ke->values[numdof*(4*i+1)+4*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps2dotdphii; + Ke->values[numdof*(4*i+1)+4*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps2dotdphii; + Ke->values[numdof*(4*i+1)+4*j+2]+=gauss->weight*Jdet*2*mu_prime*eps3dotdphij*eps2dotdphii; + + Ke->values[numdof*(4*i+2)+4*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps3dotdphii; + Ke->values[numdof*(4*i+2)+4*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps3dotdphii; + Ke->values[numdof*(4*i+2)+4*j+2]+=gauss->weight*Jdet*2*mu_prime*eps3dotdphij*eps3dotdphii; + } + } + } + + /*Transform Coordinate System*/ + element->TransformStiffnessMatrixCoord(Ke,XYZEnum); + + /*Clean up and return*/ + delete gauss; + xDelete(dbasis); + xDelete(xyz_list); + return Ke; +}/*}}}*/ +ElementVector* AdjointHorizAnalysis::CreatePVector(Element* element){/*{{{*/ + + int approximation; + element->GetInputValue(&approximation,ApproximationEnum); + switch(approximation){ + case SSAApproximationEnum: + return CreatePVectorSSA(element); + case HOApproximationEnum: + return CreatePVectorHO(element); + case FSApproximationEnum: + return CreatePVectorFS(element); + case NoneApproximationEnum: + return NULL; + default: + _error_("Approximation "<IsOnSurface()) return NULL; + + /*Intermediaries */ + int num_responses,i,dim; + IssmDouble Jdet,obs_velocity_mag,velocity_mag; + IssmDouble vx,vy,vxobs,vyobs,dux,duy,weight; + IssmDouble scalex,scaley,scale,S; + int *responses = NULL; + IssmDouble *xyz_list_top = NULL; + + /*Get problem dimension*/ + element->FindParam(&dim,DomainDimensionEnum); + + /*Fetch number of nodes and dof for this finite element*/ + int vnumnodes = element->NumberofNodesVelocity(); + int pnumnodes = element->NumberofNodesPressure(); + + /*Prepare coordinate system list*/ + int* cs_list = xNew(vnumnodes+pnumnodes); + for(i=0;iNewElementVector(FSApproximationEnum); + IssmDouble* vbasis = xNew(vnumnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinatesTop(&xyz_list_top); + element->FindParam(&num_responses,InversionNumCostFunctionsEnum); + element->FindParam(&responses,NULL,InversionCostFunctionsEnum); + Input* weights_input = element->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input); + Input* vx_input = element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input = element->GetInput(VyEnum); _assert_(vy_input); + Input* vxobs_input = element->GetInput(InversionVxObsEnum); _assert_(vxobs_input); + Input* vyobs_input = element->GetInput(InversionVyObsEnum); _assert_(vyobs_input); + IssmDouble epsvel = 2.220446049250313e-16; + IssmDouble meanvel = 3.170979198376458e-05; /*1000 m/yr*/ + + /*Get Surface if required by one response*/ + for(int resp=0;respGetInputValue(&S,SurfaceAreaEnum); break; + } + } + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGaussTop(4); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminantTop(&Jdet,xyz_list_top,gauss); + element->NodalFunctionsVelocity(vbasis,gauss); + + vx_input->GetInputValue(&vx,gauss); + vy_input->GetInputValue(&vy,gauss); + vxobs_input->GetInputValue(&vxobs,gauss); + vyobs_input->GetInputValue(&vyobs,gauss); + + /*Loop over all requested responses*/ + for(int resp=0;respGetInputValue(&weight,gauss,responses[resp]); + + switch(responses[resp]){ + case SurfaceAbsVelMisfitEnum: + /* + * 1 [ 2 2 ] + * J = --- | (u - u ) + (v - v ) | + * 2 [ obs obs ] + * + * dJ + * DU = - -- = (u - u ) + * du obs + */ + for(i=0;ivalues[i*dim+0]+=dux*weight*Jdet*gauss->weight*vbasis[i]; + pe->values[i*dim+1]+=duy*weight*Jdet*gauss->weight*vbasis[i]; + } + break; + case SurfaceRelVelMisfitEnum: + /* + * 1 [ \bar{v}^2 2 \bar{v}^2 2 ] + * J = --- | ------------- (u - u ) + ------------- (v - v ) | + * 2 [ (u + eps)^2 obs (v + eps)^2 obs ] + * obs obs + * + * dJ \bar{v}^2 + * DU = - -- = ------------- (u - u ) + * du (u + eps)^2 obs + * obs + */ + for(i=0;ivalues[i*dim+0]+=dux*weight*Jdet*gauss->weight*vbasis[i]; + pe->values[i*dim+1]+=duy*weight*Jdet*gauss->weight*vbasis[i]; + } + break; + case SurfaceLogVelMisfitEnum: + /* + * [ vel + eps ] 2 + * J = 4 \bar{v}^2 | log ( ----------- ) | + * [ vel + eps ] + * obs + * + * dJ 2 * log(...) + * DU = - -- = - 4 \bar{v}^2 ------------- u + * du vel^2 + eps + * + */ + for(i=0;ivalues[i*dim+0]+=dux*weight*Jdet*gauss->weight*vbasis[i]; + pe->values[i*dim+1]+=duy*weight*Jdet*gauss->weight*vbasis[i]; + } + break; + case SurfaceAverageVelMisfitEnum: + /* + * 1 2 2 + * J = --- sqrt( (u - u ) + (v - v ) ) + * S obs obs + * + * dJ 1 1 + * DU = - -- = - --- ----------- * 2 (u - u ) + * du S 2 sqrt(...) obs + */ + for(i=0;ivalues[i*dim+0]+=dux*weight*Jdet*gauss->weight*vbasis[i]; + pe->values[i*dim+1]+=duy*weight*Jdet*gauss->weight*vbasis[i]; + } + break; + case SurfaceLogVxVyMisfitEnum: + /* + * 1 [ |u| + eps 2 |v| + eps 2 ] + * J = --- \bar{v}^2 | log ( ----------- ) + log ( ----------- ) | + * 2 [ |u |+ eps |v |+ eps ] + * obs obs + * dJ 1 u 1 + * DU = - -- = - \bar{v}^2 log(u...) --------- ---- ~ - \bar{v}^2 log(u...) ------ + * du |u| + eps |u| u + eps + */ + for(i=0;ivalues[i*dim+0]+=dux*weight*Jdet*gauss->weight*vbasis[i]; + pe->values[i*dim+1]+=duy*weight*Jdet*gauss->weight*vbasis[i]; + } + break; + case DragCoefficientAbsGradientEnum: + /*Nothing in P vector*/ + break; + case ThicknessAbsGradientEnum: + /*Nothing in P vector*/ + break; + case ThicknessAlongGradientEnum: + /*Nothing in P vector*/ + break; + case ThicknessAcrossGradientEnum: + /*Nothing in P vector*/ + break; + case RheologyBbarAbsGradientEnum: + /*Nothing in P vector*/ + break; + default: + _error_("response " << EnumToStringx(responses[resp]) << " not supported yet"); + } + } + } + + /*Transform coordinate system*/ + element->TransformLoadVectorCoord(pe,cs_list); + + /*Clean up and return*/ + xDelete(cs_list); + xDelete(responses); + xDelete(xyz_list_top); + xDelete(vbasis); + delete gauss; + return pe; + _error_("S"); +}/*}}}*/ +ElementVector* AdjointHorizAnalysis::CreatePVectorHO(Element* element){/*{{{*/ + + /*Nothing to be done if not on surface*/ + if(!element->IsOnSurface()) return NULL; + + /*Intermediaries */ + int num_responses,i; + IssmDouble Jdet,obs_velocity_mag,velocity_mag; + IssmDouble vx,vy,vxobs,vyobs,dux,duy,weight; + IssmDouble scalex,scaley,scale,S; + int *responses = NULL; + IssmDouble *xyz_list_top = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and vectors*/ + ElementVector* pe = element->NewElementVector(HOApproximationEnum); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinatesTop(&xyz_list_top); + element->FindParam(&num_responses,InversionNumCostFunctionsEnum); + element->FindParam(&responses,NULL,InversionCostFunctionsEnum); + Input* weights_input = element->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input); + Input* vx_input = element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input = element->GetInput(VyEnum); _assert_(vy_input); + Input* vxobs_input = element->GetInput(InversionVxObsEnum); _assert_(vxobs_input); + Input* vyobs_input = element->GetInput(InversionVyObsEnum); _assert_(vyobs_input); + IssmDouble epsvel = 2.220446049250313e-16; + IssmDouble meanvel = 3.170979198376458e-05; /*1000 m/yr*/ + + /*Get Surface if required by one response*/ + for(int resp=0;respGetInputValue(&S,SurfaceAreaEnum); break; + } + } + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGaussTop(4); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminantTop(&Jdet,xyz_list_top,gauss); + element->NodalFunctions(basis, gauss); + + vx_input->GetInputValue(&vx,gauss); + vy_input->GetInputValue(&vy,gauss); + vxobs_input->GetInputValue(&vxobs,gauss); + vyobs_input->GetInputValue(&vyobs,gauss); + + /*Loop over all requested responses*/ + for(int resp=0;respGetInputValue(&weight,gauss,responses[resp]); + + switch(responses[resp]){ + case SurfaceAbsVelMisfitEnum: + /* + * 1 [ 2 2 ] + * J = --- | (u - u ) + (v - v ) | + * 2 [ obs obs ] + * + * dJ + * DU = - -- = (u - u ) + * du obs + */ + for(i=0;ivalues[i*2+0]+=dux*weight*Jdet*gauss->weight*basis[i]; + pe->values[i*2+1]+=duy*weight*Jdet*gauss->weight*basis[i]; + } + break; + case SurfaceRelVelMisfitEnum: + /* + * 1 [ \bar{v}^2 2 \bar{v}^2 2 ] + * J = --- | ------------- (u - u ) + ------------- (v - v ) | + * 2 [ (u + eps)^2 obs (v + eps)^2 obs ] + * obs obs + * + * dJ \bar{v}^2 + * DU = - -- = ------------- (u - u ) + * du (u + eps)^2 obs + * obs + */ + for(i=0;ivalues[i*2+0]+=dux*weight*Jdet*gauss->weight*basis[i]; + pe->values[i*2+1]+=duy*weight*Jdet*gauss->weight*basis[i]; + } + break; + case SurfaceLogVelMisfitEnum: + /* + * [ vel + eps ] 2 + * J = 4 \bar{v}^2 | log ( ----------- ) | + * [ vel + eps ] + * obs + * + * dJ 2 * log(...) + * DU = - -- = - 4 \bar{v}^2 ------------- u + * du vel^2 + eps + * + */ + for(i=0;ivalues[i*2+0]+=dux*weight*Jdet*gauss->weight*basis[i]; + pe->values[i*2+1]+=duy*weight*Jdet*gauss->weight*basis[i]; + } + break; + case SurfaceAverageVelMisfitEnum: + /* + * 1 2 2 + * J = --- sqrt( (u - u ) + (v - v ) ) + * S obs obs + * + * dJ 1 1 + * DU = - -- = - --- ----------- * 2 (u - u ) + * du S 2 sqrt(...) obs + */ + for(i=0;ivalues[i*2+0]+=dux*weight*Jdet*gauss->weight*basis[i]; + pe->values[i*2+1]+=duy*weight*Jdet*gauss->weight*basis[i]; + } + break; + case SurfaceLogVxVyMisfitEnum: + /* + * 1 [ |u| + eps 2 |v| + eps 2 ] + * J = --- \bar{v}^2 | log ( ----------- ) + log ( ----------- ) | + * 2 [ |u |+ eps |v |+ eps ] + * obs obs + * dJ 1 u 1 + * DU = - -- = - \bar{v}^2 log(u...) --------- ---- ~ - \bar{v}^2 log(u...) ------ + * du |u| + eps |u| u + eps + */ + for(i=0;ivalues[i*2+0]+=dux*weight*Jdet*gauss->weight*basis[i]; + pe->values[i*2+1]+=duy*weight*Jdet*gauss->weight*basis[i]; + } + break; + case DragCoefficientAbsGradientEnum: + /*Nothing in P vector*/ + break; + case ThicknessAbsGradientEnum: + /*Nothing in P vector*/ + break; + case ThicknessAlongGradientEnum: + /*Nothing in P vector*/ + break; + case ThicknessAcrossGradientEnum: + /*Nothing in P vector*/ + break; + case RheologyBbarAbsGradientEnum: + /*Nothing in P vector*/ + break; + default: + _error_("response " << EnumToStringx(responses[resp]) << " not supported yet"); + } + } + } + + /*Transform coordinate system*/ + element->TransformLoadVectorCoord(pe,XYEnum); + + /*Clean up and return*/ + xDelete(responses); + xDelete(xyz_list_top); + xDelete(basis); + delete gauss; + return pe; + +}/*}}}*/ +ElementVector* AdjointHorizAnalysis::CreatePVectorSSA(Element* element){/*{{{*/ + + /*Intermediaries*/ + int domaintype; + Element* basalelement; + + /*Get basal element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + break; + case Domain3DEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Initialize Element vector and vectors*/ + ElementVector* pe = basalelement->NewElementVector(SSAApproximationEnum); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + basalelement->GetVerticesCoordinates(&xyz_list); + basalelement->FindParam(&num_responses,InversionNumCostFunctionsEnum); + basalelement->FindParam(&responses,NULL,InversionCostFunctionsEnum); + Input* weights_input = basalelement->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input); + Input* vx_input = basalelement->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input = basalelement->GetInput(VyEnum); _assert_(vy_input); + Input* vxobs_input = basalelement->GetInput(InversionVxObsEnum); _assert_(vxobs_input); + Input* vyobs_input = basalelement->GetInput(InversionVyObsEnum); _assert_(vyobs_input); + IssmDouble epsvel = 2.220446049250313e-16; + IssmDouble meanvel = 3.170979198376458e-05; /*1000 m/yr*/ + + /*Get Surface if required by one response*/ + for(int resp=0;respGetInputValue(&S,SurfaceAreaEnum); break; + } + } + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=basalelement->NewGauss(4); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + basalelement->JacobianDeterminant(&Jdet,xyz_list,gauss); + basalelement->NodalFunctions(basis, gauss); + + vx_input->GetInputValue(&vx,gauss); + vy_input->GetInputValue(&vy,gauss); + vxobs_input->GetInputValue(&vxobs,gauss); + vyobs_input->GetInputValue(&vyobs,gauss); + + /*Loop over all requested responses*/ + for(int resp=0;respGetInputValue(&weight,gauss,responses[resp]); + + switch(responses[resp]){ + case SurfaceAbsVelMisfitEnum: + /* + * 1 [ 2 2 ] + * J = --- | (u - u ) + (v - v ) | + * 2 [ obs obs ] + * + * dJ + * DU = - -- = (u - u ) + * du obs + */ + for(i=0;ivalues[i*2+0]+=dux*weight*Jdet*gauss->weight*basis[i]; + pe->values[i*2+1]+=duy*weight*Jdet*gauss->weight*basis[i]; + } + break; + case SurfaceRelVelMisfitEnum: + /* + * 1 [ \bar{v}^2 2 \bar{v}^2 2 ] + * J = --- | ------------- (u - u ) + ------------- (v - v ) | + * 2 [ (u + eps)^2 obs (v + eps)^2 obs ] + * obs obs + * + * dJ \bar{v}^2 + * DU = - -- = ------------- (u - u ) + * du (u + eps)^2 obs + * obs + */ + for(i=0;ivalues[i*2+0]+=dux*weight*Jdet*gauss->weight*basis[i]; + pe->values[i*2+1]+=duy*weight*Jdet*gauss->weight*basis[i]; + } + break; + case SurfaceLogVelMisfitEnum: + /* + * [ vel + eps ] 2 + * J = 4 \bar{v}^2 | log ( ----------- ) | + * [ vel + eps ] + * obs + * + * dJ 2 * log(...) + * DU = - -- = - 4 \bar{v}^2 ------------- u + * du vel^2 + eps + * + */ + for(i=0;ivalues[i*2+0]+=dux*weight*Jdet*gauss->weight*basis[i]; + pe->values[i*2+1]+=duy*weight*Jdet*gauss->weight*basis[i]; + } + break; + case SurfaceAverageVelMisfitEnum: + /* + * 1 2 2 + * J = --- sqrt( (u - u ) + (v - v ) ) + * S obs obs + * + * dJ 1 1 + * DU = - -- = - --- ----------- * 2 (u - u ) + * du S 2 sqrt(...) obs + */ + for(i=0;ivalues[i*2+0]+=dux*weight*Jdet*gauss->weight*basis[i]; + pe->values[i*2+1]+=duy*weight*Jdet*gauss->weight*basis[i]; + } + break; + case SurfaceLogVxVyMisfitEnum: + /* + * 1 [ |u| + eps 2 |v| + eps 2 ] + * J = --- \bar{v}^2 | log ( ----------- ) + log ( ----------- ) | + * 2 [ |u |+ eps |v |+ eps ] + * obs obs + * dJ 1 u 1 + * DU = - -- = - \bar{v}^2 log(u...) --------- ---- ~ - \bar{v}^2 log(u...) ------ + * du |u| + eps |u| u + eps + */ + for(i=0;ivalues[i*2+0]+=dux*weight*Jdet*gauss->weight*basis[i]; + pe->values[i*2+1]+=duy*weight*Jdet*gauss->weight*basis[i]; + } + break; + case DragCoefficientAbsGradientEnum: + /*Nothing in P vector*/ + break; + case ThicknessAbsGradientEnum: + /*Nothing in P vector*/ + break; + case ThicknessAlongGradientEnum: + /*Nothing in P vector*/ + break; + case ThicknessAcrossGradientEnum: + /*Nothing in P vector*/ + break; + case RheologyBbarAbsGradientEnum: + /*Nothing in P vector*/ + break; + default: + _error_("response " << EnumToStringx(responses[resp]) << " not supported yet"); + } + } + } + + /*Transform coordinate system*/ + basalelement->TransformLoadVectorCoord(pe,XYEnum); + + /*Clean up and return*/ + xDelete(responses); + xDelete(xyz_list); + xDelete(basis); + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + delete gauss; + return pe; +}/*}}}*/ +void AdjointHorizAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void AdjointHorizAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + int approximation; + element->GetInputValue(&approximation,ApproximationEnum); + if(approximation==FSApproximationEnum || approximation==NoneApproximationEnum){ + InputUpdateFromSolutionFS(solution,element); + } + else{ + InputUpdateFromSolutionHoriz(solution,element); + } +}/*}}}*/ +void AdjointHorizAnalysis::InputUpdateFromSolutionHoriz(IssmDouble* solution,Element* element){/*{{{*/ + int i; + int* doflist=NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + int numdof = numnodes*2; + + /*Fetch dof list and allocate solution vectors*/ + element->GetDofList(&doflist,NoneApproximationEnum,GsetEnum); + IssmDouble* values = xNew(numdof); + IssmDouble* lambdax = xNew(numnodes); + IssmDouble* lambday = xNew(numnodes); + + /*Use the dof list to index into the solution vector: */ + for(i=0;iTransformSolutionCoord(&values[0],XYEnum); + + /*Ok, we have vx and vy in values, fill in vx and vy arrays: */ + for(i=0;i(lambdax[i])) _error_("NaN found in solution vector"); + if(xIsNan(lambday[i])) _error_("NaN found in solution vector"); + } + + /*Add vx and vy as inputs to the tria element: */ + element->AddInput(AdjointxEnum,lambdax,element->GetElementType()); + element->AddInput(AdjointyEnum,lambday,element->GetElementType()); + + /*Free ressources:*/ + xDelete(values); + xDelete(lambdax); + xDelete(lambday); + xDelete(doflist); +}/*}}}*/ +void AdjointHorizAnalysis::InputUpdateFromSolutionFS(IssmDouble* solution,Element* element){/*{{{*/ + int i; + int* vdoflist=NULL; + int* pdoflist=NULL; + IssmDouble FSreconditioning; + + /*Fetch number of nodes and dof for this finite element*/ + int vnumnodes = element->NumberofNodesVelocity(); + int pnumnodes = element->NumberofNodesPressure(); + int vnumdof = vnumnodes*3; + int pnumdof = pnumnodes*1; + + /*Initialize values*/ + IssmDouble* values = xNew(vnumdof+pnumdof); + IssmDouble* lambdax = xNew(vnumnodes); + IssmDouble* lambday = xNew(vnumnodes); + IssmDouble* lambdaz = xNew(vnumnodes); + IssmDouble* lambdap = xNew(pnumnodes); + + int* cs_list = xNew(vnumnodes+pnumnodes); + for(i=0;iGetDofListVelocity(&vdoflist,GsetEnum); + element->GetDofListPressure(&pdoflist,GsetEnum); + + /*Use the dof list to index into the solution vector: */ + for(i=0;iTransformSolutionCoord(values,cs_list); + + /*fill in all arrays: */ + for(i=0;i(lambdax[i])) _error_("NaN found in solution vector"); + lambday[i] = values[i*NDOF3+1]; if(xIsNan(lambday[i])) _error_("NaN found in solution vector"); + lambdaz[i] = values[i*NDOF3+2]; if(xIsNan(lambdaz[i])) _error_("NaN found in solution vector"); + } + for(i=0;i(lambdap[i])) _error_("NaN found in solution vector"); + } + + /*Recondition pressure and compute vel: */ + element->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); + for(i=0;iAddInput(AdjointxEnum,lambdax,element->VelocityInterpolation()); + element->AddInput(AdjointyEnum,lambday,element->VelocityInterpolation()); + element->AddInput(AdjointzEnum,lambdaz,element->VelocityInterpolation()); + element->AddInput(AdjointpEnum,lambdap,element->PressureInterpolation()); + + /*Free ressources:*/ + xDelete(vdoflist); + xDelete(pdoflist); + xDelete(cs_list); + xDelete(lambdap); + xDelete(lambdaz); + xDelete(lambday); + xDelete(lambdax); + xDelete(values); +}/*}}}*/ +void AdjointHorizAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ + /*Default, do nothing*/ + return; +}/*}}}*/ Index: /issm/trunk/src/c/analyses/AdjointHorizAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/AdjointHorizAnalysis.h (revision 17805) +++ /issm/trunk/src/c/analyses/AdjointHorizAnalysis.h (revision 17806) @@ -12,5 +12,6 @@ public: - int DofsPerNode(int** doflist,int meshtype,int approximation); + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); @@ -18,4 +19,22 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementMatrix* CreateKMatrixSSA(Element* element); + ElementMatrix* CreateKMatrixHO(Element* element); + ElementMatrix* CreateKMatrixFS(Element* element); + ElementVector* CreatePVector(Element* element); + ElementVector* CreatePVectorSSA(Element* element); + ElementVector* CreatePVectorHO(Element* element); + ElementVector* CreatePVectorFS(Element* element); + void GetSolutionFromInputs(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); + void InputUpdateFromSolutionHoriz(IssmDouble* solution,Element* element); + void InputUpdateFromSolutionFS(IssmDouble* solution,Element* element); }; #endif Index: /issm/trunk/src/c/analyses/Analysis.h =================================================================== --- /issm/trunk/src/c/analyses/Analysis.h (revision 17805) +++ /issm/trunk/src/c/analyses/Analysis.h (revision 17806) @@ -6,4 +6,5 @@ #define _ANALYSIS_H_ +#include "../toolkits/objects/toolkitobjects.h" class Parameters; class IoModel; @@ -12,11 +13,17 @@ class Constraints; class Loads; +class Element; +class ElementVector; +class ElementMatrix; +class Gauss; class Analysis{ public: + /*Constructor/Destructor*/ + virtual ~Analysis(){}; - virtual ~Analysis(){}; - virtual int DofsPerNode(int** doflist,int meshtype,int approximation)=0; + /*Model processing*/ + virtual int DofsPerNode(int** doflist,int domaintype,int approximation)=0; virtual void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum)=0; virtual void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type)=0; @@ -24,4 +31,14 @@ virtual void CreateConstraints(Constraints* constraints,IoModel* iomodel)=0; virtual void CreateLoads(Loads* loads, IoModel* iomodel)=0; + + /*Finite element Analysis*/ + virtual void Core(FemModel* femmodel)=0; + virtual ElementVector* CreateDVector(Element* element)=0; + virtual ElementMatrix* CreateJacobianMatrix(Element* element)=0; + virtual ElementMatrix* CreateKMatrix(Element* element)=0; + virtual ElementVector* CreatePVector(Element* element)=0; + virtual void GetSolutionFromInputs(Vector* solution,Element* element)=0; + virtual void InputUpdateFromSolution(IssmDouble* solution,Element* element)=0; + virtual void UpdateConstraints(FemModel* femmodel)=0; }; #endif Index: /issm/trunk/src/c/analyses/BalancethicknessAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/BalancethicknessAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/BalancethicknessAnalysis.cpp (revision 17806) @@ -6,5 +6,5 @@ /*Model processing*/ -int BalancethicknessAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int BalancethicknessAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ return 1; }/*}}}*/ @@ -36,5 +36,5 @@ iomodel->FetchDataToInput(elements,ThicknessEnum); iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,VxEnum); @@ -44,6 +44,6 @@ iomodel->FetchDataToInput(elements,BalancethicknessThickeningRateEnum); - if(iomodel->meshtype==Mesh3DEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + if(iomodel->domaintype==Domain3DEnum){ + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); } @@ -55,8 +55,8 @@ /*Check in 3d*/ - if(stabilization==3 && iomodel->meshtype==Mesh3DEnum) _error_("DG 3d not implemented yet"); + if(stabilization==3 && iomodel->domaintype==Domain3DEnum) _error_("DG 3d not implemented yet"); /*First fetch data: */ - if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + if(iomodel->domaintype==Domain3DEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); if(stabilization!=3){ ::CreateNodes(nodes,iomodel,BalancethicknessAnalysisEnum,P1Enum); @@ -65,5 +65,5 @@ ::CreateNodes(nodes,iomodel,BalancethicknessAnalysisEnum,P1DGEnum); } - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); }/*}}}*/ void BalancethicknessAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ @@ -112,2 +112,386 @@ } }/*}}}*/ + +/*Finite Element Analysis*/ +void BalancethicknessAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* BalancethicknessAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* BalancethicknessAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* BalancethicknessAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + if(!element->IsOnBase()) return NULL; + Element* basalelement = element->SpawnBasalElement(); + + ElementMatrix* Ke = NULL; + switch(element->FiniteElement()){ + case P1Enum: case P2Enum: + Ke = CreateKMatrixCG(basalelement); + break; + case P1DGEnum: + Ke = CreateKMatrixDG(basalelement); + break; + default: + _error_("Element type " << EnumToStringx(element->FiniteElement()) << " not supported yet"); + } + + int domaintype; + element->FindParam(&domaintype,DomainTypeEnum); + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + return Ke; +}/*}}}*/ +ElementMatrix* BalancethicknessAnalysis::CreateKMatrixCG(Element* element){/*{{{*/ + + /*Intermediaries */ + int stabilization; + int domaintype; + IssmDouble Jdet,D_scalar,h; + IssmDouble vel,vx,vy,dvxdx,dvydy; + IssmDouble dvx[2],dvy[2]; + IssmDouble* xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(); + IssmDouble* B = xNew(2*numnodes); + IssmDouble* Bprime = xNew(2*numnodes); + IssmDouble D[2][2]; + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + element->FindParam(&domaintype,DomainTypeEnum); + element->FindParam(&stabilization,BalancethicknessStabilizationEnum); + Input* vxaverage_input=NULL; + Input* vyaverage_input=NULL; + if(domaintype==Domain2DhorizontalEnum){ + vxaverage_input=element->GetInput(VxEnum); _assert_(vxaverage_input); + vyaverage_input=element->GetInput(VyEnum); _assert_(vyaverage_input); + } + else{ + vxaverage_input=element->GetInput(VxAverageEnum); _assert_(vxaverage_input); + vyaverage_input=element->GetInput(VyAverageEnum); _assert_(vyaverage_input); + } + h = element->CharacteristicLength(); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + GetB(B,element,xyz_list,gauss); + GetBprime(Bprime,element,xyz_list,gauss); + + vxaverage_input->GetInputValue(&vx,gauss); + vyaverage_input->GetInputValue(&vy,gauss); + vxaverage_input->GetInputDerivativeValue(&dvx[0],xyz_list,gauss); + vyaverage_input->GetInputDerivativeValue(&dvy[0],xyz_list,gauss); + dvxdx=dvx[0]; + dvydy=dvy[1]; + D_scalar=gauss->weight*Jdet; + + D[0][0]=D_scalar*dvxdx; + D[0][1]=0.; + D[1][0]=0.; + D[1][1]=D_scalar*dvydy; + TripleMultiply(B,2,numnodes,1, + &D[0][0],2,2,0, + B,2,numnodes,0, + &Ke->values[0],1); + + D[0][0]=D_scalar*vx; + D[1][1]=D_scalar*vy; + TripleMultiply(B,2,numnodes,1, + &D[0][0],2,2,0, + Bprime,2,numnodes,0, + &Ke->values[0],1); + + if(stabilization==1){ + /*Streamline upwinding*/ + vel=sqrt(vx*vx+vy*vy); + D[0][0]=h/(2*vel)*vx*vx; + D[1][0]=h/(2*vel)*vy*vx; + D[0][1]=h/(2*vel)*vx*vy; + D[1][1]=h/(2*vel)*vy*vy; + } + else if(stabilization==2){ + /*SSA*/ + vxaverage_input->GetInputAverage(&vx); + vyaverage_input->GetInputAverage(&vy); + D[0][0]=h/2.0*fabs(vx); + D[0][1]=0.; + D[1][0]=0.; + D[1][1]=h/2.0*fabs(vy); + } + if(stabilization==1 || stabilization==2){ + D[0][0]=D_scalar*D[0][0]; + D[1][0]=D_scalar*D[1][0]; + D[0][1]=D_scalar*D[0][1]; + D[1][1]=D_scalar*D[1][1]; + TripleMultiply(Bprime,2,numnodes,1, + &D[0][0],2,2,0, + Bprime,2,numnodes,0, + &Ke->values[0],1); + } + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(B); + xDelete(Bprime); + delete gauss; + return Ke; +}/*}}}*/ +ElementMatrix* BalancethicknessAnalysis::CreateKMatrixDG(Element* element){/*{{{*/ + + /*Intermediaries */ + int domaintype; + IssmDouble Jdet,D_scalar,vx,vy,dvxdx,dvydy,vel; + IssmDouble dvx[2],dvy[2]; + IssmDouble* xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(); + IssmDouble* B = xNew(2*numnodes); + IssmDouble* Bprime = xNew(2*numnodes); + IssmDouble D[2][2]; + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + element->FindParam(&domaintype,DomainTypeEnum); + Input* vxaverage_input=NULL; + Input* vyaverage_input=NULL; + if(domaintype==Domain2DhorizontalEnum){ + vxaverage_input=element->GetInput(VxEnum); _assert_(vxaverage_input); + vyaverage_input=element->GetInput(VyEnum); _assert_(vyaverage_input); + } + else{ + vxaverage_input=element->GetInput(VxAverageEnum); _assert_(vxaverage_input); + vyaverage_input=element->GetInput(VyAverageEnum); _assert_(vyaverage_input); + } + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + vxaverage_input->GetInputValue(&vx,gauss); + vyaverage_input->GetInputValue(&vy,gauss); + vxaverage_input->GetInputDerivativeValue(&dvx[0],xyz_list,gauss); + vyaverage_input->GetInputDerivativeValue(&dvy[0],xyz_list,gauss); + D_scalar=gauss->weight*Jdet; + + /*WARNING: B and Bprime are inverted compared to CG*/ + GetB(Bprime,element,xyz_list,gauss); + GetBprime(B,element,xyz_list,gauss); + + D_scalar = - gauss->weight*Jdet; + D[0][0] = D_scalar*vx; + D[0][1] = 0.; + D[1][0] = 0.; + D[1][1] = D_scalar*vy; + TripleMultiply(B,2,numnodes,1, + &D[0][0],2,2,0, + Bprime,2,numnodes,0, + &Ke->values[0],1); + + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(B); + xDelete(Bprime); + delete gauss; + return Ke; +}/*}}}*/ +ElementVector* BalancethicknessAnalysis::CreatePVector(Element* element){/*{{{*/ + + if(!element->IsOnBase()) return NULL; + Element* basalelement = element->SpawnBasalElement(); + + ElementVector* pe = NULL; + switch(element->FiniteElement()){ + case P1Enum: case P2Enum: + pe = CreatePVectorCG(basalelement); + break; + case P1DGEnum: + pe = CreatePVectorDG(basalelement); + break; + default: + _error_("Element type " << EnumToStringx(element->FiniteElement()) << " not supported yet"); + } + + int domaintype; + element->FindParam(&domaintype,DomainTypeEnum); + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + return pe; +}/*}}}*/ +ElementVector* BalancethicknessAnalysis::CreatePVectorCG(Element* element){/*{{{*/ + + /*Intermediaries */ + IssmDouble dhdt,mb,ms,Jdet; + IssmDouble* xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementVector* pe = element->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + Input* mb_input = element->GetInput(BasalforcingsMeltingRateEnum); _assert_(mb_input); + Input* ms_input = element->GetInput(SurfaceforcingsMassBalanceEnum); _assert_(ms_input); + Input* dhdt_input = element->GetInput(BalancethicknessThickeningRateEnum); _assert_(dhdt_input); + + /*Initialize mb_correction to 0, do not forget!:*/ + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctions(basis,gauss); + + ms_input->GetInputValue(&ms,gauss); + mb_input->GetInputValue(&mb,gauss); + dhdt_input->GetInputValue(&dhdt,gauss); + + for(int i=0;ivalues[i]+=Jdet*gauss->weight*(ms-mb-dhdt)*basis[i]; + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + delete gauss; + return pe; +}/*}}}*/ +ElementVector* BalancethicknessAnalysis::CreatePVectorDG(Element* element){/*{{{*/ + + /*Intermediaries */ + IssmDouble dhdt,mb,ms,Jdet; + IssmDouble* xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementVector* pe = element->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + Input* mb_input = element->GetInput(BasalforcingsMeltingRateEnum); _assert_(mb_input); + Input* ms_input = element->GetInput(SurfaceforcingsMassBalanceEnum); _assert_(ms_input); + Input* dhdt_input = element->GetInput(BalancethicknessThickeningRateEnum); _assert_(dhdt_input); + + /*Initialize mb_correction to 0, do not forget!:*/ + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctions(basis,gauss); + + ms_input->GetInputValue(&ms,gauss); + mb_input->GetInputValue(&mb,gauss); + dhdt_input->GetInputValue(&dhdt,gauss); + + for(int i=0;ivalues[i]+=Jdet*gauss->weight*(ms-mb-dhdt)*basis[i]; + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + delete gauss; + return pe; +}/*}}}*/ +void BalancethicknessAnalysis::GetB(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2. + * For node i, Bi can be expressed in the actual coordinate system + * by: + * Bi=[ N ] + * [ N ] + * where N is the finiteelement function for node i. + * + * We assume B_prog has been allocated already, of size: 2x(NDOF1*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions*/ + IssmDouble* basis=xNew(numnodes); + element->NodalFunctions(basis,gauss); + + /*Build B: */ + for(int i=0;i(basis); +}/*}}}*/ +void BalancethicknessAnalysis::GetBprime(IssmDouble* Bprime,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B' matrix. B'=[B1' B2' B3'] where Bi' is of size 3*NDOF2. + * For node i, Bi' can be expressed in the actual coordinate system + * by: + * Bi_prime=[ dN/dx ] + * [ dN/dy ] + * where N is the finiteelement function for node i. + * + * We assume B' has been allocated already, of size: 3x(NDOF2*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(2*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B': */ + for(int i=0;i(dbasis); + +}/*}}}*/ +void BalancethicknessAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void BalancethicknessAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + + int domaintype; + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + element->InputUpdateFromSolutionOneDof(solution,ThicknessEnum); + break; + case Domain3DEnum: + element->InputUpdateFromSolutionOneDofCollapsed(solution,ThicknessEnum); + break; + default: _error_("mesh "<* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); }; #endif Index: /issm/trunk/src/c/analyses/BalancethicknessSoftAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/BalancethicknessSoftAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/BalancethicknessSoftAnalysis.cpp (revision 17806) @@ -6,5 +6,5 @@ /*Model processing*/ -int BalancethicknessSoftAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int BalancethicknessSoftAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ _error_("not implemented"); }/*}}}*/ @@ -24,2 +24,30 @@ _error_("not implemented yet"); }/*}}}*/ + +/*Finite Element Analysis*/ +void BalancethicknessSoftAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* BalancethicknessSoftAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* BalancethicknessSoftAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* BalancethicknessSoftAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* BalancethicknessSoftAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ +void BalancethicknessSoftAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void BalancethicknessSoftAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void BalancethicknessSoftAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ + /*Default, do nothing*/ + return; +}/*}}}*/ Index: /issm/trunk/src/c/analyses/BalancethicknessSoftAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/BalancethicknessSoftAnalysis.h (revision 17805) +++ /issm/trunk/src/c/analyses/BalancethicknessSoftAnalysis.h (revision 17806) @@ -12,5 +12,6 @@ public: - int DofsPerNode(int** doflist,int meshtype,int approximation); + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); @@ -18,4 +19,14 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); + void GetSolutionFromInputs(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); }; #endif Index: /issm/trunk/src/c/analyses/BalancevelocityAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/BalancevelocityAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/BalancevelocityAnalysis.cpp (revision 17806) @@ -6,5 +6,5 @@ /*Model processing*/ -int BalancevelocityAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int BalancevelocityAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ return 1; }/*}}}*/ @@ -25,5 +25,5 @@ iomodel->FetchDataToInput(elements,ThicknessEnum); iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,VxEnum); @@ -33,6 +33,6 @@ iomodel->FetchDataToInput(elements,BalancethicknessThickeningRateEnum); - if(iomodel->meshtype==Mesh3DEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + if(iomodel->domaintype==Domain3DEnum){ + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); } @@ -41,10 +41,8 @@ /*Check in 3d*/ - if(iomodel->meshtype==Mesh3DEnum) _error_("DG 3d not implemented yet"); + if(iomodel->domaintype==Domain3DEnum) _error_("DG 3d not implemented yet"); /*First fetch data: */ - iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum); ::CreateNodes(nodes,iomodel,BalancevelocityAnalysisEnum,P1Enum); - iomodel->DeleteData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum); }/*}}}*/ void BalancevelocityAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ @@ -57,2 +55,206 @@ /*No loads*/ }/*}}}*/ + +/*Finite Element Analysis*/ +void BalancevelocityAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* BalancevelocityAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* BalancevelocityAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* BalancevelocityAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + /*Intermediaries */ + IssmDouble dhdt,mb,ms,Jdet; + IssmDouble h,gamma,thickness; + IssmDouble hnx,hny,dhnx[2],dhny[2]; + IssmDouble *xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element matrix and vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(); + IssmDouble* B = xNew(2*numnodes); + IssmDouble* basis = xNew(numnodes); + IssmDouble* dbasis = xNew(2*numnodes); + IssmDouble* HNx = xNew(numnodes); + IssmDouble* HNy = xNew(numnodes); + IssmDouble* H = xNew(numnodes); + IssmDouble* Nx = xNew(numnodes); + IssmDouble* Ny = xNew(numnodes); + + /*Retrieve all Inputs and parameters: */ + element->GetVerticesCoordinates(&xyz_list); + Input* H_input = element->GetInput(ThicknessEnum); _assert_(H_input); + h = element->CharacteristicLength(); + + /*Get vector N for all nodes and build HNx and HNy*/ + element->GetInputListOnNodes(Nx,SurfaceSlopeXEnum); + element->GetInputListOnNodes(Ny,SurfaceSlopeYEnum); + element->GetInputListOnNodes(H,ThicknessEnum); + for(int i=0;iNewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + H_input->GetInputValue(&thickness,gauss); + if(thickness<50.) thickness=50.; + element->ValueP1DerivativesOnGauss(&dhnx[0],HNx,xyz_list,gauss); + element->ValueP1DerivativesOnGauss(&dhny[0],HNy,xyz_list,gauss); + element->ValueP1OnGauss(&hnx,HNx,gauss); + element->ValueP1OnGauss(&hny,HNy,gauss); + + gamma=h/(2.*thickness+1.e-10); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctions(basis,gauss); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + for(int i=0;ivalues[i*numnodes+j] += gauss->weight*Jdet*( + (basis[i]+gamma*(basis[i]*(dhnx[0]+dhny[1]) + dbasis[0*numnodes+i]*hnx + dbasis[1*numnodes+i]*hny))* + (basis[j]*(dhnx[0]+dhny[1]) + dbasis[0*numnodes+j]*hnx + dbasis[1*numnodes+j]*hny) + ); + } + } + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + xDelete(dbasis); + xDelete(H); + xDelete(Nx); + xDelete(Ny); + xDelete(HNx); + xDelete(HNy); + xDelete(B); + delete gauss; + return Ke; +}/*}}}*/ +ElementVector* BalancevelocityAnalysis::CreatePVector(Element* element){/*{{{*/ + + /*Intermediaries*/ + int domaintype; + Element* basalelement; + + /*Get basal element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + break; + case Domain3DEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Initialize Element vector*/ + ElementVector* pe = basalelement->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + IssmDouble* dbasis = xNew(numnodes*2); + IssmDouble* H = xNew(numnodes); + IssmDouble* Nx = xNew(numnodes); + IssmDouble* Ny = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + basalelement->GetVerticesCoordinates(&xyz_list); + Input* ms_input = basalelement->GetInput(SurfaceforcingsMassBalanceEnum); _assert_(ms_input); + Input* mb_input = basalelement->GetInput(BasalforcingsMeltingRateEnum); _assert_(mb_input); + Input* dhdt_input = basalelement->GetInput(BalancethicknessThickeningRateEnum); _assert_(dhdt_input); + Input* H_input = basalelement->GetInput(ThicknessEnum); _assert_(H_input); + IssmDouble h = basalelement->CharacteristicLength(); + + /*Get vector N for all nodes*/ + basalelement->GetInputListOnNodes(Nx,SurfaceSlopeXEnum); + basalelement->GetInputListOnNodes(Ny,SurfaceSlopeYEnum); + basalelement->GetInputListOnNodes(H,ThicknessEnum); + for(int i=0;iNewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + basalelement->JacobianDeterminant(&Jdet,xyz_list,gauss); + basalelement->NodalFunctions(basis,gauss); + basalelement->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + element->ValueP1DerivativesOnGauss(&dhnx[0],Nx,xyz_list,gauss); + element->ValueP1DerivativesOnGauss(&dhny[0],Ny,xyz_list,gauss); + element->ValueP1OnGauss(&hnx,Nx,gauss); + element->ValueP1OnGauss(&hny,Ny,gauss); + + ms_input->GetInputValue(&ms,gauss); + mb_input->GetInputValue(&mb,gauss); + dhdt_input->GetInputValue(&dhdt,gauss); + H_input->GetInputValue(&thickness,gauss); + if(thickness<50.) thickness=50.; + + gamma=h/(2.*thickness+1.e-10); + + for(int i=0;ivalues[i]+=Jdet*gauss->weight*(ms-mb-dhdt)*( basis[i] + gamma*(basis[i]*(dhnx[0]+dhny[1])+hnx*dbasis[0*numnodes+i] + hny*dbasis[1*numnodes+i])); + } + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + xDelete(dbasis); + xDelete(H); + xDelete(Nx); + xDelete(Ny); + delete gauss; + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + return pe; +}/*}}}*/ +void BalancevelocityAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void BalancevelocityAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + + int domaintype; + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + element->InputUpdateFromSolutionOneDof(solution,VelEnum); + break; + case Domain3DEnum: + element->InputUpdateFromSolutionOneDofCollapsed(solution,VelEnum); + break; + default: _error_("mesh "<* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); }; #endif Index: /issm/trunk/src/c/analyses/DamageEvolutionAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/DamageEvolutionAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/DamageEvolutionAnalysis.cpp (revision 17806) @@ -6,13 +6,16 @@ /*Model processing*/ -int DamageEvolutionAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int DamageEvolutionAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ return 1; }/*}}}*/ void DamageEvolutionAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/ + + /*Intermediaries*/ + int numoutputs; + char** requestedoutputs = NULL; /*retrieve some parameters: */ parameters->AddObject(iomodel->CopyConstantObject(DamageLawEnum)); parameters->AddObject(iomodel->CopyConstantObject(DamageStabilizationEnum)); - parameters->AddObject(iomodel->CopyConstantObject(DamagePenaltyThresholdEnum)); parameters->AddObject(iomodel->CopyConstantObject(DamagePenaltyLockEnum)); @@ -20,4 +23,10 @@ parameters->AddObject(iomodel->CopyConstantObject(DamageMaxiterEnum)); parameters->AddObject(iomodel->CopyConstantObject(DamageMaxDamageEnum)); + + /*Requested outputs*/ + iomodel->FetchData(&requestedoutputs,&numoutputs,DamageEvolutionRequestedOutputsEnum); + parameters->AddObject(new IntParam(DamageEvolutionNumRequestedOutputsEnum,numoutputs)); + if(numoutputs)parameters->AddObject(new StringArrayParam(DamageEvolutionRequestedOutputsEnum,requestedoutputs,numoutputs)); + iomodel->DeleteData(&requestedoutputs,numoutputs,DamageEvolutionRequestedOutputsEnum); /*Retrieve law dependent parameters: */ @@ -31,4 +40,5 @@ parameters->AddObject(iomodel->CopyConstantObject(DamageStressThresholdEnum)); parameters->AddObject(iomodel->CopyConstantObject(DamageHealingEnum)); + parameters->AddObject(iomodel->CopyConstantObject(DamageEquivStressEnum)); } xDelete(law); @@ -36,4 +46,6 @@ }/*}}}*/ void DamageEvolutionAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/ + + int finiteelement = P1Enum; /*Update elements: */ @@ -42,5 +54,5 @@ if(iomodel->my_elements[i]){ Element* element=(Element*)elements->GetObjectByOffset(counter); - element->Update(i,iomodel,analysis_counter,analysis_type,P1Enum); + element->Update(i,iomodel,analysis_counter,analysis_type,finiteelement); counter++; } @@ -50,5 +62,5 @@ iomodel->FetchDataToInput(elements,VxEnum); iomodel->FetchDataToInput(elements,VyEnum); - iomodel->FetchDataToInput(elements,VzEnum); + if(iomodel->domaintype==Domain3DEnum) iomodel->FetchDataToInput(elements,VzEnum); iomodel->FetchDataToInput(elements,DamageDEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); @@ -63,32 +75,442 @@ void DamageEvolutionAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ - iomodel->FetchData(1,MeshVertexonbedEnum); - ::CreateNodes(nodes,iomodel,DamageEvolutionAnalysisEnum,P1Enum); - iomodel->DeleteData(1,MeshVertexonbedEnum); + int finiteelement = P1Enum; + + if(iomodel->domaintype!=Domain2DhorizontalEnum) iomodel->FetchData(1,MeshVertexonbaseEnum); + ::CreateNodes(nodes,iomodel,DamageEvolutionAnalysisEnum,finiteelement); + iomodel->DeleteData(1,MeshVertexonbaseEnum); }/*}}}*/ void DamageEvolutionAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ int stabilization; + int finiteelement = P1Enum; iomodel->Constant(&stabilization,DamageStabilizationEnum); - IoModelToConstraintsx(constraints,iomodel,DamageSpcdamageEnum,DamageEvolutionAnalysisEnum,P1Enum); + IoModelToConstraintsx(constraints,iomodel,DamageSpcdamageEnum,DamageEvolutionAnalysisEnum,finiteelement); }/*}}}*/ void DamageEvolutionAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/ - /*create penalties for nodes: no node can have a damage > 1*/ - iomodel->FetchData(1,DamageSpcdamageEnum); - CreateSingleNodeToElementConnectivity(iomodel); - - for(int i=0;inumberofvertices;i++){ - - /*keep only this partition's nodes:*/ - if(iomodel->my_vertices[i]){ - if (xIsNan(iomodel->Data(DamageSpcdamageEnum)[i])){ //No penalty applied on spc nodes! - loads->AddObject(new Pengrid(iomodel->loadcounter+i+1,i,iomodel,DamageEvolutionAnalysisEnum)); + /*Nothing for now*/ + +}/*}}}*/ + +/*Finite Element Analysis*/ +void DamageEvolutionAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* DamageEvolutionAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* DamageEvolutionAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* DamageEvolutionAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*Intermediaries*/ + Element* basalelement; + int domaintype,dim; + int stabilization; + IssmDouble Jdet,dt,D_scalar,h; + IssmDouble vel,vx,vy,dvxdx,dvydy,dvx[2],dvy[2]; + IssmDouble *xyz_list = NULL; + + /*Get problem dimension and basal element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + dim = 2; + break; + case Domain3DEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + dim = 2; + break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Initialize Element vector*/ + ElementMatrix* Ke = basalelement->NewElementMatrix(); + IssmDouble* basis = xNew(numnodes); + IssmDouble* B = xNew(dim*numnodes); + IssmDouble* Bprime = xNew(dim*numnodes); + IssmDouble* D = xNewZeroInit(dim*dim); + + /*Retrieve all inputs and parameters*/ + basalelement->GetVerticesCoordinates(&xyz_list); + basalelement->FindParam(&dt,TimesteppingTimeStepEnum); + basalelement->FindParam(&stabilization,DamageStabilizationEnum); + Input* vxaverage_input=NULL; + Input* vyaverage_input=NULL; + if(domaintype==Domain2DhorizontalEnum){ + vxaverage_input=basalelement->GetInput(VxEnum); _assert_(vxaverage_input); + vyaverage_input=basalelement->GetInput(VyEnum); _assert_(vyaverage_input); + } + else{ + if(dim==1){ + vxaverage_input=element->GetInput(VxEnum); _assert_(vxaverage_input); + } + if(dim==2){ + vxaverage_input=element->GetInput(VxAverageEnum); _assert_(vxaverage_input); + vyaverage_input=element->GetInput(VyAverageEnum); _assert_(vyaverage_input); + } + } + h=basalelement->CharacteristicLength(); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=basalelement->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + basalelement->JacobianDeterminant(&Jdet,xyz_list,gauss); + basalelement->NodalFunctions(basis,gauss); + + vxaverage_input->GetInputValue(&vx,gauss); + vxaverage_input->GetInputDerivativeValue(&dvx[0],xyz_list,gauss); + if(dim==2){ + vyaverage_input->GetInputValue(&vy,gauss); + vyaverage_input->GetInputDerivativeValue(&dvy[0],xyz_list,gauss); + } + + D_scalar=gauss->weight*Jdet; + TripleMultiply(basis,1,numnodes,1, + &D_scalar,1,1,0, + basis,1,numnodes,0, + &Ke->values[0],1); + + GetB(B,basalelement,dim,xyz_list,gauss); + GetBprime(Bprime,basalelement,dim,xyz_list,gauss); + + dvxdx=dvx[0]; + if(dim==2) dvydy=dvy[1]; + D_scalar=dt*gauss->weight*Jdet; + + D[0*dim+0]=D_scalar*dvxdx; + if(dim==2) D[1*dim+1]=D_scalar*dvydy; + + TripleMultiply(B,dim,numnodes,1, + D,dim,dim,0, + B,dim,numnodes,0, + &Ke->values[0],1); + + D[0*dim+0]=D_scalar*vx; + if(dim==2) D[1*dim+1]=D_scalar*vy; + + TripleMultiply(B,dim,numnodes,1, + D,dim,dim,0, + Bprime,dim,numnodes,0, + &Ke->values[0],1); + + if(stabilization==2){ + if(dim==1){ + vel=fabs(vx)+1.e-8; + D[0]=h/(2.0*vel)*vx*vx; } - } - } - iomodel->DeleteData(1,DamageSpcdamageEnum); - -}/*}}}*/ + else{ + /*Streamline upwinding*/ + vel=sqrt(vx*vx+vy*vy)+1.e-8; + D[0*dim+0]=h/(2.0*vel)*vx*vx; + D[1*dim+0]=h/(2.0*vel)*vy*vx; + D[0*dim+1]=h/(2.0*vel)*vx*vy; + D[1*dim+1]=h/(2.0*vel)*vy*vy; + } + } + else if(stabilization==1){ + vxaverage_input->GetInputAverage(&vx); + if(dim==2) vyaverage_input->GetInputAverage(&vy); + D[0*dim+0]=h/2.0*fabs(vx); + if(dim==2) D[1*dim+1]=h/2.0*fabs(vy); + } + if(stabilization==1 || stabilization==2){ + if(dim==1) D[0]=D_scalar*D[0]; + else{ + D[0*dim+0]=D_scalar*D[0*dim+0]; + D[1*dim+0]=D_scalar*D[1*dim+0]; + D[0*dim+1]=D_scalar*D[0*dim+1]; + D[1*dim+1]=D_scalar*D[1*dim+1]; + } + + TripleMultiply(Bprime,dim,numnodes,1, + D,dim,dim,0, + Bprime,dim,numnodes,0, + &Ke->values[0],1); + } + + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + xDelete(B); + xDelete(Bprime); + xDelete(D); + delete gauss; + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + return Ke; +}/*}}}*/ +ElementVector* DamageEvolutionAnalysis::CreatePVector(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*Intermediaries*/ + int domaintype; + Element* basalelement; + IssmDouble Jdet,dt; + IssmDouble f,damage; + IssmDouble* xyz_list = NULL; + + /*Get basal element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + break; + case Domain3DEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementVector* pe = basalelement->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + basalelement->GetVerticesCoordinates(&xyz_list); + basalelement->FindParam(&dt,TimesteppingTimeStepEnum); + this->CreateDamageFInput(basalelement); + Input* damaged_input = basalelement->GetInput(DamageDEnum); _assert_(damaged_input); + Input* damagef_input = basalelement->GetInput(DamageFEnum); _assert_(damagef_input); + + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=basalelement->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + basalelement->JacobianDeterminant(&Jdet,xyz_list,gauss); + basalelement->NodalFunctions(basis,gauss); + + damaged_input->GetInputValue(&damage,gauss); + damagef_input->GetInputValue(&f,gauss); + + for(int i=0;ivalues[i]+=Jdet*gauss->weight*(damage+dt*f)*basis[i]; + } + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + delete gauss; + return pe; +}/*}}}*/ +void DamageEvolutionAnalysis::GetB(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2. + * For node i, Bi can be expressed in the actual coordinate system + * by: + * Bi=[ N ] + * [ N ] + * where N is the finiteelement function for node i. + * + * We assume B_prog has been allocated already, of size: 2x(NDOF1*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions*/ + IssmDouble* basis=xNew(numnodes); + element->NodalFunctions(basis,gauss); + + /*Build B: */ + for(int i=0;i(basis); +}/*}}}*/ +void DamageEvolutionAnalysis::GetBprime(IssmDouble* Bprime,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B' matrix. B'=[B1' B2' B3'] where Bi' is of size 3*NDOF2. + * For node i, Bi' can be expressed in the actual coordinate system + * by: + * Bi_prime=[ dN/dx ] + * [ dN/dy ] + * where N is the finiteelement function for node i. + * + * We assume B' has been allocated already, of size: 3x(NDOF2*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(dim*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B': */ + for(int i=0;i(dbasis); + +}/*}}}*/ +void DamageEvolutionAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void DamageEvolutionAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + + int domaintype; + IssmDouble max_damage; + int *doflist = NULL; + Element* basalelement=NULL; + + element->FindParam(&domaintype,DomainTypeEnum); + if(domaintype!=Domain2DhorizontalEnum){ + if(!element->IsOnBase()) return; + basalelement=element->SpawnBasalElement(); + } + else{ + basalelement = element; + } + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = basalelement->GetNumberOfNodes(); + + /*Fetch dof list and allocate solution vector*/ + basalelement->GetDofList(&doflist,NoneApproximationEnum,GsetEnum); + IssmDouble* newdamage = xNew(numnodes); + + /*Get user-supplied max_damage: */ + basalelement->FindParam(&max_damage,DamageMaxDamageEnum); + + /*Use the dof list to index into the solution vector: */ + for(int i=0;i(newdamage[i])) _error_("NaN found in solution vector"); + /*Enforce D < max_damage and D > 0 */ + if(newdamage[i]>max_damage) newdamage[i]=max_damage; + else if(newdamage[i]<0.) newdamage[i]=0.; + } + + /*Get all inputs and parameters*/ + if(domaintype==Domain2DhorizontalEnum){ + basalelement->AddInput(DamageDbarEnum,newdamage,element->GetElementType()); + } + else{ + basalelement->AddBasalInput(DamageDEnum,newdamage,element->GetElementType()); + } + + /*Free ressources:*/ + xDelete(newdamage); + xDelete(doflist); + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; +}/*}}}*/ +void DamageEvolutionAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ + /*Default, do nothing*/ + return; +}/*}}}*/ + +/*Intermediaries*/ +void DamageEvolutionAnalysis::CreateDamageFInput(Element* element){/*{{{*/ + + /*Intermediaries */ + IssmDouble c1,c2,c3,healing,stress_threshold; + IssmDouble s_xx,s_xy,s_yy,s1,s2,stmp; + IssmDouble J2s,Chi,Psi,PosPsi,NegPsi; + IssmDouble damage,tau_xx,tau_xy,tau_yy; + int equivstress,domaintype; + + /*Fetch number of vertices and allocate output*/ + int numvertices = element->GetNumberOfVertices(); + IssmDouble* f = xNew(numvertices); + + /*retrieve parameters:*/ + element->FindParam(&c1,DamageC1Enum); + element->FindParam(&c2,DamageC2Enum); + element->FindParam(&c3,DamageC3Enum); + element->FindParam(&healing,DamageHealingEnum); + element->FindParam(&stress_threshold,DamageStressThresholdEnum); + element->FindParam(&domaintype,DomainTypeEnum); + + /*Compute stress tensor: */ + element->ComputeDeviatoricStressTensor(); + + /*retrieve what we need: */ + Input* tau_xx_input = element->GetInput(DeviatoricStressxxEnum); _assert_(tau_xx_input); + Input* tau_xy_input = element->GetInput(DeviatoricStressxyEnum); _assert_(tau_xy_input); + Input* tau_yy_input = element->GetInput(DeviatoricStressyyEnum); _assert_(tau_yy_input); + Input* damage_input = NULL; + if(domaintype==Domain2DhorizontalEnum){ + damage_input = element->GetInput(DamageDbarEnum); _assert_(damage_input); + } + else{ + damage_input = element->GetInput(DamageDEnum); _assert_(damage_input); + } + + + + /*retrieve the desired type of equivalent stress*/ + element->FindParam(&equivstress,DamageEquivStressEnum); + + /*Calculate damage evolution source term: */ + Gauss* gauss=element->NewGauss(); + for (int iv=0;ivGaussVertex(iv); + + damage_input->GetInputValue(&damage,gauss); + tau_xx_input->GetInputValue(&tau_xx,gauss); + tau_xy_input->GetInputValue(&tau_xy,gauss); + tau_yy_input->GetInputValue(&tau_yy,gauss); + + /*Calculate effective stress components*/ + s_xx=tau_xx/(1.-damage); + s_xy=tau_xy/(1.-damage); + s_yy=tau_yy/(1.-damage); + + /*Calculate principal effective stresses*/ + s1=(s_xx+s_yy)/2.+sqrt(pow((s_xx-s_yy)/2.,2)+pow(s_xy,2)); + s2=(s_xx+s_yy)/2.-sqrt(pow((s_xx-s_yy)/2.,2)+pow(s_xy,2)); + if(fabs(s2)>fabs(s1)){stmp=s2; s2=s1; s1=stmp;} + + if(equivstress==0){ /* von Mises */ + Chi=sqrt(s1*s1-s1*s2+s2*s2); + } + else if(equivstress==1){ /* max principal stress */ + Chi=s1; + } + Psi=Chi-stress_threshold; + PosPsi=max(Psi,0.); + NegPsi=max(-Chi,0.); /* healing only for compressive stresses */ + + f[iv]= c1*(pow(PosPsi,c2) - healing*pow(NegPsi,c2))*pow((1.-damage),-c3); + } + + /*Add input*/ + element->AddInput(DamageFEnum,f,P1Enum); + + /*Clean up and return*/ + xDelete(f); + delete gauss; +}/*}}}*/ Index: /issm/trunk/src/c/analyses/DamageEvolutionAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/DamageEvolutionAnalysis.h (revision 17805) +++ /issm/trunk/src/c/analyses/DamageEvolutionAnalysis.h (revision 17806) @@ -12,5 +12,6 @@ public: - int DofsPerNode(int** doflist,int meshtype,int approximation); + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); @@ -18,4 +19,19 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); + void GetB(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); + void GetBprime(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); + void GetSolutionFromInputs(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); + + /*Intermediaries*/ + void CreateDamageFInput(Element* element); }; #endif Index: /issm/trunk/src/c/analyses/DepthAverageAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/DepthAverageAnalysis.cpp (revision 17806) +++ /issm/trunk/src/c/analyses/DepthAverageAnalysis.cpp (revision 17806) @@ -0,0 +1,171 @@ +#include "./DepthAverageAnalysis.h" +#include "../toolkits/toolkits.h" +#include "../classes/classes.h" +#include "../shared/shared.h" +#include "../modules/modules.h" + +/*Model processing*/ +int DepthAverageAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ + return 1; +}/*}}}*/ +void DepthAverageAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/ +}/*}}}*/ +void DepthAverageAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/ + + int counter=0; + for(int i=0;inumberofelements;i++){ + if(iomodel->my_elements[i]){ + Element* element=(Element*)elements->GetObjectByOffset(counter); + element->Update(i,iomodel,analysis_counter,analysis_type,P1Enum); + counter++; + } + } + + if(iomodel->domaintype==Domain2DverticalEnum){ + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); + } +}/*}}}*/ +void DepthAverageAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ + + ::CreateNodes(nodes,iomodel,DepthAverageAnalysisEnum,P1Enum); + +}/*}}}*/ +void DepthAverageAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ +}/*}}}*/ +void DepthAverageAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/ +}/*}}}*/ + +/*Finite Element Analysis*/ +void DepthAverageAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* DepthAverageAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* DepthAverageAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* DepthAverageAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + /*Intermediaries */ + int dim; + IssmDouble Jdet,D,dt=1.e+9; + IssmDouble *xyz_list = NULL; + + /*Get dimension*/ + element->FindParam(&dim,DomainDimensionEnum); + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(); + IssmDouble* B = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + GetB(B,element,dim,xyz_list,gauss); + D=gauss->weight*Jdet*dt; + + /*vertical diffusion*/ + TripleMultiply(B,1,numnodes,1, + &D,1,1,0, + B,1,numnodes,0, + &Ke->values[0],1); + + /*Next value*/ + D=gauss->weight*Jdet; + element->NodalFunctions(B,gauss); + TripleMultiply(B,numnodes,1,0, + &D,1,1,0, + B,1,numnodes,0, + &Ke->values[0],1); + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(B); + delete gauss; + return Ke; +}/*}}}*/ +ElementVector* DepthAverageAnalysis::CreatePVector(Element* element){/*{{{*/ + + /*Intermediaries*/ + int input_enum; + IssmDouble Jdet,scalar,value; + IssmDouble* xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector*/ + ElementVector* pe = element->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + element->FindParam(&input_enum,InputToDepthaverageEnum); + Input* input = element->GetInput(input_enum); _assert_(input); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(3); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctions(basis,gauss); + + /* Build transient now */ + input->GetInputValue(&value, gauss); + scalar=value*Jdet*gauss->weight; + for(int i=0;ivalues[i]+=scalar*basis[i]; + + } + + /*Clean up and return*/ + xDelete(basis); + xDelete(xyz_list); + delete gauss; + return pe; +}/*}}}*/ +void DepthAverageAnalysis::GetB(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /* Compute B matrix. B=[dh1/dz dh2/dz dh3/dz dh4/dz dh5/dz dh6/dz]; + where hi is the interpolation function for node i.*/ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(dim*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B: */ + for(int i=0;i(dbasis); +} +/*}}}*/ +void DepthAverageAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void DepthAverageAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + + int inputenum; + element->FindParam(&inputenum,InputToDepthaverageEnum); + element->InputUpdateFromSolutionOneDof(solution,inputenum); +}/*}}}*/ +void DepthAverageAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ + /*Default, do nothing*/ + return; +}/*}}}*/ Index: /issm/trunk/src/c/analyses/DepthAverageAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/DepthAverageAnalysis.h (revision 17806) +++ /issm/trunk/src/c/analyses/DepthAverageAnalysis.h (revision 17806) @@ -0,0 +1,33 @@ +/*! \file DepthAverageAnalysis.h + * \brief: header file for generic external result object + */ + +#ifndef _DepthAverageAnalysis_ +#define _DepthAverageAnalysis_ + +/*Headers*/ +#include "./Analysis.h" + +class DepthAverageAnalysis: public Analysis{ + + public: + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); + void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); + void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); + void CreateNodes(Nodes* nodes,IoModel* iomodel); + void CreateConstraints(Constraints* constraints,IoModel* iomodel); + void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); + void GetB(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); + void GetSolutionFromInputs(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); +}; +#endif Index: /issm/trunk/src/c/analyses/EnthalpyAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/EnthalpyAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/EnthalpyAnalysis.cpp (revision 17806) @@ -6,16 +6,28 @@ /*Model processing*/ -int EnthalpyAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int EnthalpyAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ return 1; }/*}}}*/ void EnthalpyAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/ + + int numoutputs; + char** requestedoutputs = NULL; + + parameters->AddObject(iomodel->CopyConstantObject(ThermalStabilizationEnum)); + parameters->AddObject(iomodel->CopyConstantObject(ThermalIsenthalpyEnum)); + parameters->AddObject(iomodel->CopyConstantObject(ThermalIsdynamicbasalspcEnum)); + + iomodel->FetchData(&requestedoutputs,&numoutputs,ThermalRequestedOutputsEnum); + parameters->AddObject(new IntParam(ThermalNumRequestedOutputsEnum,numoutputs)); + if(numoutputs)parameters->AddObject(new StringArrayParam(ThermalRequestedOutputsEnum,requestedoutputs,numoutputs)); + iomodel->DeleteData(&requestedoutputs,numoutputs,ThermalRequestedOutputsEnum); }/*}}}*/ void EnthalpyAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/ - bool dakota_analysis; + bool dakota_analysis, islevelset; bool isenthalpy; /*Now, is the model 3d? otherwise, do nothing: */ - if(iomodel->meshtype==Mesh2DhorizontalEnum)return; + if(iomodel->domaintype==Domain2DhorizontalEnum)return; /*Is enthalpy requested?*/ @@ -37,8 +49,9 @@ iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum); + iomodel->Constant(&islevelset,TransientIslevelsetEnum); iomodel->FetchDataToInput(elements,ThicknessEnum); iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,FrictionCoefficientEnum); iomodel->FetchDataToInput(elements,FrictionPEnum); @@ -46,5 +59,5 @@ iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum); - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); iomodel->FetchDataToInput(elements,FlowequationElementEquationEnum); @@ -71,4 +84,8 @@ elements->InputDuplicate(VxMeshEnum,QmuVzMeshEnum); } + if(islevelset){ + iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum); + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); // required for updating active nodes + } /*Free data: */ @@ -77,7 +94,7 @@ void EnthalpyAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ - if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + if(iomodel->domaintype==Domain3DEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); ::CreateNodes(nodes,iomodel,EnthalpyAnalysisEnum,P1Enum); - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); }/*}}}*/ void EnthalpyAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ @@ -100,5 +117,5 @@ /*return if 2d mesh*/ - if(iomodel->meshtype==Mesh2DhorizontalEnum) return; + if(iomodel->domaintype==Domain2DhorizontalEnum) return; /*Fetch data: */ @@ -117,5 +134,5 @@ if (!xIsNan(spcvector[i])){ - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,heatcapacity*(spcvector[i]-referencetemperature),EnthalpyAnalysisEnum)); + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,0,heatcapacity*(spcvector[i]-referencetemperature),EnthalpyAnalysisEnum)); count++; @@ -150,5 +167,5 @@ if(spcpresent){ - constraints->AddObject(new SpcTransient(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,N,times,values,EnthalpyAnalysisEnum)); + constraints->AddObject(new SpcTransient(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,0,N,times,values,EnthalpyAnalysisEnum)); count++; } @@ -170,2 +187,1113 @@ /*No loads */ }/*}}}*/ + +/*Finite Element Analysis*/ +void EnthalpyAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* EnthalpyAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* EnthalpyAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* EnthalpyAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*compute all stiffness matrices for this element*/ + ElementMatrix* Ke1=CreateKMatrixVolume(element); + ElementMatrix* Ke2=CreateKMatrixShelf(element); + ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); + + /*clean-up and return*/ + delete Ke1; + delete Ke2; + return Ke; +}/*}}}*/ +ElementMatrix* EnthalpyAnalysis::CreateKMatrixVolume(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*Intermediaries */ + int stabilization; + IssmDouble Jdet,dt,u,v,w,um,vm,wm,vel; + IssmDouble h,hx,hy,hz,vx,vy,vz; + IssmDouble tau_parameter,diameter; + IssmDouble D_scalar; + IssmDouble* xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(); + IssmDouble* basis = xNew(numnodes); + IssmDouble* dbasis = xNew(3*numnodes); + IssmDouble* B = xNew(3*numnodes); + IssmDouble* Bprime = xNew(3*numnodes); + IssmDouble D[3][3] = {0.}; + IssmDouble K[3][3]; + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + element->FindParam(&dt,TimesteppingTimeStepEnum); + element->FindParam(&stabilization,ThermalStabilizationEnum); + IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoWaterEnum); + IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble gravity = element->GetMaterialParameter(ConstantsGEnum); + IssmDouble heatcapacity = element->GetMaterialParameter(MaterialsHeatcapacityEnum); + IssmDouble thermalconductivity = element->GetMaterialParameter(MaterialsThermalconductivityEnum); + Input* vx_input = element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input = element->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input = element->GetInput(VzEnum); _assert_(vz_input); + Input* vxm_input = element->GetInput(VxMeshEnum); _assert_(vxm_input); + Input* vym_input = element->GetInput(VyMeshEnum); _assert_(vym_input); + Input* vzm_input = element->GetInput(VzMeshEnum); _assert_(vzm_input); + if(stabilization==2) diameter=element->MinEdgeLength(xyz_list); + + /*Enthalpy diffusion parameter*/ + IssmDouble kappa=this->EnthalpyDiffusionParameterVolume(element,EnthalpyPicardEnum); _assert_(kappa>=0.); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + D_scalar=gauss->weight*Jdet; + if(dt!=0.) D_scalar=D_scalar*dt; + + /*Conduction: */ + GetBConduct(B,element,xyz_list,gauss); + D[0][0]=D_scalar*kappa/rho_ice; + D[1][1]=D_scalar*kappa/rho_ice; + D[2][2]=D_scalar*kappa/rho_ice; + TripleMultiply(B,3,numnodes,1, + &D[0][0],3,3,0, + B,3,numnodes,0, + &Ke->values[0],1); + + /*Advection: */ + GetBAdvec(B,element,xyz_list,gauss); + GetBAdvecprime(Bprime,element,xyz_list,gauss); + vx_input->GetInputValue(&u,gauss); vxm_input->GetInputValue(&um,gauss); vx=u-um; + vy_input->GetInputValue(&v,gauss); vym_input->GetInputValue(&vm,gauss); vy=v-vm; + vz_input->GetInputValue(&w,gauss); vzm_input->GetInputValue(&wm,gauss); vz=w-wm; + D[0][0]=D_scalar*vx; + D[1][1]=D_scalar*vy; + D[2][2]=D_scalar*vz; + TripleMultiply(B,3,numnodes,1, + &D[0][0],3,3,0, + Bprime,3,numnodes,0, + &Ke->values[0],1); + + /*Transient: */ + if(dt!=0.){ + D_scalar=gauss->weight*Jdet; + element->NodalFunctions(basis,gauss); + TripleMultiply(basis,numnodes,1,0, + &D_scalar,1,1,0, + basis,1,numnodes,0, + &Ke->values[0],1); + D_scalar=D_scalar*dt; + } + + /*Artifficial diffusivity*/ + if(stabilization==1){ + element->ElementSizes(&hx,&hy,&hz); + vel=sqrt(vx*vx + vy*vy + vz*vz)+1.e-14; + h=sqrt( pow(hx*vx/vel,2) + pow(hy*vy/vel,2) + pow(hz*vz/vel,2)); + K[0][0]=h/(2.*vel)*vx*vx; K[0][1]=h/(2.*vel)*vx*vy; K[0][2]=h/(2.*vel)*vx*vz; + K[1][0]=h/(2.*vel)*vy*vx; K[1][1]=h/(2.*vel)*vy*vy; K[1][2]=h/(2.*vel)*vy*vz; + K[2][0]=h/(2.*vel)*vz*vx; K[2][1]=h/(2.*vel)*vz*vy; K[2][2]=h/(2.*vel)*vz*vz; + for(int i=0;i<3;i++) for(int j=0;j<3;j++) K[i][j] = D_scalar*K[i][j]; + + GetBAdvecprime(Bprime,element,xyz_list,gauss); + TripleMultiply(Bprime,3,numnodes,1, + &K[0][0],3,3,0, + Bprime,3,numnodes,0, + &Ke->values[0],1); + } + else if(stabilization==2){ + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + tau_parameter=element->StabilizationParameter(u-um,v-vm,w-wm,diameter,kappa/rho_ice); + for(int i=0;ivalues[i*numnodes+j]+=tau_parameter*D_scalar* + ((u-um)*dbasis[0*numnodes+i]+(v-vm)*dbasis[1*numnodes+i]+(w-wm)*dbasis[2*numnodes+i])*((u-um)*dbasis[0*numnodes+j]+(v-vm)*dbasis[1*numnodes+j]+(w-wm)*dbasis[2*numnodes+j]); + } + } + if(dt!=0.){ + D_scalar=gauss->weight*Jdet; + for(int i=0;ivalues[i*numnodes+j]+=tau_parameter*D_scalar*basis[j]*((u-um)*dbasis[0*numnodes+i]+(v-vm)*dbasis[1*numnodes+i]+(w-wm)*dbasis[2*numnodes+i]); + } + } + } + } + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + xDelete(dbasis); + xDelete(B); + xDelete(Bprime); + delete gauss; + return Ke; +}/*}}}*/ +ElementMatrix* EnthalpyAnalysis::CreateKMatrixShelf(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*Initialize Element matrix and return if necessary*/ + if(!element->IsOnBase() || !element->IsFloating()) return NULL; + + /*Intermediaries*/ + IssmDouble dt,Jdet,D; + IssmDouble *xyz_list_base = NULL; + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinatesBase(&xyz_list_base); + element->FindParam(&dt,TimesteppingTimeStepEnum); + IssmDouble gravity = element->GetMaterialParameter(ConstantsGEnum); + IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoWaterEnum); + IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble heatcapacity = element->GetMaterialParameter(MaterialsHeatcapacityEnum); + IssmDouble mixed_layer_capacity= element->GetMaterialParameter(MaterialsMixedLayerCapacityEnum); + IssmDouble thermal_exchange_vel= element->GetMaterialParameter(MaterialsThermalExchangeVelocityEnum); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGaussBase(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminantBase(&Jdet,xyz_list_base,gauss); + element->NodalFunctions(basis,gauss); + + D=gauss->weight*Jdet*rho_water*mixed_layer_capacity*thermal_exchange_vel/(heatcapacity*rho_ice); + if(reCast(dt)) D=dt*D; + TripleMultiply(basis,numnodes,1,0, + &D,1,1,0, + basis,1,numnodes,0, + &Ke->values[0],1); + + } + + /*Clean up and return*/ + delete gauss; + xDelete(basis); + xDelete(xyz_list_base); + return Ke; +}/*}}}*/ +ElementVector* EnthalpyAnalysis::CreatePVector(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*compute all load vectors for this element*/ + ElementVector* pe1=CreatePVectorVolume(element); + ElementVector* pe2=CreatePVectorSheet(element); + ElementVector* pe3=CreatePVectorShelf(element); + ElementVector* pe =new ElementVector(pe1,pe2,pe3); + + /*clean-up and return*/ + delete pe1; + delete pe2; + delete pe3; + return pe; +}/*}}}*/ +ElementVector* EnthalpyAnalysis::CreatePVectorVolume(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*Intermediaries*/ + int i, stabilization; + IssmDouble Jdet,phi,dt; + IssmDouble enthalpy, Hpmp; + IssmDouble enthalpypicard, d1enthalpypicard[3]; + IssmDouble pressure, d1pressure[3], d2pressure; + IssmDouble waterfractionpicard; + IssmDouble kappa,tau_parameter,diameter,kappa_w; + IssmDouble u,v,w; + IssmDouble scalar_def, scalar_sens ,scalar_transient; + IssmDouble* xyz_list = NULL; + IssmDouble d1H_d1P, d1P2; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + int numvertices = element->GetNumberOfVertices(); + + /*Initialize Element vector*/ + ElementVector* pe = element->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + IssmDouble* dbasis = xNew(3*numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble heatcapacity = element->GetMaterialParameter(MaterialsHeatcapacityEnum); + IssmDouble thermalconductivity = element->GetMaterialParameter(MaterialsThermalconductivityEnum); + IssmDouble temperateiceconductivity = element->GetMaterialParameter(MaterialsTemperateiceconductivityEnum); + IssmDouble beta = element->GetMaterialParameter(MaterialsBetaEnum); + IssmDouble latentheat = element->GetMaterialParameter(MaterialsLatentheatEnum); + element->FindParam(&dt,TimesteppingTimeStepEnum); + element->FindParam(&stabilization,ThermalStabilizationEnum); + Input* vx_input=element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=element->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input=element->GetInput(VzEnum); _assert_(vz_input); + Input* enthalpypicard_input=element->GetInput(EnthalpyPicardEnum); _assert_(enthalpypicard_input); + Input* pressure_input=element->GetInput(PressureEnum); _assert_(pressure_input); + Input* enthalpy_input=NULL; + if(reCast(dt)){enthalpy_input = element->GetInput(EnthalpyEnum); _assert_(enthalpy_input);} + if(stabilization==2){ + diameter=element->MinEdgeLength(xyz_list); + kappa=this->EnthalpyDiffusionParameterVolume(element,EnthalpyPicardEnum); _assert_(kappa>=0.); + } + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(3); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctions(basis,gauss); + + /*viscous dissipation*/ + element->ViscousHeating(&phi,xyz_list,gauss,vx_input,vy_input,vz_input); + + scalar_def=phi/rho_ice*Jdet*gauss->weight; + if(dt!=0.) scalar_def=scalar_def*dt; + + for(i=0;ivalues[i]+=scalar_def*basis[i]; + + /*sensible heat flux in temperate ice*/ + enthalpypicard_input->GetInputValue(&enthalpypicard,gauss); + pressure_input->GetInputValue(&pressure,gauss); + Hpmp=this->PureIceEnthalpy(element, pressure); + + if(enthalpypicard>=Hpmp){ + enthalpypicard_input->GetInputDerivativeValue(&d1enthalpypicard[0],xyz_list,gauss); + pressure_input->GetInputDerivativeValue(&d1pressure[0],xyz_list,gauss); + d2pressure=0.; // for linear elements, 2nd derivative is zero + + d1H_d1P=0.; + for(i=0;i<3;i++) d1H_d1P+=d1enthalpypicard[i]*d1pressure[i]; + d1P2=0.; + for(i=0;i<3;i++) d1P2+=pow(d1pressure[i],2.); + + scalar_sens=-beta*((temperateiceconductivity - thermalconductivity)/latentheat*(d1H_d1P + beta*heatcapacity*d1P2))/rho_ice; + if(dt!=0.) scalar_sens=scalar_sens*dt; + for(i=0;ivalues[i]+=scalar_sens*basis[i]; + } + + /* Build transient now */ + if(reCast(dt)){ + enthalpy_input->GetInputValue(&enthalpy, gauss); + scalar_transient=enthalpy*Jdet*gauss->weight; + for(i=0;ivalues[i]+=scalar_transient*basis[i]; + } + + if(stabilization==2){ + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + vx_input->GetInputValue(&u,gauss); + vy_input->GetInputValue(&v,gauss); + vz_input->GetInputValue(&w,gauss); + tau_parameter=element->StabilizationParameter(u,v,w,diameter,kappa/rho_ice); + + for(i=0;ivalues[i]+=tau_parameter*scalar_def*(u*dbasis[0*numnodes+i]+v*dbasis[1*numnodes+i]+w*dbasis[2*numnodes+i]); + + if(dt!=0.){ + for(i=0;ivalues[i]+=tau_parameter*scalar_transient*(u*dbasis[0*numnodes+i]+v*dbasis[1*numnodes+i]+w*dbasis[2*numnodes+i]); + } + } + } + + /*Clean up and return*/ + xDelete(basis); + xDelete(dbasis); + xDelete(xyz_list); + delete gauss; + return pe; + +}/*}}}*/ +ElementVector* EnthalpyAnalysis::CreatePVectorSheet(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /* implementation of the basal condition decision chart of Aschwanden 2012, Fig.5 */ + if(!element->IsOnBase() || element->IsFloating()) return NULL; + + IssmDouble dt,Jdet,enthalpy,pressure,watercolumn,geothermalflux,vx,vy,vz; + IssmDouble enthalpyup,pressureup,alpha2,scalar,basalfriction,heatflux; + IssmDouble *xyz_list_base = NULL; + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize vectors*/ + ElementVector* pe = element->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinatesBase(&xyz_list_base); + element->FindParam(&dt,TimesteppingTimeStepEnum); + Input* vx_input = element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input = element->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input = element->GetInput(VzEnum); _assert_(vz_input); + Input* enthalpy_input = element->GetInput(EnthalpyPicardEnum); _assert_(enthalpy_input); + Input* pressure_input = element->GetInput(PressureEnum); _assert_(pressure_input); + Input* geothermalflux_input = element->GetInput(BasalforcingsGeothermalfluxEnum); _assert_(geothermalflux_input); + Input* watercolumn_input = element->GetInput(WatercolumnEnum); _assert_(watercolumn_input); + IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble heatcapacity = element->GetMaterialParameter(MaterialsHeatcapacityEnum); + + /*Build friction element, needed later: */ + Friction* friction=new Friction(element,3); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss = element->NewGaussBase(2); + Gauss* gaussup = element->NewGaussTop(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminantBase(&Jdet,xyz_list_base,gauss); + element->NodalFunctions(basis,gauss); + + enthalpy_input->GetInputValue(&enthalpy,gauss); + pressure_input->GetInputValue(&pressure,gauss); + watercolumn_input->GetInputValue(&watercolumn,gauss); + + if((watercolumn<=0.) && (enthalpy0.) AND (enthalpyGetInputValue(&geothermalflux,gauss); + + friction->GetAlpha2(&alpha2,gauss,vx_input,vy_input,vz_input); + vx_input->GetInputValue(&vx,gauss); + vy_input->GetInputValue(&vy,gauss); + vz_input->GetInputValue(&vz,gauss); + basalfriction = alpha2*(vx*vx + vy*vy + vz*vz); + heatflux = (basalfriction+geothermalflux)/(rho_ice); + + scalar = gauss->weight*Jdet*heatflux; + if(dt!=0.) scalar=dt*scalar; + + for(int i=0;ivalues[i]+=scalar*basis[i]; + } + else if(enthalpy >= PureIceEnthalpy(element,pressure)){ + /* check positive thickness of temperate basal ice layer */ + enthalpy_input->GetInputValue(&enthalpyup,gaussup); + pressure_input->GetInputValue(&pressureup,gaussup); + if(enthalpyup >= PureIceEnthalpy(element,pressureup)){ + // do nothing, set grad enthalpy*n=0. + } + else{ + // only base temperate, set Dirichlet BCs in Penta::UpdateBasalConstraintsEnthalpy() + } + } + else{ + // base cold, but watercolumn positive. Set base to pressure melting point enthalpy + } + } + + /*Clean up and return*/ + delete gauss; + delete gaussup; + delete friction; + xDelete(basis); + xDelete(xyz_list_base); + return pe; + +}/*}}}*/ +ElementVector* EnthalpyAnalysis::CreatePVectorShelf(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*Get basal element*/ + if(!element->IsOnBase() || !element->IsFloating()) return NULL; + + IssmDouble h_pmp,dt,Jdet,scalar_ocean,pressure; + IssmDouble *xyz_list_base = NULL; + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize vectors*/ + ElementVector* pe = element->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinatesBase(&xyz_list_base); + element->FindParam(&dt,TimesteppingTimeStepEnum); + Input* pressure_input=element->GetInput(PressureEnum); _assert_(pressure_input); + IssmDouble gravity = element->GetMaterialParameter(ConstantsGEnum); + IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoWaterEnum); + IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble heatcapacity = element->GetMaterialParameter(MaterialsHeatcapacityEnum); + IssmDouble mixed_layer_capacity= element->GetMaterialParameter(MaterialsMixedLayerCapacityEnum); + IssmDouble thermal_exchange_vel= element->GetMaterialParameter(MaterialsThermalExchangeVelocityEnum); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGaussBase(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminantBase(&Jdet,xyz_list_base,gauss); + element->NodalFunctions(basis,gauss); + + pressure_input->GetInputValue(&pressure,gauss); + h_pmp=element->PureIceEnthalpy(pressure); + + scalar_ocean=gauss->weight*Jdet*rho_water*mixed_layer_capacity*thermal_exchange_vel*h_pmp/(heatcapacity*rho_ice); + if(reCast(dt)) scalar_ocean=dt*scalar_ocean; + + for(int i=0;ivalues[i]+=scalar_ocean*basis[i]; + } + + /*Clean up and return*/ + delete gauss; + xDelete(basis); + xDelete(xyz_list_base); + return pe; +}/*}}}*/ +void EnthalpyAnalysis::GetBConduct(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF1. + * For node i, Bi' can be expressed in the actual coordinate system + * by: + * Bi_conduct=[ dh/dx ] + * [ dh/dy ] + * [ dh/dz ] + * where h is the interpolation function for node i. + * + * We assume B has been allocated already, of size: 3x(NDOF1*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(3*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B: */ + for(int i=0;i(dbasis); +}/*}}}*/ +void EnthalpyAnalysis::GetBAdvec(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF1. + * For node i, Bi' can be expressed in the actual coordinate system + * by: + * Bi_advec =[ h ] + * [ h ] + * [ h ] + * where h is the interpolation function for node i. + * + * We assume B has been allocated already, of size: 3x(NDOF1*NUMNODESP1) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions*/ + IssmDouble* basis=xNew(numnodes); + element->NodalFunctions(basis,gauss); + + /*Build B: */ + for(int i=0;i(basis); +}/*}}}*/ +void EnthalpyAnalysis::GetBAdvecprime(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF1. + * For node i, Bi' can be expressed in the actual coordinate system + * by: + * Biprime_advec=[ dh/dx ] + * [ dh/dy ] + * [ dh/dz ] + * where h is the interpolation function for node i. + * + * We assume B has been allocated already, of size: 3x(NDOF1*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(3*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B: */ + for(int i=0;i(dbasis); +}/*}}}*/ +void EnthalpyAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + element->GetSolutionFromInputsOneDof(solution,EnthalpyEnum); +}/*}}}*/ +void EnthalpyAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + + bool converged; + int i,rheology_law; + IssmDouble B_average,s_average,T_average=0.,P_average=0.; + int *doflist = NULL; + IssmDouble *xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Fetch dof list and allocate solution vector*/ + element->GetDofList(&doflist,NoneApproximationEnum,GsetEnum); + IssmDouble* values = xNew(numnodes); + IssmDouble* pressure = xNew(numnodes); + IssmDouble* surface = xNew(numnodes); + IssmDouble* B = xNew(numnodes); + IssmDouble* temperature = xNew(numnodes); + IssmDouble* waterfraction = xNew(numnodes); + + /*Use the dof list to index into the solution vector: */ + for(i=0;i(values[i])) _error_("NaN found in solution vector"); + } + + /*Get all inputs and parameters*/ + element->GetInputValue(&converged,ConvergedEnum); + element->GetInputListOnNodes(&pressure[0],PressureEnum); + if(converged){ + for(i=0;iEnthalpyToThermal(&temperature[i],&waterfraction[i],values[i],pressure[i]); + if(waterfraction[i]<0.) _error_("Negative water fraction found in solution vector"); + //if(waterfraction[i]>1.) _error_("Water fraction >1 found in solution vector"); + } + element->AddInput(EnthalpyEnum,values,element->GetElementType()); + element->AddInput(WaterfractionEnum,waterfraction,element->GetElementType()); + element->AddInput(TemperatureEnum,temperature,element->GetElementType()); + + /*Update Rheology only if converged (we must make sure that the temperature is below melting point + * otherwise the rheology could be negative*/ + element->FindParam(&rheology_law,MaterialsRheologyLawEnum); + element->GetInputListOnNodes(&surface[0],SurfaceEnum); + switch(rheology_law){ + case NoneEnum: + /*Do nothing: B is not temperature dependent*/ + break; + case CuffeyEnum: + for(i=0;iAddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType()); + break; + case PatersonEnum: + for(i=0;iAddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType()); + break; + case ArrheniusEnum: + element->GetVerticesCoordinates(&xyz_list); + for(i=0;iGetMaterialParameter(MaterialsRheologyNEnum)); + element->AddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType()); + break; + case LliboutryDuvalEnum: + for(i=0;iGetMaterialParameter(MaterialsRheologyNEnum),element->GetMaterialParameter(MaterialsBetaEnum),element->GetMaterialParameter(ConstantsReferencetemperatureEnum),element->GetMaterialParameter(MaterialsHeatcapacityEnum),element->GetMaterialParameter(MaterialsLatentheatEnum)); + element->AddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType()); + break; + default: _error_("Rheology law " << EnumToStringx(rheology_law) << " not supported yet"); + } + } + else{ + element->AddInput(EnthalpyPicardEnum,values,element->GetElementType()); + } + + /*Free ressources:*/ + xDelete(values); + xDelete(pressure); + xDelete(surface); + xDelete(B); + xDelete(temperature); + xDelete(waterfraction); + xDelete(xyz_list); + xDelete(doflist); +}/*}}}*/ +void EnthalpyAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ + + bool islevelset; + femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum); + if(islevelset){ + SetActiveNodesLSMx(femmodel); + } + return; +}/*}}}*/ + +/*Modules*/ +void EnthalpyAnalysis::PostProcessing(FemModel* femmodel){/*{{{*/ + + /*Intermediaries*/ + int solution_type, i; + bool computebasalmeltingrates=true; + bool isdrainage=true; + bool updatebasalconstraints=true; + + if(isdrainage){ + /*Drain excess water fraction in ice column: */ + for(i=0;ielements->Size();i++){ + Element* element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); + DrainWaterfractionIcecolumn(element); + } + } + + if(computebasalmeltingrates){ + /*Compute basal melting rates: */ + for(i=0;ielements->Size();i++){ + Element* element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); + ComputeBasalMeltingrate(element); + } + } + + if(updatebasalconstraints){ + /*Update basal dirichlet BCs for enthalpy in transient runs: */ + femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum); + if(solution_type==TransientSolutionEnum){ + for(i=0;ielements->Size();i++){ + Element* element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); + UpdateBasalConstraints(element); + } + } + } +}/*}}}*/ +void EnthalpyAnalysis::ComputeBasalMeltingrate(Element* element){/*{{{*/ + /*Calculate the basal melt rates of the enthalpy model after Aschwanden 2012*/ + /* melting rate is positive when melting, negative when refreezing*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return; + + /* Only compute melt rates at the base of grounded ice*/ + if(!element->IsOnBase() || element->IsFloating()) return; + + /* Intermediaries */ + const int dim=3; + int i,is,vertexdown,vertexup,numvertices,numsegments; + IssmDouble heatflux; + IssmDouble vec_heatflux[dim],normal_base[dim],d1enthalpy[dim]; + IssmDouble temperature, waterfraction; + IssmDouble basalfriction,alpha2; + IssmDouble dt,yts; + IssmDouble melting_overshoot,lambda; + IssmDouble geothermalflux; + IssmDouble vx,vy,vz; + IssmDouble *xyz_list = NULL; + IssmDouble *xyz_list_base = NULL; + int *pairindices = NULL; + + /*Fetch parameters and inputs */ + element->GetVerticesCoordinates(&xyz_list); + element->GetVerticesCoordinatesBase(&xyz_list_base); + IssmDouble latentheat = element->GetMaterialParameter(MaterialsLatentheatEnum); + IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoWaterEnum); + Input* enthalpy_input = element->GetInput(EnthalpyEnum); _assert_(enthalpy_input); + Input* geothermalflux_input = element->GetInput(BasalforcingsGeothermalfluxEnum); _assert_(geothermalflux_input); + Input* vx_input = element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input = element->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input = element->GetInput(VzEnum); _assert_(vz_input); + IssmDouble kappa=EnthalpyDiffusionParameterVolume(element,EnthalpyEnum); _assert_(kappa>=0.); + element->NormalBase(&normal_base[0],xyz_list_base); + element->VerticalSegmentIndices(&pairindices,&numsegments); + IssmDouble* meltingrate_enthalpy = xNew(numsegments); + IssmDouble* heating = xNew(numsegments); + + /*Build friction element, needed later: */ + Friction* friction=new Friction(element,dim); + + /******** MELTING RATES ************************************/ + numvertices=element->GetNumberOfVertices(); + IssmDouble* enthalpy = xNew(numvertices); + IssmDouble* pressure = xNew(numvertices); + IssmDouble* watercolumn = xNew(numvertices); + IssmDouble* basalmeltingrate = xNew(numvertices); + element->GetInputListOnVertices(enthalpy,EnthalpyEnum); + element->GetInputListOnVertices(pressure,PressureEnum); + element->GetInputListOnVertices(watercolumn,WatercolumnEnum); + element->GetInputListOnVertices(basalmeltingrate,BasalforcingsMeltingRateEnum); + + Gauss* gauss=element->NewGauss(); + + for(int is=0;isGaussVertex(vertexdown); + + bool checkpositivethickness=true; + _assert_(watercolumn[vertexdown]>=0.); + + /*Calculate basal meltingrate after Fig.5 of A.Aschwanden 2012*/ + meltingrate_enthalpy[is]=0.; + heating[is]=0.; + if((watercolumn[vertexdown]>0.) && (enthalpy[vertexdown]PureIceEnthalpy(pressure[vertexdown]); + } + else if(enthalpy[vertexdown]PureIceEnthalpy(pressure[vertexdown])){ + /*cold base: set q*n=q_geo*n+frictionheating as Neumann BC in Penta::CreatePVectorEnthalpySheet*/ + checkpositivethickness=false; // cold base, skip next test + } + else{/*we have a temperate base, go to next test*/} + + if(checkpositivethickness){ + /*From here on all basal ice is temperate. Check for positive thickness of layer of temperate ice. */ + bool istemperatelayer=false; + if(enthalpy[vertexup]>=element->PureIceEnthalpy(pressure[vertexup])) istemperatelayer=true; + if(istemperatelayer) for(i=0;iGetInputDerivativeValue(&d1enthalpy[0],xyz_list,gauss); + for(i=0;i<3;i++) vec_heatflux[i]=-kappa*d1enthalpy[i]; + } + + /*heat flux along normal*/ + heatflux=0.; + for(i=0;i<3;i++) heatflux+=(vec_heatflux[i])*normal_base[i]; + + /*basal friction*/ + friction->GetAlpha2(&alpha2,gauss,vx_input,vy_input,vz_input); + vx_input->GetInputValue(&vx,gauss); + vy_input->GetInputValue(&vy,gauss); + vz_input->GetInputValue(&vz,gauss); + basalfriction=alpha2*(vx*vx + vy*vy + vz*vz); + + element->EnthalpyToThermal(&temperature,&waterfraction,enthalpy[vertexdown],pressure[vertexdown]); + geothermalflux_input->GetInputValue(&geothermalflux,gauss); + /* -Mb= Fb-(q-q_geo)/((1-w)*L), cf Aschwanden 2012, eq.66*/ + heating[is]=(heatflux+basalfriction+geothermalflux); + meltingrate_enthalpy[is]=heating[is]/((1-waterfraction)*latentheat*rho_water); // m/s water equivalent + } + } + /******** UPDATE MELTINGRATES AND WATERCOLUMN **************/ + element->FindParam(&dt,TimesteppingTimeStepEnum); + for(is=0;is=0.); _assert_(lambda<1.); + watercolumn[vertexdown]=0.; + basalmeltingrate[vertexdown]=lambda*meltingrate_enthalpy[is]; // restrict freeze on only to size of watercolumn + enthalpy[vertexdown]+=(1.-lambda)*meltingrate_enthalpy[is]*dt*latentheat; // use rest of energy to cool down base + } + else{ + basalmeltingrate[vertexdown]=meltingrate_enthalpy[is]; + watercolumn[vertexdown]+=dt*meltingrate_enthalpy[is]; + } + } + else{ + basalmeltingrate[vertexdown]=meltingrate_enthalpy[is]; + watercolumn[vertexdown]+=meltingrate_enthalpy[is]; + } + basalmeltingrate[vertexdown]*=rho_water/rho_ice; // convert meltingrate from water to ice equivalent + _assert_(watercolumn[vertexdown]>=0.); + } + + /*feed updated variables back into model*/ + element->AddInput(EnthalpyEnum,enthalpy,P1Enum); + element->AddInput(WatercolumnEnum,watercolumn,P1Enum); + element->AddInput(BasalforcingsMeltingRateEnum,basalmeltingrate,P1Enum); + + /*Clean up and return*/ + delete gauss; + delete friction; + xDelete(enthalpy); + xDelete(pressure); + xDelete(watercolumn); + xDelete(basalmeltingrate); + xDelete(meltingrate_enthalpy); + xDelete(heating); + xDelete(xyz_list); +}/*}}}*/ +void EnthalpyAnalysis::DrainWaterfractionIcecolumn(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return; + + /* Only drain waterfraction of ice column from element at base*/ + if(!element->IsOnBase()) return; //FIXME: allow freeze on for floating elements + + /* Intermediaries*/ + int is, numvertices, numsegments; + int *pairindices = NULL; + + numvertices=element->GetNumberOfVertices(); + element->VerticalSegmentIndices(&pairindices,&numsegments); + + IssmDouble* watercolumn = xNew(numvertices); + IssmDouble* drainrate_column = xNew(numsegments); + IssmDouble* drainrate_element = xNew(numsegments); + + element->GetInputListOnVertices(watercolumn,WatercolumnEnum); + + for(is=0;isIsOnSurface()) break; + elementi=elementi->GetUpperElement(); + } + /* add drained water to water column*/ + for(is=0;isAddInput(WatercolumnEnum,watercolumn,P1Enum); + + xDelete(pairindices); + xDelete(drainrate_column); + xDelete(drainrate_element); + xDelete(watercolumn); +}/*}}}*/ +void EnthalpyAnalysis::DrainWaterfraction(Element* element, IssmDouble* pdrainrate_element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return; + + /*Intermediaries*/ + int iv,is,vertexdown,vertexup,numsegments; + IssmDouble dt, height_element; + IssmDouble rho_water, rho_ice; + int numvertices = element->GetNumberOfVertices(); + + IssmDouble* xyz_list = NULL; + IssmDouble* enthalpies = xNew(numvertices); + IssmDouble* pressures = xNew(numvertices); + IssmDouble* temperatures = xNew(numvertices); + IssmDouble* waterfractions = xNew(numvertices); + IssmDouble* deltawaterfractions = xNew(numvertices); + int *pairindices = NULL; + + rho_ice=element->GetMaterialParameter(MaterialsRhoIceEnum); + rho_water=element->GetMaterialParameter(MaterialsRhoWaterEnum); + + element->GetVerticesCoordinates(&xyz_list); + element->GetInputListOnVertices(enthalpies,EnthalpyEnum); + element->GetInputListOnVertices(pressures,PressureEnum); + + element->FindParam(&dt,TimesteppingTimeStepEnum); + for(iv=0;ivEnthalpyToThermal(&temperatures[iv],&waterfractions[iv], enthalpies[iv],pressures[iv]); + deltawaterfractions[iv]=DrainageFunctionWaterfraction(waterfractions[iv], dt); + } + + /*drain waterfraction, feed updated variables back into model*/ + for(iv=0;iv(dt)) + waterfractions[iv]-=deltawaterfractions[iv]*dt; + else + waterfractions[iv]-=deltawaterfractions[iv]; + element->ThermalToEnthalpy(&enthalpies[iv], temperatures[iv], waterfractions[iv], pressures[iv]); + } + element->AddInput(EnthalpyEnum,enthalpies,P1Enum); + element->AddInput(WaterfractionEnum,waterfractions,P1Enum); + + /*return meltwater column equivalent to drained water*/ + element->VerticalSegmentIndices(&pairindices,&numsegments); + for(is=0;is=0.); + } + + /*Clean up and return*/ + xDelete(pairindices); + xDelete(xyz_list); + xDelete(enthalpies); + xDelete(pressures); + xDelete(temperatures); + xDelete(waterfractions); + xDelete(deltawaterfractions); +}/*}}}*/ +void EnthalpyAnalysis::UpdateBasalConstraints(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return; + + /* Only update Constraints at the base of grounded ice*/ + if(!(element->IsOnBase()) || element->IsFloating()) return; + + /*Intermediary*/ + bool isdynamicbasalspc,setspc; + int numindices, numindicesup; + IssmDouble pressure, pressureup; + IssmDouble h_pmp, enthalpy, enthalpyup; + IssmDouble watercolumn; + int *indices = NULL, *indicesup = NULL; + Node* node = NULL; + + /*Check wether dynamic basal boundary conditions are activated */ + element->FindParam(&isdynamicbasalspc,ThermalIsdynamicbasalspcEnum); + if(!isdynamicbasalspc) return; + + /*Fetch indices of basal & surface nodes for this finite element*/ + Penta *penta = (Penta *) element; // TODO: add Basal-/SurfaceNodeIndices to element.h, and change this to Element* + penta->BasalNodeIndices(&numindices,&indices,element->GetElementType()); + penta->SurfaceNodeIndices(&numindicesup,&indicesup,element->GetElementType()); + _assert_(numindices==numindicesup); + + /*Get parameters and inputs: */ + Input* pressure_input=element->GetInput(PressureEnum); _assert_(pressure_input); + Input* enthalpy_input=element->GetInput(EnthalpyEnum); _assert_(enthalpy_input); + Input* watercolumn_input=element->GetInput(WatercolumnEnum); _assert_(watercolumn_input); + + /*if there is a temperate layer of zero thickness, set spc enthalpy=h_pmp at that node*/ + GaussPenta* gauss=new GaussPenta(); + GaussPenta* gaussup=new GaussPenta(); + for(int i=0;iGaussNode(element->GetElementType(),indices[i]); + gaussup->GaussNode(element->GetElementType(),indicesup[i]); + + /*Check wether there is a temperate layer at the base or not */ + /*check if node is temperate, else continue*/ + enthalpy_input->GetInputValue(&enthalpy, gauss); + pressure_input->GetInputValue(&pressure, gauss); + watercolumn_input->GetInputValue(&watercolumn,gauss); + h_pmp=PureIceEnthalpy(element,pressure); + if (enthalpy>=h_pmp){ + /*check if upper node is temperate, too. + if yes, then we have a temperate layer of positive thickness and reset the spc. + if not, apply dirichlet BC.*/ + enthalpy_input->GetInputValue(&enthalpyup, gaussup); + pressure_input->GetInputValue(&pressureup, gaussup); + setspc=((enthalpyup=0.))?true:false; + } + else + setspc = false; + + node=element->GetNode(indices[i]); + if(setspc) + node->ApplyConstraint(0,h_pmp); /*apply spc*/ + else + node->DofInFSet(0); /*remove spc*/ + } + + /*Free ressources:*/ + xDelete(indices); + xDelete(indicesup); + delete gauss; + delete gaussup; +}/*}}}*/ + +/*Intermediaries*/ +IssmDouble EnthalpyAnalysis::EnthalpyDiffusionParameter(Element* element,IssmDouble enthalpy,IssmDouble pressure){/*{{{*/ + + IssmDouble heatcapacity = element->GetMaterialParameter(MaterialsHeatcapacityEnum); + IssmDouble temperateiceconductivity = element->GetMaterialParameter(MaterialsTemperateiceconductivityEnum); + IssmDouble thermalconductivity = element->GetMaterialParameter(MaterialsThermalconductivityEnum); + + if(enthalpy < PureIceEnthalpy(element,pressure)){ + return thermalconductivity/heatcapacity; + } + else{ + return temperateiceconductivity/heatcapacity; + } +}/*}}}*/ +IssmDouble EnthalpyAnalysis::EnthalpyDiffusionParameterVolume(Element* element,int enthalpy_enum){/*{{{*/ + + int iv; + IssmDouble lambda; /* fraction of cold ice */ + IssmDouble kappa,kappa_c,kappa_t; /* enthalpy conductivities */ + IssmDouble Hc,Ht; + + /*Get pressures and enthalpies on vertices*/ + int numvertices = element->GetNumberOfVertices(); + IssmDouble* pressures = xNew(numvertices); + IssmDouble* enthalpies = xNew(numvertices); + IssmDouble* PIE = xNew(numvertices); + IssmDouble* dHpmp = xNew(numvertices); + element->GetInputListOnVertices(pressures,PressureEnum); + element->GetInputListOnVertices(enthalpies,enthalpy_enum); + for(iv=0;iv=0.)); + } + + if(allequalsign){ + kappa = EnthalpyDiffusionParameter(element,enthalpies[0],pressures[0]); + } + else{ + /* return harmonic mean of thermal conductivities, weighted by fraction of cold/temperate ice, + cf Patankar 1980, pp44 */ + kappa_c = EnthalpyDiffusionParameter(element,PureIceEnthalpy(element,0.)-1.,0.); + kappa_t = EnthalpyDiffusionParameter(element,PureIceEnthalpy(element,0.)+1.,0.); + Hc=0.; Ht=0.; + for(iv=0; iv0.); + lambda = Hc/(Hc+Ht); + kappa = kappa_c*kappa_t/(lambda*kappa_t+(1.-lambda)*kappa_c); // ==(lambda/kappa_c + (1.-lambda)/kappa_t)^-1 + } + + /*Clean up and return*/ + xDelete(PIE); + xDelete(dHpmp); + xDelete(pressures); + xDelete(enthalpies); + return kappa; +}/*}}}*/ +IssmDouble EnthalpyAnalysis::PureIceEnthalpy(Element* element,IssmDouble pressure){/*{{{*/ + + IssmDouble heatcapacity = element->GetMaterialParameter(MaterialsHeatcapacityEnum); + IssmDouble referencetemperature = element->GetMaterialParameter(ConstantsReferencetemperatureEnum); + + return heatcapacity*(TMeltingPoint(element,pressure)-referencetemperature); +}/*}}}*/ +IssmDouble EnthalpyAnalysis::TMeltingPoint(Element* element,IssmDouble pressure){/*{{{*/ + + IssmDouble meltingpoint = element->GetMaterialParameter(MaterialsMeltingpointEnum); + IssmDouble beta = element->GetMaterialParameter(MaterialsBetaEnum); + + return meltingpoint-beta*pressure; +}/*}}}*/ Index: /issm/trunk/src/c/analyses/EnthalpyAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/EnthalpyAnalysis.h (revision 17805) +++ /issm/trunk/src/c/analyses/EnthalpyAnalysis.h (revision 17806) @@ -12,5 +12,6 @@ public: - int DofsPerNode(int** doflist,int meshtype,int approximation); + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); @@ -18,4 +19,35 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementMatrix* CreateKMatrixVolume(Element* element); + ElementMatrix* CreateKMatrixShelf(Element* element); + ElementVector* CreatePVector(Element* element); + ElementVector* CreatePVectorVolume(Element* element); + ElementVector* CreatePVectorSheet(Element* element); + ElementVector* CreatePVectorShelf(Element* element); + void GetBConduct(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss); + void GetBAdvec(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss); + void GetBAdvecprime(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss); + void GetSolutionFromInputs(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); + + /*Modules*/ + static void PostProcessing(FemModel* femmodel); + static void ComputeBasalMeltingrate(Element* element); + static void DrainWaterfractionIcecolumn(Element* element); + static void DrainWaterfraction(Element* element, IssmDouble* pdrainrate_element); + static void UpdateBasalConstraints(Element* element); + + /*Intermediaries*/ + static IssmDouble EnthalpyDiffusionParameter(Element* element,IssmDouble enthalpy,IssmDouble pressure); + static IssmDouble EnthalpyDiffusionParameterVolume(Element* element,int enthalpy_enum); + static IssmDouble PureIceEnthalpy(Element* element,IssmDouble pressure); + static IssmDouble TMeltingPoint(Element* element,IssmDouble pressure); }; #endif Index: /issm/trunk/src/c/analyses/EnumToAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/EnumToAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/EnumToAnalysis.cpp (revision 17806) @@ -14,25 +14,79 @@ switch(analysis_enum){ + #ifdef _HAVE_ADJOINTBALANCETHICKNESS_ case AdjointBalancethicknessAnalysisEnum : return new AdjointBalancethicknessAnalysis(); + #endif + #ifdef _HAVE_ADJOINTHORIZ_ case AdjointHorizAnalysisEnum : return new AdjointHorizAnalysis(); + #endif + #ifdef _HAVE_BALANCETHICKNESS_ case BalancethicknessAnalysisEnum : return new BalancethicknessAnalysis(); + #endif + #ifdef _HAVE_BALANCETHICKNESSSOFT_ case BalancethicknessSoftAnalysisEnum : return new BalancethicknessSoftAnalysis(); + #endif + #ifdef _HAVE_BALANCEVELOCITY_ case BalancevelocityAnalysisEnum : return new BalancevelocityAnalysis(); + #endif + #ifdef _HAVE_L2PROJECTIONEPL_ + case L2ProjectionEPLAnalysisEnum : return new L2ProjectionEPLAnalysis(); + #endif + #ifdef _HAVE_L2PROJECTIONBASE_ case L2ProjectionBaseAnalysisEnum : return new L2ProjectionBaseAnalysis(); + #endif + #ifdef _HAVE_DAMAGEEVOLUTION_ case DamageEvolutionAnalysisEnum : return new DamageEvolutionAnalysis(); + #endif + #ifdef _HAVE_STRESSBALANCE_ case StressbalanceAnalysisEnum : return new StressbalanceAnalysis(); + #endif + #ifdef _HAVE_STRESSBALANCESIA_ case StressbalanceSIAAnalysisEnum : return new StressbalanceSIAAnalysis(); + #endif + #ifdef _HAVE_STRESSBALANCEVERTICAL_ case StressbalanceVerticalAnalysisEnum : return new StressbalanceVerticalAnalysis(); + #endif + #ifdef _HAVE_ENTHALPY_ case EnthalpyAnalysisEnum : return new EnthalpyAnalysis(); + #endif + #ifdef _HAVE_HYDROLOGYSHREVE_ case HydrologyShreveAnalysisEnum : return new HydrologyShreveAnalysis(); + #endif + #ifdef _HAVE_HYDROLOGYDCINEFFICIENT_ case HydrologyDCInefficientAnalysisEnum : return new HydrologyDCInefficientAnalysis(); + #endif + #ifdef _HAVE_HYDROLOGYDCEFFICIENT_ case HydrologyDCEfficientAnalysisEnum : return new HydrologyDCEfficientAnalysis(); + #endif + #ifdef _HAVE_MELTING_ case MeltingAnalysisEnum : return new MeltingAnalysis(); + #endif + #ifdef _HAVE_MASSTRANSPORT_ case MasstransportAnalysisEnum : return new MasstransportAnalysis(); + #endif + #ifdef _HAVE_FREESURFACEBASE_ case FreeSurfaceBaseAnalysisEnum : return new FreeSurfaceBaseAnalysis(); + #endif + #ifdef _HAVE_FREESURFACETOP_ case FreeSurfaceTopAnalysisEnum : return new FreeSurfaceTopAnalysis(); + #endif + #ifdef _HAVE_EXTRUDEFROMBASE_ case ExtrudeFromBaseAnalysisEnum : return new ExtrudeFromBaseAnalysis(); + #endif + #ifdef _HAVE_EXTRUDEFROMTOP_ case ExtrudeFromTopAnalysisEnum : return new ExtrudeFromTopAnalysis(); + #endif + #ifdef _HAVE_DEPTHAVERAGE_ + case DepthAverageAnalysisEnum : return new DepthAverageAnalysis(); + #endif + #ifdef _HAVE_SMOOTHEDSURFACESLOPEX_ + case SmoothedSurfaceSlopeXAnalysisEnum : return new SmoothedSurfaceSlopeXAnalysis(); + #endif + #ifdef _HAVE_SMOOTHEDSURFACESLOPEY_ + case SmoothedSurfaceSlopeYAnalysisEnum : return new SmoothedSurfaceSlopeYAnalysis(); + #endif + #ifdef _HAVE_THERMAL_ case ThermalAnalysisEnum : return new ThermalAnalysis(); + #endif #ifdef _HAVE_GIA_ case GiaAnalysisEnum : return new GiaAnalysis(); @@ -41,6 +95,13 @@ case MeshdeformationAnalysisEnum : return new MeshdeformationAnalysis(); #endif - case SmoothedSurfaceSlopeXAnalysisEnum: return new SmoothedSurfaceSlopeXAnalysis(); - case SmoothedSurfaceSlopeYAnalysisEnum: return new SmoothedSurfaceSlopeYAnalysis(); + #ifdef _HAVE_LEVELSET_ + case LevelsetAnalysisEnum : return new LevelsetAnalysis(); + #endif + #ifdef _HAVE_EXTRAPOLATION_ + case ExtrapolationAnalysisEnum : return new ExtrapolationAnalysis(); + #endif + #ifdef _HAVE_LSFREINITIALIZATION_ + case LsfReinitializationAnalysisEnum : return new LsfReinitializationAnalysis(); + #endif default : _error_("enum provided not supported ("<* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk/src/c/analyses/ExtrapolationAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/ExtrapolationAnalysis.cpp (revision 17806) +++ /issm/trunk/src/c/analyses/ExtrapolationAnalysis.cpp (revision 17806) @@ -0,0 +1,352 @@ +#include "./ExtrapolationAnalysis.h" +#include "../toolkits/toolkits.h" +#include "../classes/classes.h" +#include "../shared/shared.h" +#include "../modules/modules.h" +#include "../solutionsequences/solutionsequences.h" + +int ExtrapolationAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ + return 1; +} +/*}}}*/ +void ExtrapolationAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/ + //do nothing for now + return; +} +/*}}}*/ +void ExtrapolationAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/ + int finiteelement; + + /*Finite element type*/ + finiteelement = P1Enum; + + /*Update elements: */ + int counter=0; + for(int i=0;inumberofelements;i++){ + if(iomodel->my_elements[i]){ + Element* element=(Element*)elements->GetObjectByOffset(counter); + element->Update(i,iomodel,analysis_counter,analysis_type,finiteelement); + counter++; + } + } + if(iomodel->domaintype==Domain3DEnum){ + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); + iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); + } +} +/*}}}*/ +void ExtrapolationAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ + int finiteelement=P1Enum; + if(iomodel->domaintype!=Domain2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); + ::CreateNodes(nodes,iomodel,ExtrapolationAnalysisEnum,finiteelement); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); +} +/*}}}*/ +void ExtrapolationAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ + // do nothing for now + return; +} +/*}}}*/ +void ExtrapolationAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/ + // do nothing for now + return; +}/*}}}*/ + +/*Finite element Analysis*/ +void ExtrapolationAnalysis::Core(FemModel* femmodel){/*{{{*/ + + /* Intermediaries */ + bool save_results; + int extvar_enum; + femmodel->parameters->FindParam(&extvar_enum, ExtrapolationVariableEnum); + + /*activate formulation: */ + femmodel->SetCurrentConfiguration(ExtrapolationAnalysisEnum); + + if(VerboseSolution()) _printf0_("extrapolation of " << EnumToStringx(extvar_enum) << ": call computational core:\n"); + solutionsequence_linear(femmodel); + + save_results=true; + if(save_results){ + if(VerboseSolution()) _printf0_(" saving results\n"); + int outputs[2] = {VxEnum,VyEnum}; + femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],2); + } +}/*}}}*/ +ElementVector* ExtrapolationAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* ExtrapolationAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ + /* Jacobian required for the Newton solver */ + _error_("not implemented yet"); +}/*}}}*/ +ElementMatrix* ExtrapolationAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + if(!element->IsOnBase()) return NULL; + Element* basalelement = element->SpawnBasalElement(); + + /*Intermediaries */ + int domaintype,dim; + int i,row,col,stabilization; + bool extrapolatebydiffusion = true; + IssmDouble Jdet,D_scalar,h; + IssmDouble norm_dlsf; + IssmDouble hx,hy,hz,kappa; + IssmDouble* xyz_list = NULL; + + /*Get problem dimension*/ + basalelement->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DverticalEnum: dim = 1; break; + case Domain2DhorizontalEnum: dim = 2; break; + case Domain3DEnum: dim = 2; break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementMatrix* Ke = basalelement->NewElementMatrix(); + IssmDouble* B = xNew(dim*numnodes); + IssmDouble* Bprime = xNew(dim*numnodes); + IssmDouble* D = xNew(dim*dim); + IssmDouble* dlsf = xNew(dim); + IssmDouble* normal= xNew(dim); + + /*Retrieve all inputs and parameters*/ + Input* lsf_slopex_input=basalelement->GetInput(LevelsetfunctionSlopeXEnum); _assert_(lsf_slopex_input); + Input* lsf_slopey_input=basalelement->GetInput(LevelsetfunctionSlopeYEnum); _assert_(lsf_slopey_input); + basalelement->GetVerticesCoordinates(&xyz_list); + h = basalelement->CharacteristicLength(); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=basalelement->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){/*{{{*/ + gauss->GaussPoint(ig); + + basalelement->JacobianDeterminant(&Jdet,xyz_list,gauss); + GetB(B,basalelement,xyz_list,gauss); + GetBprime(Bprime,basalelement,xyz_list,gauss); + + D_scalar=gauss->weight*Jdet; + + if(extrapolatebydiffusion){ + /* diffuse values outward */ + for(row=0;rowvalues[0],1); + } + else{ + /* extrapolate values along normal */ + /* Get normal on ice boundary */ + lsf_slopex_input->GetInputValue(&dlsf[0],gauss); + lsf_slopey_input->GetInputValue(&dlsf[1],gauss); + norm_dlsf=0.; + for(i=0;i0.); + + if(norm_dlsf>0.) + for(i=0;ivalues[0],1); + + /* Stabilization *//*{{{*/ + stabilization=1; + if (stabilization==0){/* no stabilization, do nothing*/} + else if(stabilization==1){ + /* Artificial Diffusion */ + basalelement->ElementSizes(&hx,&hy,&hz); + h=sqrt( pow(hx*normal[0],2) + pow(hy*normal[1],2)); + kappa=h/2.+1.e-14; + for(row=0;rowvalues[0],1); + } + else if(stabilization==2){ + /*Streamline upwinding - do not use this for extrapolation: yields oscillating results due to smoothing along normal, not across */ + for(row=0;rowvalues[0],1); + }/*}}}*/ + } + }/*}}}*/ + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(B); + xDelete(Bprime); + xDelete(D); + xDelete(dlsf); + xDelete(normal); + delete gauss; + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + return Ke; + +}/*}}}*/ +ElementVector* ExtrapolationAnalysis::CreatePVector(Element* element){/*{{{*/ + + if(!element->IsOnBase()) return NULL; + Element* basalelement = element->SpawnBasalElement(); + + /*Intermediaries */ + int i, domaintype; + + /*Fetch number of nodes */ + int numnodes = basalelement->GetNumberOfNodes(); + + /*Initialize Element vector*/ + ElementVector* pe = basalelement->NewElementVector(); + for(i=0;ivalues[i]=0.; + + basalelement->FindParam(&domaintype,DomainTypeEnum); + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + return pe; +}/*}}}*/ +void ExtrapolationAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void ExtrapolationAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + + int domaintype, extrapolationvariable; + element->FindParam(&domaintype,DomainTypeEnum); + element->FindParam(&extrapolationvariable, ExtrapolationVariableEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + element->InputUpdateFromSolutionOneDof(solution,extrapolationvariable); + break; + case Domain3DEnum: + element->InputUpdateFromSolutionOneDofCollapsed(solution,extrapolationvariable); + break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Get nodal functions*/ + IssmDouble* basis=xNew(numnodes); + element->NodalFunctions(basis,gauss); + + /*Build B: */ + for(int i=0;i(basis); +}/*}}}*/ +void ExtrapolationAnalysis::GetBprime(IssmDouble* Bprime,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B' matrix. B'=[B1' B2' B3'] where Bi' is of size 3*NDOF2. + * For node i, Bi' can be expressed in the actual coordinate system + * by: + * Bi_prime=[ dN/dx ] + * [ dN/dy ] + * where N is the finiteelement function for node i. + * + * We assume B' has been allocated already, of size: 3x(NDOF2*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(2*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B': */ + for(int i=0;i(dbasis); + +}/*}}}*/ +void ExtrapolationAnalysis::SetConstraintsOnIce(Element* element){/*{{{*/ + + int numnodes=element->GetNumberOfNodes(); + + /* Intermediaries */ + int extvar_enum; + IssmDouble phi,value; + Node* node = NULL; + + /* Get parameters */ + element->FindParam(&extvar_enum, ExtrapolationVariableEnum); + + Input* levelset_input=element->GetInput(MaskIceLevelsetEnum); _assert_(levelset_input); + Input* extvar_input=element->GetInput(extvar_enum); _assert_(extvar_input); + + Gauss* gauss=element->NewGauss(); + for(int in=0;inGaussNode(element->GetElementType(),in); + node=element->GetNode(in); + levelset_input->GetInputValue(&phi,gauss); + if(node->IsActive()){ + if(phi<=0.){ + /* if ice, set dirichlet BC */ + extvar_input->GetInputValue(&value,gauss); + node->ApplyConstraint(0,value); + } + else { + /* no ice, set no spc */ + node->DofInFSet(0); + } + } + } + delete gauss; +}/*}}}*/ +void ExtrapolationAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ + + for(int i=0;ielements->Size();i++){ + Element* element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); + this->SetConstraintsOnIce(element); + } +}/*}}}*/ Index: /issm/trunk/src/c/analyses/ExtrapolationAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/ExtrapolationAnalysis.h (revision 17806) +++ /issm/trunk/src/c/analyses/ExtrapolationAnalysis.h (revision 17806) @@ -0,0 +1,35 @@ +/*! \file ExtrapolationAnalysis.h + * \brief: header file for generic external result object + */ + +#ifndef _ExtrapolationAnalysis_ +#define _ExtrapolationAnalysis_ + +/*Headers*/ +#include "./Analysis.h" + +class ExtrapolationAnalysis: public Analysis{ + + public: + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); + void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); + void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); + void CreateNodes(Nodes* nodes,IoModel* iomodel); + void CreateConstraints(Constraints* constraints,IoModel* iomodel); + void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); + void GetSolutionFromInputs(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); + void GetB(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss); + void GetBprime(IssmDouble* Bprime,Element* element,IssmDouble* xyz_list,Gauss* gauss); + void SetConstraintsOnIce(Element* element); +}; +#endif Index: /issm/trunk/src/c/analyses/ExtrudeFromBaseAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/ExtrudeFromBaseAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/ExtrudeFromBaseAnalysis.cpp (revision 17806) @@ -6,5 +6,5 @@ /*Model processing*/ -int ExtrudeFromBaseAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int ExtrudeFromBaseAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ return 1; }/*}}}*/ @@ -22,6 +22,6 @@ } - if(iomodel->meshtype==Mesh2DverticalEnum){ - iomodel->FetchDataToInput(elements,MeshVertexonbedEnum); + if(iomodel->domaintype==Domain2DverticalEnum){ + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); } }/*}}}*/ @@ -35,2 +35,199 @@ void ExtrudeFromBaseAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/ }/*}}}*/ + +/*Finite Element Analysis*/ +void ExtrudeFromBaseAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* ExtrudeFromBaseAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* ExtrudeFromBaseAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* ExtrudeFromBaseAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + /*compute all stiffness matrices for this element*/ + ElementMatrix* Ke1=CreateKMatrixVolume(element); + ElementMatrix* Ke2=CreateKMatrixSurface(element); + ElementMatrix* Ke3=CreateKMatrixBed(element); + ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2,Ke3); + + /*clean-up and return*/ + delete Ke1; + delete Ke2; + delete Ke3; + return Ke; +}/*}}}*/ +ElementMatrix* ExtrudeFromBaseAnalysis::CreateKMatrixVolume(Element* element){/*{{{*/ + + /*Intermediaries */ + IssmDouble Jdet,D; + IssmDouble *xyz_list = NULL; + + /*Get dimension*/ + int dim; + element->FindParam(&dim,DomainDimensionEnum); + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(); + IssmDouble* B = xNew(numnodes); + IssmDouble* Bprime = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctions(Bprime,gauss); + GetB(B,element,dim,xyz_list,gauss); + D=gauss->weight*Jdet; + + TripleMultiply(B,1,numnodes,1, + &D,1,1,0, + Bprime,1,numnodes,0, + &Ke->values[0],1); + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(B); + xDelete(Bprime); + delete gauss; + return Ke; +} +/*}}}*/ +ElementMatrix* ExtrudeFromBaseAnalysis::CreateKMatrixSurface(Element* element){/*{{{*/ + + if(!element->IsOnSurface()) return NULL; + + /*Intermediaries */ + int dim; + IssmDouble Jdet,D,normal[3]; + IssmDouble *xyz_list_top = NULL; + + /*Get dimension*/ + element->FindParam(&dim,DomainDimensionEnum); + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinatesTop(&xyz_list_top); + element->NormalTop(&normal[0],xyz_list_top); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGaussTop(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminantTop(&Jdet,xyz_list_top,gauss); + element->NodalFunctions(basis,gauss); + D = - gauss->weight*Jdet*normal[dim-1]; + + TripleMultiply(basis,1,numnodes,1, + &D,1,1,0, + basis,1,numnodes,0, + &Ke->values[0],1); + } + + /*Clean up and return*/ + xDelete(xyz_list_top); + xDelete(basis); + delete gauss; + return Ke; +} +/*}}}*/ +ElementMatrix* ExtrudeFromBaseAnalysis::CreateKMatrixBed(Element* element){/*{{{*/ + + if(!element->IsOnBase()) return NULL; + + /*Intermediaries */ + int dim; + IssmDouble Jdet,D,normal[3]; + IssmDouble *xyz_list_base = NULL; + + /*Get dimension*/ + element->FindParam(&dim,DomainDimensionEnum); + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinatesBase(&xyz_list_base); + element->NormalBase(&normal[0],xyz_list_base); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGaussBase(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminantBase(&Jdet,xyz_list_base,gauss); + element->NodalFunctions(basis,gauss); + D = - gauss->weight*Jdet*normal[dim-1]; + + TripleMultiply(basis,1,numnodes,1, + &D,1,1,0, + basis,1,numnodes,0, + &Ke->values[0],1); + } + + /*Clean up and return*/ + xDelete(xyz_list_base); + xDelete(basis); + delete gauss; + return Ke; +} +/*}}}*/ +ElementVector* ExtrudeFromBaseAnalysis::CreatePVector(Element* element){/*{{{*/ + return NULL; +}/*}}}*/ +void ExtrudeFromBaseAnalysis::GetB(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /* Compute B matrix. B=[dh1/dz dh2/dz dh3/dz dh4/dz dh5/dz dh6/dz]; + where hi is the interpolation function for node i.*/ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(dim*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B: */ + for(int i=0;i(dbasis); +} +/*}}}*/ +void ExtrudeFromBaseAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void ExtrudeFromBaseAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + + int inputenum; + element->FindParam(&inputenum,InputToExtrudeEnum); + element->InputUpdateFromSolutionOneDof(solution,inputenum); +}/*}}}*/ +void ExtrudeFromBaseAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ + /*Default, do nothing*/ + return; +}/*}}}*/ Index: /issm/trunk/src/c/analyses/ExtrudeFromBaseAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/ExtrudeFromBaseAnalysis.h (revision 17805) +++ /issm/trunk/src/c/analyses/ExtrudeFromBaseAnalysis.h (revision 17806) @@ -12,5 +12,6 @@ public: - int DofsPerNode(int** doflist,int meshtype,int approximation); + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); @@ -18,4 +19,18 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementMatrix* CreateKMatrixVolume(Element* element); + ElementMatrix* CreateKMatrixSurface(Element* element); + ElementMatrix* CreateKMatrixBed(Element* element); + ElementVector* CreatePVector(Element* element); + void GetB(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); + void GetSolutionFromInputs(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); }; #endif Index: /issm/trunk/src/c/analyses/ExtrudeFromTopAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/ExtrudeFromTopAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/ExtrudeFromTopAnalysis.cpp (revision 17806) @@ -6,5 +6,5 @@ /*Model processing*/ -int ExtrudeFromTopAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int ExtrudeFromTopAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ return 1; }/*}}}*/ @@ -22,11 +22,11 @@ } - if(iomodel->meshtype==Mesh2DverticalEnum){ - iomodel->FetchDataToInput(elements,MeshVertexonbedEnum); + if(iomodel->domaintype==Domain2DverticalEnum){ + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); } }/*}}}*/ void ExtrudeFromTopAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ - ::CreateNodes(nodes,iomodel,ExtrudeFromBaseAnalysisEnum,P1Enum); + ::CreateNodes(nodes,iomodel,ExtrudeFromTopAnalysisEnum,P1Enum); }/*}}}*/ @@ -35,2 +35,199 @@ void ExtrudeFromTopAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/ }/*}}}*/ + +/*Finite Element Analysis*/ +void ExtrudeFromTopAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* ExtrudeFromTopAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* ExtrudeFromTopAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* ExtrudeFromTopAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + /*compute all stiffness matrices for this element*/ + ElementMatrix* Ke1=CreateKMatrixVolume(element); + ElementMatrix* Ke2=CreateKMatrixSurface(element); + ElementMatrix* Ke3=CreateKMatrixBed(element); + ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2,Ke3); + + /*clean-up and return*/ + delete Ke1; + delete Ke2; + delete Ke3; + return Ke; +}/*}}}*/ +ElementMatrix* ExtrudeFromTopAnalysis::CreateKMatrixVolume(Element* element){/*{{{*/ + + /*Intermediaries */ + int dim; + IssmDouble Jdet,D; + IssmDouble *xyz_list = NULL; + + /*Get dimension*/ + element->FindParam(&dim,DomainDimensionEnum); + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(); + IssmDouble* B = xNew(numnodes); + IssmDouble* Bprime = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctions(Bprime,gauss); + GetB(B,element,dim,xyz_list,gauss); + D=gauss->weight*Jdet; + + TripleMultiply(B,1,numnodes,1, + &D,1,1,0, + Bprime,1,numnodes,0, + &Ke->values[0],1); + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(B); + xDelete(Bprime); + delete gauss; + return Ke; +} +/*}}}*/ +ElementMatrix* ExtrudeFromTopAnalysis::CreateKMatrixSurface(Element* element){/*{{{*/ + + if(!element->IsOnSurface()) return NULL; + + /*Intermediaries */ + int dim; + IssmDouble Jdet,D,normal[2]; + IssmDouble *xyz_list_top = NULL; + + /*Get dimension*/ + element->FindParam(&dim,DomainDimensionEnum); + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinatesTop(&xyz_list_top); + element->NormalTop(&normal[0],xyz_list_top); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGaussTop(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminantTop(&Jdet,xyz_list_top,gauss); + element->NodalFunctions(basis,gauss); + D = - gauss->weight*Jdet*normal[dim-1]; + + TripleMultiply(basis,1,numnodes,1, + &D,1,1,0, + basis,1,numnodes,0, + &Ke->values[0],1); + } + + /*Clean up and return*/ + xDelete(xyz_list_top); + xDelete(basis); + delete gauss; + return Ke; +} +/*}}}*/ +ElementMatrix* ExtrudeFromTopAnalysis::CreateKMatrixBed(Element* element){/*{{{*/ + + if(!element->IsOnBase()) return NULL; + + /*Intermediaries */ + int dim; + IssmDouble Jdet,D,normal[3]; + IssmDouble *xyz_list_base = NULL; + + /*Get dimension*/ + element->FindParam(&dim,DomainDimensionEnum); + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinatesBase(&xyz_list_base); + element->NormalBase(&normal[0],xyz_list_base); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGaussBase(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminantBase(&Jdet,xyz_list_base,gauss); + element->NodalFunctions(basis,gauss); + D = - gauss->weight*Jdet*normal[dim-1]; + + TripleMultiply(basis,1,numnodes,1, + &D,1,1,0, + basis,1,numnodes,0, + &Ke->values[0],1); + } + + /*Clean up and return*/ + xDelete(xyz_list_base); + xDelete(basis); + delete gauss; + return Ke; +} +/*}}}*/ +ElementVector* ExtrudeFromTopAnalysis::CreatePVector(Element* element){/*{{{*/ + return NULL; +}/*}}}*/ +void ExtrudeFromTopAnalysis::GetB(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /* Compute B matrix. B=[dh1/dz dh2/dz dh3/dz dh4/dz dh5/dz dh6/dz]; + where hi is the interpolation function for node i.*/ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(dim*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B: */ + for(int i=0;i(dbasis); +} +/*}}}*/ +void ExtrudeFromTopAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void ExtrudeFromTopAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + + int inputenum; + element->FindParam(&inputenum,InputToExtrudeEnum); + element->InputUpdateFromSolutionOneDof(solution,inputenum); +}/*}}}*/ +void ExtrudeFromTopAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ + /*Default, do nothing*/ + return; +}/*}}}*/ Index: /issm/trunk/src/c/analyses/ExtrudeFromTopAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/ExtrudeFromTopAnalysis.h (revision 17805) +++ /issm/trunk/src/c/analyses/ExtrudeFromTopAnalysis.h (revision 17806) @@ -12,5 +12,6 @@ public: - int DofsPerNode(int** doflist,int meshtype,int approximation); + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); @@ -18,4 +19,18 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementMatrix* CreateKMatrixVolume(Element* element); + ElementMatrix* CreateKMatrixSurface(Element* element); + ElementMatrix* CreateKMatrixBed(Element* element); + ElementVector* CreatePVector(Element* element); + void GetB(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); + void GetSolutionFromInputs(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); }; #endif Index: /issm/trunk/src/c/analyses/FreeSurfaceBaseAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/FreeSurfaceBaseAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/FreeSurfaceBaseAnalysis.cpp (revision 17806) @@ -6,5 +6,5 @@ /*Model processing*/ -int FreeSurfaceBaseAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int FreeSurfaceBaseAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ return 1; }/*}}}*/ @@ -14,5 +14,5 @@ /*Now, is the model 3d? otherwise, do nothing: */ - if (iomodel->meshtype==Mesh2DhorizontalEnum)return; + if (iomodel->domaintype==Domain2DhorizontalEnum)return; /*Finite element type*/ @@ -35,7 +35,7 @@ iomodel->FetchDataToInput(elements,VxEnum); iomodel->FetchDataToInput(elements,VyEnum); - if(iomodel->meshtype==Mesh3DEnum){ + if(iomodel->domaintype==Domain3DEnum){ iomodel->FetchDataToInput(elements,VzEnum); - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); } @@ -43,7 +43,7 @@ void FreeSurfaceBaseAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ - if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); ::CreateNodes(nodes,iomodel,FreeSurfaceBaseAnalysisEnum,P1Enum); - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); }/*}}}*/ void FreeSurfaceBaseAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ @@ -58,7 +58,7 @@ /*Create Penpair for vertex_pairing: */ IssmDouble *vertex_pairing=NULL; - IssmDouble *nodeonbed=NULL; + IssmDouble *nodeonbase=NULL; iomodel->FetchData(&vertex_pairing,&numvertex_pairing,NULL,MasstransportVertexPairingEnum); - iomodel->FetchData(&nodeonbed,NULL,NULL,MeshVertexonbedEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum) iomodel->FetchData(&nodeonbase,NULL,NULL,MeshVertexonbaseEnum); for(int i=0;i(nodeonbed[reCast(vertex_pairing[2*i+0])-1])) || !(reCast(nodeonbed[reCast(vertex_pairing[2*i+1])-1]))) continue; + if(iomodel->domaintype!=Domain2DhorizontalEnum){ + if(!(reCast(nodeonbase[reCast(vertex_pairing[2*i+0])-1])) || !(reCast(nodeonbase[reCast(vertex_pairing[2*i+1])-1]))) continue; + } /*Get node ids*/ @@ -86,4 +88,312 @@ /*free ressources: */ iomodel->DeleteData(vertex_pairing,MasstransportVertexPairingEnum); - iomodel->DeleteData(nodeonbed,MeshVertexonbedEnum); -}/*}}}*/ + iomodel->DeleteData(nodeonbase,MeshVertexonbaseEnum); +}/*}}}*/ + +/*Finite Element Analysis*/ +void FreeSurfaceBaseAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* FreeSurfaceBaseAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* FreeSurfaceBaseAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* FreeSurfaceBaseAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + /*Intermediaries*/ + int domaintype,dim,stabilization; + Element* basalelement = NULL; + IssmDouble *xyz_list = NULL; + IssmDouble Jdet,D_scalar,dt,h; + IssmDouble vel,vx,vy; + + /*Get basal element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + dim = 2; + break; + case Domain2DverticalEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + dim = 1; + break; + case Domain3DEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + dim = 2; + break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Initialize Element vector*/ + ElementMatrix* Ke = basalelement->NewElementMatrix(NoneApproximationEnum); + IssmDouble* basis = xNew(numnodes); + IssmDouble* B = xNew(dim*numnodes); + IssmDouble* Bprime = xNew(dim*numnodes); + IssmDouble* D = xNew(dim*dim); + + /*Retrieve all inputs and parameters*/ + basalelement->GetVerticesCoordinates(&xyz_list); + basalelement->FindParam(&dt,TimesteppingTimeStepEnum); + basalelement->FindParam(&stabilization,MasstransportStabilizationEnum); + Input* vx_input=basalelement->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=NULL; + if(dim>1){vy_input = basalelement->GetInput(VyEnum); _assert_(vy_input);} + h = basalelement->CharacteristicLength(); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=basalelement->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + basalelement->JacobianDeterminant(&Jdet,xyz_list,gauss); + basalelement->NodalFunctions(basis,gauss); + + vx_input->GetInputValue(&vx,gauss); + if(dim==2) vy_input->GetInputValue(&vy,gauss); + + D_scalar=gauss->weight*Jdet; + TripleMultiply(basis,1,numnodes,1, + &D_scalar,1,1,0, + basis,1,numnodes,0, + &Ke->values[0],1); + + GetB(B,basalelement,dim,xyz_list,gauss); + GetBprime(Bprime,basalelement,dim,xyz_list,gauss); + + D_scalar=dt*gauss->weight*Jdet; + for(int i=0;ivalues[0],1); + + if(stabilization==2){ + /*Streamline upwinding*/ + if(dim==1){ + vel=fabs(vx)+1.e-8; + D[0] = h/(2.*vel)*vx*vx; + } + else{ + vel=sqrt(vx*vx+vy*vy)+1.e-8; + D[0*dim+0]=h/(2*vel)*vx*vx; + D[1*dim+0]=h/(2*vel)*vy*vx; + D[0*dim+1]=h/(2*vel)*vx*vy; + D[1*dim+1]=h/(2*vel)*vy*vy; + } + } + else if(stabilization==1){ + /*SSA*/ + if(dim==1){ + vx_input->GetInputAverage(&vx); + D[0]=h/2.*fabs(vx); + } + else{ + vx_input->GetInputAverage(&vx); + vy_input->GetInputAverage(&vy); + D[0*dim+0]=h/2.0*fabs(vx); + D[1*dim+1]=h/2.0*fabs(vy); + } + } + if(stabilization==1 || stabilization==2){ + for(int i=0;ivalues[0],1); + } + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + xDelete(B); + xDelete(Bprime); + xDelete(D); + delete gauss; + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + return Ke; +}/*}}}*/ +ElementVector* FreeSurfaceBaseAnalysis::CreatePVector(Element* element){/*{{{*/ + /*Intermediaries*/ + int domaintype,dim; + IssmDouble Jdet,dt; + IssmDouble mb,mb_correction,bed,vz; + Element* basalelement = NULL; + IssmDouble *xyz_list = NULL; + + /*Get basal element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + dim = 2; + break; + case Domain2DverticalEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + dim = 1; + break; + case Domain3DEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + dim = 2; + break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementVector* pe = basalelement->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + basalelement->GetVerticesCoordinates(&xyz_list); + basalelement->FindParam(&dt,TimesteppingTimeStepEnum); + Input* mb_input = basalelement->GetInput(BasalforcingsMeltingRateEnum); _assert_(mb_input); + Input* mb_correction_input = basalelement->GetInput(BasalforcingsMeltingRateCorrectionEnum); + Input* base_input = basalelement->GetInput(BaseEnum); _assert_(base_input); + Input* vz_input = NULL; + switch(dim){ + case 1: vz_input = basalelement->GetInput(VyEnum); _assert_(vz_input); break; + case 2: vz_input = basalelement->GetInput(VzEnum); _assert_(vz_input); break; + default: _error_("not implemented"); + } + + /*Initialize mb_correction to 0, do not forget!:*/ + /* Start looping on the number of gaussian points: */ + Gauss* gauss=basalelement->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + basalelement->JacobianDeterminant(&Jdet,xyz_list,gauss); + basalelement->NodalFunctions(basis,gauss); + + vz_input->GetInputValue(&vz,gauss); + mb_input->GetInputValue(&mb,gauss); + base_input->GetInputValue(&bed,gauss); + if(mb_correction_input) + mb_correction_input->GetInputValue(&mb_correction,gauss); + else + mb_correction=0.; + + for(int i=0;ivalues[i]+=Jdet*gauss->weight*(bed+dt*(mb-mb_correction) + dt*vz)*basis[i]; + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + delete gauss; + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + return pe; + +}/*}}}*/ +void FreeSurfaceBaseAnalysis::GetB(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2. + * For node i, Bi can be expressed in the actual coordinate system + * by: + * Bi=[ N ] + * [ N ] + * where N is the finiteelement function for node i. + * + * We assume B_prog has been allocated already, of size: 2x(NDOF1*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions*/ + IssmDouble* basis=xNew(numnodes); + element->NodalFunctions(basis,gauss); + + /*Build B: */ + for(int i=0;i(basis); +}/*}}}*/ +void FreeSurfaceBaseAnalysis::GetBprime(IssmDouble* Bprime,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B' matrix. B'=[B1' B2' B3'] where Bi' is of size 3*NDOF2. + * For node i, Bi' can be expressed in the actual coordinate system + * by: + * Bi_prime=[ dN/dx ] + * [ dN/dy ] + * where N is the finiteelement function for node i. + * + * We assume B' has been allocated already, of size: 3x(NDOF2*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(dim*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B': */ + for(int i=0;i(dbasis); + +}/*}}}*/ +void FreeSurfaceBaseAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void FreeSurfaceBaseAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + element->InputUpdateFromSolutionOneDof(solution,BaseEnum); +}/*}}}*/ +void FreeSurfaceBaseAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ + + /*Intermediary*/ + IssmDouble phi,isonbase,base; + + for(int i=0;ielements->Size();i++){ + + Element* element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); + if(!element->IsOnBase()) continue; + + int numnodes = element->GetNumberOfNodes(); + Input* groundedice_input = element->GetInput(MaskGroundediceLevelsetEnum); _assert_(groundedice_input); + Input* onbase_input = element->GetInput(MeshVertexonbaseEnum); _assert_(onbase_input); + Input* base_input = element->GetInput(BaseEnum); _assert_(base_input); + + Gauss* gauss=element->NewGauss(); + for(int iv=0;ivGaussNode(element->GetElementType(),iv); + onbase_input->GetInputValue(&isonbase,gauss); + if(isonbase==1.){ + groundedice_input->GetInputValue(&phi,gauss); + if(phi>=0.){ + base_input->GetInputValue(&base,gauss); + element->nodes[iv]->ApplyConstraint(0,base); + } + else{ + element->nodes[iv]->DofInFSet(0); + } + } + } + delete gauss; + } +}/*}}}*/ Index: /issm/trunk/src/c/analyses/FreeSurfaceBaseAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/FreeSurfaceBaseAnalysis.h (revision 17805) +++ /issm/trunk/src/c/analyses/FreeSurfaceBaseAnalysis.h (revision 17806) @@ -12,5 +12,6 @@ public: - int DofsPerNode(int** doflist,int meshtype,int approximation); + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); @@ -18,4 +19,16 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); + void GetB(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); + void GetBprime(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); + void GetSolutionFromInputs(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); }; #endif Index: /issm/trunk/src/c/analyses/FreeSurfaceTopAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/FreeSurfaceTopAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/FreeSurfaceTopAnalysis.cpp (revision 17806) @@ -6,5 +6,5 @@ /*Model processing*/ -int FreeSurfaceTopAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int FreeSurfaceTopAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ return 1; }/*}}}*/ @@ -14,7 +14,11 @@ /*Now, is the model 3d? otherwise, do nothing: */ - if (iomodel->meshtype==Mesh2DhorizontalEnum)return; - + if (iomodel->domaintype==Domain2DhorizontalEnum)return; + + int smb_model; int finiteelement = P1Enum; + + /*Fetch data needed: */ + iomodel->Constant(&smb_model,SurfaceforcingsEnum); /*Update elements: */ @@ -30,18 +34,25 @@ iomodel->FetchDataToInput(elements,SurfaceEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); - iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum,0.); iomodel->FetchDataToInput(elements,VxEnum); - iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); - if(iomodel->meshtype==Mesh3DEnum){ + if(iomodel->domaintype!=Domain2DhorizontalEnum) iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); + if(iomodel->domaintype==Domain3DEnum){ iomodel->FetchDataToInput(elements,VzEnum); - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); } + switch(smb_model){ + case SMBEnum: + iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum,0.); + break; + default: + /*Nothing for now*/ + ; + } }/*}}}*/ void FreeSurfaceTopAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ - if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); ::CreateNodes(nodes,iomodel,FreeSurfaceTopAnalysisEnum,P1Enum); - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); }/*}}}*/ void FreeSurfaceTopAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ @@ -58,5 +69,5 @@ IssmDouble *nodeonsurface=NULL; iomodel->FetchData(&vertex_pairing,&numvertex_pairing,NULL,MasstransportVertexPairingEnum); - iomodel->FetchData(&nodeonsurface,NULL,NULL,MeshVertexonsurfaceEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum) iomodel->FetchData(&nodeonsurface,NULL,NULL,MeshVertexonsurfaceEnum); for(int i=0;i(nodeonsurface[reCast(vertex_pairing[2*i+0])-1])) || !(reCast(nodeonsurface[reCast(vertex_pairing[2*i+1])-1]))) continue; + if(iomodel->domaintype!=Domain2DhorizontalEnum){ + if(!(reCast(nodeonsurface[reCast(vertex_pairing[2*i+0])-1])) || !(reCast(nodeonsurface[reCast(vertex_pairing[2*i+1])-1]))) continue; + } /*Get node ids*/ @@ -86,2 +99,277 @@ iomodel->DeleteData(nodeonsurface,MeshVertexonsurfaceEnum); }/*}}}*/ + +/*Finite Element Analysis*/ +void FreeSurfaceTopAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* FreeSurfaceTopAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* FreeSurfaceTopAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* FreeSurfaceTopAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + /*Intermediaries*/ + int domaintype,dim,stabilization; + Element* topelement = NULL; + IssmDouble *xyz_list = NULL; + IssmDouble Jdet,D_scalar,dt,h; + IssmDouble vel,vx,vy; + + /*Get top element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + topelement = element; + dim = 2; + break; + case Domain2DverticalEnum: + if(!element->IsOnSurface()) return NULL; + topelement = element->SpawnTopElement(); + dim = 1; + break; + case Domain3DEnum: + if(!element->IsOnSurface()) return NULL; + topelement = element->SpawnTopElement(); + dim = 2; + break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Initialize Element vector*/ + ElementMatrix* Ke = topelement->NewElementMatrix(NoneApproximationEnum); + IssmDouble* basis = xNew(numnodes); + IssmDouble* B = xNew(dim*numnodes); + IssmDouble* Bprime = xNew(dim*numnodes); + IssmDouble* D = xNew(dim*dim); + + /*Retrieve all inputs and parameters*/ + topelement->GetVerticesCoordinates(&xyz_list); + topelement->FindParam(&dt,TimesteppingTimeStepEnum); + topelement->FindParam(&stabilization,MasstransportStabilizationEnum); + Input* vx_input=topelement->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=NULL; + if(dim>1){vy_input = topelement->GetInput(VyEnum); _assert_(vy_input);} + h = topelement->CharacteristicLength(); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=topelement->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + topelement->JacobianDeterminant(&Jdet,xyz_list,gauss); + topelement->NodalFunctions(basis,gauss); + + vx_input->GetInputValue(&vx,gauss); + if(dim==2) vy_input->GetInputValue(&vy,gauss); + + D_scalar=gauss->weight*Jdet; + TripleMultiply(basis,1,numnodes,1, + &D_scalar,1,1,0, + basis,1,numnodes,0, + &Ke->values[0],1); + + GetB(B,topelement,dim,xyz_list,gauss); + GetBprime(Bprime,topelement,dim,xyz_list,gauss); + + D_scalar=dt*gauss->weight*Jdet; + for(int i=0;ivalues[0],1); + + if(stabilization==2){ + /*Streamline upwinding*/ + if(dim==1){ + vel=fabs(vx)+1.e-8; + D[0] = h/(2.*vel)*vx*vx; + } + else{ + vel=sqrt(vx*vx+vy*vy)+1.e-8; + D[0*dim+0]=h/(2*vel)*vx*vx; + D[1*dim+0]=h/(2*vel)*vy*vx; + D[0*dim+1]=h/(2*vel)*vx*vy; + D[1*dim+1]=h/(2*vel)*vy*vy; + } + } + else if(stabilization==1){ + /*SSA*/ + if(dim==1){ + vx_input->GetInputAverage(&vx); + D[0]=h/2.*fabs(vx); + } + else{ + vx_input->GetInputAverage(&vx); + vy_input->GetInputAverage(&vy); + D[0*dim+0]=h/2.0*fabs(vx); + D[1*dim+1]=h/2.0*fabs(vy); + } + } + if(stabilization==1 || stabilization==2){ + for(int i=0;ivalues[0],1); + } + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + xDelete(B); + xDelete(Bprime); + xDelete(D); + delete gauss; + if(domaintype!=Domain2DhorizontalEnum){topelement->DeleteMaterials(); delete topelement;}; + return Ke; +}/*}}}*/ +ElementVector* FreeSurfaceTopAnalysis::CreatePVector(Element* element){/*{{{*/ + /*Intermediaries*/ + int domaintype,dim; + IssmDouble Jdet,dt; + IssmDouble ms,surface,vz; + Element* topelement = NULL; + IssmDouble *xyz_list = NULL; + + /*Get top element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + topelement = element; + dim = 2; + break; + case Domain2DverticalEnum: + if(!element->IsOnSurface()) return NULL; + topelement = element->SpawnTopElement(); + dim = 1; + break; + case Domain3DEnum: + if(!element->IsOnSurface()) return NULL; + topelement = element->SpawnTopElement(); + dim = 2; + break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementVector* pe = topelement->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + topelement->GetVerticesCoordinates(&xyz_list); + topelement->FindParam(&dt,TimesteppingTimeStepEnum); + Input* ms_input = topelement->GetInput(SurfaceforcingsMassBalanceEnum); _assert_(ms_input); + Input* surface_input = topelement->GetInput(SurfaceEnum); _assert_(surface_input); + Input* vz_input = NULL; + switch(dim){ + case 1: vz_input = topelement->GetInput(VyEnum); _assert_(vz_input); break; + case 2: vz_input = topelement->GetInput(VzEnum); _assert_(vz_input); break; + default: _error_("not implemented"); + } + + /*Initialize mb_correction to 0, do not forget!:*/ + /* Start looping on the number of gaussian points: */ + Gauss* gauss=topelement->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + topelement->JacobianDeterminant(&Jdet,xyz_list,gauss); + topelement->NodalFunctions(basis,gauss); + + ms_input->GetInputValue(&ms,gauss); + vz_input->GetInputValue(&vz,gauss); + surface_input->GetInputValue(&surface,gauss); + + for(int i=0;ivalues[i]+=Jdet*gauss->weight*(surface + dt*ms + dt*vz)*basis[i]; + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + delete gauss; + if(domaintype!=Domain2DhorizontalEnum){topelement->DeleteMaterials(); delete topelement;}; + return pe; + +}/*}}}*/ +void FreeSurfaceTopAnalysis::GetB(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2. + * For node i, Bi can be expressed in the actual coordinate system + * by: + * Bi=[ N ] + * [ N ] + * where N is the finiteelement function for node i. + * + * We assume B_prog has been allocated already, of size: 2x(NDOF1*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions*/ + IssmDouble* basis=xNew(numnodes); + element->NodalFunctions(basis,gauss); + + /*Build B: */ + for(int i=0;i(basis); +}/*}}}*/ +void FreeSurfaceTopAnalysis::GetBprime(IssmDouble* Bprime,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B' matrix. B'=[B1' B2' B3'] where Bi' is of size 3*NDOF2. + * For node i, Bi' can be expressed in the actual coordinate system + * by: + * Bi_prime=[ dN/dx ] + * [ dN/dy ] + * where N is the finiteelement function for node i. + * + * We assume B' has been allocated already, of size: 3x(NDOF2*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(dim*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B': */ + for(int i=0;i(dbasis); + +}/*}}}*/ +void FreeSurfaceTopAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void FreeSurfaceTopAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + + element->InputUpdateFromSolutionOneDof(solution,SurfaceEnum); +}/*}}}*/ +void FreeSurfaceTopAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ + /*Default, do nothing*/ + return; +}/*}}}*/ Index: /issm/trunk/src/c/analyses/FreeSurfaceTopAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/FreeSurfaceTopAnalysis.h (revision 17805) +++ /issm/trunk/src/c/analyses/FreeSurfaceTopAnalysis.h (revision 17806) @@ -12,5 +12,6 @@ public: - int DofsPerNode(int** doflist,int meshtype,int approximation); + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); @@ -18,4 +19,16 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); + void GetB(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); + void GetBprime(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); + void GetSolutionFromInputs(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); }; #endif Index: /issm/trunk/src/c/analyses/GiaAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/GiaAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/GiaAnalysis.cpp (revision 17806) @@ -6,5 +6,5 @@ /*Model processing*/ -int GiaAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int GiaAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ return 1; }/*}}}*/ @@ -36,2 +36,30 @@ /*No loads*/ }/*}}}*/ + +/*Finite Element Analysis*/ +void GiaAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* GiaAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* GiaAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* GiaAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* GiaAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ +void GiaAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void GiaAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void GiaAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ + /*Default, do nothing*/ + return; +}/*}}}*/ Index: /issm/trunk/src/c/analyses/GiaAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/GiaAnalysis.h (revision 17805) +++ /issm/trunk/src/c/analyses/GiaAnalysis.h (revision 17806) @@ -12,5 +12,6 @@ public: - int DofsPerNode(int** doflist,int meshtype,int approximation); + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); @@ -18,4 +19,14 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); + void GetSolutionFromInputs(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); }; #endif Index: /issm/trunk/src/c/analyses/HydrologyDCEfficientAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 17806) @@ -6,5 +6,5 @@ /*Model processing*/ -int HydrologyDCEfficientAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int HydrologyDCEfficientAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ return 1; }/*}}}*/ @@ -48,13 +48,17 @@ } } - iomodel->FetchDataToInput(elements,ThicknessEnum); - iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); - iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); - iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum); iomodel->FetchDataToInput(elements,EplHeadEnum); + iomodel->FetchDataToInput(elements,SedimentHeadEnum); + iomodel->FetchDataToInput(elements,HydrologydcEplInitialThicknessEnum); + iomodel->FetchDataToInput(elements,HydrologydcEplMaxThicknessEnum); + iomodel->FetchDataToInput(elements,HydrologydcSedimentTransmitivityEnum); + iomodel->FetchDataToInput(elements,HydrologydcEplThicknessEnum); + if(iomodel->domaintype==Domain3DEnum) iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); + + // elements->InputDuplicate(HydrologydcEplInitialThicknessEnum,HydrologydcEplThicknessEnum); + }/*}}}*/ void HydrologyDCEfficientAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ @@ -70,7 +74,7 @@ if(!isefficientlayer) return; - iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); ::CreateNodes(nodes,iomodel,HydrologyDCEfficientAnalysisEnum,P1Enum); - iomodel->DeleteData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); }/*}}}*/ void HydrologyDCEfficientAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ @@ -90,15 +94,665 @@ }/*}}}*/ void HydrologyDCEfficientAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/ - - /*Do we really want DC?*/ - int hydrology_model; - iomodel->Constant(&hydrology_model,HydrologyModelEnum); - if(hydrology_model!=HydrologydcEnum) return; - - /*Do we want an efficient layer*/ - bool isefficientlayer; - iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum); - if(!isefficientlayer) return; - /*Nothing for now*/ }/*}}}*/ + +/*Finite Element Analysis*/ +void HydrologyDCEfficientAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* HydrologyDCEfficientAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* HydrologyDCEfficientAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* HydrologyDCEfficientAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + /*Intermediaries*/ + bool active_element; + int domaintype; + Element* basalelement; + + /*Get basal element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + break; + case Domain3DEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + break; + default: _error_("mesh "<GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input); + active_element_input->GetInputValue(&active_element); + + /*Check that all nodes are active, else return empty matrix*/ + if(!active_element) { + if(domaintype!=Domain2DhorizontalEnum){ + basalelement->DeleteMaterials(); + delete basalelement; + } + return NULL; + } + /* Intermediaries */ + IssmDouble D_scalar,Jdet,dt; + IssmDouble epl_thickness; + IssmDouble transfer; + IssmDouble *xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = basalelement->GetNumberOfNodes(); + + /*Initialize Element vector*/ + ElementMatrix* Ke = basalelement->NewElementMatrix(); + IssmDouble* B = xNew(2*numnodes); + IssmDouble* basis = xNew(numnodes); + IssmDouble D[2][2]={0.}; + + /*Retrieve all inputs and parameters*/ + basalelement->GetVerticesCoordinates(&xyz_list); + basalelement->FindParam(&dt,TimesteppingTimeStepEnum); + Input* thickness_input = basalelement->GetInput(HydrologydcEplThicknessEnum); _assert_(thickness_input); + Input* sed_head_input = basalelement->GetInput(SedimentHeadEnum); + Input* epl_head_input = basalelement->GetInput(EplHeadEnum); + Input* sed_trans_input = basalelement->GetInput(HydrologydcSedimentTransmitivityEnum); + Input* residual_input = basalelement->GetInput(SedimentHeadResidualEnum); + + IssmDouble epl_specificstoring = EplSpecificStoring(basalelement); + IssmDouble epl_conductivity = basalelement->GetMaterialParameter(HydrologydcEplConductivityEnum); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=basalelement->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss ->GaussPoint(ig); + basalelement ->JacobianDeterminant(&Jdet,xyz_list,gauss); + thickness_input ->GetInputValue(&epl_thickness,gauss); + + /*Diffusivity*/ + D_scalar=epl_conductivity*epl_thickness*gauss->weight*Jdet; + if(dt!=0.) D_scalar=D_scalar*dt; + D[0][0]=D_scalar; + D[1][1]=D_scalar; + GetB(B,basalelement,xyz_list,gauss); + TripleMultiply(B,2,numnodes,1, + &D[0][0],2,2,0, + B,2,numnodes,0, + &Ke->values[0],1); + + /*Transient*/ + if(dt!=0.){ + basalelement->NodalFunctions(&basis[0],gauss); + D_scalar=epl_specificstoring*epl_thickness*gauss->weight*Jdet; + TripleMultiply(basis,numnodes,1,0, + &D_scalar,1,1,0, + basis,1,numnodes,0, + &Ke->values[0],1); + + /*Transfer EPL part*/ + transfer=GetHydrologyKMatrixTransfer(basalelement,gauss,thickness_input,sed_head_input,epl_head_input,sed_trans_input,residual_input); + D_scalar=transfer*gauss->weight*Jdet*dt; + TripleMultiply(basis,numnodes,1,0, + &D_scalar,1,1,0, + basis,1,numnodes,0, + &Ke->values[0],1); + } + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + xDelete(B); + delete gauss; + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + return Ke; + +}/*}}}*/ +ElementVector* HydrologyDCEfficientAnalysis::CreatePVector(Element* element){/*{{{*/ + + /*Intermediaries*/ + bool active_element; + int domaintype; + Element* basalelement; + + /*Get basal element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + break; + case Domain3DEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + break; + default: _error_("mesh "<GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input); + active_element_input->GetInputValue(&active_element); + + /*Check that all nodes are active, else return empty matrix*/ + if(!active_element) { + if(domaintype!=Domain2DhorizontalEnum){ + basalelement->DeleteMaterials(); + delete basalelement; + } + return NULL; + } + /*Intermediaries */ + IssmDouble dt,scalar,water_head; + IssmDouble transfer; + IssmDouble epl_thickness; + IssmDouble Jdet; + IssmDouble residual,connectivity; + + IssmDouble *xyz_list = NULL; + Input* old_wh_input = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = basalelement->GetNumberOfNodes(); + int numvertices = basalelement->GetNumberOfVertices(); + + /*Initialize Element vector*/ + ElementVector* pe = basalelement->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + basalelement->GetVerticesCoordinates(&xyz_list); + basalelement->FindParam(&dt,TimesteppingTimeStepEnum); + + Input* thickness_input = basalelement->GetInput(HydrologydcEplThicknessEnum); _assert_(thickness_input); + Input* sed_head_input = basalelement->GetInput(SedimentHeadEnum); + Input* epl_head_input = basalelement->GetInput(EplHeadEnum); + Input* sed_trans_input = basalelement->GetInput(HydrologydcSedimentTransmitivityEnum); + Input* residual_input = basalelement->GetInput(SedimentHeadResidualEnum); _assert_(residual_input); + if(dt!= 0.){old_wh_input = basalelement->GetInput(EplHeadOldEnum); _assert_(old_wh_input);} + + IssmDouble epl_specificstoring = EplSpecificStoring(basalelement); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=basalelement->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + basalelement ->JacobianDeterminant(&Jdet,xyz_list,gauss); + basalelement ->NodalFunctions(basis,gauss); + + /*Transient and transfer terms*/ + if(dt!=0.){ + old_wh_input ->GetInputValue(&water_head,gauss); + thickness_input ->GetInputValue(&epl_thickness,gauss); + + /*Dealing with the sediment part of the transfer term*/ + transfer=GetHydrologyPVectorTransfer(basalelement,gauss,thickness_input,sed_head_input,epl_head_input,sed_trans_input,residual_input); + scalar = Jdet*gauss->weight*((water_head*epl_specificstoring*epl_thickness)+(transfer*dt)); + for(int i=0;ivalues[i]+=scalar*basis[i]; + } + } + delete gauss; + + /* Add residual if necessary*/ + gauss=basalelement->NewGauss(); + for(int iv=0;ivGaussVertex(iv); + + connectivity = IssmDouble(basalelement->VertexConnectivity(iv)); + residual_input->GetInputValue(&residual,gauss); + pe->values[iv]+=residual/connectivity; + + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + delete gauss; + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + return pe; +}/*}}}*/ +void HydrologyDCEfficientAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + element->GetSolutionFromInputsOneDof(solution,EplHeadEnum); +}/*}}}*/ +void HydrologyDCEfficientAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + + int domaintype,i; + Element* basalelement=NULL; + + element->FindParam(&domaintype,DomainTypeEnum); + + if(domaintype!=Domain2DhorizontalEnum){ + if(!element->IsOnBase()) return; + basalelement=element->SpawnBasalElement(); + } + else{ + basalelement = element; + } + + /*Intermediary*/ + int* doflist = NULL; + + /*Fetch number of nodes for this finite element*/ + int numnodes = basalelement->GetNumberOfNodes(); + + /*Fetch dof list and allocate solution vector*/ + basalelement->GetDofList(&doflist,NoneApproximationEnum,GsetEnum); + IssmDouble* eplHeads = xNew(numnodes); + + /*Use the dof list to index into the solution vector: */ + for(i=0;i(eplHeads[i])) _error_("NaN found in solution vector"); + } + /*Add input to the element: */ + element->AddBasalInput(EplHeadEnum,eplHeads,P1Enum); + + /*Free ressources:*/ + xDelete(eplHeads); + xDelete(doflist); + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; +} /*}}}*/ +void HydrologyDCEfficientAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ + /*Default, do nothing*/ + return; +}/*}}}*/ + +/*Intermediaries*/ +IssmDouble HydrologyDCEfficientAnalysis::EplSpecificStoring(Element* element){/*{{{*/ + IssmDouble rho_freshwater = element->GetMaterialParameter(MaterialsRhoFreshwaterEnum); + IssmDouble g = element->GetMaterialParameter(ConstantsGEnum); + IssmDouble epl_porosity = element->GetMaterialParameter(HydrologydcEplPorosityEnum); + IssmDouble epl_compressibility = element->GetMaterialParameter(HydrologydcEplCompressibilityEnum); + IssmDouble water_compressibility = element->GetMaterialParameter(HydrologydcWaterCompressibilityEnum); + return rho_freshwater*g*epl_porosity*(water_compressibility+(epl_compressibility/epl_porosity)); +}/*}}}*/ +IssmDouble HydrologyDCEfficientAnalysis::SedimentStoring(Element* element){/*{{{*/ + IssmDouble rho_freshwater = element->GetMaterialParameter(MaterialsRhoFreshwaterEnum); + IssmDouble g = element->GetMaterialParameter(ConstantsGEnum); + IssmDouble sediment_porosity = element->GetMaterialParameter(HydrologydcSedimentPorosityEnum); + IssmDouble sediment_thickness = element->GetMaterialParameter(HydrologydcSedimentThicknessEnum); + IssmDouble sediment_compressibility = element->GetMaterialParameter(HydrologydcSedimentCompressibilityEnum); + IssmDouble water_compressibility = element->GetMaterialParameter(HydrologydcWaterCompressibilityEnum); + return rho_freshwater*g*sediment_porosity*sediment_thickness*(water_compressibility+(sediment_compressibility/sediment_porosity)); +}/*}}}*/ +IssmDouble HydrologyDCEfficientAnalysis::GetHydrologyKMatrixTransfer(Element* element, Gauss* gauss, Input* epl_thick_input, Input* sed_head_input, Input* epl_head_input, Input* sed_trans_input, Input* residual_input){/*{{{*/ + + int transfermethod; + IssmDouble epl_thickness; + IssmDouble epl_head,sed_head; + IssmDouble sediment_transmitivity; + IssmDouble leakage,residual,transfer; + + IssmDouble sediment_thickness = element->GetMaterialParameter(HydrologydcSedimentThicknessEnum); + IssmDouble sediment_storing = SedimentStoring(element); + IssmDouble epl_specificstoring = EplSpecificStoring(element); + + element->FindParam(&transfermethod,HydrologydcTransferFlagEnum); + /*Switch between the different transfer methods cases*/ + switch(transfermethod){ + case 0: + /*Just keepping the transfer to zero*/ + transfer=0.0; + break; + case 1: + _assert_(epl_thick_input); + _assert_(sed_head_input); + _assert_(epl_head_input); + _assert_(sed_trans_input); + _assert_(residual_input); + /* get input */ + epl_thick_input->GetInputValue(&epl_thickness,gauss); + sed_head_input->GetInputValue(&sed_head,gauss); + epl_head_input->GetInputValue(&epl_head,gauss); + sed_trans_input->GetInputValue(&sediment_transmitivity,gauss); + residual_input->GetInputValue(&residual,gauss); + element->FindParam(&leakage,HydrologydcLeakageFactorEnum); + + if(epl_head>sed_head){ + if(residual>0.0){ + transfer=0.0; + } + else{ + transfer=(epl_specificstoring*epl_thickness*sediment_transmitivity)/(sediment_thickness*leakage); + } + } + else{ + transfer=(sediment_storing*sediment_transmitivity)/(sediment_thickness*leakage); + } + break; + default: + _error_("no case higher than 1 for the Transfer method"); + } + + return transfer; +}/*}}}*/ +IssmDouble HydrologyDCEfficientAnalysis::GetHydrologyPVectorTransfer(Element* element, Gauss* gauss, Input* epl_thick_input, Input* sed_head_input, Input* epl_head_input, Input* sed_trans_input, Input* residual_input){/*{{{*/ + + int transfermethod; + IssmDouble epl_thickness; + IssmDouble epl_head,sediment_head; + IssmDouble sediment_transmitivity; + IssmDouble leakage,residual,transfer; + + IssmDouble sediment_thickness = element->GetMaterialParameter(HydrologydcSedimentThicknessEnum); + IssmDouble sediment_storing = SedimentStoring(element); + IssmDouble epl_specificstoring = EplSpecificStoring(element); + + element->FindParam(&transfermethod,HydrologydcTransferFlagEnum); + /*Switch between the different transfer methods cases*/ + switch(transfermethod){ + case 0: + /*Just keepping the transfer to zero*/ + transfer=0.0; + break; + case 1: + _assert_(epl_thick_input); + _assert_(sed_head_input); + _assert_(epl_head_input); + _assert_(sed_trans_input); + _assert_(residual_input); + /* get input */ + epl_thick_input->GetInputValue(&epl_thickness,gauss); + sed_head_input->GetInputValue(&sediment_head,gauss); + epl_head_input->GetInputValue(&epl_head,gauss); + sed_trans_input->GetInputValue(&sediment_transmitivity,gauss); + residual_input->GetInputValue(&residual,gauss); + element->FindParam(&leakage,HydrologydcLeakageFactorEnum); + + if(epl_head>sediment_head){ + if(residual>0.0){ + transfer=0.0; + } + else{ + transfer=(epl_specificstoring*epl_thickness*sediment_transmitivity*sediment_head)/(sediment_thickness*leakage); + } + } + else{ + transfer=(sediment_storing*sediment_transmitivity*sediment_head)/(sediment_thickness*leakage); + } + break; + default: + _error_("no case higher than 1 for the Transfer method"); + } + return transfer; +}/*}}}*/ + +void HydrologyDCEfficientAnalysis::ComputeEPLThickness(FemModel* femmodel){/*{{{*/ + + bool active_element; + int domaintype; + IssmDouble dt,A,B; + IssmDouble EPLgrad2; + IssmDouble EPL_N; + + femmodel->parameters->FindParam(&domaintype,DomainTypeEnum); + + for(int j=0;jelements->Size();j++){ + + Element* element=(Element*)femmodel->elements->GetObjectByOffset(j); + + switch(domaintype){ + case Domain2DhorizontalEnum: + if(!element->IsOnBase()) return; + B = element->GetMaterialParameter(MaterialsRheologyBbarEnum); + break; + case Domain3DEnum: + B = element->GetMaterialParameter(MaterialsRheologyBEnum); + break; + default: + _error_("not Implemented Yet"); + } + + int numnodes = element->GetNumberOfNodes(); + IssmDouble* thickness = xNew(numnodes); + IssmDouble* eplhead = xNew(numnodes); + IssmDouble* epl_slopeX = xNew(numnodes); + IssmDouble* epl_slopeY = xNew(numnodes); + IssmDouble* old_thickness = xNew(numnodes); + IssmDouble* ice_thickness = xNew(numnodes); + IssmDouble* bed = xNew(numnodes); + + Input* active_element_input=element->GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input); + active_element_input->GetInputValue(&active_element); + element->FindParam(&dt,TimesteppingTimeStepEnum); + + /*For now, assuming just one way to compute EPL thickness*/ + IssmDouble gravity = element->GetMaterialParameter(ConstantsGEnum); + IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoFreshwaterEnum); + IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble n = element->GetMaterialParameter(MaterialsRheologyNEnum); + IssmDouble latentheat = element->GetMaterialParameter(MaterialsLatentheatEnum); + IssmDouble epl_conductivity = element->GetMaterialParameter(HydrologydcEplConductivityEnum); + IssmDouble init_thick = element->GetMaterialParameter(HydrologydcEplInitialThicknessEnum); + IssmDouble max_thick = element->GetMaterialParameter(HydrologydcEplMaxThicknessEnum); + + A=pow(B,-n); + + element->GetInputListOnVertices(&eplhead[0],EplHeadEnum); + element->GetInputListOnVertices(&epl_slopeX[0],EplHeadSlopeXEnum); + element->GetInputListOnVertices(&epl_slopeY[0],EplHeadSlopeYEnum); + element->GetInputListOnVertices(&old_thickness[0],HydrologydcEplThicknessOldEnum); + element->GetInputListOnVertices(&ice_thickness[0],ThicknessEnum); + element->GetInputListOnVertices(&bed[0],BaseEnum); + + if(!active_element){ + + /*Keeping thickness to initial value if EPL is not active*/ + for(int i=0;imax_thick){ + thickness[i] = max_thick; + } + } + } + element->AddInput(HydrologydcEplThicknessEnum,thickness,element->GetElementType()); + xDelete(thickness); + xDelete(eplhead); + xDelete(epl_slopeX); + xDelete(epl_slopeY); + xDelete(old_thickness); + xDelete(ice_thickness); + xDelete(bed); + } +} +/*}}}*/ +void HydrologyDCEfficientAnalysis::GetB(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2. + * For node i, Bi can be expressed in the actual coordinate system + * by: + * Bi=[ dN/dx ] + * [ dN/dy ] + * where N is the finiteelement function for node i. + * + * We assume B has been allocated already, of size: 3x(NDOF2*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(2*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B: */ + for(int i=0;i(dbasis); +}/*}}}*/ +void HydrologyDCEfficientAnalysis::HydrologyEPLGetMask(Vector* vec_mask,Element* element){ + + bool active_element; + int i,j; + int domaintype; + IssmDouble h_max; + IssmDouble sedheadmin; + Element* basalelement=NULL; + + /*Get basal element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + break; + case Domain3DEnum: + if(!element->IsOnBase()) return; + basalelement = element->SpawnBasalElement(); + break; + default: _error_("mesh "<GetNumberOfNodes(); + IssmDouble* epl_thickness =xNew(numnodes); + IssmDouble* old_active =xNew(numnodes); + IssmDouble* sedhead =xNew(numnodes); + IssmDouble* eplhead =xNew(numnodes); + IssmDouble* residual =xNew(numnodes); + + IssmDouble init_thick = basalelement->GetMaterialParameter(HydrologydcEplInitialThicknessEnum); + + Input* active_element_input=basalelement->GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input); + active_element_input->GetInputValue(&active_element); + + basalelement-> GetInputListOnVertices(&old_active[0],HydrologydcMaskEplactiveNodeEnum); + basalelement-> GetInputListOnVertices(&epl_thickness[0],HydrologydcEplThicknessEnum); + basalelement-> GetInputListOnVertices(&sedhead[0],SedimentHeadEnum); + basalelement-> GetInputListOnVertices(&eplhead[0],EplHeadEnum); + basalelement-> GetInputListOnVertices(&residual[0],SedimentHeadResidualEnum); + + /*Get minimum sediment head of the element*/ + sedheadmin=sedhead[0]; + for(i=1;i0 */ + if(residual[i]>0.){ + vec_mask->SetValue(basalelement->nodes[i]->Sid(),1.,INS_VAL); + } + + /*If mask was already one, keep one*/ + else if(old_active[i]>0.){ + vec_mask->SetValue(basalelement->nodes[i]->Sid(),1.,INS_VAL); + /*If epl thickness gets under 10-3 initial thickness, close the layer*/ + if(epl_thickness[i]<0.001*init_thick){ + vec_mask->SetValue(basalelement->nodes[i]->Sid(),0.,INS_VAL); + epl_thickness[i]=init_thick; + } + } + /*Increase of the efficient system is needed if the epl head reach the maximum value (sediment max value for now)*/ + GetHydrologyDCInefficientHmax(&h_max,basalelement,basalelement->nodes[i]); + if(eplhead[i]>=h_max && active_element){ + for(j=0;j0.){ + vec_mask->SetValue(basalelement->nodes[i]->Sid(),1.,INS_VAL); + } + /*Increase of the domain is on the downstream node in term of sediment head*/ + if(sedhead[j] == sedheadmin){ + vec_mask->SetValue(basalelement->nodes[j]->Sid(),1.,INS_VAL); + } + } + } + } + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + xDelete(epl_thickness); + xDelete(old_active); + xDelete(sedhead); + xDelete(eplhead); + xDelete(residual); +} +/*}}}*/ +void HydrologyDCEfficientAnalysis::HydrologyEPLGetActive(Vector* active_vec, Element* element){ + /*Constants*/ + + int domaintype; + Element* basalelement=NULL; + + /*Get basal element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + break; + case Domain3DEnum: + if(!element->IsOnBase()) return; + basalelement = element->SpawnBasalElement(); + break; + default: _error_("mesh "<GetNumberOfNodes(); + IssmDouble flag = 0.; + IssmDouble* active = xNew(numnodes); + + basalelement->GetInputListOnVertices(&active[0],HydrologydcMaskEplactiveNodeEnum); + + for(int i=0;i0.){ + for(int i=0;iSetValue(basalelement->nodes[i]->Sid(),1.,INS_VAL); + } + } + else{ + /*Do not do anything: at least one node is active for this element but this element is not solved for*/ + } + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + xDelete(active); +} + +void HydrologyDCEfficientAnalysis::GetHydrologyDCInefficientHmax(IssmDouble* ph_max,Element* element, Node* innode){/*{{{*/ + + int hmax_flag; + IssmDouble h_max; + IssmDouble rho_ice,rho_water; + IssmDouble thickness,bed; + /*Get the flag to the limitation method*/ + element->FindParam(&hmax_flag,HydrologydcSedimentlimitFlagEnum); + + /*Switch between the different cases*/ + switch(hmax_flag){ + case 0: + h_max=1.0e+10; + break; + case 1: + element->FindParam(&h_max,HydrologydcSedimentlimitEnum); + break; + case 2: + /*Compute max*/ + rho_water = element->GetMaterialParameter(MaterialsRhoFreshwaterEnum); + rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + element-> GetInputValue(&thickness,innode,ThicknessEnum); + element-> GetInputValue(&bed,innode,BaseEnum); + h_max=((rho_ice*thickness)/rho_water)+bed; + break; + case 3: + _error_("Using normal stress not supported yet"); + break; + default: + _error_("no case higher than 3 for SedimentlimitFlag"); + } + /*Assign output pointer*/ + *ph_max=h_max; +} +/*}}}*/ Index: /issm/trunk/src/c/analyses/HydrologyDCEfficientAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/HydrologyDCEfficientAnalysis.h (revision 17805) +++ /issm/trunk/src/c/analyses/HydrologyDCEfficientAnalysis.h (revision 17806) @@ -8,9 +8,11 @@ /*Headers*/ #include "./Analysis.h" - +class Node; +class Input; class HydrologyDCEfficientAnalysis: public Analysis{ public: - int DofsPerNode(int** doflist,int meshtype,int approximation); + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); @@ -18,4 +20,25 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); + void GetSolutionFromInputs(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); + + /*Intermediaries*/ + void GetB(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss); + IssmDouble EplSpecificStoring(Element* element); + IssmDouble SedimentStoring(Element* element); + IssmDouble GetHydrologyKMatrixTransfer(Element* element, Gauss* gauss, Input* epl_thick_input, Input* sed_head_input, Input* epl_head_input, Input* sed_trans_input, Input* residual_input); + IssmDouble GetHydrologyPVectorTransfer(Element* element, Gauss* gauss, Input* epl_thick_input, Input* sed_head_input, Input* epl_head_input, Input* sed_trans_input, Input* residual_input); + void HydrologyEPLGetMask(Vector* vec_mask,Element* element); + void HydrologyEPLGetActive(Vector* active_vec, Element* element); + void GetHydrologyDCInefficientHmax(IssmDouble* ph_max,Element* element, Node* innode); + void ComputeEPLThickness(FemModel* femmodel); }; #endif Index: /issm/trunk/src/c/analyses/HydrologyDCInefficientAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 17806) @@ -2,9 +2,10 @@ #include "../toolkits/toolkits.h" #include "../classes/classes.h" +#include "../classes/Node.h" #include "../shared/shared.h" #include "../modules/modules.h" /*Model processing*/ -int HydrologyDCInefficientAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int HydrologyDCInefficientAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ return 1; }/*}}}*/ @@ -14,4 +15,6 @@ int sedimentlimit_flag; int transfer_flag; + int penalty_lock; + int hydro_maxiter; bool isefficientlayer; IssmDouble sedimentlimit; @@ -31,4 +34,6 @@ iomodel->FetchData(&penalty_factor,HydrologydcPenaltyFactorEnum); iomodel->FetchData(&rel_tol,HydrologydcRelTolEnum); + iomodel->FetchData(&penalty_lock,HydrologydcPenaltyLockEnum); + iomodel->FetchData(&hydro_maxiter,HydrologydcMaxIterEnum); if(sedimentlimit_flag==1){ @@ -48,4 +53,6 @@ parameters->AddObject(new IntParam(HydrologydcTransferFlagEnum,transfer_flag)); parameters->AddObject(new DoubleParam(HydrologydcRelTolEnum,rel_tol)); + parameters->AddObject(new IntParam(HydrologydcPenaltyLockEnum,penalty_lock)); + parameters->AddObject(new IntParam(HydrologydcMaxIterEnum,hydro_maxiter)); }/*}}}*/ @@ -75,12 +82,13 @@ iomodel->FetchDataToInput(elements,ThicknessEnum); - iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); - iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum); + iomodel->FetchDataToInput(elements,HydrologydcBasalMoulinInputEnum); iomodel->FetchDataToInput(elements,SedimentHeadEnum); - if(isefficientlayer)iomodel->FetchDataToInput(elements,HydrologydcMaskEplactiveEnum); + iomodel->FetchDataToInput(elements,HydrologydcSedimentTransmitivityEnum); + if(iomodel->domaintype==Domain3DEnum) iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); + + if(isefficientlayer)iomodel->FetchDataToInput(elements,HydrologydcMaskEplactiveNodeEnum); }/*}}}*/ void HydrologyDCInefficientAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ @@ -93,7 +101,7 @@ if(hydrology_model!=HydrologydcEnum) return; - if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); ::CreateNodes(nodes,iomodel,HydrologyDCInefficientAnalysisEnum,P1Enum); - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); }/*}}}*/ void HydrologyDCInefficientAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ @@ -113,10 +121,10 @@ if(hydrology_model!=HydrologydcEnum) return; - iomodel->FetchData(1,MeshVertexonbedEnum); - - //create penalties for nodes: no node can have a temperature over the melting point + if(iomodel->domaintype==Domain3DEnum) iomodel->FetchData(1,MeshVertexonbaseEnum); + + //create penalties for nodes: no node can have water above the max CreateSingleNodeToElementConnectivity(iomodel); for(int i=0;inumberofvertices;i++){ - if (iomodel->meshtype==Mesh3DEnum){ + if (iomodel->domaintype!=Domain3DEnum){ /*keep only this partition's nodes:*/ if(iomodel->my_vertices[i]){ @@ -124,5 +132,5 @@ } } - else if(reCast(iomodel->Data(MeshVertexonbedEnum)[i])){ + else if(reCast(iomodel->Data(MeshVertexonbaseEnum)[i])){ if(iomodel->my_vertices[i]){ loads->AddObject(new Pengrid(iomodel->loadcounter+i+1,i,iomodel,HydrologyDCInefficientAnalysisEnum)); @@ -130,4 +138,559 @@ } } - iomodel->DeleteData(1,MeshVertexonbedEnum); -}/*}}}*/ + iomodel->DeleteData(1,MeshVertexonbaseEnum); +}/*}}}*/ + +/*Finite Element Analysis*/ +void HydrologyDCInefficientAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* HydrologyDCInefficientAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* HydrologyDCInefficientAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* HydrologyDCInefficientAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + /*Intermediaries*/ + int domaintype; + Element* basalelement; + + /*Get basal element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + break; + case Domain3DEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Initialize Element vector*/ + ElementMatrix* Ke = basalelement->NewElementMatrix(); + IssmDouble* B = xNew(2*numnodes); + IssmDouble* basis = xNew(numnodes); + IssmDouble D[2][2]= {0.}; + + /*Retrieve all inputs and parameters*/ + basalelement ->GetVerticesCoordinates(&xyz_list); + basalelement ->FindParam(&dt,TimesteppingTimeStepEnum); + basalelement ->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum); + + Input* epl_thick_input = basalelement->GetInput(HydrologydcEplThicknessEnum); + Input* sed_head_input = basalelement->GetInput(SedimentHeadEnum); + Input* epl_head_input = basalelement->GetInput(EplHeadEnum); + Input* thickness_input = basalelement->GetInput(ThicknessEnum); + Input* base_input = basalelement->GetInput(BaseEnum); + Input* SedTrans_input = basalelement->GetInput(HydrologydcSedimentTransmitivityEnum); _assert_(SedTrans_input); + IssmDouble sediment_storing = SedimentStoring(basalelement); + /*Transfer related Inputs*/ + if(isefficientlayer){ + active_element_input = basalelement->GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input); + } + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=basalelement->NewGauss(2); + for(int ig=gauss -> begin();igend();ig++){ + gauss -> GaussPoint(ig); + basalelement -> JacobianDeterminant(&Jdet,xyz_list,gauss); + SedTrans_input -> GetInputValue(&sediment_transmitivity,gauss); + /*Diffusivity*/ + D_scalar=sediment_transmitivity*gauss->weight*Jdet; + if(dt!=0.) D_scalar=D_scalar*dt; + D[0][0]=D_scalar; + D[1][1]=D_scalar; + GetB(B,basalelement,xyz_list,gauss); + TripleMultiply(B,2,numnodes,1, + &D[0][0],2,2,0, + B,2,numnodes,0, + &Ke->values[0],1); + + /*Transient*/ + if(dt!=0.){ + basalelement->NodalFunctions(&basis[0],gauss); + D_scalar=sediment_storing*gauss->weight*Jdet; + TripleMultiply(basis,numnodes,1,0, + &D_scalar,1,1,0, + basis,1,numnodes,0, + &Ke->values[0],1); + + /*Transfer EPL part*/ + if(isefficientlayer){ + active_element_input->GetInputValue(&active_element); + if(active_element){ + transfer=GetHydrologyKMatrixTransfer(basalelement,gauss,epl_thick_input,sed_head_input,epl_head_input,SedTrans_input,thickness_input,base_input); + basalelement->NodalFunctions(&basis[0],gauss); + D_scalar=transfer*gauss->weight*Jdet*dt; + TripleMultiply(basis,numnodes,1,0, + &D_scalar,1,1,0, + basis,1,numnodes,0, + &Ke->values[0],1); + } + } + } + } + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(B); + xDelete(basis); + delete gauss; + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + return Ke; +}/*}}}*/ +ElementVector* HydrologyDCInefficientAnalysis::CreatePVector(Element* element){/*{{{*/ + + /*Intermediaries*/ + int domaintype; + Element* basalelement; + + /*Get basal element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + break; + case Domain3DEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Initialize Element vector*/ + ElementVector* pe = basalelement->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + basalelement->GetVerticesCoordinates(&xyz_list); + basalelement->FindParam(&dt,TimesteppingTimeStepEnum); + basalelement->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum); + + Input* epl_thick_input = basalelement->GetInput(HydrologydcEplThicknessEnum); + Input* sed_head_input = basalelement->GetInput(SedimentHeadEnum); + Input* epl_head_input = basalelement->GetInput(EplHeadEnum); + Input* sed_trans_input = basalelement->GetInput(HydrologydcSedimentTransmitivityEnum); + Input* thickness_input = basalelement->GetInput(ThicknessEnum); + Input* base_input = basalelement->GetInput(BaseEnum); + Input* water_input = basalelement->GetInput(BasalforcingsMeltingRateEnum); _assert_(water_input); + if(dt!= 0.){old_wh_input = basalelement->GetInput(SedimentHeadOldEnum); _assert_(old_wh_input);} + + IssmDouble sediment_storing = SedimentStoring(basalelement); + + /*Transfer related Inputs*/ + if(isefficientlayer){ + active_element_input = basalelement->GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input); + } + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=basalelement->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + basalelement->JacobianDeterminant(&Jdet,xyz_list,gauss); + basalelement->NodalFunctions(basis,gauss); + + /*Loading term*/ + water_input->GetInputValue(&water_load,gauss); + + scalar = Jdet*gauss->weight*(water_load); + if(dt!=0.) scalar = scalar*dt; + for(int i=0;ivalues[i]+=scalar*basis[i]; + } + + /*Transient and transfer terms*/ + if(dt!=0.){ + old_wh_input ->GetInputValue(&water_head,gauss); + if(isefficientlayer){ + /*Dealing with the sediment part of the transfer term*/ + active_element_input->GetInputValue(&active_element); + if(active_element){ + transfer=GetHydrologyPVectorTransfer(basalelement,gauss,epl_thick_input,sed_head_input,epl_head_input,sed_trans_input,thickness_input,base_input); + } + else{ + transfer=0.0; + } + scalar = Jdet*gauss->weight*((water_head*sediment_storing)+(dt*transfer)); + for(int i=0;ivalues[i]+=scalar*basis[i]; + } + else{ + scalar = Jdet*gauss->weight*(water_head*sediment_storing); + for(int i=0;ivalues[i]+=scalar*basis[i]; + } + } + } + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + delete gauss; + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + return pe; +}/*}}}*/ +void HydrologyDCInefficientAnalysis::GetB(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2. + * For node i, Bi can be expressed in the actual coordinate system + * by: + * Bi=[ dN/dx ] + * [ dN/dy ] + * where N is the finiteelement function for node i. + * + * We assume B has been allocated already, of size: 3x(NDOF2*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(2*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B: */ + for(int i=0;i(dbasis); +}/*}}}*/ +void HydrologyDCInefficientAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + element->GetSolutionFromInputsOneDof(solution,SedimentHeadEnum); +}/*}}}*/ +void HydrologyDCInefficientAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + + int domaintype; + bool converged; + int* doflist=NULL; + Element* basalelement=NULL; + + element->FindParam(&domaintype,DomainTypeEnum); + if(domaintype!=Domain2DhorizontalEnum){ + if(!element->IsOnBase()) return; + basalelement=element->SpawnBasalElement(); + } + else{ + basalelement = element; + } + + /*Fetch number of nodes for this finite element*/ + int numnodes = basalelement->GetNumberOfNodes(); + + /*Fetch dof list and allocate solution vector*/ + basalelement->GetDofList(&doflist,NoneApproximationEnum,GsetEnum); + IssmDouble* values = xNew(numnodes); + IssmDouble* pressure = xNew(numnodes); + IssmDouble* residual = xNew(numnodes); + + /*Use the dof list to index into the solution vector: */ + for(int i=0;i(values[i])) _error_("NaN found in solution vector"); + } + + /*If converged keep the residual in mind, also compute effective pressure*/ + basalelement->GetInputValue(&converged,ConvergedEnum); + + /*Get inputs*/ + if(converged){ + IssmDouble penalty_factor,kmax,kappa,h_max; + IssmDouble rho_freshwater,rho_ice; + IssmDouble g; + IssmDouble* thickness = xNew(numnodes); + IssmDouble* base = xNew(numnodes); + + basalelement->FindParam(&kmax,HydrologySedimentKmaxEnum); + basalelement->FindParam(&penalty_factor,HydrologydcPenaltyFactorEnum); + basalelement->GetMaterialParameter(MaterialsRhoFreshwaterEnum); + basalelement->GetMaterialParameter(MaterialsRhoIceEnum); + basalelement->GetMaterialParameter(ConstantsGEnum); + + basalelement->GetInputListOnVertices(thickness,ThicknessEnum); + basalelement->GetInputListOnVertices(base,BaseEnum); + + kappa=kmax*pow(10.,penalty_factor); + + for(int i=0;iGetNode(i)); + if(values[i]>h_max) { + residual[i] = kappa*(values[i]-h_max); + pressure[i]=(rho_ice*g*thickness[i])-(rho_freshwater*g*(values[i]-base[i])); + } + else{ + residual[i] = 0.; + pressure[i]=(rho_ice*g*thickness[i])-(rho_freshwater*g*(h_max-base[i])); + } + } + xDelete(thickness); + xDelete(base); + } + + /*Add input to the element: */ + element->AddBasalInput(SedimentHeadEnum,values,P1Enum); + element->AddBasalInput(SedimentHeadResidualEnum,residual,P1Enum); + element->AddBasalInput(EffectivePressureEnum,pressure,P1Enum); + + /*Free ressources:*/ + xDelete(values); + xDelete(residual); + xDelete(pressure); + xDelete(doflist); + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; +}/*}}}*/ +void HydrologyDCInefficientAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ + /*Default, do nothing*/ + return; +}/*}}}*/ + +/*Intermediaries*/ +IssmDouble HydrologyDCInefficientAnalysis::SedimentStoring(Element* element){/*{{{*/ + IssmDouble rho_freshwater = element->GetMaterialParameter(MaterialsRhoFreshwaterEnum); + IssmDouble g = element->GetMaterialParameter(ConstantsGEnum); + IssmDouble sediment_porosity = element->GetMaterialParameter(HydrologydcSedimentPorosityEnum); + IssmDouble sediment_thickness = element->GetMaterialParameter(HydrologydcSedimentThicknessEnum); + IssmDouble sediment_compressibility = element->GetMaterialParameter(HydrologydcSedimentCompressibilityEnum); + IssmDouble water_compressibility = element->GetMaterialParameter(HydrologydcWaterCompressibilityEnum); + return rho_freshwater*g*sediment_porosity*sediment_thickness*(water_compressibility+(sediment_compressibility/sediment_porosity)); +}/*}}}*/ + +IssmDouble HydrologyDCInefficientAnalysis::EplSpecificStoring(Element* element){/*{{{*/ + IssmDouble rho_freshwater = element->GetMaterialParameter(MaterialsRhoFreshwaterEnum); + IssmDouble g = element->GetMaterialParameter(ConstantsGEnum); + IssmDouble epl_porosity = element->GetMaterialParameter(HydrologydcEplPorosityEnum); + IssmDouble epl_compressibility = element->GetMaterialParameter(HydrologydcEplCompressibilityEnum); + IssmDouble water_compressibility = element->GetMaterialParameter(HydrologydcWaterCompressibilityEnum); + return rho_freshwater*g*epl_porosity*(water_compressibility+(epl_compressibility/epl_porosity)); +}/*}}}*/ + +IssmDouble HydrologyDCInefficientAnalysis::GetHydrologyDCInefficientHmax(Element* element, Gauss* gauss, Input* thick_input, Input* base_input){/*{{{*/ + int hmax_flag; + IssmDouble h_max; + IssmDouble rho_ice,rho_water; + IssmDouble thickness,bed; + /*Get the flag to the limitation method*/ + element->FindParam(&hmax_flag,HydrologydcSedimentlimitFlagEnum); + + /*Switch between the different cases*/ + switch(hmax_flag){ + case 0: + h_max=1.0e+10; + break; + case 1: + element->FindParam(&h_max,HydrologydcSedimentlimitEnum); + break; + case 2: + + rho_water = element->GetMaterialParameter(MaterialsRhoFreshwaterEnum); + rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + + _assert_(thick_input); + _assert_(base_input); + + /*Compute max*/ + thick_input->GetInputValue(&thickness,gauss); + base_input->GetInputValue(&bed,gauss); + h_max=((rho_ice*thickness)/rho_water)+bed; + break; + case 3: + _error_("Using normal stress not supported yet"); + break; + default: + _error_("no case higher than 3 for SedimentlimitFlag"); + } + return h_max; +}/*}}}*/ +void HydrologyDCInefficientAnalysis::GetHydrologyDCInefficientHmax(IssmDouble* ph_max,Element* element, Node* innode){/*{{{*/ + + int hmax_flag; + IssmDouble h_max; + IssmDouble rho_ice,rho_water; + IssmDouble thickness,bed; + /*Get the flag to the limitation method*/ + element->FindParam(&hmax_flag,HydrologydcSedimentlimitFlagEnum); + + /*Switch between the different cases*/ + switch(hmax_flag){ + case 0: + h_max=1.0e+10; + break; + case 1: + element->FindParam(&h_max,HydrologydcSedimentlimitEnum); + break; + case 2: + /*Compute max*/ + rho_water = element->GetMaterialParameter(MaterialsRhoFreshwaterEnum); + rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + element->GetInputValue(&thickness,innode,ThicknessEnum); + element->GetInputValue(&bed,innode,BaseEnum); + h_max=((rho_ice*thickness)/rho_water)+bed; + break; + case 3: + _error_("Using normal stress not supported yet"); + break; + default: + _error_("no case higher than 3 for SedimentlimitFlag"); + } + /*Assign output pointer*/ + *ph_max=h_max; +} +/*}}}*/ +IssmDouble HydrologyDCInefficientAnalysis::GetHydrologyKMatrixTransfer(Element* element, Gauss* gauss, Input* epl_thick_input, Input* sed_head_input, Input* epl_head_input, Input* sed_trans_input, Input* thickness_input, Input* base_input){/*{{{*/ + + int transfermethod; + IssmDouble epl_thickness; + IssmDouble epl_head,sed_head; + IssmDouble sediment_transmitivity; + IssmDouble leakage,h_max,transfer; + + IssmDouble sediment_thickness = element->GetMaterialParameter(HydrologydcSedimentThicknessEnum); + IssmDouble sediment_storing = SedimentStoring(element); + IssmDouble epl_specificstoring = EplSpecificStoring(element); + + element->FindParam(&transfermethod,HydrologydcTransferFlagEnum); + /*Switch between the different transfer methods cases*/ + switch(transfermethod){ + case 0: + /*Just keepping the transfer to zero*/ + transfer=0.0; + break; + case 1: + + _assert_(epl_thick_input); + _assert_(sed_head_input); + _assert_(epl_head_input); + _assert_(sed_trans_input); + _assert_(thickness_input); + _assert_(base_input); + + epl_thick_input->GetInputValue(&epl_thickness,gauss); + sed_head_input->GetInputValue(&sed_head,gauss); + epl_head_input->GetInputValue(&epl_head,gauss); + sed_trans_input->GetInputValue(&sediment_transmitivity,gauss); + element->FindParam(&leakage,HydrologydcLeakageFactorEnum); + + if(epl_head>sed_head){ + h_max=GetHydrologyDCInefficientHmax(element,gauss,thickness_input,base_input); + if(sed_head>=h_max){ + transfer=0.0; + } + else{ + transfer=(epl_specificstoring*epl_thickness*sediment_transmitivity)/(sediment_thickness*leakage); + } + } + else{ + transfer=(sediment_storing*sediment_transmitivity)/(sediment_thickness*leakage); + } + break; + default: + _error_("no case higher than 1 for the Transfer method"); + } + + return transfer; +}/*}}}*/ + +IssmDouble HydrologyDCInefficientAnalysis::GetHydrologyPVectorTransfer(Element* element, Gauss* gauss, Input* epl_thick_input, Input* sed_head_input, Input* epl_head_input, Input* sed_trans_input, Input* thickness_input, Input* base_input){/*{{{*/ + + int transfermethod; + IssmDouble epl_thickness; + IssmDouble epl_head,sediment_head; + IssmDouble sediment_transmitivity; + IssmDouble leakage,h_max,transfer; + + IssmDouble sediment_thickness = element->GetMaterialParameter(HydrologydcSedimentThicknessEnum); + IssmDouble sediment_storing = SedimentStoring(element); + IssmDouble epl_specificstoring = EplSpecificStoring(element); + + element->FindParam(&transfermethod,HydrologydcTransferFlagEnum); + /*Switch between the different transfer methods cases*/ + switch(transfermethod){ + case 0: + /*Just keepping the transfer to zero*/ + transfer=0.0; + break; + case 1: + + _assert_(epl_thick_input); + _assert_(sed_head_input); + _assert_(epl_head_input); + _assert_(sed_trans_input); + _assert_(thickness_input); + _assert_(base_input); + + epl_thick_input->GetInputValue(&epl_thickness,gauss); + sed_head_input->GetInputValue(&sediment_head,gauss); + epl_head_input->GetInputValue(&epl_head,gauss); + sed_trans_input->GetInputValue(&sediment_transmitivity,gauss); + + element->FindParam(&leakage,HydrologydcLeakageFactorEnum); + + if(epl_head>sediment_head){ + h_max=GetHydrologyDCInefficientHmax(element,gauss,thickness_input,base_input); + if(sediment_head>=h_max){ + transfer=0.0; + } + else{ + transfer=(epl_specificstoring*epl_thickness*sediment_transmitivity*epl_head)/(sediment_thickness*leakage); + } + } + else{ + transfer=(sediment_storing*sediment_transmitivity*epl_head)/(sediment_thickness*leakage); + } + break; + default: + _error_("no case higher than 1 for the Transfer method"); + } + return transfer; +}/*}}}*/ + +void HydrologyDCInefficientAnalysis::ElementizeEplMask(FemModel* femmodel){/*{{{*/ + + bool element_active; + Element* element=NULL; + + for(int i=0;ielements->Size();i++){ + element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); + + int numvertices = element->GetNumberOfVertices(); + Input* node_mask_input = element->GetInput(HydrologydcMaskEplactiveNodeEnum); + if(node_mask_input->Max()>0.) { + element_active = true; + } + else{ + element_active = false; + } + element->AddInput(new BoolInput(HydrologydcMaskEplactiveEltEnum,element_active)); + } +}/*}}}*/ + Index: /issm/trunk/src/c/analyses/HydrologyDCInefficientAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/HydrologyDCInefficientAnalysis.h (revision 17805) +++ /issm/trunk/src/c/analyses/HydrologyDCInefficientAnalysis.h (revision 17806) @@ -8,9 +8,11 @@ /*Headers*/ #include "./Analysis.h" - +class Node; +class Input; class HydrologyDCInefficientAnalysis: public Analysis{ public: - int DofsPerNode(int** doflist,int meshtype,int approximation); + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); @@ -18,4 +20,24 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); + void GetSolutionFromInputs(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); + + /*Intermediaries*/ + void GetB(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss); + IssmDouble SedimentStoring(Element* element); + IssmDouble EplSpecificStoring(Element* element); + IssmDouble GetHydrologyDCInefficientHmax(Element* element, Gauss* gauss, Input* thickness_input, Input* base_input); + void GetHydrologyDCInefficientHmax(IssmDouble* ph_max,Element* element, Node* innode); + IssmDouble GetHydrologyKMatrixTransfer(Element* element, Gauss* gauss, Input* epl_thick_input, Input* sed_head_input, Input* epl_head_input, Input* sed_trans_input, Input* thickness_input, Input* base_input); + IssmDouble GetHydrologyPVectorTransfer(Element* element, Gauss* gauss, Input* epl_thick_input, Input* sed_head_input, Input* epl_head_input, Input* sed_trans_input, Input* thickness_input, Input* base_input); + void ElementizeEplMask(FemModel* femmodel); }; #endif Index: /issm/trunk/src/c/analyses/HydrologyShreveAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/HydrologyShreveAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/HydrologyShreveAnalysis.cpp (revision 17806) @@ -6,5 +6,5 @@ /*Model processing*/ -int HydrologyShreveAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int HydrologyShreveAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ return 1; }/*}}}*/ @@ -43,6 +43,6 @@ iomodel->FetchDataToInput(elements,ThicknessEnum); iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); @@ -62,7 +62,7 @@ if(hydrology_model!=HydrologyshreveEnum) return; - if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + if(iomodel->domaintype==Domain3DEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); ::CreateNodes(nodes,iomodel,HydrologyShreveAnalysisEnum,P1Enum); - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); }/*}}}*/ void HydrologyShreveAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ @@ -80,2 +80,295 @@ /*No loads*/ }/*}}}*/ + +/*Finite Element Analysis*/ +void HydrologyShreveAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* HydrologyShreveAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* HydrologyShreveAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* HydrologyShreveAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + /*Intermediaries */ + IssmDouble diffusivity; + IssmDouble Jdet,D_scalar,dt,h; + IssmDouble vx,vy,vel,dvxdx,dvydy; + IssmDouble dvx[2],dvy[2]; + IssmDouble* xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(); + IssmDouble* basis = xNew(numnodes); + IssmDouble* B = xNew(2*numnodes); + IssmDouble* Bprime = xNew(2*numnodes); + IssmDouble D[2][2]={0.}; + + /*Create water velocity vx and vy from current inputs*/ + CreateHydrologyWaterVelocityInput(element); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + element->FindParam(&dt,TimesteppingTimeStepEnum); + element->FindParam(&diffusivity,HydrologyshreveStabilizationEnum); + Input* vx_input=element->GetInput(HydrologyWaterVxEnum); _assert_(vx_input); + Input* vy_input=element->GetInput(HydrologyWaterVyEnum); _assert_(vy_input); + h = element->CharacteristicLength(); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctions(basis,gauss); + + vx_input->GetInputValue(&vx,gauss); + vy_input->GetInputValue(&vy,gauss); + vx_input->GetInputDerivativeValue(&dvx[0],xyz_list,gauss); + vy_input->GetInputDerivativeValue(&dvy[0],xyz_list,gauss); + + D_scalar=gauss->weight*Jdet; + + TripleMultiply(basis,1,numnodes,1, + &D_scalar,1,1,0, + basis,1,numnodes,0, + Ke->values,1); + + GetB(B,element,xyz_list,gauss); + GetBprime(Bprime,element,xyz_list,gauss); + + dvxdx=dvx[0]; + dvydy=dvy[1]; + D_scalar=dt*gauss->weight*Jdet; + + D[0][0]=D_scalar*dvxdx; + D[1][1]=D_scalar*dvydy; + TripleMultiply(B,2,numnodes,1, + &D[0][0],2,2,0, + B,2,numnodes,0, + &Ke->values[0],1); + + D[0][0]=D_scalar*vx; + D[1][1]=D_scalar*vy; + TripleMultiply(B,2,numnodes,1, + &D[0][0],2,2,0, + Bprime,2,numnodes,0, + &Ke->values[0],1); + + /*Artificial diffusivity*/ + vel=sqrt(vx*vx+vy*vy); + D[0][0]=D_scalar*diffusivity*h/(2*vel)*vx*vx; + D[1][0]=D_scalar*diffusivity*h/(2*vel)*vy*vx; + D[0][1]=D_scalar*diffusivity*h/(2*vel)*vx*vy; + D[1][1]=D_scalar*diffusivity*h/(2*vel)*vy*vy; + TripleMultiply(Bprime,2,numnodes,1, + &D[0][0],2,2,0, + Bprime,2,numnodes,0, + &Ke->values[0],1); + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + xDelete(B); + xDelete(Bprime); + delete gauss; + return Ke; +}/*}}}*/ +ElementVector* HydrologyShreveAnalysis::CreatePVector(Element* element){/*{{{*/ + + /*Skip if water or ice shelf element*/ + if(element->IsFloating()) return NULL; + + /*Intermediaries */ + IssmDouble Jdet,dt; + IssmDouble mb,oldw; + IssmDouble* xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementVector* pe = element->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + element->FindParam(&dt,TimesteppingTimeStepEnum); + Input* mb_input = element->GetInput(BasalforcingsMeltingRateEnum); _assert_(mb_input); + Input* oldw_input = element->GetInput(WaterColumnOldEnum); _assert_(oldw_input); + + /*Initialize mb_correction to 0, do not forget!:*/ + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctions(basis,gauss); + + mb_input->GetInputValue(&mb,gauss); + oldw_input->GetInputValue(&oldw,gauss); + + if(dt!=0.){ + for(int i=0;ivalues[i]+=Jdet*gauss->weight*(oldw+dt*mb)*basis[i]; + } + else{ + for(int i=0;ivalues[i]+=Jdet*gauss->weight*mb*basis[i]; + } + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + delete gauss; + return pe; +}/*}}}*/ +void HydrologyShreveAnalysis::GetB(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2. + * For node i, Bi can be expressed in the actual coordinate system + * by: + * Bi=[ N ] + * [ N ] + * where N is the finiteelement function for node i. + * + * We assume B_prog has been allocated already, of size: 2x(NDOF1*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions*/ + IssmDouble* basis=xNew(numnodes); + element->NodalFunctions(basis,gauss); + + /*Build B: */ + for(int i=0;i(basis); +}/*}}}*/ +void HydrologyShreveAnalysis::GetBprime(IssmDouble* Bprime,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B' matrix. B'=[B1' B2' B3'] where Bi' is of size 3*NDOF2. + * For node i, Bi' can be expressed in the actual coordinate system + * by: + * Bi_prime=[ dN/dx ] + * [ dN/dy ] + * where N is the finiteelement function for node i. + * + * We assume B' has been allocated already, of size: 3x(NDOF2*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(2*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B': */ + for(int i=0;i(dbasis); + +}/*}}}*/ +void HydrologyShreveAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + element->GetSolutionFromInputsOneDof(solution,WatercolumnEnum); +}/*}}}*/ +void HydrologyShreveAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + + /*Intermediary*/ + int* doflist = NULL; + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Fetch dof list and allocate solution vector*/ + element->GetDofList(&doflist,NoneApproximationEnum,GsetEnum); + IssmDouble* values = xNew(numnodes); + + /*Use the dof list to index into the solution vector: */ + for(int i=0;i(values[i])) _error_("NaN found in solution vector"); + if (values[i]<10e-10) values[i]=10e-10; //correcting the water column to positive values + } + + /*Add input to the element: */ + element->AddInput(WatercolumnEnum,values,element->GetElementType()); + + /*Free ressources:*/ + xDelete(values); + xDelete(doflist); +}/*}}}*/ +void HydrologyShreveAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ + /*Default, do nothing*/ + return; +}/*}}}*/ + +/*Intermediaries*/ +void HydrologyShreveAnalysis::CreateHydrologyWaterVelocityInput(Element* element){/*{{{*/ + + /*Intermediaries*/ + IssmDouble dsdx,dsdy,dbdx,dbdy,w; + + /*Retrieve all inputs and parameters*/ + IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoWaterEnum); + IssmDouble g = element->GetMaterialParameter(ConstantsGEnum); + IssmDouble CR = element->GetMaterialParameter(HydrologyshreveCREnum); + IssmDouble n_man = element->GetMaterialParameter(HydrologyshreveNEnum); + IssmDouble mu_water = element->GetMaterialParameter(MaterialsMuWaterEnum); + Input* surfaceslopex_input = element->GetInput(SurfaceSlopeXEnum); _assert_(surfaceslopex_input); + Input* surfaceslopey_input = element->GetInput(SurfaceSlopeYEnum); _assert_(surfaceslopey_input); + Input* bedslopex_input = element->GetInput(BedSlopeXEnum); _assert_(bedslopex_input); + Input* bedslopey_input = element->GetInput(BedSlopeYEnum); _assert_(bedslopey_input); + Input* watercolumn_input = element->GetInput(WatercolumnEnum); _assert_(watercolumn_input); + + /* compute VelocityFactor */ + IssmDouble VelocityFactor = n_man*CR*CR*rho_water*g/mu_water; + + /*Fetch number of vertices and allocate output*/ + int numvertices = element->GetNumberOfVertices(); + IssmDouble* vx = xNew(numvertices); + IssmDouble* vy = xNew(numvertices); + + Gauss* gauss=element->NewGauss(); + for(int iv=0;ivGaussVertex(iv); + surfaceslopex_input->GetInputValue(&dsdx,gauss); + surfaceslopey_input->GetInputValue(&dsdy,gauss); + bedslopex_input->GetInputValue(&dbdx,gauss); + bedslopey_input->GetInputValue(&dbdy,gauss); + watercolumn_input->GetInputValue(&w,gauss); + + /* Water velocity x and y components */ + // vx[iv]= - w*w/(12 * mu_water)*(rho_ice*g*dsdx+(rho_water-rho_ice)*g*dbdx); + // vy[iv]= - w*w/(12 * mu_water)*(rho_ice*g*dsdy+(rho_water-rho_ice)*g*dbdy); + vx[iv]= - w*w/(VelocityFactor* mu_water)*(rho_ice*g*dsdx+(rho_water-rho_ice)*g*dbdx); + vy[iv]= - w*w/(VelocityFactor* mu_water)*(rho_ice*g*dsdy+(rho_water-rho_ice)*g*dbdy); + } + + /*clean-up*/ + delete gauss; + + /*Add to inputs*/ + element->AddInput(HydrologyWaterVxEnum,vx,P1Enum); + element->AddInput(HydrologyWaterVyEnum,vy,P1Enum); + xDelete(vx); + xDelete(vy); +}/*}}}*/ Index: /issm/trunk/src/c/analyses/HydrologyShreveAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/HydrologyShreveAnalysis.h (revision 17805) +++ /issm/trunk/src/c/analyses/HydrologyShreveAnalysis.h (revision 17806) @@ -12,5 +12,6 @@ public: - int DofsPerNode(int** doflist,int meshtype,int approximation); + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); @@ -18,4 +19,19 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); + void GetSolutionFromInputs(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); + + /*Intermediaries*/ + void GetB(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss); + void GetBprime(IssmDouble* Bprime,Element* element,IssmDouble* xyz_list,Gauss* gauss); + void CreateHydrologyWaterVelocityInput(Element* element); }; #endif Index: /issm/trunk/src/c/analyses/L2ProjectionBaseAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/L2ProjectionBaseAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/L2ProjectionBaseAnalysis.cpp (revision 17806) @@ -6,5 +6,5 @@ /*Model processing*/ -int L2ProjectionBaseAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int L2ProjectionBaseAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ return 1; }/*}}}*/ @@ -24,24 +24,27 @@ iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); - if(iomodel->meshtype==Mesh3DEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); - iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); - } - if(iomodel->meshtype==Mesh2DverticalEnum){ - iomodel->FetchDataToInput(elements,MeshVertexonbedEnum); + if(iomodel->domaintype==Domain3DEnum){ + if(iomodel->meshelementtype==PentaEnum){ + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); + iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); + } + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); + } + if(iomodel->domaintype==Domain2DverticalEnum){ + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); } }/*}}}*/ void L2ProjectionBaseAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ - if(iomodel->meshtype==Mesh3DEnum){ - iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); - } - else if(iomodel->meshtype==Mesh2DverticalEnum){ - iomodel->FetchData(1,MeshVertexonbedEnum); + if(iomodel->domaintype==Domain3DEnum){ + iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); + } + else if(iomodel->domaintype==Domain2DverticalEnum){ + iomodel->FetchData(1,MeshVertexonbaseEnum); } ::CreateNodes(nodes,iomodel,L2ProjectionBaseAnalysisEnum,P1Enum); - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); }/*}}}*/ void L2ProjectionBaseAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ @@ -53,2 +56,178 @@ /*No loads*/ }/*}}}*/ + +/*Finite Element Analysis*/ +void L2ProjectionBaseAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* L2ProjectionBaseAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* L2ProjectionBaseAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* L2ProjectionBaseAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + /*Intermediaries*/ + int domaintype; + Element* basalelement; + + /*Get basal element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + break; + case Domain2DverticalEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + break; + case Domain3DEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Initialize Element vector*/ + ElementMatrix* Ke = basalelement->NewElementMatrix(NoneApproximationEnum); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + basalelement->GetVerticesCoordinates(&xyz_list); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=basalelement->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + basalelement->JacobianDeterminant(&Jdet,xyz_list,gauss); + basalelement->NodalFunctions(basis,gauss); + D=gauss->weight*Jdet; + + TripleMultiply(basis,1,numnodes,1, + &D,1,1,0, + basis,1,numnodes,0, + &Ke->values[0],1); + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + delete gauss; + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + return Ke; +}/*}}}*/ +ElementVector* L2ProjectionBaseAnalysis::CreatePVector(Element* element){/*{{{*/ + + /*Intermediaries*/ + int domaintype; + Element* basalelement; + + /*Get basal element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + break; + case Domain2DverticalEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + break; + case Domain3DEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Initialize Element vector*/ + ElementVector* pe = basalelement->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + basalelement->GetVerticesCoordinates(&xyz_list); + basalelement->FindParam(&input_enum,InputToL2ProjectEnum); + switch(input_enum){ + case SurfaceSlopeXEnum: input2 = basalelement->GetInput(SurfaceEnum); _assert_(input2); break; + case SurfaceSlopeYEnum: input2 = basalelement->GetInput(SurfaceEnum); _assert_(input2); break; + case BedSlopeXEnum: input2 = basalelement->GetInput(BaseEnum); _assert_(input2); break; + case BedSlopeYEnum: input2 = basalelement->GetInput(BaseEnum); _assert_(input2); break; + case LevelsetfunctionSlopeXEnum: input2 = basalelement->GetInput(MaskIceLevelsetEnum); _assert_(input2); break; + case LevelsetfunctionSlopeYEnum: input2 = basalelement->GetInput(MaskIceLevelsetEnum); _assert_(input2); break; + default: input = element->GetInput(input_enum); + } + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=basalelement->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + basalelement->JacobianDeterminant(&Jdet,xyz_list,gauss); + basalelement->NodalFunctions(basis,gauss); + + if(input2) input2->GetInputDerivativeValue(&slopes[0],xyz_list,gauss); + switch(input_enum){ + case SurfaceSlopeXEnum: case BedSlopeXEnum: case LevelsetfunctionSlopeXEnum: value = slopes[0]; break; + case SurfaceSlopeYEnum: case BedSlopeYEnum: case LevelsetfunctionSlopeYEnum: value = slopes[1]; break; + default: input->GetInputValue(&value,gauss); + } + + for(int i=0;ivalues[i]+=Jdet*gauss->weight*value*basis[i]; + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + delete gauss; + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + return pe; +}/*}}}*/ +void L2ProjectionBaseAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void L2ProjectionBaseAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + + int inputenum,domaintype,elementtype; + + element->FindParam(&inputenum,InputToL2ProjectEnum); + element->FindParam(&domaintype,DomainTypeEnum); + element->FindParam(&elementtype,MeshElementtypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + element->InputUpdateFromSolutionOneDof(solution,inputenum); + break; + case Domain2DverticalEnum: + element->InputUpdateFromSolutionOneDof(solution,inputenum); + break; + case Domain3DEnum: + if(elementtype==TetraEnum) + element->InputUpdateFromSolutionOneDof(solution,inputenum); + else + element->InputUpdateFromSolutionOneDofCollapsed(solution,inputenum); + break; + default: _error_("mesh "<* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); }; #endif Index: /issm/trunk/src/c/analyses/L2ProjectionEPLAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/L2ProjectionEPLAnalysis.cpp (revision 17806) +++ /issm/trunk/src/c/analyses/L2ProjectionEPLAnalysis.cpp (revision 17806) @@ -0,0 +1,252 @@ +#include "./L2ProjectionEPLAnalysis.h" +#include "../toolkits/toolkits.h" +#include "../classes/classes.h" +#include "../shared/shared.h" +#include "../modules/modules.h" + +/*Model processing*/ +int L2ProjectionEPLAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ + return 1; +}/*}}}*/ +void L2ProjectionEPLAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/ +}/*}}}*/ +void L2ProjectionEPLAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/ + + bool isefficientlayer; + int hydrology_model; + + /*Now, do we really want DC?*/ + iomodel->Constant(&hydrology_model,HydrologyModelEnum); + if(hydrology_model!=HydrologydcEnum) return; + + /*Do we want an efficient layer*/ + iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum); + if(!isefficientlayer) return; + + /*Update elements: */ + int counter=0; + for(int i=0;inumberofelements;i++){ + if(iomodel->my_elements[i]){ + Element* element=(Element*)elements->GetObjectByOffset(counter); + element->Update(i,iomodel,analysis_counter,analysis_type,P1Enum); + counter++; + } + } + + iomodel->FetchDataToInput(elements,EplHeadEnum); + iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); + if(iomodel->domaintype==Domain3DEnum){ + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); + } +}/*}}}*/ +void L2ProjectionEPLAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ + /*Now, do we really want DC?*/ + int hydrology_model; + iomodel->Constant(&hydrology_model,HydrologyModelEnum); + if(hydrology_model!=HydrologydcEnum) return; + + /*Do we want an efficient layer*/ + bool isefficientlayer; + iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum); + if(!isefficientlayer) return; + + if(iomodel->domaintype==Domain3DEnum){ + iomodel->FetchData(1,MeshVertexonbaseEnum); + } + else if(iomodel->domaintype==Domain2DverticalEnum){ + iomodel->FetchData(1,MeshVertexonbaseEnum); + } + ::CreateNodes(nodes,iomodel,L2ProjectionEPLAnalysisEnum,P1Enum); + iomodel->DeleteData(1,MeshVertexonbaseEnum); +}/*}}}*/ +void L2ProjectionEPLAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ + + /*No constraints*/ +}/*}}}*/ +void L2ProjectionEPLAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/ + + /*No loads*/ +}/*}}}*/ + +/*Finite Element Analysis*/ +void L2ProjectionEPLAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* L2ProjectionEPLAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* L2ProjectionEPLAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* L2ProjectionEPLAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + /*Intermediaries*/ + int domaintype; + bool active_element; + Element* basalelement; + + /*Get basal element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + break; + case Domain2DverticalEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + break; + case Domain3DEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + break; + default: _error_("mesh "<GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input); + active_element_input->GetInputValue(&active_element); + + /* Check that all nodes are active, else return empty matrix */ + if(!active_element){ + if(domaintype!=Domain2DhorizontalEnum){ + basalelement->DeleteMaterials(); + delete basalelement; + } + return NULL; + } + + /*Intermediaries */ + IssmDouble D,Jdet; + IssmDouble *xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = basalelement->GetNumberOfNodes(); + + /*Initialize Element vector*/ + ElementMatrix* Ke = basalelement->NewElementMatrix(NoneApproximationEnum); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + basalelement->GetVerticesCoordinates(&xyz_list); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=basalelement->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + basalelement->JacobianDeterminant(&Jdet,xyz_list,gauss); + basalelement->NodalFunctions(basis,gauss); + D=gauss->weight*Jdet; + + TripleMultiply(basis,1,numnodes,1, + &D,1,1,0, + basis,1,numnodes,0, + &Ke->values[0],1); + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + delete gauss; + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + return Ke; +}/*}}}*/ +ElementVector* L2ProjectionEPLAnalysis::CreatePVector(Element* element){/*{{{*/ + + /*Intermediaries*/ + int domaintype; + bool active_element; + Element* basalelement; + + /*Get basal element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + break; + case Domain3DEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + break; + default: _error_("mesh "<GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input); + active_element_input->GetInputValue(&active_element); + + /*Check that all nodes are active, else return empty matrix*/ + if(!active_element) { + if(domaintype!=Domain2DhorizontalEnum){ + basalelement->DeleteMaterials(); + delete basalelement; + } + return NULL; + } + + /*Intermediaries */ + int input_enum,index; + IssmDouble Jdet,slopes[2]; + Input *input = NULL; + IssmDouble *xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = basalelement->GetNumberOfNodes(); + + /*Initialize Element vector*/ + ElementVector* pe = basalelement->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + basalelement->GetVerticesCoordinates(&xyz_list); + basalelement->FindParam(&input_enum,InputToL2ProjectEnum); + switch(input_enum){ + case EplHeadSlopeXEnum: input = basalelement->GetInput(EplHeadEnum); index = 0; _assert_(input); break; + case EplHeadSlopeYEnum: input = basalelement->GetInput(EplHeadEnum); index = 1; _assert_(input); break; + default: _error_("not implemented"); + } + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=basalelement->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + basalelement->JacobianDeterminant(&Jdet,xyz_list,gauss); + basalelement->NodalFunctions(basis,gauss); + + input->GetInputDerivativeValue(&slopes[0],xyz_list,gauss); + for(int i=0;ivalues[i]+=Jdet*gauss->weight*slopes[index]*basis[i]; + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + delete gauss; + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + return pe; +}/*}}}*/ +void L2ProjectionEPLAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void L2ProjectionEPLAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + int inputenum,domaintype; + + element->FindParam(&inputenum,InputToL2ProjectEnum); + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + element->InputUpdateFromSolutionOneDof(solution,inputenum); + break; + case Domain2DverticalEnum: + element->InputUpdateFromSolutionOneDof(solution,inputenum); + break; + case Domain3DEnum: + element->InputUpdateFromSolutionOneDofCollapsed(solution,inputenum); + break; + default: _error_("mesh "<* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); +}; +#endif Index: /issm/trunk/src/c/analyses/LevelsetAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/LevelsetAnalysis.cpp (revision 17806) +++ /issm/trunk/src/c/analyses/LevelsetAnalysis.cpp (revision 17806) @@ -0,0 +1,351 @@ +#ifdef HAVE_CONFIG_H + #include +#else +#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" +#endif +#include "./LevelsetAnalysis.h" +#include "../toolkits/toolkits.h" +#include "../classes/classes.h" +#include "../shared/shared.h" +#include "../modules/modules.h" +#include "../solutionsequences/solutionsequences.h" + +int LevelsetAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ + return 1; +} +/*}}}*/ +void LevelsetAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/ + return; +} +/*}}}*/ +void LevelsetAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/ + int finiteelement; + + /*Finite element type*/ + finiteelement = P1Enum; + + /*Update elements: */ + int counter=0; + for(int i=0;inumberofelements;i++){ + if(iomodel->my_elements[i]){ + Element* element=(Element*)elements->GetObjectByOffset(counter); + element->Update(i,iomodel,analysis_counter,analysis_type,finiteelement); + counter++; + } + } + + iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); + iomodel->FetchDataToInput(elements,VxEnum); + iomodel->FetchDataToInput(elements,VyEnum); + iomodel->FetchDataToInput(elements,MasstransportCalvingrateEnum); +} +/*}}}*/ +void LevelsetAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ + int finiteelement=P1Enum; + if(iomodel->domaintype!=Domain2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); + ::CreateNodes(nodes,iomodel,LevelsetAnalysisEnum,finiteelement); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); +} +/*}}}*/ +void LevelsetAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ + return; +} +/*}}}*/ +void LevelsetAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/ + return; +}/*}}}*/ + +/*Finite element Analysis*/ +void LevelsetAnalysis::Core(FemModel* femmodel){/*{{{*/ + + #if !defined(_DEVELOPMENT_) + _error_("Not implemented yet"); + #endif + + /*parameters: */ + bool save_results; + femmodel->parameters->FindParam(&save_results,SaveResultsEnum); + + /*activate formulation: */ + femmodel->SetCurrentConfiguration(LevelsetAnalysisEnum); + + if(VerboseSolution()) _printf0_("call computational core:\n"); + solutionsequence_linear(femmodel); + + if(save_results){ + if(VerboseSolution()) _printf0_(" saving results\n"); + int outputs = MaskIceLevelsetEnum; + femmodel->RequestedOutputsx(&femmodel->results,&outputs,1); + } +}/*}}}*/ +ElementVector* LevelsetAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* LevelsetAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ + /* Jacobian required for the Newton solver */ + _error_("not implemented yet"); +}/*}}}*/ +ElementMatrix* LevelsetAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + _error_("NOT IMPLEMENTED YET"); + +}/*}}}*/ +ElementVector* LevelsetAnalysis::CreatePVector(Element* element){/*{{{*/ + + if(!element->IsOnBase()) return NULL; + Element* basalelement = element->SpawnBasalElement(); + + /*Intermediaries */ + int i, ig, domaintype; + IssmDouble Jdet,dt; + IssmDouble lsf; + IssmDouble* xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = basalelement->GetNumberOfNodes(); + + /*Initialize Element vector*/ + ElementVector* pe = basalelement->NewElementVector(); + basalelement->FindParam(&dt,TimesteppingTimeStepEnum); + + if(dt!=0.){ + /*Initialize basis vector*/ + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + basalelement->GetVerticesCoordinates(&xyz_list); + Input* levelset_input = basalelement->GetInput(MaskIceLevelsetEnum); _assert_(levelset_input); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=basalelement->NewGauss(2); + for(ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + basalelement->JacobianDeterminant(&Jdet,xyz_list,gauss); + basalelement->NodalFunctions(basis,gauss); + + /* old function value */ + levelset_input->GetInputValue(&lsf,gauss); + for(i=0;ivalues[i]+=Jdet*gauss->weight*lsf*basis[i]; + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + basalelement->FindParam(&domaintype,DomainTypeEnum); + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + delete gauss; + } + + return pe; +}/*}}}*/ +void LevelsetAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void LevelsetAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + + int domaintype; + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + element->InputUpdateFromSolutionOneDof(solution,MaskIceLevelsetEnum); + break; + case Domain3DEnum: + element->InputUpdateFromSolutionOneDofCollapsed(solution,MaskIceLevelsetEnum); + break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Get nodal functions*/ + IssmDouble* basis=xNew(numnodes); + element->NodalFunctions(basis,gauss); + + /*Build B: */ + for(int i=0;i(basis); +}/*}}}*/ +void LevelsetAnalysis::GetBprime(IssmDouble* Bprime,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B' matrix. B'=[B1' B2' B3'] where Bi' is of size 3*NDOF2. + * For node i, Bi' can be expressed in the actual coordinate system + * by: + * Bi_prime=[ dN/dx ] + * [ dN/dy ] + * where N is the finiteelement function for node i. + * + * We assume B' has been allocated already, of size: 3x(NDOF2*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(2*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B': */ + for(int i=0;i(dbasis); + +}/*}}}*/ +void LevelsetAnalysis::SetDistanceOnIntersectedElements(FemModel* femmodel){/*{{{*/ + + /* Intermediaries */ + int i,k; + IssmDouble dmaxp=0.,dmaxm=0,val=0.; + + /*Initialize vector with number of vertices*/ + int numvertices=femmodel->vertices->NumberOfVertices(); + Element* element; + + Vector* vec_dist_zerolevelset = NULL; + GetVectorFromInputsx(&vec_dist_zerolevelset, femmodel, MaskIceLevelsetEnum, VertexEnum); + + /* set NaN on elements intersected by zero levelset */ + for(i=0;ielements->Size();i++){ + element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); + if(element->IsZeroLevelset(MaskIceLevelsetEnum)) + for(k=0;kGetNumberOfVertices();k++) + vec_dist_zerolevelset->SetValue(element->vertices[k]->Sid(),NAN,INS_VAL); + } + + /* set distance on elements intersected by zero levelset */ + for(i=0;ielements->Size();i++){ + element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); + if(element->IsZeroLevelset(MaskIceLevelsetEnum)){ + SetDistanceToZeroLevelsetElement(vec_dist_zerolevelset, element); + + /* Get maximum distance to interface along vertices */ + for(k=0;kGetNumberOfVertices();k++){ + vec_dist_zerolevelset->GetValue(&val,element->vertices[k]->Sid()); + if((val>0.) && (val>dmaxp)) + dmaxp=val; + else if((val<0.) && (valGetValue(&val,i); + if(val==1.) //FIXME: improve check + vec_dist_zerolevelset->SetValue(i,3.*dmaxp,INS_VAL); + else if(val==-1.) + vec_dist_zerolevelset->SetValue(i,3.*dmaxm,INS_VAL); + } + + /*Assemble vector and serialize */ + vec_dist_zerolevelset->Assemble(); + IssmDouble* dist_zerolevelset=vec_dist_zerolevelset->ToMPISerial(); + InputUpdateFromVectorx(femmodel,dist_zerolevelset,MaskIceLevelsetEnum,VertexSIdEnum); + + /*Clean up and return*/ + delete vec_dist_zerolevelset; + delete dist_zerolevelset; +}/*}}}*/ +void LevelsetAnalysis::SetDistanceToZeroLevelsetElement(Vector* vec_signed_dist, Element* element){/*{{{*/ + + if(!element->IsZeroLevelset(MaskIceLevelsetEnum)) + return; + + /* Intermediaries */ + const int dim=3; + int i,d; + int numvertices=element->GetNumberOfVertices(); + IssmDouble s0[dim], s1[dim], v[dim]; + IssmDouble dist,lsf_old; + + IssmDouble* lsf = xNew(numvertices); + IssmDouble* sign_lsf = xNew(numvertices); + IssmDouble* signed_dist = xNew(numvertices); + IssmDouble* xyz_list = NULL; + IssmDouble* xyz_list_zero = NULL; + + /* retrieve inputs and parameters */ + element->GetVerticesCoordinates(&xyz_list); + element->GetInputListOnVertices(lsf,MaskIceLevelsetEnum); + + /* get sign of levelset function */ + for(i=0;i=0.?1.:-1.); + + element->ZeroLevelsetCoordinates(&xyz_list_zero, xyz_list, MaskIceLevelsetEnum); + for(d=0;dGetValue(&lsf_old, element->vertices[i]->Sid()); + if(xIsNan(lsf_old) || fabs(signed_dist[i])SetValue(element->vertices[i]->Sid(),signed_dist[i],INS_VAL); + } + + xDelete(lsf); + xDelete(sign_lsf); + xDelete(signed_dist); + xDelete(xyz_list); + xDelete(xyz_list_zero); +}/*}}}*/ +IssmDouble LevelsetAnalysis::GetDistanceToStraight(IssmDouble* q, IssmDouble* s0, IssmDouble* s1){/*{{{*/ + // returns distance d of point q to straight going through points s0, s1 + // d=|a x b|/|b| + // with a=q-s0, b=s1-s0 + + /* Intermediaries */ + const int dim=2; + int i; + IssmDouble a[dim], b[dim]; + IssmDouble norm_b; + + for(i=0;i0.); + + return fabs(a[0]*b[1]-a[1]*b[0])/norm_b; +}/*}}}*/ Index: /issm/trunk/src/c/analyses/LevelsetAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/LevelsetAnalysis.h (revision 17806) +++ /issm/trunk/src/c/analyses/LevelsetAnalysis.h (revision 17806) @@ -0,0 +1,37 @@ +/*! \file LevelsetAnalysis.h + * \brief: header file for generic external result object + */ + +#ifndef _LevelsetAnalysis_ +#define _LevelsetAnalysis_ + +/*Headers*/ +#include "./Analysis.h" + +class LevelsetAnalysis: public Analysis{ + + public: + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); + void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); + void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); + void CreateNodes(Nodes* nodes,IoModel* iomodel); + void CreateConstraints(Constraints* constraints,IoModel* iomodel); + void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); + void GetSolutionFromInputs(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); + void GetB(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss); + void GetBprime(IssmDouble* Bprime,Element* element,IssmDouble* xyz_list,Gauss* gauss); + void SetDistanceOnIntersectedElements(FemModel* femmodel); + void SetDistanceToZeroLevelsetElement(Vector* vec_signed_dist, Element* element); + IssmDouble GetDistanceToStraight(IssmDouble* q, IssmDouble* s0, IssmDouble* s1); +}; +#endif Index: /issm/trunk/src/c/analyses/LsfReinitializationAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/LsfReinitializationAnalysis.cpp (revision 17806) +++ /issm/trunk/src/c/analyses/LsfReinitializationAnalysis.cpp (revision 17806) @@ -0,0 +1,558 @@ +#include "./LsfReinitializationAnalysis.h" +#include "../toolkits/toolkits.h" +#include "../classes/classes.h" +#include "../shared/shared.h" +#include "../modules/modules.h" +#include "../solutionsequences/solutionsequences.h" +#include "../cores/cores.h" + +#include "../modules/GetVectorFromInputsx/GetVectorFromInputsx.h" + +/*Model processing*/ +int LsfReinitializationAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ + return 1; +}/*}}}*/ +void LsfReinitializationAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/ + /* Do nothing for now */ +}/*}}}*/ +void LsfReinitializationAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/ + int finiteelement; + + /*Finite element type*/ + finiteelement = P1Enum; + + /*Update elements: */ + int counter=0; + for(int i=0;inumberofelements;i++){ + if(iomodel->my_elements[i]){ + Element* element=(Element*)elements->GetObjectByOffset(counter); + element->Update(i,iomodel,analysis_counter,analysis_type,finiteelement); + counter++; + } + } + + iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); +}/*}}}*/ +void LsfReinitializationAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ + int finiteelement=P1Enum; + if(iomodel->domaintype!=Domain2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); + ::CreateNodes(nodes,iomodel,LsfReinitializationAnalysisEnum,finiteelement); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); +}/*}}}*/ +void LsfReinitializationAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ + /* Do nothing for now */ +}/*}}}*/ +void LsfReinitializationAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/ + /* Do nothing for now */ +}/*}}}*/ + +/*Finite element Analysis*/ +void LsfReinitializationAnalysis::Core(FemModel* femmodel){/*{{{*/ + + /*parameters: */ + bool save_results; + int maxiter = 3; + int step; + IssmDouble reltol = 0.05; + + Vector* lsfg = NULL; + Vector* lsfg_old = NULL; + + femmodel->parameters->FindParam(&save_results,SaveResultsEnum); + + /*activate formulation: */ + femmodel->SetCurrentConfiguration(LsfReinitializationAnalysisEnum); + + /* set spcs for reinitialization */ + if(VerboseSolution()) _printf0_("Update spcs for reinitialization:\n"); + SetReinitSPCs(femmodel); + + step = 1; + for(;;){ + + _printf_("smoothing lsf slope\n"); + /* smoothen slope of lsf for computation of normal on ice domain*/ + levelsetfunctionslope_core(femmodel); + + //solve current artificial time step + if(VerboseSolution()) _printf0_("call computational core for reinitialization in step " << step << ":\n"); + solutionsequence_linear(femmodel); + GetSolutionFromInputsx(&lsfg,femmodel); + + if(step>1){ + if(VerboseSolution()) _printf0_(" checking reinitialization convergence\n"); + if(ReinitConvergence(lsfg,lsfg_old,reltol)) break; + } + if(step>maxiter){ + if(VerboseSolution()) _printf0_(" maximum number reinitialization iterations " << maxiter << " reached\n"); + break; + } + + /*update results and increase counter*/ + delete lsfg_old;lsfg_old=lsfg; + step++; + } + + if(save_results){ + if(VerboseSolution()) _printf0_(" saving results\n"); + int outputs[1] = {MaskIceLevelsetEnum}; + femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],1); + } + +}/*}}}*/ +ElementVector* LsfReinitializationAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* LsfReinitializationAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementMatrix* LsfReinitializationAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + /*Intermediaries */ + const int dim = 2; + int i,row,col,stabilization; + IssmDouble Jdet,D_scalar; + IssmDouble dtau = 1.; + IssmDouble mu = 1.; + IssmDouble* xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(); + IssmDouble* basis = xNew(numnodes); + IssmDouble* Bprime = xNew(dim*numnodes); + IssmDouble* D = xNew(dim*dim); + IssmDouble* dlsf = xNew(dim); + IssmDouble* normal= xNew(dim); + + element->GetVerticesCoordinates(&xyz_list); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){/*{{{*/ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + D_scalar=gauss->weight*Jdet; + + if(dtau!=0.){ + element->NodalFunctions(basis,gauss); + TripleMultiply(basis,numnodes,1,0, + &D_scalar,1,1,0, + basis,1,numnodes,0, + &Ke->values[0],1); + D_scalar*=dtau; + } + + GetBprime(Bprime,element,xyz_list,gauss); + + for(row=0;rowvalues[0],1); + + /* Stabilization */ + stabilization=0; + if (stabilization==0){/* no stabilization, do nothing*/} + + }/*}}}*/ + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + xDelete(Bprime); + xDelete(D); + delete gauss; + return Ke; +}/*}}}*/ +ElementVector* LsfReinitializationAnalysis::CreatePVector(Element* element){/*{{{*/ + + /*Intermediaries */ + int i,k; + int dim = 2; + IssmDouble dtau = 1.; + IssmDouble mu = 1.; + IssmDouble Jdet, D_scalar; + IssmDouble lsf; + IssmDouble norm_dlsf; + IssmDouble dbasis_normal; + + /*Fetch number of nodes */ + int numnodes = element->GetNumberOfNodes(); + + IssmDouble* xyz_list = NULL; + IssmDouble* basis = xNew(numnodes); + IssmDouble* dbasis=xNew(dim*numnodes); + IssmDouble* dlsf = xNew(dim); + IssmDouble* normal = xNew(dim); + element->GetVerticesCoordinates(&xyz_list); + + /*Initialize Element vector*/ + ElementVector* pe = element->NewElementVector(); + + /*Retrieve all inputs and parameters*/ + Input* lsf_input = element->GetInput(MaskIceLevelsetEnum); _assert_(lsf_input); + Input* lsf_slopex_input=element->GetInput(LevelsetfunctionSlopeXEnum); _assert_(lsf_slopex_input); + Input* lsf_slopey_input=element->GetInput(LevelsetfunctionSlopeYEnum); _assert_(lsf_slopey_input); + + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctions(basis,gauss); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + D_scalar=Jdet*gauss->weight; + + if(dtau!=0.){ + /* old function value */ + lsf_input->GetInputValue(&lsf,gauss); + for(i=0;ivalues[i]+=D_scalar*lsf*basis[i]; + D_scalar*=dtau; + } + + lsf_slopex_input->GetInputValue(&dlsf[0],gauss); + lsf_slopey_input->GetInputValue(&dlsf[1],gauss); + + /*get normal*/ + norm_dlsf=0.; + for(i=0;i0.) + for(i=0;ivalues[i]+=D_scalar*mu*dbasis_normal; + } + } + + xDelete(basis); + xDelete(dbasis); + xDelete(xyz_list); + xDelete(dlsf); + xDelete(normal); + return pe; + }/*}}}*/ +void LsfReinitializationAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + + IssmDouble lsf; + int dim; + int* doflist = NULL; + + /*Get some parameters*/ + element->FindParam(&dim,DomainDimensionEnum); + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Fetch dof list and allocate solution vector*/ + element->GetDofList(&doflist,NoneApproximationEnum,GsetEnum); + IssmDouble* values = xNew(numnodes); + + /*Get inputs*/ + Input* lsf_input=element->GetInput(MaskIceLevelsetEnum); _assert_(lsf_input); + + Gauss* gauss=element->NewGauss(); + for(int i=0;iGaussNode(element->FiniteElement(),i); + + lsf_input->GetInputValue(&lsf,gauss); + values[i]=lsf; + } + + solution->SetValues(numnodes,doflist,values,INS_VAL); + + /*Free ressources:*/ + delete gauss; + xDelete(values); + xDelete(doflist); + +}/*}}}*/ +void LsfReinitializationAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + + int domaintype; + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + element->InputUpdateFromSolutionOneDof(solution,MaskIceLevelsetEnum); + break; + case Domain3DEnum: + element->InputUpdateFromSolutionOneDofCollapsed(solution,MaskIceLevelsetEnum); + break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Get nodal functions*/ + IssmDouble* basis=xNew(numnodes); + element->NodalFunctions(basis,gauss); + + /*Build B: */ + for(int i=0;i(basis); +}/*}}}*/ +void LsfReinitializationAnalysis::GetBprime(IssmDouble* Bprime,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B' matrix. B'=[B1' B2' B3'] where Bi' is of size 3*NDOF2. + * For node i, Bi' can be expressed in the actual coordinate system + * by: + * Bi_prime=[ dN/dx ] + * [ dN/dy ] + * where N is the finiteelement function for node i. + * + * We assume B' has been allocated already, of size: 3x(NDOF2*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(2*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B': */ + for(int i=0;i(dbasis); + +}/*}}}*/ + +/* Other */ +void LsfReinitializationAnalysis::SetReinitSPCs(FemModel* femmodel){/*{{{*/ + + int i,k, numnodes; + Element* element; + Node* node; + + /* deactivate all spcs */ + for(i=0;ielements->Size();i++){ + element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); + for(k=0;kGetNumberOfNodes();k++){ + node=element->GetNode(k); + if(node->IsActive()){ + node->DofInFSet(0); + } + } + } + + SetDistanceOnIntersectedElements(femmodel); + + /* reactivate spcs on elements intersected by zero levelset */ + for(i=0;ielements->Size();i++){ + element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); + if(element->IsZeroLevelset(MaskIceLevelsetEnum)){ + /*iterate over nodes and set spc */ + numnodes=element->GetNumberOfNodes(); + IssmDouble* lsf = xNew(numnodes); + element->GetInputListOnNodes(&lsf[0],MaskIceLevelsetEnum); + for(k=0;kGetNode(k); + if(node->IsActive()){ + node->ApplyConstraint(0,lsf[k]); + } + } + xDelete(lsf); + } + } + +}/*}}}*/ +void LsfReinitializationAnalysis::SetDistanceOnIntersectedElements(FemModel* femmodel){/*{{{*/ + + /* Intermediaries */ + int i,k; + IssmDouble dmaxp,dmaxm,val; + Element* element; + + /*Initialize vector with number of vertices*/ + int numvertices=femmodel->vertices->NumberOfVertices(); + + Vector* vec_dist_zerolevelset = NULL; + GetVectorFromInputsx(&vec_dist_zerolevelset, femmodel, MaskIceLevelsetEnum, VertexEnum); + + /* set distance on elements intersected by zero levelset */ + for(i=0;ielements->Size();i++){ + element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); + if(element->IsZeroLevelset(MaskIceLevelsetEnum)){ + SetDistanceToZeroLevelsetElement(vec_dist_zerolevelset, element); + } + } + vec_dist_zerolevelset->Assemble(); + + /* Get maximum distance to interface along vertices */ + dmaxp=0.; dmaxm=0.; + for(i=0;iGetValue(&val,i); + if((val>0.) && (val>dmaxp)) + dmaxp=val; + else if((val<0.) && (valGetValue(&val,i); + if(val==1.) //FIXME: improve check + vec_dist_zerolevelset->SetValue(i,3.*dmaxp,INS_VAL); + else if(val==-1.) + vec_dist_zerolevelset->SetValue(i,3.*dmaxm,INS_VAL); + } + + /*Assemble vector and serialize */ + vec_dist_zerolevelset->Assemble(); + IssmDouble* dist_zerolevelset=vec_dist_zerolevelset->ToMPISerial(); + InputUpdateFromVectorx(femmodel,dist_zerolevelset,MaskIceLevelsetEnum,VertexSIdEnum); + + /*Clean up and return*/ + delete vec_dist_zerolevelset; + delete dist_zerolevelset; + +}/*}}}*/ +void LsfReinitializationAnalysis::SetDistanceToZeroLevelsetElement(Vector* vec_signed_dist, Element* element){/*{{{*/ + + if(!element->IsZeroLevelset(MaskIceLevelsetEnum)) + return; + + /* Intermediaries */ + int dim=3; + int i,d; + IssmDouble dist,lsf_old; + + int numvertices=element->GetNumberOfVertices(); + + IssmDouble* lsf = xNew(numvertices); + IssmDouble* sign_lsf = xNew(numvertices); + IssmDouble* signed_dist = xNew(numvertices); + IssmDouble* s0 = xNew(dim); + IssmDouble* s1 = xNew(dim); + IssmDouble* v = xNew(dim); + IssmDouble* xyz_list = NULL; + IssmDouble* xyz_list_zero = NULL; + + /* retrieve inputs and parameters */ + element->GetVerticesCoordinates(&xyz_list); + element->GetInputListOnVertices(lsf,MaskIceLevelsetEnum); + + /* get sign of levelset function */ + for(i=0;i=0.?1.:-1.); + + element->ZeroLevelsetCoordinates(&xyz_list_zero, xyz_list, MaskIceLevelsetEnum); + for(i=0;iGetValue(&lsf_old, element->vertices[i]->Sid()); + /* initial lsf values are +-1. Update those fields or if distance to interface smaller.*/ + if(fabs(lsf_old)==1. || fabs(signed_dist[i])SetValue(element->vertices[i]->Sid(),signed_dist[i],INS_VAL); + } + + xDelete(lsf); + xDelete(sign_lsf); + xDelete(signed_dist); + xDelete(s0); + xDelete(s1); + xDelete(v); + +}/*}}}*/ +IssmDouble LsfReinitializationAnalysis::GetDistanceToStraight(IssmDouble* q, IssmDouble* s0, IssmDouble* s1){/*{{{*/ + // returns distance d of point q to straight going through points s0, s1 + // d=|a x b|/|b| + // with a=q-s0, b=s1-s0 + + /* Intermediaries */ + const int dim=2; + int i; + IssmDouble a[dim], b[dim]; + IssmDouble norm_b; + + for(i=0;i0.); + + return fabs(a[0]*b[1]-a[1]*b[0])/norm_b; +}/*}}}*/ +bool LsfReinitializationAnalysis::ReinitConvergence(Vector* lsfg,Vector* lsfg_old,IssmDouble reltol){/*{{{*/ + + /*Output*/ + bool converged = true; + + /*Intermediary*/ + Vector* dlsfg = NULL; + IssmDouble norm_dlsf,norm_lsf; + + /*compute norm(du)/norm(u)*/ + dlsfg=lsfg_old->Duplicate(); lsfg_old->Copy(dlsfg); dlsfg->AYPX(lsfg,-1.0); + norm_dlsf=dlsfg->Norm(NORM_TWO); norm_lsf=lsfg_old->Norm(NORM_TWO); + if (xIsNan(norm_dlsf) || xIsNan(norm_lsf)) _error_("convergence criterion is NaN!"); + if((norm_dlsf/norm_lsf) "<* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); + void GetB(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss); + void GetBprime(IssmDouble* Bprime,Element* element,IssmDouble* xyz_list,Gauss* gauss); + + /* Other */ + void SetReinitSPCs(FemModel* femmodel); + void SetDistanceOnIntersectedElements(FemModel* femmodel); + void SetDistanceToZeroLevelsetElement(Vector* vec_dist, Element* element); + IssmDouble GetDistanceToStraight(IssmDouble* q, IssmDouble* s0, IssmDouble* s1); + bool ReinitConvergence(Vector* lsfg,Vector* lsfg_old,IssmDouble reltol); +}; +#endif Index: /issm/trunk/src/c/analyses/MasstransportAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/MasstransportAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/MasstransportAnalysis.cpp (revision 17806) @@ -6,15 +6,29 @@ /*Model processing*/ -int MasstransportAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int MasstransportAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ return 1; }/*}}}*/ void MasstransportAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/ + int numoutputs; + char** requestedoutputs = NULL; + parameters->AddObject(iomodel->CopyConstantObject(FlowequationIsFSEnum)); + parameters->AddObject(iomodel->CopyConstantObject(MasstransportIsfreesurfaceEnum)); + parameters->AddObject(iomodel->CopyConstantObject(MasstransportHydrostaticAdjustmentEnum)); + parameters->AddObject(iomodel->CopyConstantObject(MasstransportStabilizationEnum)); + parameters->AddObject(iomodel->CopyConstantObject(MasstransportMinThicknessEnum)); + parameters->AddObject(iomodel->CopyConstantObject(MasstransportPenaltyFactorEnum)); + + iomodel->FetchData(&requestedoutputs,&numoutputs,MasstransportRequestedOutputsEnum); + parameters->AddObject(new IntParam(MasstransportNumRequestedOutputsEnum,numoutputs)); + if(numoutputs)parameters->AddObject(new StringArrayParam(MasstransportRequestedOutputsEnum,requestedoutputs,numoutputs)); + iomodel->DeleteData(&requestedoutputs,numoutputs,MasstransportRequestedOutputsEnum); + }/*}}}*/ void MasstransportAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/ - int stabilization,finiteelement; + int stabilization,finiteelement,smb_model; bool dakota_analysis; bool issmbgradients; @@ -22,12 +36,12 @@ bool isdelta18o; bool isgroundingline; + bool islevelset; /*Fetch data needed: */ iomodel->Constant(&stabilization,MasstransportStabilizationEnum); iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum); - iomodel->Constant(&ispdd,SurfaceforcingsIspddEnum); - iomodel->Constant(&isdelta18o,SurfaceforcingsIsdelta18oEnum); - iomodel->Constant(&issmbgradients,SurfaceforcingsIssmbgradientsEnum); + iomodel->Constant(&smb_model,SurfaceforcingsEnum); iomodel->Constant(&isgroundingline,TransientIsgroundinglineEnum); + iomodel->Constant(&islevelset,TransientIslevelsetEnum); /*Finite element type*/ @@ -49,5 +63,5 @@ iomodel->FetchDataToInput(elements,ThicknessEnum); iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum); @@ -62,5 +76,5 @@ if(dakota_analysis){ - elements->InputDuplicate(BedEnum,QmuBedEnum); + elements->InputDuplicate(BaseEnum,QmuBaseEnum); elements->InputDuplicate(ThicknessEnum,QmuThicknessEnum); elements->InputDuplicate(SurfaceEnum,QmuSurfaceEnum); @@ -69,30 +83,45 @@ } - if(iomodel->meshtype==Mesh3DEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + if(iomodel->domaintype==Domain3DEnum){ + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); } - if(issmbgradients){ - iomodel->FetchDataToInput(elements,SurfaceforcingsHrefEnum); - iomodel->FetchDataToInput(elements,SurfaceforcingsSmbrefEnum); - iomodel->FetchDataToInput(elements,SurfaceforcingsBPosEnum); - iomodel->FetchDataToInput(elements,SurfaceforcingsBNegEnum); - } - if(ispdd){ - iomodel->FetchDataToInput(elements,ThermalSpctemperatureEnum); - if(isdelta18o){ - iomodel->FetchDataToInput(elements,SurfaceforcingsTemperaturesLgmEnum); - iomodel->FetchDataToInput(elements,SurfaceforcingsTemperaturesPresentdayEnum); - iomodel->FetchDataToInput(elements,SurfaceforcingsPrecipitationsPresentdayEnum); - } - else{ - iomodel->FetchDataToInput(elements,SurfaceforcingsPrecipitationEnum); - iomodel->FetchDataToInput(elements,SurfaceforcingsMonthlytemperaturesEnum); - } - } - if(~ispdd && ~issmbgradients){ - iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum,0.); - } + if(islevelset){ + iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum) + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); // required for updating active nodes + } + + switch(smb_model){ + case SMBEnum: + iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum,0.); + break; + case SMBpddEnum: + iomodel->Constant(&isdelta18o,SurfaceforcingsIsdelta18oEnum); + iomodel->FetchDataToInput(elements,ThermalSpctemperatureEnum); + if(isdelta18o){ + iomodel->FetchDataToInput(elements,SurfaceforcingsTemperaturesLgmEnum); + iomodel->FetchDataToInput(elements,SurfaceforcingsTemperaturesPresentdayEnum); + iomodel->FetchDataToInput(elements,SurfaceforcingsPrecipitationsPresentdayEnum); + } + else{ + iomodel->FetchDataToInput(elements,SurfaceforcingsPrecipitationEnum); + iomodel->FetchDataToInput(elements,SurfaceforcingsMonthlytemperaturesEnum); + } + break; + case SMBgradientsEnum: + iomodel->FetchDataToInput(elements,SurfaceforcingsHrefEnum); + iomodel->FetchDataToInput(elements,SurfaceforcingsSmbrefEnum); + iomodel->FetchDataToInput(elements,SurfaceforcingsBPosEnum); + iomodel->FetchDataToInput(elements,SurfaceforcingsBNegEnum); + break; + case SMBhenningEnum: + iomodel->FetchDataToInput(elements,SurfaceforcingsSmbrefEnum,0.); + break; + default: + _error_("Surface mass balance model "<meshtype==Mesh3DEnum) _error_("DG 3d not implemented yet"); + if(stabilization==3 && iomodel->domaintype==Domain3DEnum) _error_("DG 3d not implemented yet"); /*Create Nodes either DG or CG depending on stabilization*/ - if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); if(stabilization!=3){ ::CreateNodes(nodes,iomodel,MasstransportAnalysisEnum,P1Enum); @@ -113,5 +142,5 @@ ::CreateNodes(nodes,iomodel,MasstransportAnalysisEnum,P1DGEnum); } - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); }/*}}}*/ void MasstransportAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ @@ -164,7 +193,7 @@ /*Create Penpair for vertex_pairing: */ IssmDouble *vertex_pairing=NULL; - IssmDouble *nodeonbed=NULL; + IssmDouble *nodeonbase=NULL; iomodel->FetchData(&vertex_pairing,&numvertex_pairing,NULL,MasstransportVertexPairingEnum); - iomodel->FetchData(&nodeonbed,NULL,NULL,MeshVertexonbedEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum) iomodel->FetchData(&nodeonbase,NULL,NULL,MeshVertexonbaseEnum); for(int i=0;i(nodeonbed[reCast(vertex_pairing[2*i+0])-1])) || !(reCast(nodeonbed[reCast(vertex_pairing[2*i+1])-1]))) continue; + if(iomodel->domaintype!=Domain2DhorizontalEnum){ + if(!(reCast(nodeonbase[reCast(vertex_pairing[2*i+0])-1])) || !(reCast(nodeonbase[reCast(vertex_pairing[2*i+1])-1]))) continue; + } /*Get node ids*/ @@ -193,5 +224,539 @@ /*free ressources: */ iomodel->DeleteData(vertex_pairing,MasstransportVertexPairingEnum); - iomodel->DeleteData(nodeonbed,MeshVertexonbedEnum); - -}/*}}}*/ + iomodel->DeleteData(nodeonbase,MeshVertexonbaseEnum); + +}/*}}}*/ + +/*Finite Element Analysis*/ +void MasstransportAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* MasstransportAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* MasstransportAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* MasstransportAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + if(!element->IsOnBase()) return NULL; + Element* basalelement = element->SpawnBasalElement(); + + ElementMatrix* Ke = NULL; + switch(element->FiniteElement()){ + case P1Enum: case P2Enum: + Ke = CreateKMatrixCG(basalelement); + break; + case P1DGEnum: + Ke = CreateKMatrixDG(basalelement); + break; + default: + _error_("Element type " << EnumToStringx(element->FiniteElement()) << " not supported yet"); + } + + int domaintype; + element->FindParam(&domaintype,DomainTypeEnum); + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + return Ke; +}/*}}}*/ +ElementMatrix* MasstransportAnalysis::CreateKMatrixCG(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*Intermediaries */ + int stabilization; + int domaintype,dim; + IssmDouble Jdet,D_scalar,dt,h; + IssmDouble vel,vx,vy,dvxdx,dvydy; + IssmDouble dvx[2],dvy[2]; + IssmDouble* xyz_list = NULL; + + /*Get problem dimension*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DverticalEnum: dim = 1; break; + case Domain2DhorizontalEnum: dim = 2; break; + case Domain3DEnum: dim = 2; break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(); + IssmDouble* basis = xNew(numnodes); + IssmDouble* B = xNew(dim*numnodes); + IssmDouble* Bprime = xNew(dim*numnodes); + IssmDouble* D = xNewZeroInit(dim*dim); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + element->FindParam(&dt,TimesteppingTimeStepEnum); + element->FindParam(&domaintype,DomainTypeEnum); + element->FindParam(&stabilization,MasstransportStabilizationEnum); + Input* vxaverage_input=NULL; + Input* vyaverage_input=NULL; + if(domaintype==Domain2DhorizontalEnum){ + vxaverage_input=element->GetInput(VxEnum); _assert_(vxaverage_input); + vyaverage_input=element->GetInput(VyEnum); _assert_(vyaverage_input); + } + else{ + if(dim==1){ + vxaverage_input=element->GetInput(VxEnum); _assert_(vxaverage_input); + } + if(dim==2){ + vxaverage_input=element->GetInput(VxAverageEnum); _assert_(vxaverage_input); + vyaverage_input=element->GetInput(VyAverageEnum); _assert_(vyaverage_input); + } + + } + h = element->CharacteristicLength(); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctions(basis,gauss); + + vxaverage_input->GetInputValue(&vx,gauss); + vxaverage_input->GetInputDerivativeValue(&dvx[0],xyz_list,gauss); + if(dim==2){ + vyaverage_input->GetInputValue(&vy,gauss); + vyaverage_input->GetInputDerivativeValue(&dvy[0],xyz_list,gauss); + } + + D_scalar=gauss->weight*Jdet; + TripleMultiply(basis,1,numnodes,1, + &D_scalar,1,1,0, + basis,1,numnodes,0, + &Ke->values[0],1); + + GetB(B,element,dim,xyz_list,gauss); + GetBprime(Bprime,element,dim,xyz_list,gauss); + + dvxdx=dvx[0]; + if(dim==2) dvydy=dvy[1]; + D_scalar=dt*gauss->weight*Jdet; + + D[0*dim+0]=D_scalar*dvxdx; + if(dim==2) D[1*dim+1]=D_scalar*dvydy; + + TripleMultiply(B,dim,numnodes,1, + D,dim,dim,0, + B,dim,numnodes,0, + &Ke->values[0],1); + + D[0*dim+0]=D_scalar*vx; + if(dim==2) D[1*dim+1]=D_scalar*vy; + + TripleMultiply(B,dim,numnodes,1, + D,dim,dim,0, + Bprime,dim,numnodes,0, + &Ke->values[0],1); + + if(stabilization==2){ + if(dim==1){ + vel=fabs(vx)+1.e-8; + D[0]=h/(2*vel)*vx*vx; + } + else{ + /*Streamline upwinding*/ + vel=sqrt(vx*vx+vy*vy)+1.e-8; + D[0*dim+0]=h/(2*vel)*vx*vx; + D[1*dim+0]=h/(2*vel)*vy*vx; + D[0*dim+1]=h/(2*vel)*vx*vy; + D[1*dim+1]=h/(2*vel)*vy*vy; + } + } + else if(stabilization==1){ + /*SSA*/ + vxaverage_input->GetInputAverage(&vx); + if(dim==2) vyaverage_input->GetInputAverage(&vy); + D[0*dim+0]=h/2.0*fabs(vx); + if(dim==2) D[1*dim+1]=h/2.0*fabs(vy); + } + if(stabilization==1 || stabilization==2){ + if(dim==1) D[0]=D_scalar*D[0]; + else{ + D[0*dim+0]=D_scalar*D[0*dim+0]; + D[1*dim+0]=D_scalar*D[1*dim+0]; + D[0*dim+1]=D_scalar*D[0*dim+1]; + D[1*dim+1]=D_scalar*D[1*dim+1]; + } + + TripleMultiply(Bprime,dim,numnodes,1, + D,dim,dim,0, + Bprime,dim,numnodes,0, + &Ke->values[0],1); + } + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + xDelete(B); + xDelete(Bprime); + xDelete(D); + delete gauss; + return Ke; +}/*}}}*/ +ElementMatrix* MasstransportAnalysis::CreateKMatrixDG(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*Intermediaries */ + int domaintype; + IssmDouble Jdet,D_scalar,dt,vx,vy; + IssmDouble* xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(); + IssmDouble* basis = xNew(numnodes); + IssmDouble* B = xNew(2*numnodes); + IssmDouble* Bprime = xNew(2*numnodes); + IssmDouble D[2][2]; + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + element->FindParam(&dt,TimesteppingTimeStepEnum); + element->FindParam(&domaintype,DomainTypeEnum); + Input* vxaverage_input=NULL; + Input* vyaverage_input=NULL; + if(domaintype==Domain2DhorizontalEnum){ + vxaverage_input=element->GetInput(VxEnum); _assert_(vxaverage_input); + vyaverage_input=element->GetInput(VyEnum); _assert_(vyaverage_input); + } + else{ + vxaverage_input=element->GetInput(VxAverageEnum); _assert_(vxaverage_input); + vyaverage_input=element->GetInput(VyAverageEnum); _assert_(vyaverage_input); + } + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctions(basis,gauss); + + vxaverage_input->GetInputValue(&vx,gauss); + vyaverage_input->GetInputValue(&vy,gauss); + + D_scalar=gauss->weight*Jdet; + TripleMultiply(basis,1,numnodes,1, + &D_scalar,1,1,0, + basis,1,numnodes,0, + &Ke->values[0],1); + + /*WARNING: B and Bprime are inverted compared to CG*/ + GetB(Bprime,element,2,xyz_list,gauss); + GetBprime(B,element,2,xyz_list,gauss); + + D_scalar = - dt*gauss->weight*Jdet; + D[0][0] = D_scalar*vx; + D[0][1] = 0.; + D[1][0] = 0.; + D[1][1] = D_scalar*vy; + TripleMultiply(B,2,numnodes,1, + &D[0][0],2,2,0, + Bprime,2,numnodes,0, + &Ke->values[0],1); + + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + xDelete(B); + xDelete(Bprime); + delete gauss; + return Ke; +}/*}}}*/ +ElementVector* MasstransportAnalysis::CreatePVector(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + if(!element->IsOnBase()) return NULL; + Element* basalelement = element->SpawnBasalElement(); + + ElementVector* pe = NULL; + switch(element->FiniteElement()){ + case P1Enum: case P2Enum: + pe = CreatePVectorCG(basalelement); + break; + case P1DGEnum: + pe = CreatePVectorDG(basalelement); + break; + default: + _error_("Element type " << EnumToStringx(element->FiniteElement()) << " not supported yet"); + } + + int domaintype; + element->FindParam(&domaintype,DomainTypeEnum); + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + return pe; +}/*}}}*/ +ElementVector* MasstransportAnalysis::CreatePVectorCG(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*Intermediaries */ + IssmDouble Jdet,dt; + IssmDouble ms,mb,mb_correction=0.,thickness; + IssmDouble* xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementVector* pe = element->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + element->FindParam(&dt,TimesteppingTimeStepEnum); + Input* mb_correction_input = element->GetInput(BasalforcingsMeltingRateCorrectionEnum); + Input* mb_input = element->GetInput(BasalforcingsMeltingRateEnum); _assert_(mb_input); + Input* ms_input = element->GetInput(SurfaceforcingsMassBalanceEnum); _assert_(ms_input); + Input* thickness_input = element->GetInput(ThicknessEnum); _assert_(thickness_input); + + /*Initialize mb_correction to 0, do not forget!:*/ + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctions(basis,gauss); + + ms_input->GetInputValue(&ms,gauss); + mb_input->GetInputValue(&mb,gauss); + thickness_input->GetInputValue(&thickness,gauss); + if(mb_correction_input) + mb_correction_input->GetInputValue(&mb_correction,gauss); + + for(int i=0;ivalues[i]+=Jdet*gauss->weight*(thickness+dt*(ms-mb-mb_correction))*basis[i]; + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + delete gauss; + return pe; +}/*}}}*/ +ElementVector* MasstransportAnalysis::CreatePVectorDG(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*Intermediaries */ + IssmDouble Jdet,dt; + IssmDouble ms,mb,mb_correction=0.,thickness; + IssmDouble* xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementVector* pe = element->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + element->FindParam(&dt,TimesteppingTimeStepEnum); + Input* mb_correction_input = element->GetInput(BasalforcingsMeltingRateCorrectionEnum); + Input* mb_input = element->GetInput(BasalforcingsMeltingRateEnum); _assert_(mb_input); + Input* ms_input = element->GetInput(SurfaceforcingsMassBalanceEnum); _assert_(ms_input); + Input* thickness_input = element->GetInput(ThicknessEnum); _assert_(thickness_input); + + /*Initialize mb_correction to 0, do not forget!:*/ + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctions(basis,gauss); + + ms_input->GetInputValue(&ms,gauss); + mb_input->GetInputValue(&mb,gauss); + thickness_input->GetInputValue(&thickness,gauss); + if(mb_correction_input) + mb_correction_input->GetInputValue(&mb_correction,gauss); + + for(int i=0;ivalues[i]+=Jdet*gauss->weight*(thickness+dt*(ms-mb-mb_correction))*basis[i]; + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + delete gauss; + return pe; +}/*}}}*/ +void MasstransportAnalysis::GetB(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2. + * For node i, Bi can be expressed in the actual coordinate system + * by: + * Bi=[ N ] + * [ N ] + * where N is the finiteelement function for node i. + * + * We assume B_prog has been allocated already, of size: 2x(NDOF1*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions*/ + IssmDouble* basis=xNew(numnodes); + element->NodalFunctions(basis,gauss); + + /*Build B: */ + for(int i=0;i(basis); +}/*}}}*/ +void MasstransportAnalysis::GetBprime(IssmDouble* Bprime,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B' matrix. B'=[B1' B2' B3'] where Bi' is of size 3*NDOF2. + * For node i, Bi' can be expressed in the actual coordinate system + * by: + * Bi_prime=[ dN/dx ] + * [ dN/dy ] + * where N is the finiteelement function for node i. + * + * We assume B' has been allocated already, of size: 3x(NDOF2*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(dim*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B': */ + for(int i=0;i(dbasis); + +}/*}}}*/ +void MasstransportAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void MasstransportAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + + int i,hydroadjustment,domaintype; + int* doflist=NULL; + IssmDouble rho_ice,rho_water,minthickness; + Element* basalelement=NULL; + + element->FindParam(&domaintype,DomainTypeEnum); + if(domaintype!=Domain2DhorizontalEnum){ + if(!element->IsOnBase()) return; + basalelement=element->SpawnBasalElement(); + } + else{ + basalelement = element; + } + + /*Fetch number of nodes for this finite element*/ + int numnodes = basalelement->GetNumberOfNodes(); + + /*Fetch dof list and allocate solution vector*/ + basalelement->GetDofList(&doflist,NoneApproximationEnum,GsetEnum); + IssmDouble* newthickness = xNew(numnodes); + IssmDouble* newbed = xNew(numnodes); + IssmDouble* newsurface = xNew(numnodes); + IssmDouble* oldthickness = xNew(numnodes); + IssmDouble* oldbed = xNew(numnodes); + IssmDouble* oldsurface = xNew(numnodes); + IssmDouble* phi = xNew(numnodes); + + /*Use the dof list to index into the solution vector: */ + basalelement->FindParam(&minthickness,MasstransportMinThicknessEnum); + for(i=0;i(newthickness[i])) _error_("NaN found in solution vector"); + /*Constrain thickness to be at least 1m*/ + if(newthickness[i]GetInputListOnNodes(&oldbed[0],BaseEnum); + basalelement->GetInputListOnNodes(&oldsurface[0],SurfaceEnum); + basalelement->GetInputListOnNodes(&oldthickness[0],ThicknessEnum); + basalelement->GetInputListOnNodes(&phi[0],MaskGroundediceLevelsetEnum); + + /*Find MasstransportHydrostaticAdjustment to figure out how to update the geometry:*/ + basalelement->FindParam(&hydroadjustment,MasstransportHydrostaticAdjustmentEnum); + rho_ice = basalelement->GetMaterialParameter(MaterialsRhoIceEnum); + rho_water = basalelement->GetMaterialParameter(MaterialsRhoWaterEnum); + + for(i=0;i0.){ + newsurface[i] = oldbed[i]+newthickness[i]; //surface = oldbed + newthickness + newbed[i] = oldbed[i]; //same bed: do nothing + } + else{ //this is an ice shelf + if(hydroadjustment==AbsoluteEnum){ + newsurface[i] = newthickness[i]*(1-rho_ice/rho_water); + newbed[i] = newthickness[i]*(-rho_ice/rho_water); + } + else if(hydroadjustment==IncrementalEnum){ + newsurface[i] = oldsurface[i]+(1.0-rho_ice/rho_water)*(newthickness[i]-oldthickness[i]); //surface = oldsurface + (1-di) * dH + newbed[i] = oldbed[i]-rho_ice/rho_water*(newthickness[i]-oldthickness[i]); //bed = oldbed + di * dH + } + else _error_("Hydrostatic adjustment " << hydroadjustment << " (" << EnumToStringx(hydroadjustment) << ") not supported yet"); + } + } + + /*Add input to the element: */ + element->AddBasalInput(ThicknessEnum,newthickness,P1Enum); + element->AddBasalInput(SurfaceEnum,newsurface,P1Enum); + element->AddBasalInput(BaseEnum,newbed,P1Enum); + + /*Free ressources:*/ + xDelete(newthickness); + xDelete(newbed); + xDelete(newsurface); + xDelete(oldthickness); + xDelete(oldbed); + xDelete(oldsurface); + xDelete(phi); + xDelete(doflist); + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; +}/*}}}*/ +void MasstransportAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ + + bool islevelset; + femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum); + if(islevelset){ + SetActiveNodesLSMx(femmodel); + } + return; +}/*}}}*/ Index: /issm/trunk/src/c/analyses/MasstransportAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/MasstransportAnalysis.h (revision 17805) +++ /issm/trunk/src/c/analyses/MasstransportAnalysis.h (revision 17806) @@ -12,5 +12,6 @@ public: - int DofsPerNode(int** doflist,int meshtype,int approximation); + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); @@ -18,4 +19,20 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementMatrix* CreateKMatrixCG(Element* element); + ElementMatrix* CreateKMatrixDG(Element* element); + ElementVector* CreatePVector(Element* element); + ElementVector* CreatePVectorCG(Element* element); + ElementVector* CreatePVectorDG(Element* element); + void GetB(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); + void GetBprime(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); + void GetSolutionFromInputs(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); }; #endif Index: /issm/trunk/src/c/analyses/MeltingAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/MeltingAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/MeltingAnalysis.cpp (revision 17806) @@ -6,5 +6,5 @@ /*Model processing*/ -int MeltingAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int MeltingAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ return 1; }/*}}}*/ @@ -14,5 +14,5 @@ /*Now, is the model 3d? otherwise, do nothing: */ - if(iomodel->meshtype==Mesh2DhorizontalEnum)return; + if(iomodel->domaintype==Domain2DhorizontalEnum)return; /*Update elements: */ @@ -29,10 +29,10 @@ iomodel->FetchDataToInput(elements,ThicknessEnum); iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,FrictionCoefficientEnum); iomodel->FetchDataToInput(elements,FrictionPEnum); iomodel->FetchDataToInput(elements,FrictionQEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); iomodel->FetchDataToInput(elements,FlowequationElementEquationEnum); @@ -44,7 +44,7 @@ void MeltingAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ - if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + if(iomodel->domaintype==Domain3DEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); ::CreateNodes(nodes,iomodel,MeltingAnalysisEnum,P1Enum); - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); }/*}}}*/ void MeltingAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ @@ -54,18 +54,87 @@ /*if 2d: Error*/ - if(iomodel->meshtype==Mesh2DhorizontalEnum) _error_("2d meshes not supported yet"); + if(iomodel->domaintype==Domain2DhorizontalEnum) _error_("2d meshes not supported yet"); //create penalties for nodes: no node can have a temperature over the melting point - iomodel->FetchData(1,MeshVertexonbedEnum); + iomodel->FetchData(1,MeshVertexonbaseEnum); CreateSingleNodeToElementConnectivity(iomodel); for(int i=0;inumberofvertices;i++){ if(iomodel->my_vertices[i]){ - if (reCast(iomodel->Data(MeshVertexonbedEnum)[i])){ + if (reCast(iomodel->Data(MeshVertexonbaseEnum)[i])){ loads->AddObject(new Pengrid(iomodel->loadcounter+i+1,i,iomodel,MeltingAnalysisEnum)); } } } - iomodel->DeleteData(1,MeshVertexonbedEnum); + iomodel->DeleteData(1,MeshVertexonbaseEnum); }/*}}}*/ + +/*Finite Element Analysis*/ +void MeltingAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* MeltingAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* MeltingAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* MeltingAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + /*Get basal element*/ + if(!element->IsOnBase()) return NULL; + Element* basalelement = element->SpawnBasalElement(); + + /*Intermediaries */ + IssmDouble D,Jdet; + IssmDouble *xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = basalelement->GetNumberOfNodes(); + + /*Initialize Element vector*/ + ElementMatrix* Ke = basalelement->NewElementMatrix(NoneApproximationEnum); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + basalelement->GetVerticesCoordinates(&xyz_list); + IssmDouble latentheat = element->GetMaterialParameter(MaterialsLatentheatEnum); + IssmDouble heatcapacity = element->GetMaterialParameter(MaterialsHeatcapacityEnum); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=basalelement->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + basalelement->JacobianDeterminant(&Jdet,xyz_list,gauss); + basalelement->NodalFunctions(basis,gauss); + D=latentheat/heatcapacity*gauss->weight*Jdet; + + TripleMultiply(basis,1,numnodes,1, + &D,1,1,0, + basis,1,numnodes,0, + &Ke->values[0],1); + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + delete gauss; + basalelement->DeleteMaterials(); delete basalelement; + return Ke; +}/*}}}*/ +ElementVector* MeltingAnalysis::CreatePVector(Element* element){/*{{{*/ + return NULL; +}/*}}}*/ +void MeltingAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void MeltingAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + element->InputUpdateFromSolutionOneDof(solution,BasalforcingsMeltingRateEnum); +}/*}}}*/ +void MeltingAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ + /*Default, do nothing*/ + return; +}/*}}}*/ Index: /issm/trunk/src/c/analyses/MeltingAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/MeltingAnalysis.h (revision 17805) +++ /issm/trunk/src/c/analyses/MeltingAnalysis.h (revision 17806) @@ -12,5 +12,6 @@ public: - int DofsPerNode(int** doflist,int meshtype,int approximation); + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); @@ -18,4 +19,14 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); + void GetSolutionFromInputs(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); }; #endif Index: /issm/trunk/src/c/analyses/MeshdeformationAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/MeshdeformationAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/MeshdeformationAnalysis.cpp (revision 17806) @@ -6,5 +6,5 @@ /*Model processing*/ -int MeshdeformationAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int MeshdeformationAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ _error_("not implemented"); }/*}}}*/ @@ -24,2 +24,30 @@ _error_("not implemented yet"); }/*}}}*/ + +/*Finite Element Analysis*/ +void MeshdeformationAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* MeshdeformationAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* MeshdeformationAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* MeshdeformationAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* MeshdeformationAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ +void MeshdeformationAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void MeshdeformationAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void MeshdeformationAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ + /*Default, do nothing*/ + return; +}/*}}}*/ Index: /issm/trunk/src/c/analyses/MeshdeformationAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/MeshdeformationAnalysis.h (revision 17805) +++ /issm/trunk/src/c/analyses/MeshdeformationAnalysis.h (revision 17806) @@ -12,5 +12,6 @@ public: - int DofsPerNode(int** doflist,int meshtype,int approximation); + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); @@ -18,4 +19,14 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); + void GetSolutionFromInputs(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); }; #endif Index: /issm/trunk/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp (revision 17806) @@ -6,5 +6,5 @@ /*Model processing*/ -int SmoothedSurfaceSlopeXAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int SmoothedSurfaceSlopeXAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ return 1; }/*}}}*/ @@ -24,18 +24,18 @@ iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); - if(iomodel->meshtype==Mesh3DEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + if(iomodel->domaintype==Domain3DEnum){ + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); } - if(iomodel->meshtype==Mesh2DverticalEnum){ - iomodel->FetchDataToInput(elements,MeshVertexonbedEnum); + if(iomodel->domaintype==Domain2DverticalEnum){ + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); } }/*}}}*/ void SmoothedSurfaceSlopeXAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ - iomodel->FetchData(1,MeshVertexonbedEnum); + if(iomodel->domaintype==Domain3DEnum) iomodel->FetchData(1,MeshVertexonbaseEnum); ::CreateNodes(nodes,iomodel,SmoothedSurfaceSlopeXAnalysisEnum,P1Enum); - iomodel->DeleteData(1,MeshVertexonbedEnum); + if(iomodel->domaintype==Domain3DEnum) iomodel->DeleteData(1,MeshVertexonbaseEnum); }/*}}}*/ void SmoothedSurfaceSlopeXAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ @@ -43,2 +43,141 @@ void SmoothedSurfaceSlopeXAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/ }/*}}}*/ + +/*Finite Element Analysis*/ +void SmoothedSurfaceSlopeXAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* SmoothedSurfaceSlopeXAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* SmoothedSurfaceSlopeXAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* SmoothedSurfaceSlopeXAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + /* Intermediaries */ + IssmDouble Jdet,thickness,l=8.; + IssmDouble *xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element matrix and vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(); + IssmDouble* dbasis = xNew(2*numnodes); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + Input* thickness_input = element->GetInput(ThicknessEnum); _assert_(thickness_input); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + thickness_input->GetInputValue(&thickness,gauss); + if(thickness<50.) thickness=50.; + + element->NodalFunctions(basis,gauss); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + for(int i=0;ivalues[i*numnodes+j] += gauss->weight*Jdet*( + basis[i]*basis[j] + +(l*thickness)*(l*thickness)*(dbasis[0*numnodes+i]*dbasis[0*numnodes+j] + dbasis[1*numnodes+i]*dbasis[1*numnodes+j]) + ); + } + } + } + + /*Clean up and return*/ + delete gauss; + xDelete(dbasis); + xDelete(basis); + xDelete(xyz_list); + return Ke; +}/*}}}*/ +ElementVector* SmoothedSurfaceSlopeXAnalysis::CreatePVector(Element* element){/*{{{*/ + + /*Intermediaries*/ + int domaintype; + Element* basalelement; + + /*Get basal element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + break; + case Domain3DEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Initialize Element vector*/ + ElementVector* pe = basalelement->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + basalelement->GetVerticesCoordinates(&xyz_list); + IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble gravity = element->GetMaterialParameter(ConstantsGEnum); + Input* H_input = basalelement->GetInput(ThicknessEnum); _assert_(H_input); + Input* surface_input = basalelement->GetInput(SurfaceEnum); _assert_(surface_input); + Input* vx_input = basalelement->GetInput(VxEnum); + Input* vy_input = basalelement->GetInput(VyEnum); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=basalelement->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + basalelement->JacobianDeterminant(&Jdet,xyz_list,gauss); + basalelement->NodalFunctions(basis,gauss); + + H_input->GetInputValue(&thickness,gauss); + surface_input->GetInputDerivativeValue(&slope[0],xyz_list,gauss); + if(vx_input && vy_input){ + vx_input->GetInputValue(&vx,gauss); + vy_input->GetInputValue(&vy,gauss); + norms = sqrt(slope[0]*slope[0]+slope[1]*slope[1]+1.e-10); + normv = sqrt(vx*vx + vy*vy); + if(normv>15./(365.*24.*3600.)) slope[0] = -vx/normv*norms; + } + taud_x = rho_ice*gravity*thickness*slope[0]; + + for(int i=0;ivalues[i]+=Jdet*gauss->weight*taud_x*basis[i]; + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + delete gauss; + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + return pe; +}/*}}}*/ +void SmoothedSurfaceSlopeXAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void SmoothedSurfaceSlopeXAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + element->InputUpdateFromSolutionOneDof(solution,SurfaceSlopeXEnum); +}/*}}}*/ +void SmoothedSurfaceSlopeXAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ + /*Default, do nothing*/ + return; +}/*}}}*/ Index: /issm/trunk/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.h (revision 17805) +++ /issm/trunk/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.h (revision 17806) @@ -12,5 +12,6 @@ public: - int DofsPerNode(int** doflist,int meshtype,int approximation); + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); @@ -18,4 +19,14 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); + void GetSolutionFromInputs(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); }; #endif Index: /issm/trunk/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp (revision 17806) @@ -6,5 +6,5 @@ /*Model processing*/ -int SmoothedSurfaceSlopeYAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int SmoothedSurfaceSlopeYAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ return 1; }/*}}}*/ @@ -24,18 +24,18 @@ iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); - if(iomodel->meshtype==Mesh3DEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + if(iomodel->domaintype==Domain3DEnum){ + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); } - if(iomodel->meshtype==Mesh2DverticalEnum){ - iomodel->FetchDataToInput(elements,MeshVertexonbedEnum); + if(iomodel->domaintype==Domain2DverticalEnum){ + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); } }/*}}}*/ void SmoothedSurfaceSlopeYAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ - iomodel->FetchData(1,MeshVertexonbedEnum); + if(iomodel->domaintype==Domain3DEnum) iomodel->FetchData(1,MeshVertexonbaseEnum); ::CreateNodes(nodes,iomodel,SmoothedSurfaceSlopeYAnalysisEnum,P1Enum); - iomodel->DeleteData(1,MeshVertexonbedEnum); + if(iomodel->domaintype==Domain3DEnum) iomodel->DeleteData(1,MeshVertexonbaseEnum); }/*}}}*/ void SmoothedSurfaceSlopeYAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ @@ -43,2 +43,141 @@ void SmoothedSurfaceSlopeYAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/ }/*}}}*/ + +/*Finite Element Analysis*/ +void SmoothedSurfaceSlopeYAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* SmoothedSurfaceSlopeYAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* SmoothedSurfaceSlopeYAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* SmoothedSurfaceSlopeYAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + /* Intermediaries */ + IssmDouble Jdet,thickness,l=8.; + IssmDouble *xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element matrix and vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(); + IssmDouble* dbasis = xNew(2*numnodes); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + Input* thickness_input = element->GetInput(ThicknessEnum); _assert_(thickness_input); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + thickness_input->GetInputValue(&thickness,gauss); + if(thickness<50.) thickness=50.; + + element->NodalFunctions(basis,gauss); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + for(int i=0;ivalues[i*numnodes+j] += gauss->weight*Jdet*( + basis[i]*basis[j] + +(l*thickness)*(l*thickness)*(dbasis[0*numnodes+i]*dbasis[0*numnodes+j] + dbasis[1*numnodes+i]*dbasis[1*numnodes+j]) + ); + } + } + } + + /*Clean up and return*/ + delete gauss; + xDelete(dbasis); + xDelete(basis); + xDelete(xyz_list); + return Ke; +}/*}}}*/ +ElementVector* SmoothedSurfaceSlopeYAnalysis::CreatePVector(Element* element){/*{{{*/ + + /*Intermediaries*/ + int domaintype; + Element* basalelement; + + /*Get basal element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + break; + case Domain3DEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Initialize Element vector*/ + ElementVector* pe = basalelement->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + basalelement->GetVerticesCoordinates(&xyz_list); + IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble gravity = element->GetMaterialParameter(ConstantsGEnum); + Input* H_input = basalelement->GetInput(ThicknessEnum); _assert_(H_input); + Input* surface_input = basalelement->GetInput(SurfaceEnum); _assert_(surface_input); + Input* vx_input = basalelement->GetInput(VxEnum); + Input* vy_input = basalelement->GetInput(VyEnum); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=basalelement->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + basalelement->JacobianDeterminant(&Jdet,xyz_list,gauss); + basalelement->NodalFunctions(basis,gauss); + + H_input->GetInputValue(&thickness,gauss); + surface_input->GetInputDerivativeValue(&slope[0],xyz_list,gauss); + if(vx_input && vy_input){ + vx_input->GetInputValue(&vx,gauss); + vy_input->GetInputValue(&vy,gauss); + norms = sqrt(slope[0]*slope[0]+slope[1]*slope[1]+1.e-10); + normv = sqrt(vx*vx + vy*vy); + if(normv>15./(365.*24.*3600.)) slope[1] = -vy/normv*norms; + } + taud_y = rho_ice*gravity*thickness*slope[1]; + + for(int i=0;ivalues[i]+=Jdet*gauss->weight*taud_y*basis[i]; + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + delete gauss; + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + return pe; +}/*}}}*/ +void SmoothedSurfaceSlopeYAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void SmoothedSurfaceSlopeYAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + element->InputUpdateFromSolutionOneDof(solution,SurfaceSlopeYEnum); +}/*}}}*/ +void SmoothedSurfaceSlopeYAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ + /*Default, do nothing*/ + return; +}/*}}}*/ Index: /issm/trunk/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.h (revision 17805) +++ /issm/trunk/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.h (revision 17806) @@ -12,5 +12,6 @@ public: - int DofsPerNode(int** doflist,int meshtype,int approximation); + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); @@ -18,4 +19,14 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); + void GetSolutionFromInputs(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); }; #endif Index: /issm/trunk/src/c/analyses/StressbalanceAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/StressbalanceAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/StressbalanceAnalysis.cpp (revision 17806) @@ -4,7 +4,11 @@ #include "../shared/shared.h" #include "../modules/modules.h" +#include "../solutionsequences/solutionsequences.h" +#include "../cores/cores.h" + +//#define FSANALYTICAL 21 /*Model processing*/ -int StressbalanceAnalysis::DofsPerNode(int** pdoftype,int meshtype,int approximation){/*{{{*/ +int StressbalanceAnalysis::DofsPerNode(int** pdoftype,int domaintype,int approximation){/*{{{*/ /*output*/ @@ -13,12 +17,25 @@ switch(approximation){ - case SSAApproximationEnum: numdofs =2; break; + case SSAApproximationEnum: + switch(domaintype){ + case Domain3DEnum: numdofs=2; break; + case Domain2DhorizontalEnum: numdofs=2; break; + case Domain2DverticalEnum: numdofs=1; break; + default: _error_("mesh type not supported yet"); + } + break; case L1L2ApproximationEnum: numdofs =2; break; - case HOApproximationEnum: numdofs =2; break; + case HOApproximationEnum: + switch(domaintype){ + case Domain3DEnum: numdofs=2; break; + case Domain2DverticalEnum: numdofs=1; break; + default: _error_("mesh type not supported yet"); + } + break; case SIAApproximationEnum: numdofs =2; break; case FSvelocityEnum: - switch(meshtype){ - case Mesh3DEnum: numdofs=3; break; - case Mesh2DverticalEnum: numdofs=2; break; + switch(domaintype){ + case Domain3DEnum: numdofs=3; break; + case Domain2DverticalEnum: numdofs=2; break; default: _error_("mesh type not supported yet"); } @@ -26,7 +43,7 @@ case FSpressureEnum: numdofs=1; break; case NoneApproximationEnum: - switch(meshtype){ - case Mesh3DEnum: numdofs=4; break; - case Mesh2DverticalEnum: numdofs=3; break; + switch(domaintype){ + case Domain3DEnum: numdofs=4; break; + case Domain2DverticalEnum: numdofs=3; break; default: _error_("mesh type not supported yet"); } @@ -69,6 +86,7 @@ /*Intermediaries*/ - int numoutputs; - char** requestedoutputs = NULL; + int fe_FS; + int numoutputs; + char** requestedoutputs = NULL; parameters->AddObject(iomodel->CopyConstantObject(FlowequationIsSIAEnum)); @@ -89,4 +107,11 @@ parameters->AddObject(iomodel->CopyConstantObject(StressbalanceViscosityOvershootEnum)); + /*XTH parameters*/ + iomodel->Constant(&fe_FS,FlowequationFeFSEnum); + if(fe_FS==XTaylorHoodEnum){ + parameters->AddObject(iomodel->CopyConstantObject(AugmentedLagrangianREnum)); + parameters->AddObject(iomodel->CopyConstantObject(AugmentedLagrangianThetaEnum)); + } + /*Requested outputs*/ iomodel->FetchData(&requestedoutputs,&numoutputs,StressbalanceRequestedOutputsEnum); @@ -105,4 +130,6 @@ bool control_analysis; bool dakota_analysis; + bool islevelset; + bool isdamage; /*Fetch constants needed: */ @@ -114,4 +141,5 @@ iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum); iomodel->Constant(&materials_type,MaterialsEnum); + iomodel->Constant(&islevelset,TransientIslevelsetEnum); /*return if no processing required*/ @@ -127,4 +155,9 @@ else iscoupling = false; + + /*is damage mechanics being used?*/ + if(materials_type==MaticeEnum) isdamage = false; + else if(materials_type==MatdamageiceEnum) isdamage = true; + else _error_("Material type not recognized"); /*Get finite element type*/ @@ -171,5 +204,5 @@ iomodel->FetchDataToInput(elements,ThicknessEnum); iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,FrictionCoefficientEnum); iomodel->FetchDataToInput(elements,FrictionPEnum); @@ -185,9 +218,11 @@ iomodel->FetchDataToInput(elements,LoadingforceXEnum); iomodel->FetchDataToInput(elements,LoadingforceYEnum); - iomodel->FetchDataToInput(elements,DamageDEnum); - - if(iomodel->meshtype==Mesh3DEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); - iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); + if(isdamage)iomodel->FetchDataToInput(elements,DamageDEnum); + + if(iomodel->domaintype==Domain3DEnum){ + if(iomodel->meshelementtype==PentaEnum){ + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); + iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); + } iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum); iomodel->FetchDataToInput(elements,FlowequationBorderFSEnum); @@ -196,8 +231,16 @@ if(dakota_analysis)elements->InputDuplicate(VzEnum,QmuVzEnum); } + if(iomodel->domaintype==Domain2DverticalEnum){ + iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); + } if(isFS){ - iomodel->FetchDataToInput(elements,MeshVertexonbedEnum); + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); iomodel->FetchDataToInput(elements,PressureEnum,0.); if(dakota_analysis)elements->InputDuplicate(PressureEnum,QmuPressureEnum); + } + if(islevelset){ + iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum) + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); // required for updating active nodes } @@ -252,7 +295,7 @@ } iomodel->FetchData(3,FlowequationBorderSSAEnum,FlowequationVertexEquationEnum,StressbalanceReferentialEnum); - if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderFSEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum) iomodel->FetchData(3,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum,FlowequationBorderFSEnum); ::CreateNodes(nodes,iomodel,StressbalanceAnalysisEnum,finiteelement,approximation); - iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum, + iomodel->DeleteData(6,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum, FlowequationVertexEquationEnum,StressbalanceReferentialEnum); } @@ -264,5 +307,5 @@ if(!nodes) nodes = new Nodes(); - iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum, + iomodel->FetchData(6,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum, FlowequationVertexEquationEnum,StressbalanceReferentialEnum); if(isFS){ @@ -301,5 +344,5 @@ } } - iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum, + iomodel->DeleteData(6,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum, FlowequationVertexEquationEnum,StressbalanceReferentialEnum); } @@ -324,5 +367,5 @@ IssmDouble *nodeonHO = NULL; IssmDouble *nodeonFS = NULL; - IssmDouble *nodeonbed = NULL; + IssmDouble *nodeonbase = NULL; IssmDouble *groundedice_ls = NULL; IssmDouble *vertices_type = NULL; @@ -368,5 +411,7 @@ case MINIEnum : finiteelement = P1bubbleEnum; break; case TaylorHoodEnum : finiteelement = P2Enum; break; - default: _error_("finite element "<FetchData(&vertices_type,NULL,NULL,FlowequationVertexEquationEnum); iomodel->FetchData(&nodeonFS,NULL,NULL,FlowequationBorderFSEnum); - iomodel->FetchData(&nodeonbed,NULL,NULL,MeshVertexonbedEnum); + iomodel->FetchData(&nodeonbase,NULL,NULL,MeshVertexonbaseEnum); iomodel->FetchData(&groundedice_ls,NULL,NULL,MaskGroundediceLevelsetEnum); - if(iomodel->meshtype==Mesh3DEnum){ + if(iomodel->domaintype==Domain3DEnum){ iomodel->FetchData(&spcvz,&Mz,&Nz,StressbalanceSpcvzEnum); } - else if (iomodel->meshtype==Mesh2DverticalEnum){ + else if (iomodel->domaintype==Domain2DverticalEnum){ iomodel->FetchData(&spcvz,&Mz,&Nz,StressbalanceSpcvyEnum); } @@ -391,25 +436,13 @@ _error_("not supported yet"); } - for(i=0;inumberofvertices;i++){ - if(iomodel->my_vertices[i]){ - if(nodeonbed[i]>0. && groundedice_ls[i]>0. && nodeonFS[i]>0.){ - if(vertices_type[i] == FSApproximationEnum){ - for(j=0;jmeshtype==Mesh3DEnum){ - IoModelToConstraintsx(constraints,iomodel,StressbalanceSpcvxEnum,StressbalanceAnalysisEnum,finiteelement,1); - IoModelToConstraintsx(constraints,iomodel,StressbalanceSpcvyEnum,StressbalanceAnalysisEnum,finiteelement,2); - IoModelToConstraintsx(constraints,iomodel,spcvz,Mz,Nz,StressbalanceAnalysisEnum,finiteelement,3); + if(iomodel->domaintype==Domain3DEnum){ + IoModelToConstraintsx(constraints,iomodel,StressbalanceSpcvxEnum,StressbalanceAnalysisEnum,finiteelement,0); + IoModelToConstraintsx(constraints,iomodel,StressbalanceSpcvyEnum,StressbalanceAnalysisEnum,finiteelement,1); + IoModelToConstraintsx(constraints,iomodel,spcvz,Mz,Nz,StressbalanceAnalysisEnum,finiteelement,2); iomodel->DeleteData(spcvz,StressbalanceSpcvzEnum); } - else if (iomodel->meshtype==Mesh2DverticalEnum){ - IoModelToConstraintsx(constraints,iomodel,StressbalanceSpcvxEnum,StressbalanceAnalysisEnum,finiteelement,1); - IoModelToConstraintsx(constraints,iomodel,spcvz,Mz,Nz,StressbalanceAnalysisEnum,finiteelement,2); + else if (iomodel->domaintype==Domain2DverticalEnum){ + IoModelToConstraintsx(constraints,iomodel,StressbalanceSpcvxEnum,StressbalanceAnalysisEnum,finiteelement,0); + IoModelToConstraintsx(constraints,iomodel,spcvz,Mz,Nz,StressbalanceAnalysisEnum,finiteelement,1); iomodel->DeleteData(spcvz,StressbalanceSpcvyEnum); } @@ -419,5 +452,5 @@ iomodel->DeleteData(vertices_type,FlowequationVertexEquationEnum); iomodel->DeleteData(nodeonFS,FlowequationBorderFSEnum); - iomodel->DeleteData(nodeonbed,MeshVertexonbedEnum); + iomodel->DeleteData(nodeonbase,MeshVertexonbaseEnum); iomodel->DeleteData(groundedice_ls,MaskGroundediceLevelsetEnum); @@ -428,9 +461,19 @@ iomodel->FetchData(&z,NULL,NULL,MeshZEnum); switch(finiteelement){ + case P1Enum: + for(i=0;inumberofvertices;i++){ + if(iomodel->my_vertices[i]){ + if(reCast(vertices_type[i])==NoneApproximationEnum){ + constraints->AddObject(new SpcStatic(count+1,iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofelements+i+1,0,g*rho_ice*(surface[i]-z[i])/FSreconditioning,StressbalanceAnalysisEnum)); + count++; + } + } + } + break; case P1bubbleEnum: for(i=0;inumberofvertices;i++){ if(iomodel->my_vertices[i]){ if(reCast(vertices_type[i])==NoneApproximationEnum){ - constraints->AddObject(new SpcStatic(count+1,iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofelements+i+1,1,g*rho_ice*(surface[i]-z[i])/FSreconditioning,StressbalanceAnalysisEnum)); + constraints->AddObject(new SpcStatic(count+1,iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofelements+i+1,0,g*rho_ice*(surface[i]-z[i])/FSreconditioning,StressbalanceAnalysisEnum)); count++; } @@ -442,9 +485,12 @@ if(iomodel->my_vertices[i]){ if(reCast(vertices_type[i])==NoneApproximationEnum){ - constraints->AddObject(new SpcStatic(count+1,iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+i+1,1,g*rho_ice*(surface[i]-z[i])/FSreconditioning,StressbalanceAnalysisEnum)); + constraints->AddObject(new SpcStatic(count+1,iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+i+1,0,g*rho_ice*(surface[i]-z[i])/FSreconditioning,StressbalanceAnalysisEnum)); count++; } } } + break; + case P2xP4Enum: + //Nothing yet break; default: @@ -456,6 +502,8 @@ } else{ - IoModelToConstraintsx(constraints,iomodel,StressbalanceSpcvxEnum,StressbalanceAnalysisEnum,finiteelement,1); - IoModelToConstraintsx(constraints,iomodel,StressbalanceSpcvyEnum,StressbalanceAnalysisEnum,finiteelement,2); + IoModelToConstraintsx(constraints,iomodel,StressbalanceSpcvxEnum,StressbalanceAnalysisEnum,finiteelement,0); + if(iomodel->domaintype!=Domain2DverticalEnum){ + IoModelToConstraintsx(constraints,iomodel,StressbalanceSpcvyEnum,StressbalanceAnalysisEnum,finiteelement,1); + } } @@ -468,8 +516,8 @@ iomodel->FetchData(&spcvz,&Mz,&Nz,StressbalanceSpcvzEnum); iomodel->FetchData(&nodeonSSA,NULL,NULL,FlowequationBorderSSAEnum); - if(iomodel->meshtype==Mesh3DEnum)iomodel->FetchData(&nodeonHO,NULL,NULL,FlowequationBorderHOEnum); - if(iomodel->meshtype==Mesh3DEnum)iomodel->FetchData(&nodeonFS,NULL,NULL,FlowequationBorderFSEnum); - if(iomodel->meshtype==Mesh3DEnum)iomodel->FetchData(&nodeonbed,NULL,NULL,MeshVertexonbedEnum); - if(iomodel->meshtype==Mesh3DEnum)iomodel->FetchData(&groundedice_ls,NULL,NULL,MaskGroundediceLevelsetEnum); + if(iomodel->domaintype==Domain3DEnum)iomodel->FetchData(&nodeonHO,NULL,NULL,FlowequationBorderHOEnum); + if(iomodel->domaintype==Domain3DEnum)iomodel->FetchData(&nodeonFS,NULL,NULL,FlowequationBorderFSEnum); + if(iomodel->domaintype==Domain3DEnum)iomodel->FetchData(&nodeonbase,NULL,NULL,MeshVertexonbaseEnum); + if(iomodel->domaintype==Domain3DEnum)iomodel->FetchData(&groundedice_ls,NULL,NULL,MaskGroundediceLevelsetEnum); iomodel->FetchData(&vertices_type,NULL,NULL,FlowequationVertexEquationEnum); iomodel->FetchData(&surface,NULL,NULL,SurfaceEnum); @@ -503,14 +551,14 @@ /*If grionSSA, spc HO dofs: 3 & 4*/ if (reCast(nodeonHO[i])){ + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,0,0,StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. + count++; constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,0,StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,0,StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. - count++; if (!xIsNan(spcvx[i])){ - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,3,spcvx[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,spcvx[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; } if (!xIsNan(spcvy[i])){ - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,4,spcvy[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,3,spcvy[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; } @@ -518,14 +566,14 @@ } else if (reCast(nodeonSSA[i])){ + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,0,StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. + count++; constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,3,0,StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,4,0,StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. - count++; if (!xIsNan(spcvx[i])){ - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,spcvx[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,0,spcvx[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; } if (!xIsNan(spcvy[i])){ - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,spcvy[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,spcvy[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; } @@ -538,16 +586,16 @@ /*If grion,HO spc FS dofs: 3 4 & 5*/ if (reCast(nodeonHO[i])){ + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,0,StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. + count++; constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,3,0,StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,4,0,StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,5,0,StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. - count++; if (!xIsNan(spcvx[i])){ - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,spcvx[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,0,spcvx[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; } if (!xIsNan(spcvy[i])){ - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,spcvy[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,spcvy[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; } @@ -555,18 +603,18 @@ } else if (reCast(nodeonFS[i])){ //spc HO nodes: 1 & 2 + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,0,0,StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. + count++; constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,0,StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,0,StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. - count++; if (!xIsNan(spcvx[i])){ - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,3,spcvx[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,spcvx[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; } if (!xIsNan(spcvy[i])){ - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,4,spcvy[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,3,spcvy[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; } if (!xIsNan(spcvz[i])){ - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,5,spcvz[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,4,spcvz[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; } @@ -578,16 +626,16 @@ /*If grion,HO spc FS dofs: 3 4 & 5*/ if (reCast(nodeonSSA[i])){ + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,0,StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. + count++; constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,3,0,StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,4,0,StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,5,0,StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. - count++; if (!xIsNan(spcvx[i])){ - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,spcvx[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,0,spcvx[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; } if (!xIsNan(spcvy[i])){ - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,spcvy[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,spcvy[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; } @@ -595,18 +643,18 @@ } else if (reCast(nodeonFS[i])){ //spc SSA nodes: 1 & 2 + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,0,0,StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. + count++; constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,0,StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,0,StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. - count++; if (!xIsNan(spcvx[i])){ - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,3,spcvx[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,spcvx[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; } if (!xIsNan(spcvy[i])){ - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,4,spcvy[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,3,spcvy[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; } if (!xIsNan(spcvz[i])){ - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,5,spcvz[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,4,spcvz[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; } @@ -617,5 +665,5 @@ else{ if (Mx==iomodel->numberofvertices && !xIsNan(spcvx[i])){ - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,spcvx[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,0,spcvx[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; @@ -631,5 +679,5 @@ if(spcpresent){ - constraints->AddObject(new SpcTransient(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,Nx,timesx,values,StressbalanceAnalysisEnum)); + constraints->AddObject(new SpcTransient(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,0,Nx,timesx,values,StressbalanceAnalysisEnum)); count++; } @@ -637,10 +685,10 @@ } else if (vertices_type[i]==SIAApproximationEnum){ - constraints->AddObject(new SpcDynamic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,StressbalanceAnalysisEnum)); + constraints->AddObject(new SpcDynamic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,0,StressbalanceAnalysisEnum)); count++; } if (My==iomodel->numberofvertices && !xIsNan(spcvy[i])){ - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,spcvy[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vy. + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,spcvy[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vy. count++; } @@ -654,5 +702,5 @@ } if(spcpresent){ - constraints->AddObject(new SpcTransient(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,Ny,timesy,values,StressbalanceAnalysisEnum)); + constraints->AddObject(new SpcTransient(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,Ny,timesy,values,StressbalanceAnalysisEnum)); count++; } @@ -660,5 +708,5 @@ } else if (vertices_type[i]==SIAApproximationEnum){ - constraints->AddObject(new SpcDynamic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,StressbalanceAnalysisEnum)); + constraints->AddObject(new SpcDynamic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,StressbalanceAnalysisEnum)); count++; } @@ -666,5 +714,5 @@ if (reCast(vertices_type[i])==FSApproximationEnum || (reCast(vertices_type[i])==NoneApproximationEnum)){ if (Mz==iomodel->numberofvertices && !xIsNan(spcvz[i])){ - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,3,spcvz[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 2 to vy + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,spcvz[i],StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 2 to vy count++; } @@ -678,5 +726,5 @@ } if(spcpresent){ - constraints->AddObject(new SpcTransient(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,3,Nz,timesz,values,StressbalanceAnalysisEnum)); + constraints->AddObject(new SpcTransient(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,Nz,timesz,values,StressbalanceAnalysisEnum)); count++; } @@ -686,25 +734,6 @@ } if (reCast(vertices_type[i])==NoneApproximationEnum){ - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+iomodel->numberofvertices+i+1,1,g*rho_ice*(surface[i]-z[i])/FSreconditioning,StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 2 to vy + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+iomodel->numberofvertices+i+1,0,g*rho_ice*(surface[i]-z[i])/FSreconditioning,StressbalanceAnalysisEnum)); //add count'th spc, on node i+1, setting dof 2 to vy count++; - } - } - - /*Constraint at the bedrock interface (v.n = vz = 0) (Coordinates will be updated according to the bed slope)*/ - if (iomodel->meshtype==Mesh3DEnum) if(nodeonbed[i]>0. && groundedice_ls[i]>=0. && nodeonFS[i]>0.){ - switch(reCast(vertices_type[i])){ - case SSAFSApproximationEnum: - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,5,0.,StressbalanceAnalysisEnum)); - count++; - break; - case HOFSApproximationEnum: - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,5,0.,StressbalanceAnalysisEnum)); - count++; - break; - case FSApproximationEnum: - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,3,0.,StressbalanceAnalysisEnum)); - count++; - break; - default: _error_("Vertex approximation " << EnumToStringx(reCast(vertices_type[i])) << " not supported"); } } @@ -717,8 +746,8 @@ iomodel->DeleteData(spcvz,StressbalanceSpcvzEnum); iomodel->DeleteData(nodeonSSA,FlowequationBorderSSAEnum); - if(iomodel->meshtype==Mesh3DEnum)iomodel->DeleteData(nodeonHO,FlowequationBorderHOEnum); - if(iomodel->meshtype==Mesh3DEnum)iomodel->DeleteData(nodeonFS,FlowequationBorderFSEnum); - if(iomodel->meshtype==Mesh3DEnum)iomodel->DeleteData(nodeonbed,MeshVertexonbedEnum); - if(iomodel->meshtype==Mesh3DEnum)iomodel->DeleteData(groundedice_ls,MaskGroundediceLevelsetEnum); + if(iomodel->domaintype==Domain3DEnum)iomodel->DeleteData(nodeonHO,FlowequationBorderHOEnum); + if(iomodel->domaintype==Domain3DEnum)iomodel->DeleteData(nodeonFS,FlowequationBorderFSEnum); + if(iomodel->domaintype==Domain3DEnum)iomodel->DeleteData(nodeonbase,MeshVertexonbaseEnum); + if(iomodel->domaintype==Domain3DEnum)iomodel->DeleteData(groundedice_ls,MaskGroundediceLevelsetEnum); iomodel->DeleteData(vertices_type,FlowequationVertexEquationEnum); iomodel->DeleteData(surface,SurfaceEnum); @@ -782,8 +811,7 @@ /*Create Riffront loads for rifts: */ -#ifdef _HAVE_RIFTS_ if(numrifts){ iomodel->FetchData(&riftinfo,&numriftsegments,NULL,RiftsRiftstructEnum); - iomodel->FetchData(5,RiftsRiftstructEnum,ThicknessEnum,BedEnum,SurfaceEnum,MaskGroundediceLevelsetEnum); + iomodel->FetchData(5,RiftsRiftstructEnum,ThicknessEnum,BaseEnum,SurfaceEnum,MaskGroundediceLevelsetEnum); for(i=0;imy_elements[reCast(*(riftinfo+RIFTINFOSIZE*i+2))-1]){ @@ -792,7 +820,5483 @@ } } - iomodel->DeleteData(5,RiftsRiftstructEnum,ThicknessEnum,BedEnum,SurfaceEnum,MaskGroundediceLevelsetEnum); + iomodel->DeleteData(5,RiftsRiftstructEnum,ThicknessEnum,BaseEnum,SurfaceEnum,MaskGroundediceLevelsetEnum); xDelete(riftinfo); } +}/*}}}*/ + +/*Finite Element Analysis*/ +void StressbalanceAnalysis::Core(FemModel* femmodel){/*{{{*/ + + /*Intermediaries*/ + bool isSSA,isL1L2,isHO,isFS; + bool conserve_loads = true; + int newton,domaintype,fe_FS; + + /* recover parameters:*/ + femmodel->parameters->FindParam(&isSSA,FlowequationIsSSAEnum); + femmodel->parameters->FindParam(&isL1L2,FlowequationIsL1L2Enum); + femmodel->parameters->FindParam(&isHO,FlowequationIsHOEnum); + femmodel->parameters->FindParam(&isFS,FlowequationIsFSEnum); + femmodel->parameters->FindParam(&fe_FS,FlowequationFeFSEnum); + femmodel->parameters->FindParam(&domaintype,DomainTypeEnum); + femmodel->parameters->FindParam(&newton,StressbalanceIsnewtonEnum); + + if(isFS && !(isSSA || isHO || isL1L2)){ + if(VerboseSolution()) _printf0_(" computing velocities\n"); + + femmodel->SetCurrentConfiguration(StressbalanceAnalysisEnum); + if (fe_FS==XTaylorHoodEnum) + solutionsequence_la_theta(femmodel); + else if(newton>0) + solutionsequence_newton(femmodel); + else + solutionsequence_nonlinear(femmodel,conserve_loads); + } + else if(!isFS && (isSSA || isHO || isL1L2)){ + if(VerboseSolution()) _printf0_(" computing velocities\n"); + + femmodel->SetCurrentConfiguration(StressbalanceAnalysisEnum); + if(newton>0) + solutionsequence_newton(femmodel); + else + solutionsequence_nonlinear(femmodel,conserve_loads); + + if(domaintype==Domain2DverticalEnum && isSSA){ + femmodel->parameters->SetParam(VxEnum,InputToExtrudeEnum); + extrudefrombase_core(femmodel); + femmodel->parameters->SetParam(VelEnum,InputToExtrudeEnum); + extrudefrombase_core(femmodel); + } + } + else if ((isSSA || isL1L2 || isHO) && isFS){ + if(VerboseSolution()) _printf0_(" computing coupling between lower order models and FS\n"); + solutionsequence_FScoupling_nonlinear(femmodel,conserve_loads); + } + else{ + _error_("not supported"); + } + +}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreateDVector(Element* element){/*{{{*/ + + int approximation; + element->GetInputValue(&approximation,ApproximationEnum); + switch(approximation){ + case FSApproximationEnum: + return CreateDVectorFS(element); + default: + return NULL; //no need for doftypes outside of FS approximation + } + return NULL; + +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ + + int approximation; + element->GetInputValue(&approximation,ApproximationEnum); + switch(approximation){ + case SSAApproximationEnum: + return CreateJacobianMatrixSSA(element); + case HOApproximationEnum: + return CreateJacobianMatrixHO(element); + case FSApproximationEnum: + return CreateJacobianMatrixFS(element); + case NoneApproximationEnum: + return NULL; + default: + _error_("Approximation "<GetInputValue(&approximation,ApproximationEnum); + switch(approximation){ + case SIAApproximationEnum: + return NULL; + case SSAApproximationEnum: + return CreateKMatrixSSA(element); + case L1L2ApproximationEnum: + return CreateKMatrixL1L2(element); + case HOApproximationEnum: + return CreateKMatrixHO(element); + case FSApproximationEnum: + return CreateKMatrixFS(element); + case SSAHOApproximationEnum: + return CreateKMatrixSSAHO(element); + case HOFSApproximationEnum: + return CreateKMatrixHOFS(element); + case SSAFSApproximationEnum: + return CreateKMatrixSSAFS(element); + case NoneApproximationEnum: + return NULL; + default: + _error_("Approximation "<GetInputValue(&approximation,ApproximationEnum); + switch(approximation){ + case SIAApproximationEnum: + return NULL; + case SSAApproximationEnum: + return CreatePVectorSSA(element); + case L1L2ApproximationEnum: + return CreatePVectorL1L2(element); + case HOApproximationEnum: + return CreatePVectorHO(element); + case FSApproximationEnum: + return CreatePVectorFS(element); + case SSAHOApproximationEnum: + return CreatePVectorSSAHO(element); + case HOFSApproximationEnum: + return CreatePVectorHOFS(element); + case SSAFSApproximationEnum: + return CreatePVectorSSAFS(element); + case NoneApproximationEnum: + return NULL; + default: + _error_("Approximation "<* solution,Element* element){/*{{{*/ + + int approximation; + element->GetInputValue(&approximation,ApproximationEnum); + switch(approximation){ + case FSApproximationEnum: case NoneApproximationEnum: + GetSolutionFromInputsFS(solution,element); + return; + case SSAApproximationEnum: case HOApproximationEnum: case SIAApproximationEnum: + GetSolutionFromInputsHoriz(solution,element); + return; + case L1L2ApproximationEnum: + GetSolutionFromInputsHoriz(solution,element); + return; + case SSAHOApproximationEnum: case HOFSApproximationEnum: case SSAFSApproximationEnum: + /*the elements around will create the solution*/ + return; + default: + _error_("Approximation "<* solution,Element* element){/*{{{*/ + + IssmDouble vx,vy; + int domaintype,dim,approximation,dofpernode; + int* doflist = NULL; + + /*Get some parameters*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: dim = 2; dofpernode = 2; break; + case Domain2DverticalEnum: dim = 2; dofpernode = 1; break; + case Domain3DEnum: dim = 3; dofpernode = 2; break; + default: _error_("mesh "<GetNumberOfNodes(); + int numdof = numnodes*dofpernode; + element->GetInputValue(&approximation,ApproximationEnum); + + /*Fetch dof list and allocate solution vector*/ + element->GetDofList(&doflist,approximation,GsetEnum); + IssmDouble* values = xNew(numdof); + + /*Get inputs*/ + Input* vx_input=element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=NULL; + if(domaintype!=Domain2DverticalEnum){vy_input=element->GetInput(VyEnum); _assert_(vy_input);} + + /*Ok, we have vx and vy in values, fill in vx and vy arrays: */ + Gauss* gauss=element->NewGauss(); + for(int i=0;iGaussNode(element->FiniteElement(),i); + + /*Recover vx and vy*/ + vx_input->GetInputValue(&vx,gauss); + values[i*dofpernode+0]=vx; + if(dofpernode==2){ + vy_input->GetInputValue(&vy,gauss); + values[i*dofpernode+1]=vy; + } + } + + solution->SetValues(numdof,doflist,values,INS_VAL); + + /*Free ressources:*/ + delete gauss; + xDelete(values); + xDelete(doflist); +}/*}}}*/ +void StressbalanceAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + + int approximation; + element->GetInputValue(&approximation,ApproximationEnum); + switch(approximation){ + case FSApproximationEnum: case NoneApproximationEnum: + InputUpdateFromSolutionFS(solution,element); + return; + case SIAApproximationEnum: + return; + case SSAApproximationEnum: + InputUpdateFromSolutionSSA(solution,element); + return; + case HOApproximationEnum: + InputUpdateFromSolutionHO(solution,element); + return; + case L1L2ApproximationEnum: + InputUpdateFromSolutionL1L2(solution,element); + return; + case SSAHOApproximationEnum: + InputUpdateFromSolutionSSAHO(solution,element); + return; + case HOFSApproximationEnum: + InputUpdateFromSolutionHOFS(solution,element); + return; + case SSAFSApproximationEnum: + InputUpdateFromSolutionSSAFS(solution,element); + return; + default: + _error_("Approximation "<parameters->FindParam(&islevelset,TransientIslevelsetEnum); + if(islevelset){ + SetActiveNodesLSMx(femmodel); + } + return; +}/*}}}*/ + +/*SSA*/ +ElementMatrix* StressbalanceAnalysis::CreateJacobianMatrixSSA(Element* element){/*{{{*/ + + /*Intermediaries*/ + int domaintype; + Element* basalelement; + + /*Get basal element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + break; + case Domain3DEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Initialize Element matrix, vectors and Gaussian points*/ + ElementMatrix* Ke=this->CreateKMatrixSSA(element); //Initialize Jacobian with regular SSA (first part of the Gateau derivative) + IssmDouble* dbasis = xNew(2*numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + Input* thickness_input = basalelement->GetInput(ThicknessEnum);_assert_(thickness_input); + Input* vx_input = basalelement->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input = basalelement->GetInput(VyEnum); _assert_(vy_input); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss = basalelement->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + basalelement->JacobianDeterminant(&Jdet,xyz_list,gauss); + basalelement->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + thickness_input->GetInputValue(&thickness, gauss); + basalelement->StrainRateSSA(&epsilon[0],xyz_list,gauss,vx_input,vy_input); + basalelement->ViscositySSADerivativeEpsSquare(&mu_prime,&epsilon[0]); + eps1[0]=2*epsilon[0]+epsilon[1]; eps2[0]=epsilon[2]; + eps1[1]=epsilon[2]; eps2[1]=epsilon[0]+2*epsilon[1]; + + for(int i=0;ivalues[2*numnodes*(2*i+0)+2*j+0]+=gauss->weight*Jdet*2.*mu_prime*thickness*eps1dotdphij*eps1dotdphii; + Ke->values[2*numnodes*(2*i+0)+2*j+1]+=gauss->weight*Jdet*2.*mu_prime*thickness*eps2dotdphij*eps1dotdphii; + Ke->values[2*numnodes*(2*i+1)+2*j+0]+=gauss->weight*Jdet*2.*mu_prime*thickness*eps1dotdphij*eps2dotdphii; + Ke->values[2*numnodes*(2*i+1)+2*j+1]+=gauss->weight*Jdet*2.*mu_prime*thickness*eps2dotdphij*eps2dotdphii; + } + } + } + + /*Transform Coordinate System*/ + basalelement->TransformStiffnessMatrixCoord(Ke,XYEnum); + + /*Clean up and return*/ + delete gauss; + xDelete(xyz_list); + xDelete(dbasis); + + /*clean-up and return*/ + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; + return Ke; + +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixSSA(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*Intermediaries*/ + int domaintype; + Element* basalelement; + + /*Get basal element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + break; + case Domain3DEnum: case Domain2DverticalEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + break; + default: _error_("mesh "<DeleteMaterials(); delete basalelement;}; + delete Ke1; + delete Ke2; + return Ke; +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixSSAFriction(Element* element){/*{{{*/ + + /*Return if element is inactive*/ + if(element->IsFloating() || !element->IsIceInElement()) return NULL; + + /*Intermediaries*/ + int dim,domaintype; + bool mainlyfloating; + int migration_style,point1; + IssmDouble alpha2,Jdet,fraction1,fraction2; + IssmDouble gllevelset,phi=1.; + IssmDouble *xyz_list = NULL; + Gauss* gauss = NULL; + + /*Get problem dimension*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DverticalEnum: dim = 1;break; + case Domain2DhorizontalEnum: dim = 2;break; + case Domain3DEnum: dim = 2;break; + default: _error_("mesh "<GetNumberOfNodes(); + int numdof = numnodes*dim; + + /*Initialize Element matrix and vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(SSAApproximationEnum); + IssmDouble* B = xNew(dim*numdof); + IssmDouble* D = xNewZeroInit(dim*dim); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + element->FindParam(&migration_style,GroundinglineMigrationEnum); + Input* surface_input = element->GetInput(SurfaceEnum); _assert_(surface_input); + Input* vx_input = element->GetInput(VxEnum); _assert_(vx_input); + Input* gllevelset_input = NULL; + Input* vy_input = NULL; + if(dim==2){vy_input = element->GetInput(VyEnum); _assert_(vy_input);} + + /*build friction object, used later on: */ + Friction* friction=new Friction(element,1); + + /*Recover portion of element that is grounded*/ + if(migration_style==SubelementMigrationEnum) phi=element->GetGroundedPortion(xyz_list); + if(migration_style==SubelementMigration2Enum){ + gllevelset_input=element->GetInput(MaskGroundediceLevelsetEnum); _assert_(gllevelset_input); + element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating); + gauss = element->NewGauss(point1,fraction1,fraction2,mainlyfloating,2); + } + else{ + gauss = element->NewGauss(2); + } + + /* Start looping on the number of gaussian points: */ + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + friction->GetAlpha2(&alpha2, gauss,vx_input,vy_input,NULL); + if(migration_style==SubelementMigrationEnum) alpha2=phi*alpha2; + if(migration_style==SubelementMigration2Enum){ + gllevelset_input->GetInputValue(&gllevelset, gauss); + if(gllevelset<0.) alpha2=0.; + } + + this->GetBSSAFriction(B,element,dim,xyz_list,gauss); + element->JacobianDeterminant(&Jdet, xyz_list,gauss); + for(int i=0;iweight*Jdet; + + TripleMultiply(B,dim,numdof,1, + D,dim,dim,0, + B,dim,numdof,0, + &Ke->values[0],1); + } + + /*Transform Coordinate System*/ + if(dim==2) element->TransformStiffnessMatrixCoord(Ke,XYEnum); + + /*Clean up and return*/ + delete gauss; + delete friction; + xDelete(xyz_list); + xDelete(B); + xDelete(D); + return Ke; +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixSSAViscous(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*Intermediaries*/ + int dim,domaintype,bsize; + IssmDouble viscosity,newviscosity,oldviscosity; + IssmDouble viscosity_overshoot,thickness,Jdet; + IssmDouble D_scalar; + IssmDouble *xyz_list = NULL; + + /*Get problem dimension*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DverticalEnum: dim = 1; bsize = 1; break; + case Domain2DhorizontalEnum: dim = 2; bsize = 3; break; + case Domain3DEnum: dim = 2; bsize = 3; break; + default: _error_("mesh "<GetNumberOfNodes(); + int numdof = numnodes*dim; + + /*Initialize Element matrix and vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(SSAApproximationEnum); + IssmDouble* B = xNew(bsize*numdof); + IssmDouble* Bprime = xNew(bsize*numdof); + IssmDouble* D = xNewZeroInit(bsize*bsize); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + Input* thickness_input=element->GetInput(ThicknessEnum); _assert_(thickness_input); + Input* vx_input=element->GetInput(VxEnum); _assert_(vx_input); + Input* vxold_input=element->GetInput(VxPicardEnum); _assert_(vxold_input); + Input* vy_input = NULL; + Input* vyold_input = NULL; + if(dim==2){ + vy_input = element->GetInput(VyEnum); _assert_(vy_input); + vyold_input = element->GetInput(VyPicardEnum); _assert_(vyold_input); + } + element->FindParam(&viscosity_overshoot,StressbalanceViscosityOvershootEnum); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss = element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + this->GetBSSA(B,element,dim,xyz_list,gauss); + this->GetBSSAprime(Bprime,element,dim,xyz_list,gauss); + + element->ViscositySSA(&viscosity,dim,xyz_list,gauss,vx_input,vy_input); + element->ViscositySSA(&oldviscosity,dim,xyz_list,gauss,vxold_input,vyold_input); + thickness_input->GetInputValue(&thickness, gauss); + + newviscosity=viscosity+viscosity_overshoot*(viscosity-oldviscosity); + D_scalar=2.*newviscosity*thickness*gauss->weight*Jdet; + for(int i=0;ivalues[0],1); + + for(int i=0;iTransformStiffnessMatrixCoord(Ke,XYEnum); + + /*Clean up and return*/ + delete gauss; + xDelete(xyz_list); + xDelete(D); + xDelete(Bprime); + xDelete(B); + return Ke; +}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreatePVectorSSA(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*Intermediaries*/ + int domaintype; + Element* basalelement; + + /*Get basal element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + break; + case Domain3DEnum: case Domain2DverticalEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + break; + default: _error_("mesh "<DeleteMaterials(); delete basalelement;}; + delete pe1; + delete pe2; + return pe; +}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreatePVectorSSADrivingStress(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*Intermediaries */ + int dim,domaintype; + IssmDouble thickness,Jdet,slope[2]; + IssmDouble* xyz_list = NULL; + + /*Get problem dimension*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DverticalEnum: dim = 1;break; + case Domain2DhorizontalEnum: dim = 2;break; + case Domain3DEnum: dim = 2;break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Initialize Element vector and vectors*/ + ElementVector* pe = element->NewElementVector(SSAApproximationEnum); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + Input* thickness_input=element->GetInput(ThicknessEnum); _assert_(thickness_input); + Input* surface_input =element->GetInput(SurfaceEnum); _assert_(surface_input); + IssmDouble rhog = element->GetMaterialParameter(MaterialsRhoIceEnum)*element->GetMaterialParameter(ConstantsGEnum); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctions(basis, gauss); + + thickness_input->GetInputValue(&thickness,gauss); + surface_input->GetInputDerivativeValue(&slope[0],xyz_list,gauss); + + for(int i=0;ivalues[i*dim+0]+=-rhog*thickness*slope[0]*Jdet*gauss->weight*basis[i]; + if(dim==2) pe->values[i*dim+1]+=-rhog*thickness*slope[1]*Jdet*gauss->weight*basis[i]; + } + } + + /*Transform coordinate system*/ + if(dim==2) element->TransformLoadVectorCoord(pe,XYEnum); + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + delete gauss; + return pe; +}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreatePVectorSSAFront(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*If no front, return NULL*/ + if(!element->IsIcefront()) return NULL; + + /*Intermediaries*/ + int dim,domaintype; + IssmDouble Jdet,thickness,bed,water_pressure,ice_pressure; + IssmDouble surface_under_water,base_under_water,pressure; + IssmDouble *xyz_list = NULL; + IssmDouble *xyz_list_front = NULL; + IssmDouble normal[2]; + + /*Get problem dimension*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DverticalEnum: dim = 1;break; + case Domain2DhorizontalEnum: dim = 2;break; + case Domain3DEnum: dim = 2;break; + default: _error_("mesh "<GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementVector* pe = element->NewElementVector(SSAApproximationEnum); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + Input* thickness_input = element->GetInput(ThicknessEnum); _assert_(thickness_input); + Input* base_input = element->GetInput(BaseEnum); _assert_(base_input); + IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoWaterEnum); + IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble gravity = element->GetMaterialParameter(ConstantsGEnum); + element->GetVerticesCoordinates(&xyz_list); + //element->ZeroLevelsetCoordinates(&xyz_list_front,xyz_list,MaskIceLevelsetEnum); + element->GetIcefrontCoordinates(&xyz_list_front,xyz_list,MaskIceLevelsetEnum); + element->NormalSection(&normal[0],xyz_list_front); + + /*Start looping on Gaussian points*/ + Gauss* gauss=element->NewGauss(xyz_list,xyz_list_front,3); + for(int ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); + thickness_input->GetInputValue(&thickness,gauss); + base_input->GetInputValue(&bed,gauss); + element->JacobianDeterminantSurface(&Jdet,xyz_list_front,gauss); + element->NodalFunctions(basis,gauss); + + surface_under_water = min(0.,thickness+bed); // 0 if the top of the glacier is above water level + base_under_water = min(0.,bed); // 0 if the bottom of the glacier is above water level + water_pressure = 1.0/2.0*gravity*rho_water*(surface_under_water*surface_under_water - base_under_water*base_under_water); + ice_pressure = 1.0/2.0*gravity*rho_ice*thickness*thickness; + pressure = ice_pressure + water_pressure; + + for(int i=0;ivalues[dim*i+0]+= pressure*Jdet*gauss->weight*normal[0]*basis[i]; + if(dim==2) pe->values[dim*i+1]+= pressure*Jdet*gauss->weight*normal[1]*basis[i]; + } + } + + /*Transform coordinate system*/ + if(dim==2) element->TransformLoadVectorCoord(pe,XYEnum); + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(xyz_list_front); + xDelete(basis); + delete gauss; + return pe; +}/*}}}*/ +void StressbalanceAnalysis::GetBSSA(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2. + * For node i, Bi can be expressed in the actual coordinate system + * by: + * 2D 1D + * Bi=[ dN/dx 0 ] Bi=[ dN/dx ] + * [ 0 dN/dy ] + * [ 1/2*dN/dy 1/2*dN/dx ] + * where N is the finiteelement function for node i. + * + * We assume B has been allocated already, of size: 3x(NDOF2*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(dim*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B: */ + if(dim==2){ + for(int i=0;i(dbasis); +}/*}}}*/ +void StressbalanceAnalysis::GetBSSAFriction(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B matrix. B=[B1 B2 B3] where Bi is square and of size 2. + * For node i, Bi can be expressed in the actual coordinate system + * by: + * 2D 1D + * Bi=[ N 0 ] Bi = N + * [ 0 N ] + * where N is the finiteelement function for node i. + * + * We assume B has been allocated already, of size: 2 x (numdof*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* basis=xNew(numnodes); + element->NodalFunctions(basis,gauss); + + /*Build L: */ + if(dim==2){ + for(int i=0;i(basis); +}/*}}}*/ +void StressbalanceAnalysis::GetBSSAprime(IssmDouble* Bprime,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B' matrix. B'=[B1' B2' B3'] where Bi' is of size 3*NDOF2. + * For node i, Bi' can be expressed in the actual coordinate system + * by: + * 2D 1D + * Bi_prime=[ 2*dN/dx dN/dy ] Bi_prime=[ 2*dN/dx ] + * [ dN/dx 2*dN/dy ] + * [ dN/dy dN/dx ] + * where hNis the finiteelement function for node i. + * + * We assume B' has been allocated already, of size: 3x(NDOF2*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(dim*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B': */ + if(dim==2){ + for(int i=0;i(dbasis); +}/*}}}*/ +void StressbalanceAnalysis::InputUpdateFromSolutionSSA(IssmDouble* solution,Element* element){/*{{{*/ + + int i,dim,domaintype; + IssmDouble rho_ice,g; + int* doflist=NULL; + IssmDouble* xyz_list=NULL; + Element* basalelement=NULL; + + /*Deal with pressure first*/ + int numvertices = element->GetNumberOfVertices(); + IssmDouble* pressure = xNew(numvertices); + IssmDouble* thickness = xNew(numvertices); + IssmDouble* surface = xNew(numvertices); + + element->FindParam(&domaintype,DomainTypeEnum); + rho_ice =element->GetMaterialParameter(MaterialsRhoIceEnum); + g =element->GetMaterialParameter(ConstantsGEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + element->GetInputListOnVertices(thickness,ThicknessEnum); + for(i=0;iGetVerticesCoordinates(&xyz_list); + element->GetInputListOnVertices(surface,SurfaceEnum); + for(i=0;iGetVerticesCoordinates(&xyz_list); + element->GetInputListOnVertices(surface,SurfaceEnum); + for(i=0;iAddInput(PressureEnum,pressure,P1Enum); + xDelete(pressure); + xDelete(thickness); + xDelete(surface); + + /*Get basal element*/ + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + break; + case Domain3DEnum: case Domain2DverticalEnum: + if(!element->IsOnBase()){xDelete(xyz_list); return;} + basalelement=element->SpawnBasalElement(); + break; + default: _error_("mesh "<GetNumberOfNodes(); + int numdof = numnodes*dim; + + /*Fetch dof list and allocate solution vectors*/ + basalelement->GetDofList(&doflist,SSAApproximationEnum,GsetEnum); + IssmDouble* values = xNew(numdof); + IssmDouble* vx = xNew(numnodes); + IssmDouble* vy = xNew(numnodes); + IssmDouble* vz = xNew(numnodes); + IssmDouble* vel = xNew(numnodes); + + /*Use the dof list to index into the solution vector: */ + for(i=0;iTransformSolutionCoord(&values[0],XYEnum); + + /*Ok, we have vx and vy in values, fill in vx and vy arrays: */ + for(i=0;i(vx[i])) _error_("NaN found in solution vector"); + + if(dim==2){ + vy[i]=values[i*dim+1]; + if(xIsNan(vy[i])) _error_("NaN found in solution vector"); + } + } + + /*Get Vz and compute vel*/ + if(dim==2){ + basalelement->GetInputListOnNodes(&vz[0],VzEnum,0.); + for(i=0;iGetInputListOnNodes(&vy[0],VyEnum,0.); + for(i=0;iInputChangeName(VxEnum,VxPicardEnum); + if(dim==2)element->InputChangeName(VyEnum,VyPicardEnum); + + /*Add vx and vy as inputs to the tria element: */ + element->AddBasalInput(VxEnum,vx,element->GetElementType()); + if(dim==2)element->AddBasalInput(VyEnum,vy,element->GetElementType()); + element->AddBasalInput(VelEnum,vel,element->GetElementType()); + + /*Free ressources:*/ + xDelete(vel); + xDelete(vz); + xDelete(vy); + xDelete(vx); + xDelete(values); + xDelete(xyz_list); + xDelete(doflist); + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; +}/*}}}*/ + +/*L1L2*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixL1L2(Element* element){/*{{{*/ + + /*compute all stiffness matrices for this element*/ + ElementMatrix* Ke1=CreateKMatrixL1L2Viscous(element); + ElementMatrix* Ke2=CreateKMatrixL1L2Friction(element); + ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); + + /*clean-up and return*/ + delete Ke1; + delete Ke2; + return Ke; +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixL1L2Friction(Element* element){/*{{{*/ + + if(!element->IsOnBase() || element->IsFloating()) return NULL; + Element* basalelement = element->SpawnBasalElement(); + ElementMatrix* Ke = CreateKMatrixSSAFriction(basalelement); + + /*clean-up and return*/ + basalelement->DeleteMaterials(); delete basalelement; + return Ke; +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixL1L2Viscous(Element* element){/*{{{*/ + + /*Intermediaries*/ + IssmDouble viscosity,Jdet; + IssmDouble *xyz_list = NULL; + + /*Get element on base*/ + Element* basalelement = element->GetBasalElement()->SpawnBasalElement(); + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = basalelement->GetNumberOfNodes(); + int numdof = numnodes*2; + + /*Initialize Element matrix and vectors*/ + ElementMatrix* Ke = basalelement->NewElementMatrix(L1L2ApproximationEnum); + IssmDouble* B = xNew(3*numdof); + IssmDouble* Bprime = xNew(3*numdof); + IssmDouble* D = xNewZeroInit(3*3); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + Input* surface_input = element->GetInput(SurfaceEnum); _assert_(surface_input); + Input* vx_input = element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input = element->GetInput(VyEnum); _assert_(vy_input); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss = element->NewGauss(5); + Gauss* gauss_base = basalelement->NewGauss(); + for(int ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); + gauss->SynchronizeGaussBase(gauss_base); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + this->GetBSSA(B,basalelement,2,xyz_list,gauss_base); + this->GetBSSAprime(Bprime,basalelement,2,xyz_list,gauss_base); + + element->ViscosityL1L2(&viscosity,xyz_list,gauss,vx_input,vy_input,surface_input); + + for(int i=0;i<3;i++) D[i*3+i]=2*viscosity*gauss->weight*Jdet; + + TripleMultiply(B,3,numdof,1, + D,3,3,0, + Bprime,3,numdof,0, + &Ke->values[0],1); + } + + /*Transform Coordinate System*/ + basalelement->TransformStiffnessMatrixCoord(Ke,XYEnum); + + /*Clean up and return*/ + delete gauss; + delete gauss_base; + basalelement->DeleteMaterials(); delete basalelement; + xDelete(xyz_list); + xDelete(D); + xDelete(Bprime); + xDelete(B); + return Ke; +}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreatePVectorL1L2(Element* element){/*{{{*/ + + /*Intermediaries*/ + int domaintype; + Element* basalelement; + + /*Get basal element*/ + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + break; + case Domain3DEnum: case Domain2DverticalEnum: + if(!element->IsOnBase()) return NULL; + basalelement = element->SpawnBasalElement(); + break; + default: _error_("mesh "<DeleteMaterials(); delete basalelement;}; + delete pe1; + delete pe2; + return pe; +}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreatePVectorL1L2DrivingStress(Element* element){/*{{{*/ + + /*Intermediaries */ + IssmDouble thickness,Jdet,slope[2]; + IssmDouble* xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and vectors*/ + ElementVector* pe = element->NewElementVector(L1L2ApproximationEnum); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + Input* thickness_input=element->GetInput(ThicknessEnum); _assert_(thickness_input); + Input* surface_input =element->GetInput(SurfaceEnum); _assert_(surface_input); + IssmDouble rhog = element->GetMaterialParameter(MaterialsRhoIceEnum)*element->GetMaterialParameter(ConstantsGEnum); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctions(basis, gauss); + + thickness_input->GetInputValue(&thickness,gauss); + surface_input->GetInputDerivativeValue(&slope[0],xyz_list,gauss); + + for(int i=0;ivalues[i*2+0]+=-rhog*thickness*slope[0]*Jdet*gauss->weight*basis[i]; + pe->values[i*2+1]+=-rhog*thickness*slope[1]*Jdet*gauss->weight*basis[i]; + } + } + + /*Transform coordinate system*/ + element->TransformLoadVectorCoord(pe,XYEnum); + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(basis); + delete gauss; + return pe; +}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreatePVectorL1L2Front(Element* element){/*{{{*/ + + /*If no front, return NULL*/ + if(!element->IsIcefront()) return NULL; + + /*Intermediaries*/ + IssmDouble Jdet,thickness,bed,water_pressure,ice_pressure; + IssmDouble surface_under_water,base_under_water,pressure; + IssmDouble *xyz_list = NULL; + IssmDouble *xyz_list_front = NULL; + IssmDouble normal[2]; + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementVector* pe = element->NewElementVector(L1L2ApproximationEnum); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + Input* thickness_input = element->GetInput(ThicknessEnum); _assert_(thickness_input); + Input* base_input = element->GetInput(BaseEnum); _assert_(base_input); + IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoWaterEnum); + IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble gravity = element->GetMaterialParameter(ConstantsGEnum); + element->GetVerticesCoordinates(&xyz_list); + element->ZeroLevelsetCoordinates(&xyz_list_front,xyz_list,MaskIceLevelsetEnum); + element->NormalSection(&normal[0],xyz_list_front); + + /*Start looping on Gaussian points*/ + Gauss* gauss=element->NewGauss(xyz_list,xyz_list_front,3); + for(int ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); + thickness_input->GetInputValue(&thickness,gauss); + base_input->GetInputValue(&bed,gauss); + element->JacobianDeterminantSurface(&Jdet,xyz_list_front,gauss); + element->NodalFunctions(basis,gauss); + + surface_under_water = min(0.,thickness+bed); // 0 if the top of the glacier is above water level + base_under_water = min(0.,bed); // 0 if the bottom of the glacier is above water level + water_pressure = 1.0/2.0*gravity*rho_water*(surface_under_water*surface_under_water - base_under_water*base_under_water); + ice_pressure = 1.0/2.0*gravity*rho_ice*thickness*thickness; + pressure = ice_pressure + water_pressure; + + for (int i=0;ivalues[2*i+0]+= pressure*Jdet*gauss->weight*normal[0]*basis[i]; + pe->values[2*i+1]+= pressure*Jdet*gauss->weight*normal[1]*basis[i]; + } + } + + /*Transform coordinate system*/ + element->TransformLoadVectorCoord(pe,XYEnum); + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(xyz_list_front); + xDelete(basis); + delete gauss; + return pe; +}/*}}}*/ +void StressbalanceAnalysis::InputUpdateFromSolutionL1L2(IssmDouble* solution,Element* element){/*{{{*/ + + int i,dim,domaintype; + IssmDouble rho_ice,g; + int* doflist=NULL; + IssmDouble* xyz_list=NULL; + Element* basalelement=NULL; + + /*Deal with pressure first*/ + int numvertices = element->GetNumberOfVertices(); + IssmDouble* pressure = xNew(numvertices); + IssmDouble* thickness = xNew(numvertices); + IssmDouble* surface = xNew(numvertices); + + element->FindParam(&dim,DomainDimensionEnum); + element->FindParam(&domaintype,DomainTypeEnum); + rho_ice =element->GetMaterialParameter(MaterialsRhoIceEnum); + g =element->GetMaterialParameter(ConstantsGEnum); + if(dim==2){ + element->GetInputListOnVertices(thickness,ThicknessEnum); + for(i=0;iGetVerticesCoordinates(&xyz_list); + element->GetInputListOnVertices(surface,SurfaceEnum); + for(i=0;iAddInput(PressureEnum,pressure,P1Enum); + xDelete(pressure); + xDelete(thickness); + xDelete(surface); + + /*Get basal element*/ + switch(domaintype){ + case Domain2DhorizontalEnum: + basalelement = element; + break; + case Domain3DEnum: + if(!element->IsOnBase()){xDelete(xyz_list); return;} + basalelement=element->SpawnBasalElement(); + break; + default: _error_("mesh "<GetNumberOfNodes(); + int numdof = numnodes*2; + + /*Fetch dof list and allocate solution vectors*/ + basalelement->GetDofList(&doflist,NoneApproximationEnum,GsetEnum); + IssmDouble* values = xNew(numdof); + IssmDouble* vx = xNew(numnodes); + IssmDouble* vy = xNew(numnodes); + IssmDouble* vz = xNew(numnodes); + IssmDouble* vel = xNew(numnodes); + + /*Use the dof list to index into the solution vector: */ + for(i=0;iTransformSolutionCoord(&values[0],XYEnum); + basalelement->FindParam(&domaintype,DomainTypeEnum); + + /*Ok, we have vx and vy in values, fill in vx and vy arrays: */ + for(i=0;i(vx[i])) _error_("NaN found in solution vector"); + if(xIsNan(vy[i])) _error_("NaN found in solution vector"); + } + + /*Get Vz and compute vel*/ + basalelement->GetInputListOnNodes(&vz[0],VzEnum,0.); + for(i=0;iInputChangeName(VxEnum,VxPicardEnum); + element->InputChangeName(VyEnum,VyPicardEnum); + + /*Add vx and vy as inputs to the tria element: */ + element->AddBasalInput(VxEnum,vx,element->GetElementType()); + element->AddBasalInput(VyEnum,vy,element->GetElementType()); + element->AddBasalInput(VelEnum,vel,element->GetElementType()); + + /*Free ressources:*/ + xDelete(vel); + xDelete(vz); + xDelete(vy); + xDelete(vx); + xDelete(values); + xDelete(xyz_list); + xDelete(doflist); + if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;}; +}/*}}}*/ + +/*HO*/ +ElementMatrix* StressbalanceAnalysis::CreateJacobianMatrixHO(Element* element){/*{{{*/ + + /*Intermediaries */ + IssmDouble Jdet; + IssmDouble eps1dotdphii,eps1dotdphij; + IssmDouble eps2dotdphii,eps2dotdphij; + IssmDouble mu_prime; + IssmDouble epsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ + IssmDouble eps1[3],eps2[3]; + IssmDouble *xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element matrix, vectors and Gaussian points*/ + ElementMatrix* Ke=this->CreateKMatrixHO(element); //Initialize Jacobian with regular HO (first part of the Gateau derivative) + IssmDouble* dbasis = xNew(3*numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + Input* vx_input = element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input = element->GetInput(VyEnum); _assert_(vy_input); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss = element->NewGauss(5); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + element->StrainRateHO(&epsilon[0],xyz_list,gauss,vx_input,vy_input); + element->ViscosityHODerivativeEpsSquare(&mu_prime,&epsilon[0]); + eps1[0]=2*epsilon[0]+epsilon[1]; eps2[0]=epsilon[2]; + eps1[1]=epsilon[2]; eps2[1]=epsilon[0]+2*epsilon[1]; + eps1[2]=epsilon[3]; eps2[2]=epsilon[4]; + + for(int i=0;ivalues[2*numnodes*(2*i+0)+2*j+0]+=gauss->weight*Jdet*2.*mu_prime*eps1dotdphij*eps1dotdphii; + Ke->values[2*numnodes*(2*i+0)+2*j+1]+=gauss->weight*Jdet*2.*mu_prime*eps2dotdphij*eps1dotdphii; + Ke->values[2*numnodes*(2*i+1)+2*j+0]+=gauss->weight*Jdet*2.*mu_prime*eps1dotdphij*eps2dotdphii; + Ke->values[2*numnodes*(2*i+1)+2*j+1]+=gauss->weight*Jdet*2.*mu_prime*eps2dotdphij*eps2dotdphii; + } + } + } + + /*Transform Coordinate System*/ + element->TransformStiffnessMatrixCoord(Ke,XYEnum); + + /*Clean up and return*/ + delete gauss; + xDelete(xyz_list); + xDelete(dbasis); + return Ke; +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixHO(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*compute all stiffness matrices for this element*/ + ElementMatrix* Ke1=CreateKMatrixHOViscous(element); + ElementMatrix* Ke2=CreateKMatrixHOFriction(element); + ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); + + /*clean-up and return*/ + delete Ke1; + delete Ke2; + return Ke; +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixHOViscous(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*Intermediaries*/ + int dim,bsize; + IssmDouble viscosity,newviscosity,oldviscosity; + IssmDouble viscosity_overshoot,thickness,Jdet; + IssmDouble D_scalar; + IssmDouble *xyz_list = NULL; + + /*Get problem dimension*/ + element->FindParam(&dim,DomainDimensionEnum); + if(dim==2) bsize = 2; + else bsize = 5; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + int numdof = numnodes*(dim-1); + + /*Initialize Element matrix and vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(HOApproximationEnum); + IssmDouble* B = xNew(bsize*numdof); + IssmDouble* Bprime = xNew(bsize*numdof); + IssmDouble* D = xNewZeroInit(bsize*bsize); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + Input* vx_input = element->GetInput(VxEnum); _assert_(vx_input); + Input* vxold_input = element->GetInput(VxPicardEnum); _assert_(vxold_input); + Input* vy_input = NULL; + Input* vyold_input = NULL; + if(dim==3){ + vy_input=element->GetInput(VyEnum); _assert_(vy_input); + vyold_input=element->GetInput(VyPicardEnum); _assert_(vyold_input); + } + element->FindParam(&viscosity_overshoot,StressbalanceViscosityOvershootEnum); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss = element->NewGauss(5); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + this->GetBHO(B,element,dim,xyz_list,gauss); + this->GetBHOprime(Bprime,element,dim,xyz_list,gauss); + + element->ViscosityHO(&viscosity,dim,xyz_list,gauss,vx_input,vy_input); + element->ViscosityHO(&oldviscosity,dim,xyz_list,gauss,vxold_input,vyold_input); + + newviscosity=viscosity+viscosity_overshoot*(viscosity-oldviscosity); + D_scalar=2.*newviscosity*gauss->weight*Jdet; + for(int i=0;ivalues[0],1); + } + + /*Transform Coordinate System*/ + if(dim==3) element->TransformStiffnessMatrixCoord(Ke,XYEnum); + + /*Clean up and return*/ + delete gauss; + xDelete(xyz_list); + xDelete(D); + xDelete(Bprime); + xDelete(B); + return Ke; +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixHOFriction(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + if(element->IsFloating() || !element->IsOnBase()) return NULL; + + /*Intermediaries*/ + int dim; + bool mainlyfloating; + int migration_style,point1; + IssmDouble alpha2,Jdet,fraction1,fraction2; + IssmDouble gllevelset,phi=1.; + IssmDouble *xyz_list_base = NULL; + Gauss* gauss = NULL; + + /*Get problem dimension*/ + element->FindParam(&dim,DomainDimensionEnum); + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + int numdof = numnodes*(dim-1); + + /*Initialize Element matrix and vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(HOApproximationEnum); + IssmDouble* B = xNew((dim-1)*numdof); + IssmDouble* D = xNewZeroInit((dim-1)*(dim-1)); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinatesBase(&xyz_list_base); + element->FindParam(&migration_style,GroundinglineMigrationEnum); + Input* vx_input = element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input = element->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input = NULL; + Input* gllevelset_input = NULL; + if(dim==3){vz_input=element->GetInput(VzEnum); _assert_(vz_input);} + + /*build friction object, used later on: */ + Friction* friction=new Friction(element,2); + + /*Recover portion of element that is grounded*/ + if(migration_style==SubelementMigrationEnum) phi=element->GetGroundedPortion(xyz_list_base); + if(migration_style==SubelementMigration2Enum){ + gllevelset_input=element->GetInput(MaskGroundediceLevelsetEnum); _assert_(gllevelset_input); + element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating); + //gauss = element->NewGauss(point1,fraction1,fraction2,mainlyfloating,2); + gauss=element->NewGaussBase(2); + } + else{ + gauss=element->NewGaussBase(2); + } + + /* Start looping on the number of gaussian points: */ + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + friction->GetAlpha2(&alpha2,gauss,vx_input,vy_input,vz_input); + if(migration_style==SubelementMigrationEnum) alpha2=phi*alpha2; + if(migration_style==SubelementMigration2Enum){ + gllevelset_input->GetInputValue(&gllevelset, gauss); + if(gllevelset<0.) alpha2=0.; + } + + this->GetBHOFriction(B,element,dim,xyz_list_base,gauss); + element->JacobianDeterminantBase(&Jdet,xyz_list_base,gauss); + for(int i=0;iweight*Jdet; + + TripleMultiply(B,dim-1,numdof,1, + D,dim-1,dim-1,0, + B,dim-1,numdof,0, + &Ke->values[0],1); + } + + /*Transform Coordinate System*/ + if(dim==3) element->TransformStiffnessMatrixCoord(Ke,XYEnum); + + /*Clean up and return*/ + delete gauss; + delete friction; + xDelete(xyz_list_base); + xDelete(B); + xDelete(D); + return Ke; +}/*}}}*/ +#ifdef FSANALYTICAL +ElementVector* StressbalanceAnalysis::CreatePVectorHO(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*Intermediaries */ + int dim; + IssmDouble x_coord,y_coord,z_coord; + IssmDouble Jdet,forcex,forcey,forcez; + IssmDouble* xyz_list = NULL; + + /*Get problem dimension*/ + element->FindParam(&dim,DomainDimensionEnum); + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and vectors*/ + ElementVector* pe=element->NewElementVector(HOApproximationEnum); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(3); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctions(basis, gauss); + + x_coord=element->GetXcoord(gauss); + y_coord=element->GetYcoord(gauss); + if(dim==3) z_coord=element->GetZcoord(gauss); + else z_coord=0.; + + forcex=fx(x_coord,y_coord,z_coord,FSANALYTICAL); + forcey=fy(x_coord,y_coord,z_coord,FSANALYTICAL); + + for(int i=0;ivalues[i*(dim-1)+0]+=forcex*Jdet*gauss->weight*basis[i]; + pe->values[i*(dim-1)+1]+=forcey*Jdet*gauss->weight*basis[i]; + } + } + + /*Transform coordinate system*/ + if(dim==3) element->TransformLoadVectorCoord(pe,XYEnum); + + /*Clean up and return*/ + xDelete(basis); + xDelete(xyz_list); + delete gauss; + return pe; +}/*}}}*/ +#else +ElementVector* StressbalanceAnalysis::CreatePVectorHO(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*compute all load vectors for this element*/ + ElementVector* pe1=CreatePVectorHODrivingStress(element); + ElementVector* pe2=CreatePVectorHOFront(element); + ElementVector* pe =new ElementVector(pe1,pe2); + + /*clean-up and return*/ + delete pe1; + delete pe2; + return pe; +}/*}}}*/ #endif -}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreatePVectorHODrivingStress(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*Intermediaries */ + int dim; + IssmDouble Jdet,slope[3]; + IssmDouble* xyz_list = NULL; + + /*Get problem dimension*/ + element->FindParam(&dim,DomainDimensionEnum); + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and vectors*/ + ElementVector* pe=element->NewElementVector(HOApproximationEnum); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + Input* surface_input = element->GetInput(SurfaceEnum); _assert_(surface_input); + IssmDouble rhog = element->GetMaterialParameter(MaterialsRhoIceEnum)*element->GetMaterialParameter(ConstantsGEnum); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(3); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctions(basis, gauss); + surface_input->GetInputDerivativeValue(&slope[0],xyz_list,gauss); + + for(int i=0;ivalues[i*(dim-1)+0]+=-rhog*slope[0]*Jdet*gauss->weight*basis[i]; + if(dim==3) pe->values[i*(dim-1)+1]+=-rhog*slope[1]*Jdet*gauss->weight*basis[i]; + } + } + + /*Transform coordinate system*/ + if(dim==3) element->TransformLoadVectorCoord(pe,XYEnum); + + /*Clean up and return*/ + xDelete(basis); + xDelete(xyz_list); + delete gauss; + return pe; +}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreatePVectorHOFront(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*If no front, return NULL*/ + if(!element->IsIcefront()) return NULL; + + /*Intermediaries*/ + int dim; + IssmDouble Jdet,surface,z,water_pressure,ice_pressure; + IssmDouble surface_under_water,base_under_water,pressure; + IssmDouble* xyz_list = NULL; + IssmDouble* xyz_list_front = NULL; + IssmDouble normal[3]; + Gauss* gauss = NULL; + + /*Get problem dimension*/ + element->FindParam(&dim,DomainDimensionEnum); + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + int numvertices = element->GetNumberOfVertices(); + + /*Initialize Element vector and other vectors*/ + ElementVector* pe = element->NewElementVector(HOApproximationEnum); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + Input* surface_input = element->GetInput(SurfaceEnum); _assert_(surface_input); + IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoWaterEnum); + IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble gravity = element->GetMaterialParameter(ConstantsGEnum); + element->GetVerticesCoordinates(&xyz_list); + element->ZeroLevelsetCoordinates(&xyz_list_front,xyz_list,MaskIceLevelsetEnum); + element->NormalSection(&normal[0],xyz_list_front); + + /*Initialize gauss points*/ + IssmDouble zmax=xyz_list[0*3+(dim-1)]; for(int i=1;izmax) zmax=xyz_list[i*3+(dim-1)]; + IssmDouble zmin=xyz_list[0*3+(dim-1)]; for(int i=1;i0. && zmin<0.) gauss=element->NewGauss(xyz_list,xyz_list_front,3,10);//refined in vertical because of the sea level discontinuity + else gauss=element->NewGauss(xyz_list,xyz_list_front,3,3); + + /* Start looping on the number of gaussian points: */ + for(int ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); + surface_input->GetInputValue(&surface,gauss); + if(dim==3) z=element->GetZcoord(gauss); + else z=element->GetYcoord(gauss); + element->NodalFunctions(basis,gauss); + element->JacobianDeterminantSurface(&Jdet,xyz_list_front,gauss); + + water_pressure = rho_water*gravity*min(0.,z);//0 if the gaussian point is above water level + ice_pressure = rho_ice*gravity*(surface-z); + pressure = ice_pressure + water_pressure; + + for (int i=0;ivalues[(dim-1)*i+0]+= pressure*Jdet*gauss->weight*normal[0]*basis[i]; + if(dim==3) pe->values[(dim-1)*i+1]+= pressure*Jdet*gauss->weight*normal[1]*basis[i]; + } + } + + /*Transform coordinate system*/ + if(dim==3)element->TransformLoadVectorCoord(pe,XYEnum); + + /*Clean up and return*/ + xDelete(basis); + xDelete(xyz_list); + xDelete(xyz_list_front); + delete gauss; + return pe; +}/*}}}*/ +void StressbalanceAnalysis::GetBHO(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF2. + * For node i, Bi can be expressed in the actual coordinate system + * by: + * 3D 2D + * + * Bi=[ dh/dx 0 ] Bi=[ dh/dx] + * [ 0 dh/dy ] [ dh/dy] + * [ 1/2*dh/dy 1/2*dh/dx ] + * [ 1/2*dh/dz 0 ] + * [ 0 1/2*dh/dz ] + * where h is the interpolation function for node i. + * + * We assume B has been allocated already, of size: 5x(NDOF2*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(dim*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B: */ + if(dim==2){ + for(int i=0;i(dbasis); +}/*}}}*/ +void StressbalanceAnalysis::GetBHOprime(IssmDouble* Bprime,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B' matrix. B'=[B1' B2' B3'] where Bi' is of size 3*NDOF2. + * For node i, Bi' can be expressed in the actual coordinate system + * by: + * 3D 2D + * Bi_prime=[ 2*dN/dx dN/dy ] Bi_prime=[ 2*dN/dx ] + * [ dN/dx 2*dN/dy ] [ dN/dy ] + * [ dN/dy dN/dx ] + * where hNis the finiteelement function for node i. + * + * We assume B' has been allocated already, of size: 3x(NDOF2*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(dim*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B': */ + if(dim==3){ + for(int i=0;i(dbasis); +}/*}}}*/ +void StressbalanceAnalysis::GetBHOFriction(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B matrix. B=[B1 B2 B3] where Bi is square and of size 2. + * For node i, Bi can be expressed in the actual coordinate system + * by: + * 3D 2D + * Bi=[ N 0 ] Bi=N + * [ 0 N ] + * where N is the finiteelement function for node i. + * + * We assume B has been allocated already, of size: 2 x (numdof*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* basis=xNew(numnodes); + element->NodalFunctions(basis,gauss); + + /*Build L: */ + if(dim==3){ + for(int i=0;i(basis); +}/*}}}*/ +void StressbalanceAnalysis::InputUpdateFromSolutionHO(IssmDouble* solution,Element* element){/*{{{*/ + + int i,dim; + int* doflist=NULL; + IssmDouble* xyz_list=NULL; + + /*Get mesh dimension*/ + element->FindParam(&dim,DomainDimensionEnum); + + /*Deal with pressure first*/ + int numvertices = element->GetNumberOfVertices(); + IssmDouble* pressure = xNew(numvertices); + IssmDouble* surface = xNew(numvertices); + IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble g = element->GetMaterialParameter(ConstantsGEnum); + element->GetVerticesCoordinates(&xyz_list); + element->GetInputListOnVertices(surface,SurfaceEnum); + for(i=0;iAddInput(PressureEnum,pressure,P1Enum); + xDelete(pressure); + xDelete(surface); + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + int numdof = numnodes*(dim-1); + + /*Fetch dof list and allocate solution vectors*/ + element->GetDofList(&doflist,HOApproximationEnum,GsetEnum); + IssmDouble* values = xNew(numdof); + IssmDouble* vx = xNew(numnodes); + IssmDouble* vy = xNew(numnodes); + IssmDouble* vz = xNew(numnodes); + IssmDouble* vel = xNew(numnodes); + + /*Use the dof list to index into the solution vector: */ + for(i=0;iTransformSolutionCoord(&values[0],XYEnum); + + /*Ok, we have vx and vy in values, fill in vx and vy arrays: */ + for(i=0;i(vx[i])) _error_("NaN found in solution vector"); + if(dim==3){ + vy[i]=values[i*(dim-1)+1]; + if(xIsNan(vy[i])) _error_("NaN found in solution vector"); + } + } + + /*Get Vz and compute vel*/ + if(dim==3){ + element->GetInputListOnNodes(&vz[0],VzEnum,0.); + for(i=0;iGetInputListOnNodes(&vy[0],VyEnum,0.); + for(i=0;iInputChangeName(VxEnum,VxPicardEnum); + if(dim==3)element->InputChangeName(VyEnum,VyPicardEnum); + + /*Add vx and vy as inputs to the element: */ + //element->AddInput(VxEnum, vx,element->GetElementType()); + //element->AddInput(VyEnum, vy,element->GetElementType()); + //element->AddInput(VelEnum,vel,element->GetElementType()); + element->AddInput(VxEnum,vx,element->GetElementType()); + if(dim==3)element->AddInput(VyEnum,vy,element->GetElementType()); + element->AddInput(VelEnum,vel,element->GetElementType()); + + /*Free ressources:*/ + xDelete(vel); + xDelete(vz); + xDelete(vy); + xDelete(vx); + xDelete(values); + xDelete(xyz_list); + xDelete(doflist); +}/*}}}*/ + +/*FS*/ +ElementVector* StressbalanceAnalysis::CreateDVectorFS(Element* element){/*{{{*/ + + int dim; + + /*Get problem dimension*/ + element->FindParam(&dim,DomainDimensionEnum); + + /*Fetch number of nodes and dof for this finite element*/ + int vnumnodes = element->NumberofNodesVelocity(); + int pnumnodes = element->NumberofNodesPressure(); + + /*Initialize output vector*/ + ElementVector* de = element->NewElementVector(FSvelocityEnum); + + for(int i=0;ivalues[i*dim+j]=VelocityEnum; + } + for(int i=0;ivalues[vnumnodes*dim+i]=PressureEnum; + } + + return de; + +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateJacobianMatrixFS(Element* element){/*{{{*/ + + /*Intermediaries */ + int i,j; + IssmDouble Jdet; + IssmDouble eps1dotdphii,eps1dotdphij; + IssmDouble eps2dotdphii,eps2dotdphij; + IssmDouble eps3dotdphii,eps3dotdphij; + IssmDouble mu_prime; + IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ + IssmDouble eps1[3],eps2[3],eps3[3]; + IssmDouble *xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int vnumnodes = element->NumberofNodesVelocity(); + int pnumnodes = element->NumberofNodesPressure(); + int numdof = vnumnodes*NDOF3 + pnumnodes*NDOF1; + + /*Prepare coordinate system list*/ + int* cs_list = xNew(vnumnodes+pnumnodes); + for(i=0;iCreateKMatrixFS(element); //Initialize Jacobian with regular FS (first part of the Gateau derivative) + IssmDouble* dbasis = xNew(3*vnumnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + Input* vx_input = element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input = element->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input = element->GetInput(VzEnum); _assert_(vz_input); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss = element->NewGauss(5); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctionsDerivativesVelocity(dbasis,xyz_list,gauss); + + //element->StrainRateFS(&epsilon[0],xyz_list,gauss,vx_input,vy_input,vz_input); + //eps1[0]=epsilon[0]; eps2[0]=epsilon[3]; eps3[0]=epsilon[4]; + //eps1[1]=epsilon[3]; eps2[1]=epsilon[1]; eps3[1]=epsilon[5]; + //eps1[2]=epsilon[4]; eps2[2]=epsilon[5]; eps3[2]=epsilon[2]; + element->StrainRateHO(&epsilon[0],xyz_list,gauss,vx_input,vy_input); + eps1[0]=epsilon[0]; eps2[0]=epsilon[2]; eps3[0]=epsilon[3]; + eps1[1]=epsilon[2]; eps2[1]=epsilon[1]; eps3[1]=epsilon[4]; + eps1[2]=epsilon[3]; eps2[2]=epsilon[4]; eps3[2]= -epsilon[0] -epsilon[1]; + element->ViscosityFSDerivativeEpsSquare(&mu_prime,&epsilon[0]); + + for(i=0;ivalues[numdof*(3*i+0)+3*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps1dotdphii; + Ke->values[numdof*(3*i+0)+3*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps1dotdphii; + Ke->values[numdof*(3*i+0)+3*j+2]+=gauss->weight*Jdet*2*mu_prime*eps3dotdphij*eps1dotdphii; + + Ke->values[numdof*(3*i+1)+3*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps2dotdphii; + Ke->values[numdof*(3*i+1)+3*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps2dotdphii; + Ke->values[numdof*(3*i+1)+3*j+2]+=gauss->weight*Jdet*2*mu_prime*eps3dotdphij*eps2dotdphii; + + Ke->values[numdof*(3*i+2)+3*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps3dotdphii; + Ke->values[numdof*(3*i+2)+3*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps3dotdphii; + Ke->values[numdof*(3*i+2)+3*j+2]+=gauss->weight*Jdet*2*mu_prime*eps3dotdphij*eps3dotdphii; + } + } + } + + /*Transform Coordinate System*/ + element->TransformStiffnessMatrixCoord(Ke,cs_list); + + /*Clean up and return*/ + delete gauss; + xDelete(xyz_list); + xDelete(dbasis); + xDelete(cs_list); + return Ke; +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixFS(Element* element){/*{{{*/ + + /*Get type of algorithm*/ + int fe_FS; + element->FindParam(&fe_FS,FlowequationFeFSEnum); + + /*compute all stiffness matrices for this element*/ + ElementMatrix* Ke1=NULL; + if(fe_FS==XTaylorHoodEnum) + Ke1=CreateKMatrixFSViscousXTH(element); + else + Ke1=CreateKMatrixFSViscous(element); + + ElementMatrix* Ke2=CreateKMatrixFSFriction(element); + ElementMatrix* Ke3=CreateKMatrixFSShelf(element); + ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2,Ke3); + + /*clean-up and return*/ + delete Ke1; + delete Ke2; + delete Ke3; + return Ke; +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixFSViscousXTH(Element* element){/*{{{*/ + + /*Intermediaries*/ + int i,dim,epssize; + IssmDouble r,FSreconditioning,Jdet; + IssmDouble *xyz_list = NULL; + + /*Get problem dimension*/ + element->FindParam(&dim,DomainDimensionEnum); + element->FindParam(&r,AugmentedLagrangianREnum); + if(dim==2) epssize = 3; + else epssize = 6; + + /*Fetch number of nodes and dof for this finite element*/ + int vnumnodes = element->NumberofNodesVelocity(); + int pnumnodes = element->NumberofNodesPressure(); + int numdof = vnumnodes*dim + pnumnodes; + int bsize = epssize + 2; + + /*Prepare coordinate system list*/ + int* cs_list = xNew(vnumnodes+pnumnodes); + if(dim==2) for(i=0;iNewElementMatrix(FSvelocityEnum); + IssmDouble* B = xNew(bsize*numdof); + IssmDouble* Bprime = xNew(bsize*numdof); + IssmDouble* D = xNewZeroInit(bsize*bsize); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + element->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); + Input* vx_input=element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=element->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input; + if(dim==3){vz_input=element->GetInput(VzEnum); _assert_(vz_input);} + + /* Start looping on the number of gaussian points: */ + Gauss* gauss = element->NewGauss(5); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + this->GetBFS(B,element,dim,xyz_list,gauss); + this->GetBFSprime(Bprime,element,dim,xyz_list,gauss); + + for(i=0;iweight*Jdet; + for(i=epssize;iweight*Jdet; + + TripleMultiply(B,bsize,numdof,1, + D,bsize,bsize,0, + Bprime,bsize,numdof,0, + &Ke->values[0],1); + } + + /*Transform Coordinate System*/ + element->TransformStiffnessMatrixCoord(Ke,cs_list); + + /*Clean up and return*/ + delete gauss; + xDelete(xyz_list); + xDelete(D); + xDelete(Bprime); + xDelete(B); + xDelete(cs_list); + return Ke; +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixFSViscous(Element* element){/*{{{*/ + + /*Intermediaries*/ + int i,dim,epssize; + IssmDouble viscosity,FSreconditioning,Jdet; + IssmDouble *xyz_list = NULL; + + /*Get problem dimension*/ + element->FindParam(&dim,DomainDimensionEnum); + if(dim==2) epssize = 3; + else epssize = 6; + + /*Fetch number of nodes and dof for this finite element*/ + int vnumnodes = element->NumberofNodesVelocity(); + int pnumnodes = element->NumberofNodesPressure(); + int numdof = vnumnodes*dim + pnumnodes; + int bsize = epssize + 2; + + /*Prepare coordinate system list*/ + int* cs_list = xNew(vnumnodes+pnumnodes); + if(dim==2) for(i=0;iNewElementMatrix(FSvelocityEnum); + IssmDouble* B = xNew(bsize*numdof); + IssmDouble* Bprime = xNew(bsize*numdof); + IssmDouble* D = xNewZeroInit(bsize*bsize); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + element->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); + Input* vx_input=element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=element->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input; + if(dim==3){vz_input=element->GetInput(VzEnum); _assert_(vz_input);} + + /* Start looping on the number of gaussian points: */ + Gauss* gauss = element->NewGauss(5); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + this->GetBFS(B,element,dim,xyz_list,gauss); + this->GetBFSprime(Bprime,element,dim,xyz_list,gauss); + + element->ViscosityFS(&viscosity,dim,xyz_list,gauss,vx_input,vy_input,vz_input); + for(i=0;iweight*Jdet; + for(i=epssize;iweight*Jdet; + + TripleMultiply(B,bsize,numdof,1, + D,bsize,bsize,0, + Bprime,bsize,numdof,0, + &Ke->values[0],1); + } + + /*Transform Coordinate System*/ + element->TransformStiffnessMatrixCoord(Ke,cs_list); + + /*Clean up and return*/ + delete gauss; + xDelete(xyz_list); + xDelete(D); + xDelete(Bprime); + xDelete(B); + xDelete(cs_list); + return Ke; +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixFSShelf(Element* element){/*{{{*/ + + if(!element->IsFloating() || !element->IsOnBase()) return NULL; + + /*If on not water or not FS, skip stiffness: */ + int approximation,shelf_dampening; + element->GetInputValue(&approximation,ApproximationEnum); + if(approximation!=FSApproximationEnum && approximation!=SSAFSApproximationEnum && approximation!=HOFSApproximationEnum) return NULL; + element->FindParam(&shelf_dampening,StressbalanceShelfDampeningEnum); + if(shelf_dampening==0) return NULL; + + /*Intermediaries*/ + bool mainlyfloating; + int j,i,dim; + IssmDouble Jdet,slope2,scalar,dt; + IssmDouble slope[3]; + IssmDouble *xyz_list_base = NULL; + IssmDouble *xyz_list = NULL; + Gauss* gauss = NULL; + + /*Get problem dimension*/ + element->FindParam(&dim,DomainDimensionEnum); + + /*Fetch number of nodes and dof for this finite element*/ + int vnumnodes = element->NumberofNodesVelocity(); + int pnumnodes = element->NumberofNodesPressure(); + int numdof = vnumnodes*dim + pnumnodes; + + /*Initialize Element matrix and vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(FSvelocityEnum); + IssmDouble* vbasis = xNew(vnumnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinatesBase(&xyz_list_base); + element->GetVerticesCoordinates(&xyz_list); + element->FindParam(&dt,TimesteppingTimeStepEnum); + if(dt==0) dt=1.e+5; + IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoWaterEnum); + IssmDouble gravity = element->GetMaterialParameter(ConstantsGEnum); + Input* surface_input = element->GetInput(SurfaceEnum); _assert_(surface_input); + + /* Start looping on the number of gaussian points: */ + gauss=element->NewGaussBase(3); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + surface_input->GetInputDerivativeValue(&slope[0],xyz_list,gauss); + element->NodalFunctionsVelocity(vbasis,gauss); + element->JacobianDeterminantBase(&Jdet,xyz_list_base,gauss); + if(dim==2) slope2=slope[0]*slope[0]; + else if(dim==3) slope2=slope[0]*slope[0]+slope[1]*slope[1]; + scalar = rho_water*gravity*sqrt(1+slope2)*gauss->weight*Jdet*dt; + for(i=0;ivalues[numdof*((i+1)*dim-1)+(j+1)*dim-1] += scalar*vbasis[i]*vbasis[j]; + } + } + } + + /*DO NOT Transform Coordinate System: this stiffness matrix is already expressed in tangential coordinates*/ + + /*Clean up and return*/ + delete gauss; + xDelete(xyz_list_base); + xDelete(xyz_list); + xDelete(vbasis); + return Ke; +}/*}}}*/ +#ifdef FSANALYTICAL +ElementMatrix* StressbalanceAnalysis::CreateKMatrixFSFriction(Element* element){/*{{{*/ + + if(element->IsFloating() || !element->IsOnBase()) return NULL; + + /*If on water or not FS, skip stiffness: */ + int approximation; + element->GetInputValue(&approximation,ApproximationEnum); + if(approximation!=FSApproximationEnum && approximation!=SSAFSApproximationEnum && approximation!=HOFSApproximationEnum) return NULL; + + /*Intermediaries*/ + int i,dim; + IssmDouble alpha2,Jdet; + IssmDouble x_coord,y_coord,z_coord; + IssmDouble *xyz_list_base = NULL; + Gauss* gauss = NULL; + + /*Get problem dimension*/ + element->FindParam(&dim,DomainDimensionEnum); + + /*Fetch number of nodes and dof for this finite element*/ + int vnumnodes = element->NumberofNodesVelocity(); + int pnumnodes = element->NumberofNodesPressure(); + int numdof = vnumnodes*dim + pnumnodes; + + /*Initialize Element matrix and vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(FSvelocityEnum); + IssmDouble* B = xNew((dim-1)*numdof); + IssmDouble* D = xNewZeroInit((dim-1)*(dim-1)); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinatesBase(&xyz_list_base); + Input* vx_input = element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input = element->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input = NULL; + if(dim==3){ vz_input = element->GetInput(VzEnum); _assert_(vz_input);} + + /* Start looping on the number of gaussian points: */ + gauss=element->NewGaussBase(10); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + x_coord=element->GetXcoord(gauss); + y_coord=element->GetYcoord(gauss); + if(dim==3) z_coord=element->GetZcoord(gauss); + else z_coord=0.; + + alpha2=alpha(x_coord,y_coord,z_coord,FSANALYTICAL); + + this->GetBFSFriction(B,element,dim,xyz_list_base,gauss); + element->JacobianDeterminantBase(&Jdet,xyz_list_base,gauss); + for(int i=0;iweight*Jdet; //taub_x = -alpha2 v_x (same for y) + + TripleMultiply(B,dim-1,numdof,1, + D,dim-1,dim-1,0, + B,dim-1,numdof,0, + &Ke->values[0],1); + } + + /*DO NOT Transform Coordinate System: this stiffness matrix is already expressed in tangential coordinates*/ + + /*Clean up and return*/ + delete gauss; + xDelete(xyz_list_base); + xDelete(B); + xDelete(D); + return Ke; +}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreatePVectorFS(Element* element){/*{{{*/ + + int i,dim,fe_FS; + IssmDouble x_coord,y_coord,z_coord; + IssmDouble Jdet,forcex,forcey,forcez; + IssmDouble *xyz_list = NULL; + + element->FindParam(&fe_FS,FlowequationFeFSEnum); + element->FindParam(&dim,DomainDimensionEnum); + + /*Fetch number of nodes and dof for this finite element*/ + int vnumnodes = element->NumberofNodesVelocity(); + int pnumnodes = element->NumberofNodesPressure(); + + /*Prepare coordinate system list*/ + int* cs_list = xNew(vnumnodes+pnumnodes); + if(dim==2) for(i=0;iNewElementVector(FSvelocityEnum); + IssmDouble* vbasis = xNew(vnumnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(5); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctionsVelocity(vbasis,gauss); + + x_coord=element->GetXcoord(gauss); + y_coord=element->GetYcoord(gauss); + if(dim==3) z_coord=element->GetZcoord(gauss); + else z_coord=0.; + + forcex=fx(x_coord,y_coord,z_coord,FSANALYTICAL); + forcey=fy(x_coord,y_coord,z_coord,FSANALYTICAL); + forcez=fz(x_coord,y_coord,z_coord,FSANALYTICAL); + + for(i=0;ivalues[i*dim+0] += forcex *Jdet*gauss->weight*vbasis[i]; + pe->values[i*dim+1] += forcey *Jdet*gauss->weight*vbasis[i]; + if(dim==3) pe->values[i*dim+2] += forcez *Jdet*gauss->weight*vbasis[i]; + } + } + + /*Transform coordinate system*/ + element->TransformLoadVectorCoord(pe,cs_list); + + /*Clean up and return*/ + delete gauss; + xDelete(cs_list); + xDelete(vbasis); + xDelete(xyz_list); + if(fe_FS==XTaylorHoodEnum){ + ElementVector* pe2=CreatePVectorFSViscousXTH(element); + ElementVector* pe3 = new ElementVector(pe,pe2); + delete pe; + delete pe2; + return pe3; + } + return pe; +}/*}}}*/ +#else +ElementMatrix* StressbalanceAnalysis::CreateKMatrixFSFriction(Element* element){/*{{{*/ + + if(element->IsFloating() || !element->IsOnBase()) return NULL; + + /*If on water or not FS, skip stiffness: */ + int approximation; + element->GetInputValue(&approximation,ApproximationEnum); + if(approximation!=FSApproximationEnum && approximation!=SSAFSApproximationEnum && approximation!=HOFSApproximationEnum) return NULL; + + /*Intermediaries*/ + bool mainlyfloating; + int i,dim,domaintype,epssize; + int migration_style,point1; + IssmDouble alpha2,Jdet,fraction1,fraction2; + IssmDouble gllevelset,phi=1.; + IssmDouble *xyz_list_base = NULL; + Gauss* gauss = NULL; + + /*Get problem dimension*/ + element->FindParam(&dim,DomainDimensionEnum); + element->FindParam(&domaintype,DomainTypeEnum); + + /*Fetch number of nodes and dof for this finite element*/ + int vnumnodes = element->NumberofNodesVelocity(); + int pnumnodes = element->NumberofNodesPressure(); + int numdof = vnumnodes*dim + pnumnodes; + + /*Initialize Element matrix and vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(FSvelocityEnum); + IssmDouble* B = xNew((dim-1)*numdof); + IssmDouble* D = xNewZeroInit((dim-1)*(dim-1)); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinatesBase(&xyz_list_base); + element->FindParam(&migration_style,GroundinglineMigrationEnum); + Input* vx_input = element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input = element->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input = NULL; + if(dim==3){ vz_input = element->GetInput(VzEnum); _assert_(vz_input);} + Input* gllevelset_input = NULL; + + /*build friction object, used later on: */ + Friction* friction=new Friction(element,dim==3?3:1); + + /*Recover portion of element that is grounded*/ + if(migration_style==SubelementMigrationEnum) phi=element->GetGroundedPortion(xyz_list_base); + if(migration_style==SubelementMigration2Enum){ + if(domaintype==Domain2DverticalEnum) _error_("Subelement Migration 2 not implemented yet for Flowline"); + gllevelset_input=element->GetInput(MaskGroundediceLevelsetEnum); _assert_(gllevelset_input); + element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating); + //gauss = element->NewGauss(point1,fraction1,fraction2,mainlyfloating,2); + gauss=element->NewGaussBase(3); + } + else{ + gauss=element->NewGaussBase(3); + } + + /* Start looping on the number of gaussian points: */ + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + friction->GetAlpha2(&alpha2,gauss,vx_input,vy_input,vz_input); + if(migration_style==SubelementMigrationEnum) alpha2=phi*alpha2; + if(migration_style==SubelementMigration2Enum){ + gllevelset_input->GetInputValue(&gllevelset, gauss); + if(gllevelset<0.) alpha2=0.; + } + + this->GetBFSFriction(B,element,dim,xyz_list_base,gauss); + element->JacobianDeterminantBase(&Jdet,xyz_list_base,gauss); + for(int i=0;iweight*Jdet; //taub_x = -alpha2 v_x (same for y) + + TripleMultiply(B,dim-1,numdof,1, + D,dim-1,dim-1,0, + B,dim-1,numdof,0, + &Ke->values[0],1); + } + + /*DO NOT Transform Coordinate System: this stiffness matrix is already expressed in tangential coordinates*/ + + /*Clean up and return*/ + delete gauss; + delete friction; + xDelete(xyz_list_base); + xDelete(B); + xDelete(D); + return Ke; +}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreatePVectorFS(Element* element){/*{{{*/ + + ElementVector* pe = NULL; + + int fe_FS; + element->FindParam(&fe_FS,FlowequationFeFSEnum); + + if(fe_FS==XTaylorHoodEnum){ + ElementVector* pe1=CreatePVectorFSViscous(element); + ElementVector* pe2=CreatePVectorFSShelf(element); + ElementVector* pe3=CreatePVectorFSFront(element); + ElementVector* petemp =new ElementVector(pe1,pe2,pe3); + ElementVector* pe4=CreatePVectorFSViscousXTH(element); + pe = new ElementVector(petemp,pe4); + delete pe1; + delete pe2; + delete pe3; + delete petemp; + delete pe4; + } + else{ + ElementVector* pe1=CreatePVectorFSViscous(element); + ElementVector* pe2=CreatePVectorFSShelf(element); + ElementVector* pe3=CreatePVectorFSFront(element); + pe =new ElementVector(pe1,pe2,pe3); + delete pe1; + delete pe2; + delete pe3; + } + + /*clean-up and return*/ + return pe; +}/*}}}*/ +#endif +ElementVector* StressbalanceAnalysis::CreatePVectorFSViscous(Element* element){/*{{{*/ + + int i,dim; + IssmDouble Jdet,forcex,forcey,forcez; + IssmDouble *xyz_list = NULL; + + /*Get problem dimension*/ + element->FindParam(&dim,DomainDimensionEnum); + + /*Fetch number of nodes and dof for this finite element*/ + int vnumnodes = element->NumberofNodesVelocity(); + int pnumnodes = element->NumberofNodesPressure(); + + /*Prepare coordinate system list*/ + int* cs_list = xNew(vnumnodes+pnumnodes); + if(dim==2) for(i=0;iNewElementVector(FSvelocityEnum); + IssmDouble* vbasis = xNew(vnumnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + IssmDouble rho_ice =element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble gravity =element->GetMaterialParameter(ConstantsGEnum); + Input* loadingforcex_input=element->GetInput(LoadingforceXEnum); _assert_(loadingforcex_input); + Input* loadingforcey_input=element->GetInput(LoadingforceYEnum); _assert_(loadingforcey_input); + Input* loadingforcez_input=NULL; + if(dim==3){ + loadingforcez_input=element->GetInput(LoadingforceZEnum); _assert_(loadingforcez_input); + } + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(5); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctionsVelocity(vbasis,gauss); + + loadingforcex_input->GetInputValue(&forcex,gauss); + loadingforcey_input->GetInputValue(&forcey,gauss); + if(dim==3) loadingforcez_input->GetInputValue(&forcez,gauss); + + for(i=0;ivalues[i*dim+0] += +rho_ice*forcex *Jdet*gauss->weight*vbasis[i]; + pe->values[i*dim+1] += +rho_ice*forcey *Jdet*gauss->weight*vbasis[i]; + if(dim==3){ + pe->values[i*dim+2] += +rho_ice*forcez*Jdet*gauss->weight*vbasis[i]; + pe->values[i*dim+2] += -rho_ice*gravity*Jdet*gauss->weight*vbasis[i]; + } + else{ + pe->values[i*dim+1] += -rho_ice*gravity*Jdet*gauss->weight*vbasis[i]; + } + } + } + + /*Transform coordinate system*/ + element->TransformLoadVectorCoord(pe,cs_list); + + /*Clean up and return*/ + delete gauss; + xDelete(cs_list); + xDelete(vbasis); + xDelete(xyz_list); + return pe; +}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreatePVectorFSViscousXTH(Element* element){/*{{{*/ + + int i,tausize,dim; + IssmDouble Jdet,r; + IssmDouble epsxx,epsyy,epszz,epsxy,epsxz,epsyz; + IssmDouble sigmapxx,sigmapyy,sigmapzz,sigmapxy,sigmapxz,sigmapyz; + IssmDouble *xyz_list = NULL; + Gauss* gauss = NULL; + + /*Get problem dimension*/ + element->FindParam(&dim,DomainDimensionEnum); + if(dim==2) tausize = 3; + else tausize = 6; + + /*Fetch number of nodes and dof for this finite element*/ + int vnumnodes = element->NumberofNodesVelocity(); + int pnumnodes = element->NumberofNodesPressure(); + int tnumnodes = element->GetNumberOfVertices(); //Tensors, P1 DG + + /*Prepare coordinate system list*/ + int* cs_list = xNew(vnumnodes+pnumnodes); + if(dim==2) for(i=0;iNewElementVector(FSvelocityEnum); + IssmDouble* Dstar = xNewZeroInit((dim*vnumnodes)*(tausize*tnumnodes)); + IssmDouble* tau = xNew(tausize*tnumnodes); + IssmDouble* d = xNew(tausize*tnumnodes); + IssmDouble* vdbasis = xNew(dim*vnumnodes); + IssmDouble* tbasis = xNew(tnumnodes); + IssmDouble* D = xNewZeroInit(tausize*tnumnodes*tausize*tnumnodes); + + /*Retrieve all inputs and parameters*/ + element->FindParam(&r,AugmentedLagrangianREnum); + element->GetVerticesCoordinates(&xyz_list); + + /*Get d and tau*/ + Input* epsxx_input=element->GetInput(StrainRatexxEnum); _assert_(epsxx_input); + Input* epsyy_input=element->GetInput(StrainRateyyEnum); _assert_(epsyy_input); + Input* epsxy_input=element->GetInput(StrainRatexyEnum); _assert_(epsxy_input); + Input* epszz_input=NULL; Input* epsxz_input=NULL; Input* epsyz_input=NULL; + Input* sigmapxx_input=element->GetInput(DeviatoricStressxxEnum); _assert_(sigmapxx_input); + Input* sigmapyy_input=element->GetInput(DeviatoricStressyyEnum); _assert_(sigmapyy_input); + Input* sigmapxy_input=element->GetInput(DeviatoricStressxyEnum); _assert_(sigmapxy_input); + Input* sigmapzz_input=NULL; Input* sigmapxz_input=NULL; Input* sigmapyz_input=NULL; + if(dim==3){ + epszz_input=element->GetInput(StrainRatezzEnum); _assert_(epszz_input); + epsxz_input=element->GetInput(StrainRatexzEnum); _assert_(epsxz_input); + epsyz_input=element->GetInput(StrainRateyzEnum); _assert_(epsyz_input); + sigmapzz_input=element->GetInput(DeviatoricStresszzEnum); _assert_(sigmapzz_input); + sigmapxz_input=element->GetInput(DeviatoricStressxzEnum); _assert_(sigmapxz_input); + sigmapyz_input=element->GetInput(DeviatoricStressyzEnum); _assert_(sigmapyz_input); + } + + gauss = element->NewGauss(); + for(int i=0;iGaussNode(P1DGEnum,i); + + epsxx_input->GetInputValue(&epsxx,gauss); sigmapxx_input->GetInputValue(&sigmapxx,gauss); + epsyy_input->GetInputValue(&epsyy,gauss); sigmapyy_input->GetInputValue(&sigmapyy,gauss); + epsxy_input->GetInputValue(&epsxy,gauss); sigmapxy_input->GetInputValue(&sigmapxy,gauss); + if(dim==2){ + d[i*tausize+0]=epsxx; tau[i*tausize+0]=sigmapxx; + d[i*tausize+1]=epsyy; tau[i*tausize+1]=sigmapyy; + d[i*tausize+2]=epsxy; tau[i*tausize+2]=sigmapxy; + } + else{ + epszz_input->GetInputValue(&epszz,gauss); sigmapzz_input->GetInputValue(&sigmapzz,gauss); + epsxz_input->GetInputValue(&epsxz,gauss); sigmapxz_input->GetInputValue(&sigmapxz,gauss); + epsyz_input->GetInputValue(&epsyz,gauss); sigmapyz_input->GetInputValue(&sigmapyz,gauss); + d[i*tausize+0]=epsxx; tau[i*tausize+0]=sigmapxx; + d[i*tausize+1]=epsyy; tau[i*tausize+1]=sigmapyy; + d[i*tausize+2]=epszz; tau[i*tausize+2]=sigmapzz; + d[i*tausize+3]=epsxy; tau[i*tausize+3]=sigmapxy; + d[i*tausize+4]=epsxz; tau[i*tausize+4]=sigmapxz; + d[i*tausize+5]=epsyz; tau[i*tausize+5]=sigmapyz; + } + } + + /* Start looping on the number of gaussian points: */ + delete gauss; + gauss=element->NewGauss(5); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + + /*Create Dstar*/ + /*In dim = 2 + * + * <----------------- tausize ---------------> x tnumnodes + * | gamma_ij^x 0 gamma_ij^y | ^ + * Dij = | | dim + * | 0 gamma_ij^y gamma_ij^x | v + * x + * vnumnodes + * + *In dim = 3 + * + * | gamma_ij^x 0 0 gamma_ij^y gamma_ij^z 0 | + * | | + * Dij = | 0 gamma_ij^y 0 gamma_ij^x 0 gamma_ij^z | + * | | + * | 0 0 gamma_ij^z 0 gamma_ij^x gamma_ij^y | + * + * gamma_ij^x = zeta_j dphi_i/dx + * + * where: + * - zeta_j is the nodal function for the j^th node of the tensor (P1DG) + * - phi_i is the nodal function for the i^th node of the velocity (P2)*/ + element->NodalFunctionsDerivativesVelocity(vdbasis,xyz_list,gauss); + element->NodalFunctionsTensor(tbasis,gauss); + if(dim==2){ + for(int i=0;iweight*Jdet*tbasis[j]*vdbasis[0*vnumnodes+i]; + Dstar[(i*dim+0)*tausize*tnumnodes + j*tausize+2] += gauss->weight*Jdet*tbasis[j]*vdbasis[1*vnumnodes+i]; + + Dstar[(i*dim+1)*tausize*tnumnodes + j*tausize+1] += gauss->weight*Jdet*tbasis[j]*vdbasis[1*vnumnodes+i]; + Dstar[(i*dim+1)*tausize*tnumnodes + j*tausize+2] += gauss->weight*Jdet*tbasis[j]*vdbasis[0*vnumnodes+i]; + } + } + } + else{ + for(int i=0;iweight*Jdet*tbasis[j]*vdbasis[0*vnumnodes+i]; + Dstar[(i*dim+0)*tausize*tnumnodes + j*tausize+3] += gauss->weight*Jdet*tbasis[j]*vdbasis[1*vnumnodes+i]; + Dstar[(i*dim+0)*tausize*tnumnodes + j*tausize+4] += gauss->weight*Jdet*tbasis[j]*vdbasis[2*vnumnodes+i]; + + Dstar[(i*dim+1)*tausize*tnumnodes + j*tausize+1] += gauss->weight*Jdet*tbasis[j]*vdbasis[1*vnumnodes+i]; + Dstar[(i*dim+1)*tausize*tnumnodes + j*tausize+3] += gauss->weight*Jdet*tbasis[j]*vdbasis[0*vnumnodes+i]; + Dstar[(i*dim+1)*tausize*tnumnodes + j*tausize+5] += gauss->weight*Jdet*tbasis[j]*vdbasis[2*vnumnodes+i]; + + Dstar[(i*dim+2)*tausize*tnumnodes + j*tausize+2] += gauss->weight*Jdet*tbasis[j]*vdbasis[2*vnumnodes+i]; + Dstar[(i*dim+2)*tausize*tnumnodes + j*tausize+4] += gauss->weight*Jdet*tbasis[j]*vdbasis[0*vnumnodes+i]; + Dstar[(i*dim+2)*tausize*tnumnodes + j*tausize+5] += gauss->weight*Jdet*tbasis[j]*vdbasis[1*vnumnodes+i]; + } + } + } + } + + /*contribution -Dstar tau*/ + for(i=0;ivalues[0],1); + + /*contribution + r Dstar d*/ + for(i=0;ivalues[0],1); + + /*Transform coordinate system*/ + element->TransformLoadVectorCoord(pe,cs_list); + + /*Clean up and return*/ + delete gauss; + xDelete(cs_list); + xDelete(xyz_list); + xDelete(Dstar); + xDelete(d); + xDelete(D); + xDelete(tau); + xDelete(vdbasis); + xDelete(tbasis); + return pe; +}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreatePVectorFSShelf(Element* element){/*{{{*/ + + int i,dim; + IssmDouble Jdet,water_pressure,bed; + IssmDouble normal[3]; + IssmDouble *xyz_list_base = NULL; + + /*Get basal element*/ + if(!element->IsOnBase() || !element->IsFloating()) return NULL; + + /*Get problem dimension*/ + element->FindParam(&dim,DomainDimensionEnum); + + /*Fetch number of nodes and dof for this finite element*/ + int vnumnodes = element->NumberofNodesVelocity(); + int pnumnodes = element->NumberofNodesPressure(); + + /*Prepare coordinate system list*/ + int* cs_list = xNew(vnumnodes+pnumnodes); + if(dim==2) for(i=0;iNewElementVector(FSvelocityEnum); + IssmDouble* vbasis = xNew(vnumnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinatesBase(&xyz_list_base); + Input* base_input=element->GetInput(BaseEnum); _assert_(base_input); + IssmDouble rho_water=element->GetMaterialParameter(MaterialsRhoWaterEnum); + IssmDouble gravity =element->GetMaterialParameter(ConstantsGEnum); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGaussBase(5); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminantBase(&Jdet,xyz_list_base,gauss); + element->NodalFunctionsVelocity(vbasis,gauss); + + element->NormalBase(&normal[0],xyz_list_base); + _assert_(normal[dim-1]<0.); + base_input->GetInputValue(&bed, gauss); + water_pressure=gravity*rho_water*bed; + + for(i=0;ivalues[i*dim+0] += water_pressure*gauss->weight*Jdet*vbasis[i]*normal[0]; + pe->values[i*dim+1] += water_pressure*gauss->weight*Jdet*vbasis[i]*normal[1]; + if(dim==3){ + pe->values[i*dim+2]+=water_pressure*gauss->weight*Jdet*vbasis[i]*normal[2]; + } + } + } + + /*Transform coordinate system*/ + element->TransformLoadVectorCoord(pe,cs_list); + + /*Clean up and return*/ + delete gauss; + xDelete(cs_list); + xDelete(vbasis); + xDelete(xyz_list_base); + return pe; +}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreatePVectorFSFront(Element* element){/*{{{*/ + + /*If no front, return NULL*/ + if(!element->IsIcefront()) return NULL; + + /*Intermediaries*/ + int i,dim; + IssmDouble Jdet,pressure,surface,z; + IssmDouble normal[3]; + IssmDouble *xyz_list = NULL; + IssmDouble *xyz_list_front = NULL; + Gauss *gauss = NULL; + + /*Make sure current element is floating*/ + if(!element->IsFloating()) return NULL; + + /*Get problem dimension*/ + element->FindParam(&dim,DomainDimensionEnum); + + /*Fetch number of nodes and dof for this finite element*/ + int vnumnodes = element->NumberofNodesVelocity(); + int pnumnodes = element->NumberofNodesPressure(); + int numvertices = element->GetNumberOfVertices(); + + /*Prepare coordinate system list*/ + int* cs_list = xNew(vnumnodes+pnumnodes); + if(dim==2) for(i=0;iNewElementVector(FSvelocityEnum); + IssmDouble* vbasis = xNew(vnumnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + element->ZeroLevelsetCoordinates(&xyz_list_front,xyz_list,MaskIceLevelsetEnum); + element->NormalSection(&normal[0],xyz_list_front); + Input* surface_input = element->GetInput(SurfaceEnum); _assert_(surface_input); + IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoWaterEnum); + IssmDouble gravity = element->GetMaterialParameter(ConstantsGEnum); + + /*Initialize gauss points*/ + IssmDouble zmax=xyz_list[0*3+(dim-1)]; for(int i=1;izmax) zmax=xyz_list[i*3+(dim-1)]; + IssmDouble zmin=xyz_list[0*3+(dim-1)]; for(int i=1;i0. && zmin<0.) gauss=element->NewGauss(xyz_list,xyz_list_front,3,30);//refined in vertical because of the sea level discontinuity + else gauss=element->NewGauss(xyz_list,xyz_list_front,3,3); + + /* Start looping on the number of gaussian points: */ + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminantSurface(&Jdet,xyz_list_front,gauss); + element->NodalFunctionsVelocity(vbasis,gauss); + surface_input->GetInputValue(&surface,gauss); + if(dim==3) z=element->GetZcoord(gauss); + else z=element->GetYcoord(gauss); + pressure = rho_water*gravity*min(0.,z);//0 if the gaussian point is above water level + + for (int i=0;ivalues[dim*i+0]+= pressure*Jdet*gauss->weight*normal[0]*vbasis[i]; + pe->values[dim*i+1]+= pressure*Jdet*gauss->weight*normal[1]*vbasis[i]; + if(dim==3) pe->values[dim*i+2]+= pressure*Jdet*gauss->weight*normal[2]*vbasis[i]; + } + } + + /*Transform coordinate system*/ + element->TransformLoadVectorCoord(pe,cs_list); + + /*Clean up and return*/ + delete gauss; + xDelete(cs_list); + xDelete(vbasis); + xDelete(xyz_list); + xDelete(xyz_list_front); + return pe; +}/*}}}*/ +void StressbalanceAnalysis::GetBFS(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B matrix. B=[Bv1 Bv2 ... Bp1 Bp2 ...] where Bvi is of size 3*NDOF3. + * For node i, Bvi can be expressed in the actual coordinate system + * by: Bvi=[ dphi/dx 0 ] + * [ 0 dphi/dy ] + * [ 1/2*dphi/dy 1/2*dphi/dx] + * [ 0 0 ] + * [ dphi/dx dphi/dy ] + * + * Bpi=[ 0 ] + * [ 0 ] + * [ 0 ] + * [ phi_p ] + * [ 0 ] + * + * In 3d: + * Bvi=[ dh/dx 0 0 ] + * [ 0 dh/dy 0 ] + * [ 0 0 dh/dz ] + * [ 1/2*dh/dy 1/2*dh/dx 0 ] + * [ 1/2*dh/dz 0 1/2*dh/dx ] + * [ 0 1/2*dh/dz 1/2*dh/dy ] + * [ 0 0 0 ] + * [ dh/dx dh/dy dh/dz ] + * + * Bpi=[ 0 ] + * [ 0 ] + * [ 0 ] + * [ 0 ] + * [ 0 ] + * [ 0 ] + * [ h ] + * [ 0 ] + * where phi is the finiteelement function for node i. + * Same thing for Bb except the last column that does not exist. + */ + + /*Fetch number of nodes for this finite element*/ + int pnumnodes = element->NumberofNodesPressure(); + int vnumnodes = element->NumberofNodesVelocity(); + + /*Get nodal functions derivatives*/ + IssmDouble* vdbasis=xNew(dim*vnumnodes); + IssmDouble* pbasis =xNew(pnumnodes); + element->NodalFunctionsDerivativesVelocity(vdbasis,xyz_list,gauss); + element->NodalFunctionsPressure(pbasis,gauss); + + /*Build B: */ + if(dim==2){ + for(int i=0;i(vdbasis); + xDelete(pbasis); +}/*}}}*/ +void StressbalanceAnalysis::GetBFSprime(IssmDouble* Bprime,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /* Compute B' matrix. B'=[B1' B2' B3' B4' B5' B6' Bb'] where Bi' is of size 3*NDOF2. + * For node i, Bi' can be expressed in the actual coordinate system + * by: + * Bvi' = [ dphi/dx 0 ] + * [ 0 dphi/dy ] + * [ dphi/dy dphi/dx ] + * [ dphi/dx dphi/dy ] + * [ 0 0 ] + * + * by: Bpi=[ 0 ] + * [ 0 ] + * [ 0 ] + * [ 0 ] + * [ phi ] + * + * In 3d + * Bvi=[ dh/dx 0 0 ] + * [ 0 dh/dy 0 ] + * [ 0 0 dh/dz ] + * [ dh/dy dh/dx 0 ] + * [ dh/dz 0 dh/dx ] + * [ 0 dh/dz dh/dy ] + * [ dh/dx dh/dy dh/dz ] + * [ 0 0 0 ] + * + * Bpi=[ 0 ] + * [ 0 ] + * [ 0 ] + * [ 0 ] + * [ 0 ] + * [ 0 ] + * [ 0 ] + * [ h ] + * where phi is the finiteelement function for node i. + * In 3d: + */ + + /*Fetch number of nodes for this finite element*/ + int pnumnodes = element->NumberofNodesPressure(); + int vnumnodes = element->NumberofNodesVelocity(); + + /*Get nodal functions derivatives*/ + IssmDouble* vdbasis=xNew(dim*vnumnodes); + IssmDouble* pbasis =xNew(pnumnodes); + element->NodalFunctionsDerivativesVelocity(vdbasis,xyz_list,gauss); + element->NodalFunctionsPressure(pbasis,gauss); + + /*Build B_prime: */ + if(dim==2){ + for(int i=0;i(vdbasis); + xDelete(pbasis); +}/*}}}*/ +void StressbalanceAnalysis::GetBFSFriction(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /* Compute L matrix. L=[L1 L2 L3] where Li is square and of size numdof. + * For node i, Li can be expressed in the actual coordinate system + * by in 3d + * Li=[ h 0 0 0 ] + * [ 0 h 0 0 ] + * in 2d: + * Li=[ h 0 0 ] + * where h is the interpolation function for node i. + */ + + /*Fetch number of nodes for this finite element*/ + int pnumnodes = element->NumberofNodesPressure(); + int vnumnodes = element->NumberofNodesVelocity(); + int pnumdof = pnumnodes; + int vnumdof = vnumnodes*dim; + + /*Get nodal functions derivatives*/ + IssmDouble* vbasis=xNew(vnumnodes); + element->NodalFunctionsVelocity(vbasis,gauss); + + /*Build B: */ + if(dim==3){ + for(int i=0;i(vbasis); +}/*}}}*/ +void StressbalanceAnalysis::GetSolutionFromInputsFS(Vector* solution,Element* element){/*{{{*/ + + int* vdoflist=NULL; + int* pdoflist=NULL; + Input* vz_input=NULL; + int dim; + IssmDouble vx,vy,vz,p; + IssmDouble FSreconditioning; + + /*Get some parameters*/ + element->FindParam(&dim,DomainDimensionEnum); + element->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); + + /*Fetch number of nodes and dof for this finite element*/ + int vnumnodes = element->NumberofNodesVelocity(); + int pnumnodes = element->NumberofNodesPressure(); + int vnumdof = vnumnodes*dim; + int pnumdof = pnumnodes*1; + + /*Initialize values*/ + IssmDouble* vvalues = xNew(vnumdof); + IssmDouble* pvalues = xNew(pnumdof); + + /*Get dof list: */ + element->GetDofListVelocity(&vdoflist,GsetEnum); + element->GetDofListPressure(&pdoflist,GsetEnum); + Input* vx_input=element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=element->GetInput(VyEnum); _assert_(vy_input); + if(dim==3){vz_input=element->GetInput(VzEnum); _assert_(vz_input);} + Input* p_input =element->GetInput(PressureEnum); _assert_(p_input); + + element->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); + + /*Ok, we have the velocities in inputs, fill in solution */ + Gauss* gauss = element->NewGauss(); + for(int i=0;iGaussNode(element->VelocityInterpolation(),i); + vx_input->GetInputValue(&vx,gauss); + vy_input->GetInputValue(&vy,gauss); + vvalues[i*dim+0]=vx; + vvalues[i*dim+1]=vy; + if(dim==3){ + vz_input->GetInputValue(&vz,gauss); + vvalues[i*dim+2]=vz; + } + } + for(int i=0;iGaussNode(element->PressureInterpolation(),i); + p_input->GetInputValue(&p ,gauss); + pvalues[i]=p/FSreconditioning; + } + + /*Add value to global vector*/ + solution->SetValues(vnumdof,vdoflist,vvalues,INS_VAL); + solution->SetValues(pnumdof,pdoflist,pvalues,INS_VAL); + + /*Free ressources:*/ + delete gauss; + xDelete(pdoflist); + xDelete(vdoflist); + xDelete(pvalues); + xDelete(vvalues); +}/*}}}*/ +void StressbalanceAnalysis::InitializeXTH(Elements* elements,Parameters* parameters){/*{{{*/ + + /*Intermediaries*/ + int dim; + IssmDouble dvx[3],dvy[3],dvz[3]; + IssmDouble viscosity; + IssmDouble *xyz_list = NULL; + + /*Get problem dimension*/ + parameters->FindParam(&dim,DomainDimensionEnum); + + for(int i=0;iSize();i++){ + Element* element=dynamic_cast(elements->GetObjectByOffset(i)); + + /*Get inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + Input* vx_input=element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=element->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input; + if(dim==3){vz_input=element->GetInput(VzEnum); _assert_(vz_input);} + + /*Allocate new inputs*/ + int tnumnodes = element->GetNumberOfVertices(); //Tensors, P1 DG + IssmDouble* epsxx = xNew(tnumnodes); IssmDouble* sigmapxx = xNew(tnumnodes); + IssmDouble* epsyy = xNew(tnumnodes); IssmDouble* sigmapyy = xNew(tnumnodes); + IssmDouble* epsxy = xNew(tnumnodes); IssmDouble* sigmapxy = xNew(tnumnodes); + IssmDouble* epszz = NULL; IssmDouble* sigmapzz = NULL; + IssmDouble* epsxz = NULL; IssmDouble* sigmapxz = NULL; + IssmDouble* epsyz = NULL; IssmDouble* sigmapyz = NULL; + if(dim==3){ + epszz = xNew(tnumnodes); sigmapzz = xNew(tnumnodes); + epsxz = xNew(tnumnodes); sigmapxz = xNew(tnumnodes); + epsyz = xNew(tnumnodes); sigmapyz = xNew(tnumnodes); + } + + /*Get d and tau*/ + Gauss* gauss = element->NewGauss(); + for(int i=0;iGaussNode(P1DGEnum,i); + + vx_input->GetInputDerivativeValue(&dvx[0],xyz_list,gauss); + vy_input->GetInputDerivativeValue(&dvy[0],xyz_list,gauss); + if(dim==3){ + vz_input->GetInputDerivativeValue(&dvz[0],xyz_list,gauss); + } + + element->ViscosityFS(&viscosity,dim,xyz_list,gauss,vx_input,vy_input,vz_input); + epsxx[i] = dvx[0]; sigmapxx[i] = 2.*viscosity*epsxx[i]; + epsyy[i] = dvy[1]; sigmapyy[i] = 2.*viscosity*epsyy[i]; + epsxy[i] = 0.5*(dvx[1] + dvy[0]); sigmapxy[i] = 2.*viscosity*epsxy[i]; + if(dim==3){ + epszz[i] = dvz[2]; sigmapzz[i] = 2.*viscosity*epszz[i]; + epsxz[i] = 0.5*(dvx[2] + dvz[0]); sigmapxz[i] = 2.*viscosity*epsxz[i]; + epsyz[i] = 0.5*(dvy[2] + dvz[1]); sigmapyz[i] = 2.*viscosity*epsyz[i]; + } + } + + /*Add inputs*/ + element->AddInput(StrainRatexxEnum,epsxx,P1DGEnum); element->AddInput(DeviatoricStressxxEnum,sigmapxx,P1DGEnum); + element->AddInput(StrainRateyyEnum,epsyy,P1DGEnum); element->AddInput(DeviatoricStressyyEnum,sigmapyy,P1DGEnum); + element->AddInput(StrainRatexyEnum,epsxy,P1DGEnum); element->AddInput(DeviatoricStressxyEnum,sigmapxy,P1DGEnum); + if(dim==3){ + element->AddInput(StrainRatezzEnum,epszz,P1DGEnum); element->AddInput(DeviatoricStresszzEnum,sigmapzz,P1DGEnum); + element->AddInput(StrainRatexzEnum,epsxz,P1DGEnum); element->AddInput(DeviatoricStressxzEnum,sigmapxz,P1DGEnum); + element->AddInput(StrainRateyzEnum,epsyz,P1DGEnum); element->AddInput(DeviatoricStressyzEnum,sigmapyz,P1DGEnum); + } + + /*Clean up*/ + delete gauss; + xDelete(xyz_list); + xDelete(epsxx); xDelete(sigmapxx); + xDelete(epsyy); xDelete(sigmapyy); + xDelete(epszz); xDelete(sigmapzz); + xDelete(epsxy); xDelete(sigmapxy); + xDelete(epsxz); xDelete(sigmapxz); + xDelete(epsyz); xDelete(sigmapyz); + } + +}/*}}}*/ +void StressbalanceAnalysis::InputUpdateFromSolutionFS(IssmDouble* solution,Element* element){/*{{{*/ + + bool results_on_nodes; + int i,dim; + int* vdoflist=NULL; + int* pdoflist=NULL; + IssmDouble FSreconditioning; + + element->FindParam(&dim,DomainDimensionEnum); + element->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); + element->FindParam(&results_on_nodes,SettingsResultsOnNodesEnum); + + /*Fetch number of nodes and dof for this finite element*/ + int vnumnodes = element->NumberofNodesVelocity(); + int pnumnodes = element->NumberofNodesPressure(); + int vnumdof = vnumnodes*dim; + int pnumdof = pnumnodes*1; + + /*Initialize values*/ + IssmDouble* values = xNew(vnumdof+pnumdof); + IssmDouble* vx = xNew(vnumnodes); + IssmDouble* vy = xNew(vnumnodes); + IssmDouble* vz = xNew(vnumnodes); + IssmDouble* vel = xNew(vnumnodes); + IssmDouble* pressure = xNew(pnumnodes); + + /*Prepare coordinate system list*/ + int* cs_list = xNew(vnumnodes+pnumnodes); + if(dim==2) for(i=0;iGetDofListVelocity(&vdoflist,GsetEnum); + element->GetDofListPressure(&pdoflist,GsetEnum); + + /*Use the dof list to index into the solution vector: */ + for(i=0;iTransformSolutionCoord(values,cs_list); + + /*Ok, we have vx and vy in values, fill in all arrays: */ + for(i=0;i(vx[i])) _error_("NaN found in solution vector"); + if(xIsNan(vy[i])) _error_("NaN found in solution vector"); + + if(dim==3){ + vz[i] = values[i*dim+2]; + if(xIsNan(vz[i])) _error_("NaN found in solution vector"); + } + } + for(i=0;i(pressure[i])) _error_("NaN found in solution vector"); + } + + /*Recondition pressure and compute vel: */ + for(i=0;iInputChangeName(VxEnum,VxPicardEnum); + element->InputChangeName(VyEnum,VyPicardEnum); + element->InputChangeName(PressureEnum,PressurePicardEnum); + if(dim==3) element->InputChangeName(VzEnum,VzPicardEnum); + + /*Add vx and vy as inputs to the tria element: */ + element->AddInput(VxEnum, vx, element->VelocityInterpolation()); + element->AddInput(VyEnum, vy, element->VelocityInterpolation()); + element->AddInput(VelEnum, vel, element->VelocityInterpolation()); + element->AddInput(PressureEnum,pressure,element->PressureInterpolation()); + if(dim==3) element->AddInput(VzEnum,vz, element->VelocityInterpolation()); + + /*Free ressources:*/ + xDelete(pressure); + xDelete(vel); + xDelete(vz); + xDelete(vy); + xDelete(vx); + xDelete(values); + xDelete(vdoflist); + xDelete(pdoflist); + xDelete(cs_list); +}/*}}}*/ +void StressbalanceAnalysis::InputUpdateFromSolutionFSXTH_d(Elements* elements,Parameters* parameters){/*{{{*/ + + /*Intermediaries*/ + int dim,tausize; + IssmDouble epsxx,epsyy,epszz,epsxy,epsxz,epsyz,D_scalar; + IssmDouble epsxx_old,epsyy_old,epszz_old,epsxy_old,epsxz_old,epsyz_old; + IssmDouble sigmapxx,sigmapyy,sigmapzz,sigmapxy,sigmapxz,sigmapyz; + IssmDouble dvx[3],dvy[3],dvz[3],B,n; + IssmDouble *xyz_list = NULL; + IssmDouble Jdet,r; + + parameters->FindParam(&r,AugmentedLagrangianREnum); + parameters->FindParam(&dim,DomainDimensionEnum); + if(dim==2) tausize = 3; + else tausize = 6; + + for(int i=0;iSize();i++){ + Element* element=dynamic_cast(elements->GetObjectByOffset(i)); + + /*Get inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + Input* B_input=element->GetInput(MaterialsRheologyBEnum); _assert_(B_input); + Input* n_input=element->GetInput(MaterialsRheologyNEnum); _assert_(n_input); + Input* vx_input=element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=element->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input; + if(dim==3){vz_input=element->GetInput(VzEnum); _assert_(vz_input);} + + /*Fetch number of nodes and dof for this finite element*/ + int tnumnodes = element->GetNumberOfVertices(); //Tensors, P1 DG + + /*Initialize vectors*/ + IssmDouble* tbasis = xNew(tnumnodes); + IssmDouble* Ke = xNewZeroInit(tnumnodes*tnumnodes); + IssmDouble* pe_xx = xNewZeroInit(tnumnodes); + IssmDouble* pe_yy = xNewZeroInit(tnumnodes); + IssmDouble* pe_xy = xNewZeroInit(tnumnodes); + IssmDouble* pe_zz = NULL; IssmDouble* pe_xz = NULL; IssmDouble* pe_yz = NULL; + if(dim==3){ + pe_zz = xNewZeroInit(tnumnodes); + pe_xz = xNewZeroInit(tnumnodes); + pe_yz = xNewZeroInit(tnumnodes); + } + + /*Get previous d*/ + Input* epsxx_input=element->GetInput(StrainRatexxEnum); _assert_(epsxx_input); + Input* epsyy_input=element->GetInput(StrainRateyyEnum); _assert_(epsyy_input); + Input* epsxy_input=element->GetInput(StrainRatexyEnum); _assert_(epsxy_input); + Input* epszz_input=NULL; Input* epsxz_input=NULL; Input* epsyz_input=NULL; + if(dim==3){ + epszz_input=element->GetInput(StrainRatezzEnum); _assert_(epszz_input); + epsxz_input=element->GetInput(StrainRatexzEnum); _assert_(epsxz_input); + epsyz_input=element->GetInput(StrainRateyzEnum); _assert_(epsyz_input); + } + + /*Get tau*/ + Input* sigmapxx_input=element->GetInput(DeviatoricStressxxEnum); _assert_(sigmapxx_input); + Input* sigmapyy_input=element->GetInput(DeviatoricStressyyEnum); _assert_(sigmapyy_input); + Input* sigmapxy_input=element->GetInput(DeviatoricStressxyEnum); _assert_(sigmapxy_input); + Input* sigmapzz_input=NULL; Input* sigmapxz_input=NULL; Input* sigmapyz_input=NULL; + if(dim==3){ + sigmapzz_input=element->GetInput(DeviatoricStresszzEnum); _assert_(sigmapzz_input); + sigmapxz_input=element->GetInput(DeviatoricStressxzEnum); _assert_(sigmapxz_input); + sigmapyz_input=element->GetInput(DeviatoricStressyzEnum); _assert_(sigmapyz_input); + } + + Gauss* gauss=element->NewGauss(5); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctionsTensor(tbasis,gauss); + + /*Get tau from inputs*/ + sigmapxx_input->GetInputValue(&sigmapxx,gauss); + sigmapyy_input->GetInputValue(&sigmapyy,gauss); + sigmapxy_input->GetInputValue(&sigmapxy,gauss); + if(dim==3){ + sigmapzz_input->GetInputValue(&sigmapzz,gauss); + sigmapxz_input->GetInputValue(&sigmapxz,gauss); + sigmapyz_input->GetInputValue(&sigmapyz,gauss); + } + + /*Get previous d*/ + epsxx_input->GetInputValue(&epsxx_old,gauss); + epsyy_input->GetInputValue(&epsyy_old,gauss); + epsxy_input->GetInputValue(&epsxy_old,gauss); + if(dim==3){ + epszz_input->GetInputValue(&epszz_old,gauss); + epsxz_input->GetInputValue(&epsxz_old,gauss); + epsyz_input->GetInputValue(&epsyz_old,gauss); + } + + /*Calculate d from previous results*/ + vx_input->GetInputDerivativeValue(&dvx[0],xyz_list,gauss); + vy_input->GetInputDerivativeValue(&dvy[0],xyz_list,gauss); + if(dim==3){ + vz_input->GetInputDerivativeValue(&dvz[0],xyz_list,gauss); + } + epsxx = dvx[0]; + epsyy = dvy[1]; + epsxy = 0.5*(dvx[1] + dvy[0]); + if(dim==3){ + epszz = dvz[2]; + epsxz = 0.5*(dvx[2] + dvz[0]); + epsyz = 0.5*(dvy[2] + dvz[1]); + } + + /*Solve 2 eta_0 |d|^s-1 + r |d| = |rD(u) + tau|*/ + IssmDouble coef1,coef2,coef3; + B_input->GetInputValue(&B,gauss); + n_input->GetInputValue(&n,gauss); + coef1 = B*pow(1./sqrt(2.),(1.-n)/n); //2 eta_0 = 2 * B/(2* (1/sqrt(2) )^(n-1)/n ) + coef2 = r; + if(dim==2){ + coef3 = sqrt( + (r*epsxx + sigmapxx)*(r*epsxx + sigmapxx) + + (r*epsyy + sigmapyy)*(r*epsyy + sigmapyy) + + 2*(r*epsxy + sigmapxy)*(r*epsxy + sigmapxy) + ); + } + else{ + coef3 = sqrt( + (r*epsxx + sigmapxx)*(r*epsxx + sigmapxx) + + (r*epsyy + sigmapyy)*(r*epsyy + sigmapyy) + + (r*epszz + sigmapzz)*(r*epszz + sigmapzz) + + 2*(r*epsxy + sigmapxy)*(r*epsxy + sigmapxy) + + 2*(r*epsxz + sigmapxz)*(r*epsxz + sigmapxz) + + 2*(r*epsyz + sigmapyz)*(r*epsyz + sigmapyz) + ); + } + IssmDouble dnorm; + if(dim==2){ + dnorm = sqrt( epsxx_old*epsxx_old + epsyy_old*epsyy_old + 2.*epsxy_old*epsxy_old ); + } + else{ + dnorm = sqrt( epsxx_old*epsxx_old + epsyy_old*epsyy_old + epszz_old*epszz_old + +2.*(epsxy_old*epsxy_old + epsxz_old*epsxz_old + epsyz_old*epsyz_old)); + } + /*Initial guess cannot be 0 otherwise log(0) - inf*/ + if(dnorm==0.) dnorm=1.; + NewtonSolveDnorm(&dnorm,coef1,coef2,coef3,n,dnorm); + _assert_(dnorm>=0.); + _assert_(!xIsNan(dnorm)); + + /*Create Ke*/ + D_scalar=(coef1*pow(dnorm,(1.-n)/n)+r)*gauss->weight*Jdet; + TripleMultiply(tbasis,tnumnodes,1,0, + &D_scalar,1,1,0, + tbasis,1,tnumnodes,0, + Ke,1); + + /*Create Right hand sides*/ + for(int ii=0;iiweight*Jdet; + for(int ii=0;iiweight*Jdet; + for(int ii=0;iiweight*Jdet; + if(dim==3){ + for(int ii=0;iiweight*Jdet; + for(int ii=0;iiweight*Jdet; + for(int ii=0;iiweight*Jdet; + } + } + + /*Solve the systems*/ + IssmDouble* d_xx = xNew(tnumnodes); + IssmDouble* d_yy = xNew(tnumnodes); + IssmDouble* d_xy = xNew(tnumnodes); + IssmDouble* d_zz = NULL; + IssmDouble* d_xz = NULL; + IssmDouble* d_yz = NULL; + if(dim==2){ + _assert_(tnumnodes==3); + Matrix3x3Solve(&d_xx[0],Ke,pe_xx); + Matrix3x3Solve(&d_yy[0],Ke,pe_yy); + Matrix3x3Solve(&d_xy[0],Ke,pe_xy); + for(int i=0;i<3;i++) _assert_(!xIsNan(d_xx[i])); + for(int i=0;i<3;i++) _assert_(!xIsNan(d_yy[i])); + for(int i=0;i<3;i++) _assert_(!xIsNan(d_xx[i])); + element->AddInput(StrainRatexxEnum,d_xx,P1DGEnum); + element->AddInput(StrainRateyyEnum,d_yy,P1DGEnum); + element->AddInput(StrainRatexyEnum,d_xy,P1DGEnum); + } + else{ + _assert_(tnumnodes==4); + Matrix4x4Solve(&d_xx[0],Ke,pe_xx); + Matrix4x4Solve(&d_yy[0],Ke,pe_yy); + Matrix4x4Solve(&d_xy[0],Ke,pe_xy); + Matrix4x4Solve(&d_zz[0],Ke,pe_zz); + Matrix4x4Solve(&d_xz[0],Ke,pe_xz); + Matrix4x4Solve(&d_yz[0],Ke,pe_yz); + element->AddInput(StrainRatexxEnum,d_xx,P1DGEnum); + element->AddInput(StrainRateyyEnum,d_yy,P1DGEnum); + element->AddInput(StrainRatexyEnum,d_xy,P1DGEnum); + element->AddInput(StrainRatezzEnum,d_zz,P1DGEnum); + element->AddInput(StrainRatexzEnum,d_xz,P1DGEnum); + element->AddInput(StrainRateyzEnum,d_yz,P1DGEnum); + } + + /*Clean up*/ + delete gauss; + xDelete(xyz_list); + xDelete(tbasis); + xDelete(Ke); + xDelete(pe_xx); xDelete(d_xx); + xDelete(pe_yy); xDelete(d_yy); + xDelete(pe_zz); xDelete(d_zz); + xDelete(pe_xy); xDelete(d_xy); + xDelete(pe_xz); xDelete(d_xz); + xDelete(pe_yz); xDelete(d_yz); + } +}/*}}}*/ +void StressbalanceAnalysis::InputUpdateFromSolutionFSXTH_tau(Elements* elements,Parameters* parameters){/*{{{*/ + + /*Intermediaries*/ + int dim,tausize; + IssmDouble epsxx,epsyy,epszz,epsxy,epsxz,epsyz,D_scalar; + IssmDouble d_xx,d_yy,d_zz,d_xy,d_xz,d_yz; + IssmDouble sigmapxx,sigmapyy,sigmapzz,sigmapxy,sigmapxz,sigmapyz; + IssmDouble dvx[3],dvy[3],dvz[3]; + IssmDouble *xyz_list = NULL; + IssmDouble Jdet,r; + + parameters->FindParam(&r,AugmentedLagrangianREnum); + parameters->FindParam(&dim,DomainDimensionEnum); + if(dim==2) tausize = 3; + else tausize = 6; + + for(int i=0;iSize();i++){ + Element* element=dynamic_cast(elements->GetObjectByOffset(i)); + + /*Get inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + Input* vx_input=element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=element->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input; + if(dim==3){vz_input=element->GetInput(VzEnum); _assert_(vz_input);} + + /*Get previous tau*/ + Input* sigmapxx_input=element->GetInput(DeviatoricStressxxEnum); _assert_(sigmapxx_input); + Input* sigmapyy_input=element->GetInput(DeviatoricStressyyEnum); _assert_(sigmapyy_input); + Input* sigmapxy_input=element->GetInput(DeviatoricStressxyEnum); _assert_(sigmapxy_input); + Input* sigmapzz_input=NULL; Input* sigmapxz_input=NULL; Input* sigmapyz_input=NULL; + if(dim==3){ + sigmapzz_input=element->GetInput(DeviatoricStresszzEnum); _assert_(sigmapzz_input); + sigmapxz_input=element->GetInput(DeviatoricStressxzEnum); _assert_(sigmapxz_input); + sigmapyz_input=element->GetInput(DeviatoricStressyzEnum); _assert_(sigmapyz_input); + } + + /*Get NEW d*/ + Input* epsxx_input=element->GetInput(StrainRatexxEnum); _assert_(epsxx_input); + Input* epsyy_input=element->GetInput(StrainRateyyEnum); _assert_(epsyy_input); + Input* epsxy_input=element->GetInput(StrainRatexyEnum); _assert_(epsxy_input); + Input* epszz_input=NULL; Input* epsxz_input=NULL; Input* epsyz_input=NULL; + if(dim==3){ + epszz_input=element->GetInput(StrainRatezzEnum); _assert_(epszz_input); + epsxz_input=element->GetInput(StrainRatexzEnum); _assert_(epsxz_input); + epsyz_input=element->GetInput(StrainRateyzEnum); _assert_(epsyz_input); + } + + /*Fetch number of nodes and dof for this finite element*/ + int tnumnodes = element->GetNumberOfVertices(); //Tensors, P1 DG + + /*Update tau accordingly*/ + IssmDouble* tau_xx = xNew(tnumnodes); + IssmDouble* tau_yy = xNew(tnumnodes); + IssmDouble* tau_xy = xNew(tnumnodes); + IssmDouble* tau_zz = NULL; + IssmDouble* tau_xz = NULL; + IssmDouble* tau_yz = NULL; + Gauss* gauss = element->NewGauss(); + for(int ig=0;igGaussNode(P1DGEnum,ig); + + /*Get D(u)*/ + vx_input->GetInputDerivativeValue(&dvx[0],xyz_list,gauss); + vy_input->GetInputDerivativeValue(&dvy[0],xyz_list,gauss); + if(dim==3){ + vz_input->GetInputDerivativeValue(&dvz[0],xyz_list,gauss); + } + epsxx = dvx[0]; + epsyy = dvy[1]; + epsxy = 0.5*(dvx[1] + dvy[0]); + if(dim==3){ + epszz = dvz[2]; + epsxz = 0.5*(dvx[2] + dvz[0]); + epsyz = 0.5*(dvy[2] + dvz[1]); + } + + /*Get tau^(n-1) from inputs*/ + sigmapxx_input->GetInputValue(&sigmapxx,gauss); + sigmapyy_input->GetInputValue(&sigmapyy,gauss); + sigmapxy_input->GetInputValue(&sigmapxy,gauss); + if(dim==3){ + sigmapzz_input->GetInputValue(&sigmapzz,gauss); + sigmapxz_input->GetInputValue(&sigmapxz,gauss); + sigmapyz_input->GetInputValue(&sigmapyz,gauss); + } + + /*Get new d*/ + epsxx_input->GetInputValue(&d_xx,gauss); + epsyy_input->GetInputValue(&d_yy,gauss); + epsxy_input->GetInputValue(&d_xy,gauss); + if(dim==3){ + epszz_input->GetInputValue(&d_zz,gauss); + epsxz_input->GetInputValue(&d_xz,gauss); + epsyz_input->GetInputValue(&d_yz,gauss); + } + + /*Get d and update tau accordingly*/ + tau_xx[ig] = sigmapxx + r*(epsxx - d_xx); + tau_yy[ig] = sigmapyy + r*(epsyy - d_yy); + tau_xy[ig] = sigmapxy + r*(epsxy - d_xy); + if(dim==3){ + tau_zz[ig] = sigmapzz + r*(epszz - d_zz); + tau_xz[ig] = sigmapxz + r*(epsxz - d_xz); + tau_yz[ig] = sigmapyz + r*(epsyz - d_yz); + } + } + + /*Add inputs*/ + element->AddInput(DeviatoricStressxxEnum,tau_xx,P1DGEnum); + element->AddInput(DeviatoricStressyyEnum,tau_yy,P1DGEnum); + element->AddInput(DeviatoricStressxyEnum,tau_xy,P1DGEnum); + if(dim==3){ + element->AddInput(DeviatoricStresszzEnum,tau_zz,P1DGEnum); + element->AddInput(DeviatoricStressxzEnum,tau_xz,P1DGEnum); + element->AddInput(DeviatoricStressyzEnum,tau_yz,P1DGEnum); + } + + /*Clean up and */ + delete gauss; + xDelete(xyz_list); + xDelete(tau_xx); + xDelete(tau_yy); + xDelete(tau_zz); + xDelete(tau_xy); + xDelete(tau_xz); + xDelete(tau_yz); + } +}/*}}}*/ + +/*Coupling (Tiling)*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixSSA3d(Element* element){/*{{{*/ + + /*compute all stiffness matrices for this element*/ + ElementMatrix* Ke1=CreateKMatrixSSA3dViscous(element); + ElementMatrix* Ke2=CreateKMatrixSSA3dFriction(element); + ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); + + /*clean-up and return*/ + delete Ke1; + delete Ke2; + return Ke; +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixSSA3dFriction(Element* element){/*{{{*/ + + /*Initialize Element matrix and return if necessary*/ + if(element->IsFloating() || !element->IsOnBase()) return NULL; + + /*Build a tria element using the 3 nodes of the base of the penta. Then use + * the tria functionality to build a friction stiffness matrix on these 3 + * nodes: */ + Element* basalelement = element->SpawnBasalElement(); + ElementMatrix* Ke=CreateKMatrixSSAFriction(basalelement); + basalelement->DeleteMaterials(); delete basalelement; + + /*clean-up and return*/ + return Ke; +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixSSA3dViscous(Element* element){/*{{{*/ + + /*Constants*/ + const int numdof2d=2*3; + + /*Intermediaries */ + int i,j,approximation; + int dim=3; + IssmDouble Jdet,viscosity,oldviscosity,newviscosity,viscosity_overshoot; + IssmDouble epsilon[5],oldepsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ + IssmDouble epsilons[6]; //6 for FS + IssmDouble B[3][numdof2d]; + IssmDouble Bprime[3][numdof2d]; + IssmDouble D[3][3]= {0.0}; // material matrix, simple scalar matrix. + IssmDouble D_scalar; + IssmDouble Ke_gg[numdof2d][numdof2d]={0.0}; + IssmDouble *xyz_list = NULL; + + /*Find penta on bed as this is a SSA elements: */ + Element* pentabase=element->GetBasalElement(); + Element* basaltria=pentabase->SpawnBasalElement(); + + /*Initialize Element matrix*/ + ElementMatrix* Ke=basaltria->NewElementMatrix(SSAApproximationEnum); + element->GetInputValue(&approximation,ApproximationEnum); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + element->FindParam(&viscosity_overshoot,StressbalanceViscosityOvershootEnum); + Input* vx_input =element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input =element->GetInput(VyEnum); _assert_(vy_input); + Input* vxold_input=element->GetInput(VxPicardEnum); _assert_(vxold_input); + Input* vyold_input=element->GetInput(VyPicardEnum); _assert_(vyold_input); + Input* vz_input =element->GetInput(VzEnum); _assert_(vz_input); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(5); + Gauss* gauss_tria=new GaussTria(); + for(int ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); + gauss->SynchronizeGaussBase(gauss_tria); + + element->JacobianDeterminant(&Jdet, xyz_list,gauss); + this->GetBSSA(&B[0][0],basaltria,2,xyz_list, gauss_tria); + this->GetBSSAprime(&Bprime[0][0],basaltria,2,xyz_list, gauss_tria); + + if(approximation==SSAHOApproximationEnum){ + element->ViscosityHO(&viscosity,dim,xyz_list,gauss,vx_input,vy_input); + element->ViscosityHO(&oldviscosity,dim,xyz_list,gauss,vxold_input,vyold_input); + newviscosity=viscosity+viscosity_overshoot*(viscosity-oldviscosity); + } + else if (approximation==SSAFSApproximationEnum){ + element->ViscosityFS(&newviscosity,dim,xyz_list,gauss,vx_input,vy_input,vz_input); + } + else _error_("approximation " << approximation << " (" << EnumToStringx(approximation) << ") not supported yet"); + + D_scalar=2*newviscosity*gauss->weight*Jdet; + for (i=0;i<3;i++) D[i][i]=D_scalar; + + TripleMultiply( &B[0][0],3,numdof2d,1, + &D[0][0],3,3,0, + &Bprime[0][0],3,numdof2d,0, + &Ke_gg[0][0],1); + + } + for(i=0;ivalues[i*numdof2d+j]+=Ke_gg[i][j]; + + /*Transform Coordinate System*/ + basaltria->TransformStiffnessMatrixCoord(Ke,XYEnum); + + /*Clean up and return*/ + xDelete(xyz_list); + delete basaltria->material; + delete basaltria; + delete gauss_tria; + delete gauss; + return Ke; + +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixHOFS(Element* element){/*{{{*/ + + /*compute all stiffness matrices for this element*/ + ElementMatrix* Ke1=CreateKMatrixFS(element); + int indices[3]={18,19,20}; + Ke1->StaticCondensation(3,&indices[0]); + int init = element->FiniteElement(); + element->SetTemporaryElementType(P1Enum); // P1 needed for HO + ElementMatrix* Ke2=CreateKMatrixHO(element); + element->SetTemporaryElementType(init); // P1 needed for HO + ElementMatrix* Ke3=CreateKMatrixCouplingHOFS(element); + ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2,Ke3); + + /*clean-up and return*/ + delete Ke1; + delete Ke2; + delete Ke3; + return Ke; +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixSSAHO(Element* element){/*{{{*/ + + /*compute all stiffness matrices for this element*/ + ElementMatrix* Ke1=CreateKMatrixSSA3d(element); + ElementMatrix* Ke2=CreateKMatrixHO(element); + ElementMatrix* Ke3=CreateKMatrixCouplingSSAHO(element); + ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2,Ke3); + + /*clean-up and return*/ + delete Ke1; + delete Ke2; + delete Ke3; + return Ke; +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixSSAFS(Element* element){/*{{{*/ + + /*compute all stiffness matrices for this element*/ + ElementMatrix* Ke1=CreateKMatrixFS(element); + int indices[3]={18,19,20}; + Ke1->StaticCondensation(3,&indices[0]); + int init = element->FiniteElement(); + element->SetTemporaryElementType(P1Enum); + ElementMatrix* Ke2=CreateKMatrixSSA3d(element); + element->SetTemporaryElementType(init); + ElementMatrix* Ke3=CreateKMatrixCouplingSSAFS(element); + ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2,Ke3); + + /*clean-up and return*/ + delete Ke1; + delete Ke2; + delete Ke3; + return Ke; +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixCouplingHOFS(Element* element){/*{{{*/ + + /*Constants*/ + int numnodes = 3*6+1; + int numdofp = 2*6; + int numdofs = 4*6 + 3; + int numdoftotal = (2+4)*6+ 3; + + /*Intermediaries*/ + int i,j,init; + int* cs_list = xNew(6*3+1); + int* cs_list2 = xNew(6*2+1); + Node **node_list = xNew(6*3+1); + + /*Some parameters needed*/ + init = element->FiniteElement(); + + /*prepare node list*/ + for(i=0;i<6+1;i++){ + node_list[i+6] = element->GetNode(i); + cs_list[i+6] = XYZEnum; + cs_list2[i] = XYZEnum; + } + for(i=0;i<6;i++){ + node_list[i] = element->GetNode(i); + node_list[i+2*6+1] = element->GetNode(i+6*1); + cs_list[i] = XYEnum; + cs_list[i+2*6+1] = PressureEnum; + cs_list2[i+6+1] = PressureEnum; + } + + /*compute all stiffness matrices for this element*/ + ElementMatrix* Ke1=element->NewElementMatrixCoupling(6,HOApproximationEnum); + ElementMatrix* Ke2=element->NewElementMatrix(FSvelocityEnum); + ElementMatrix* Ke=new ElementMatrix(Ke1,Ke2); + delete Ke1; delete Ke2; + + /*Compute HO Matrix with P1 element type\n");*/ + Ke1=CreateKMatrixFS(element); element->TransformInvStiffnessMatrixCoord(Ke1,node_list,2*6+1,cs_list2); + int indices[3]={18,19,20}; + Ke1->StaticCondensation(3,&indices[0]); + element->SetTemporaryElementType(P1Enum); // P1 needed for HO + Ke2=CreateKMatrixHO(element); element->TransformInvStiffnessMatrixCoord(Ke2,XYEnum); + element->SetTemporaryElementType(init); // P1 needed for HO + /*Compute FS Matrix and condense it \n");*/ + + for(i=0;ivalues[(i+numdofp)*numdoftotal+2*j+0]+=Ke1->values[i*numdofs+3*j+0]; + Ke->values[(i+numdofp)*numdoftotal+2*j+1]+=Ke1->values[i*numdofs+3*j+1]; + } + for(i=0;ivalues[i*numdoftotal+numdofp+3*j+0]+=Ke2->values[i*numdofp+2*j+0]; + Ke->values[i*numdoftotal+numdofp+3*j+1]+=Ke2->values[i*numdofp+2*j+1]; + } + + /*Transform Coordinate System*/ //Do not transform, already done in the matrices + element->TransformStiffnessMatrixCoord(Ke,node_list,numnodes,cs_list); + + /*clean-up and return*/ + xDelete(cs_list); + xDelete(cs_list2); + xDelete(node_list); + delete Ke1; + delete Ke2; + return Ke; +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixCouplingSSAHO(Element* element){/*{{{*/ + + /*compute all stiffness matrices for this element*/ + ElementMatrix* Ke1=CreateKMatrixCouplingSSAHOViscous(element); + ElementMatrix* Ke2=CreateKMatrixCouplingSSAHOFriction(element); + ElementMatrix* Ke=new ElementMatrix(Ke1,Ke2); + + /*clean-up and return*/ + delete Ke1; + delete Ke2; + return Ke; +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixCouplingSSAHOFriction(Element* element){/*{{{*/ + + if(element->IsFloating() || !element->IsOnBase()) return NULL; + + /*Constants*/ + int numnodes = element->GetNumberOfNodes(); + int numdof = 2*numnodes; + int numdoftotal = 4*numnodes; + + /*Intermediaries */ + int i,j; + IssmDouble Jdet2d,alpha2; + IssmDouble *xyz_list_tria = NULL; + IssmDouble* L = xNewZeroInit(2*numdof); + IssmDouble DL[2][2] = {{ 0,0 },{0,0}}; //for basal drag + IssmDouble DL_scalar; + IssmDouble* Ke_gg = xNewZeroInit(numdof*numdof); + Node **node_list = xNew(2*numnodes); + int* cs_list = xNew(2*numnodes); + + /*Initialize Element matrix and return if necessary*/ + ElementMatrix* Ke1=element->NewElementMatrix(SSAApproximationEnum); + ElementMatrix* Ke2=element->NewElementMatrix(HOApproximationEnum); + ElementMatrix* Ke=new ElementMatrix(Ke1,Ke2); + delete Ke1; delete Ke2; + + /*Prepare node list*/ + for(i=0;iGetNode(i); + node_list[i+1*numnodes] = element->GetNode(i); + cs_list[i+0*numnodes] = XYEnum; + cs_list[i+1*numnodes] = XYEnum; + } + + /*retrieve inputs :*/ + element->GetVerticesCoordinatesBase(&xyz_list_tria); + Input* vx_input=element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=element->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input=element->GetInput(VzEnum); _assert_(vz_input); + + /*build friction object, used later on: */ + Friction* friction=new Friction(element,2); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGaussBase(2); + for(int ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); + + /*Friction: */ + friction->GetAlpha2(&alpha2,gauss,vx_input,vy_input,vz_input); + element->JacobianDeterminantBase(&Jdet2d, xyz_list_tria,gauss); + this->GetBHOFriction(L,element,3,xyz_list_tria,gauss); + + DL_scalar=alpha2*gauss->weight*Jdet2d; + for (i=0;i<2;i++) DL[i][i]=DL_scalar; + + /* Do the triple producte tL*D*L: */ + TripleMultiply( L,2,numdof,1, + &DL[0][0],2,2,0, + L,2,numdof,0, + Ke_gg,1); + } + + for(i=0;ivalues[i*numdoftotal+(numdof+j)]+=Ke_gg[i*numdof+j]; + for(i=0;ivalues[(i+numdof)*numdoftotal+j]+=Ke_gg[i*numdof+j]; + + /*Transform Coordinate System*/ + element->TransformStiffnessMatrixCoord(Ke,node_list,2*numnodes,cs_list); + + /*Clean up and return*/ + delete gauss; + delete friction; + xDelete(cs_list); + xDelete(node_list); + xDelete(xyz_list_tria); + xDelete(Ke_gg); + xDelete(L); + return Ke; +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixCouplingSSAHOViscous(Element* element){/*{{{*/ + + /*Constants*/ + int numnodes = element->GetNumberOfNodes(); + int numdofm = 1 *numnodes; //*2/2 + int numdofp = 2 *numnodes; + int numdoftotal = 2 *2 *numnodes;//2 dof per nodes and 2 sets of nodes for HO and SSA + + /*Intermediaries */ + int i,j; + IssmDouble Jdet,viscosity,oldviscosity,newviscosity,viscosity_overshoot; //viscosity + IssmDouble *xyz_list = NULL; + IssmDouble* B = xNew(3*numdofp); + IssmDouble* Bprime = xNew(3*numdofm); + IssmDouble D[3][3]={0.0}; // material matrix, simple scalar matrix. + IssmDouble D_scalar; + IssmDouble* Ke_gg = xNewZeroInit(numdofp*numdofm); + Node **node_list = xNew(2*numnodes); + int* cs_list= xNew(2*numnodes); + + /*Find penta on bed as HO must be coupled to the dofs on the bed: */ + Element* pentabase=element->GetBasalElement(); + Element* basaltria=pentabase->SpawnBasalElement(); + + /*prepare node list*/ + for(i=0;iGetNode(i); + node_list[i+1*numnodes] = element ->GetNode(i); + cs_list[i+0*numnodes] = XYEnum; + cs_list[i+1*numnodes] = XYEnum; + } + + /*Initialize Element matrix*/ + ElementMatrix* Ke1= pentabase->NewElementMatrix(SSAApproximationEnum); + ElementMatrix* Ke2= element ->NewElementMatrix(HOApproximationEnum); + ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); + delete Ke1; delete Ke2; + + /* Get node coordinates and dof list: */ + element->GetVerticesCoordinates(&xyz_list); + element->FindParam(&viscosity_overshoot,StressbalanceViscosityOvershootEnum); + Input* vx_input =element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input =element->GetInput(VyEnum); _assert_(vy_input); + Input* vxold_input=element->GetInput(VxPicardEnum); _assert_(vxold_input); + Input* vyold_input=element->GetInput(VyPicardEnum); _assert_(vyold_input); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(5); + Gauss* gauss_tria=new GaussTria(); + for(int ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); + gauss->SynchronizeGaussBase(gauss_tria); + + element->JacobianDeterminant(&Jdet, xyz_list,gauss); + this->GetBSSAHO(B, element,xyz_list, gauss); + this->GetBSSAprime(Bprime,basaltria,2,xyz_list, gauss_tria); + element->ViscosityHO(&viscosity,3,xyz_list,gauss,vx_input,vy_input); + element->ViscosityHO(&oldviscosity,3,xyz_list,gauss,vxold_input,vyold_input); + + newviscosity=viscosity+viscosity_overshoot*(viscosity-oldviscosity); + D_scalar=2*newviscosity*gauss->weight*Jdet; + for (i=0;i<3;i++) D[i][i]=D_scalar; + + TripleMultiply( B,3,numdofp,1, + &D[0][0],3,3,0, + Bprime,3,numdofm,0, + Ke_gg,1); + } + for(i=0;ivalues[(i+2*numdofm)*numdoftotal+j]+=Ke_gg[i*numdofm+j]; + for(i=0;ivalues[i*numdoftotal+(j+2*numdofm)]+=Ke_gg[j*numdofm+i]; + + /*Transform Coordinate System*/ + element->TransformStiffnessMatrixCoord(Ke,node_list,2*numnodes,cs_list); + + /*Clean-up and return*/ + basaltria->DeleteMaterials(); delete basaltria; + + delete gauss; + delete gauss_tria; + xDelete(B); + xDelete(Bprime); + xDelete(Ke_gg); + xDelete(xyz_list); + xDelete(node_list); + xDelete(cs_list); + return Ke; + +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixCouplingSSAFS(Element* element){/*{{{*/ + + /*compute all stiffness matrices for this element*/ + ElementMatrix* Ke1=CreateKMatrixCouplingSSAFSViscous(element); + ElementMatrix* Ke2=CreateKMatrixCouplingSSAFSFriction(element); + ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); + + /*clean-up and return*/ + delete Ke1; + delete Ke2; + return Ke; +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixCouplingSSAFSFriction(Element* element){/*{{{*/ + + /*Constants*/ + const int numdofs = (6+1)*3 + 6*1; + const int numdofm = 6 *2; + const int numdof2d = 3 *3; + const int numdof2dm = 3 *2; + const int numdoftot = 6*2 + (6+1)*3 +6; // HO + FS vel + FS Pressure + + /*Intermediaries */ + int i,j,approximation; + int dim=3; + IssmDouble FSreconditioning,viscosity,alpha2_gauss,Jdet2d; + IssmDouble bed_normal[3]; + IssmDouble LSSAFS[8][numdof2dm]; + IssmDouble LprimeSSAFS[8][numdofs]; + IssmDouble DLSSAFS[8][8]={0.0}; + IssmDouble LFSSSA[4][numdof2d]; + IssmDouble LprimeFSSSA[4][numdof2dm]; + IssmDouble DLFSSSA[4][4]={0.0}; + IssmDouble Ke_drag[numdof2dm][numdofs]={0.0}; + IssmDouble Ke_drag2[numdof2d][numdof2dm]={0.0}; + IssmDouble *xyz_list = NULL; + IssmDouble *xyz_list_tria = NULL; + + /*If on water or not FS, skip stiffness: */ + element->GetInputValue(&approximation,ApproximationEnum); + if(element->IsFloating() || !element->IsOnBase()) return NULL; + + int vnumnodes = element->NumberofNodesVelocity(); + int pnumnodes = element->NumberofNodesPressure(); + int numnodes = 2*vnumnodes-1+pnumnodes; + + /*Prepare node list*/ + int* cs_list = xNew(2*vnumnodes-1+pnumnodes); + Node **node_list = xNew(2*vnumnodes-1+pnumnodes); + for(i=0;iGetNode(i); + cs_list[i] = XYEnum; + } + for(i=0;iGetNode(i); + cs_list[i+vnumnodes-1] = XYZEnum; + } + for(i=0;iGetNode(vnumnodes+i); + cs_list[2*vnumnodes-1+i] = PressureEnum; + } + + ElementMatrix* Ke1=element->NewElementMatrixCoupling(6,SSAApproximationEnum); + ElementMatrix* Ke2=element->NewElementMatrix(FSvelocityEnum); + ElementMatrix* Ke=new ElementMatrix(Ke1,Ke2); + delete Ke1; delete Ke2; + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + element->GetVerticesCoordinatesBase(&xyz_list_tria); + element->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); + Input* vx_input=element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=element->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input=element->GetInput(VzEnum); _assert_(vz_input); + + /*build friction object, used later on: */ + Friction* friction=new Friction(element,3); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGaussBase(2); + for(int ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); + + element->JacobianDeterminantBase(&Jdet2d,xyz_list_tria,gauss); + this->GetLSSAFS(&LSSAFS[0][0], element,gauss); + this->GetLprimeSSAFS(&LprimeSSAFS[0][0], element,xyz_list, gauss); + this->GetLFSSSA(&LFSSSA[0][0],element, gauss); + this->GetLprimeFSSSA(&LprimeFSSSA[0][0], element,xyz_list, gauss); + + element->ViscosityFS(&viscosity,dim,xyz_list,gauss,vx_input,vy_input,vz_input); + + element->NormalBase(&bed_normal[0],xyz_list_tria); + friction->GetAlpha2(&alpha2_gauss, gauss,vx_input,vy_input,vz_input); + + DLSSAFS[0][0]=alpha2_gauss*gauss->weight*Jdet2d; + DLSSAFS[1][1]=alpha2_gauss*gauss->weight*Jdet2d; + DLSSAFS[2][2]=-alpha2_gauss*gauss->weight*Jdet2d*bed_normal[0]*bed_normal[2]; + DLSSAFS[3][3]=-alpha2_gauss*gauss->weight*Jdet2d*bed_normal[1]*bed_normal[2]; + DLSSAFS[4][4]=-2*viscosity*gauss->weight*Jdet2d*bed_normal[0]; + DLSSAFS[5][5]=-2*viscosity*gauss->weight*Jdet2d*bed_normal[1]; + DLSSAFS[6][6]=FSreconditioning*gauss->weight*Jdet2d*bed_normal[0]; + DLSSAFS[7][7]=FSreconditioning*gauss->weight*Jdet2d*bed_normal[1]; + + DLFSSSA[0][0]=alpha2_gauss*gauss->weight*Jdet2d; + DLFSSSA[1][1]=alpha2_gauss*gauss->weight*Jdet2d; + DLFSSSA[2][2]=-alpha2_gauss*gauss->weight*Jdet2d*bed_normal[0]*bed_normal[2]; + DLFSSSA[3][3]=-alpha2_gauss*gauss->weight*Jdet2d*bed_normal[1]*bed_normal[2]; + + TripleMultiply( &LSSAFS[0][0],8,numdof2dm,1, + &DLSSAFS[0][0],8,8,0, + &LprimeSSAFS[0][0],8,numdofs,0, + &Ke_drag[0][0],1); + + TripleMultiply( &LFSSSA[0][0],4,numdof2d,1, + &DLFSSSA[0][0],4,4,0, + &LprimeFSSSA[0][0],4,numdof2dm,0, + &Ke_drag2[0][0],1); + } + + for(i=0;ivalues[i*numdoftot+j+numdofm]+=Ke_drag[i][j]; + for(i=0;ivalues[(i+numdofm)*numdoftot+j]+=Ke_drag2[i][j]; + + /*Transform Coordinate System*/ + element->TransformStiffnessMatrixCoord(Ke,node_list,numnodes,cs_list); + + /*Clean up and return*/ + xDelete(cs_list); + xDelete(node_list); + xDelete(xyz_list); + xDelete(xyz_list_tria); + delete gauss; + delete friction; + return Ke; +}/*}}}*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrixCouplingSSAFSViscous(Element* element){/*{{{*/ + + /*Constants*/ + const int numdofm = 2 *3; + const int numdofs = 4 *6+ 3; + const int numdoftotal = 2 *numdofm+numdofs; + + /*Intermediaries */ + int i,j; + int dim=3; + IssmDouble Jdet,viscosity,FSreconditioning,D_scalar; + IssmDouble B[4][numdofs]; + IssmDouble Bprime[4][numdofm]; + IssmDouble B2[3][numdofm]; + IssmDouble Bprime2[3][numdofs]; + IssmDouble D[4][4]={0.0}; // material matrix, simple scalar matrix. + IssmDouble D2[3][3]={0.0}; // material matrix, simple scalar matrix. + IssmDouble Ke_gg[numdofs][numdofm]={0.0}; //local element stiffness matrix + IssmDouble Ke_gg2[numdofm][numdofs]={0.0}; //local element stiffness matrix + IssmDouble *xyz_list = NULL; + + /*Find penta on bed as FS must be coupled to the dofs on the bed: */ + Element* pentabase=element->GetBasalElement(); + Element* basaltria=pentabase->SpawnBasalElement(); + + int vnumnodes = element->NumberofNodesVelocity(); + int pnumnodes = element->NumberofNodesPressure(); + int numnodes = 2*vnumnodes-1+pnumnodes; + + /*Prepare node list*/ + int* cs_list = xNew(2*vnumnodes-1+pnumnodes); + Node **node_list = xNew(2*vnumnodes-1+pnumnodes); + for(i=0;iGetNode(i); + cs_list[i] = XYEnum; + } + for(i=0;iGetNode(i); + cs_list[i+vnumnodes-1] = XYZEnum; + } + for(i=0;iGetNode(vnumnodes+i); + cs_list[2*vnumnodes-1+i] = PressureEnum; + } + + /*Initialize Element matrix and return if necessary*/ + ElementMatrix* Ke1=pentabase->NewElementMatrixCoupling(6,SSAApproximationEnum); + ElementMatrix* Ke2=element->NewElementMatrix(FSvelocityEnum); + ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); + delete Ke1; delete Ke2; + + /* Get node coordinates and dof list: */ + element->GetVerticesCoordinates(&xyz_list); + element->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); + Input* vx_input=element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=element->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input=element->GetInput(VzEnum); _assert_(vz_input); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(5); + Gauss* gauss_tria=new GaussTria(); + for(int ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); + gauss->SynchronizeGaussBase(gauss_tria); + + element->JacobianDeterminant(&Jdet, xyz_list,gauss); + this->GetBSSAFS(&B[0][0],element,xyz_list, gauss); + this->GetBprimeSSAFSTria(&Bprime[0][0], basaltria,xyz_list, gauss_tria); + this->GetBSSAFSTria(&B2[0][0], basaltria,xyz_list, gauss_tria); + this->GetBprimeSSAFS(&Bprime2[0][0], element,xyz_list, gauss); + + element->ViscosityFS(&viscosity,dim,xyz_list,gauss,vx_input,vy_input,vz_input); + + D_scalar=2*viscosity*gauss->weight*Jdet; + for (i=0;i<3;i++) D[i][i]=D_scalar; + D[3][3]=-gauss->weight*Jdet*FSreconditioning; + for (i=0;i<3;i++) D2[i][i]=D_scalar; + + TripleMultiply( &B[0][0],4,numdofs,1, + &D[0][0],4,4,0, + &Bprime[0][0],4,numdofm,0, + &Ke_gg[0][0],1); + + TripleMultiply( &B2[0][0],3,numdofm,1, + &D2[0][0],3,3,0, + &Bprime2[0][0],3,numdofs,0, + &Ke_gg2[0][0],1); + + } + for(i=0;ivalues[(i+2*numdofm)*numdoftotal+j]+=Ke_gg[i][j]; + for(i=0;ivalues[i*numdoftotal+(j+2*numdofm)]+=Ke_gg2[i][j]; + + /*Transform Coordinate System*/ + element->TransformStiffnessMatrixCoord(Ke,node_list,numnodes,cs_list); + + /*Clean-up and return*/ + xDelete(cs_list); + xDelete(node_list); + xDelete(xyz_list); + delete basaltria->material; delete basaltria; + delete gauss; + delete gauss_tria; + return Ke; + +}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreatePVectorSSAHO(Element* element){/*{{{*/ + + /*compute all load vectors for this element*/ + ElementVector* pe1=CreatePVectorSSA(element); + ElementVector* pe2=CreatePVectorHO(element); + ElementVector* pe =new ElementVector(pe1,pe2); + + /*clean-up and return*/ + delete pe1; + delete pe2; + return pe; +}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreatePVectorSSAFS(Element* element){/*{{{*/ + + /*compute all load vectors for this element*/ + int init = element->FiniteElement(); + element->SetTemporaryElementType(P1Enum); // P1 needed for HO + ElementVector* pe1=CreatePVectorSSA(element); + element->SetTemporaryElementType(init); // P1 needed for HO + ElementVector* pe2=CreatePVectorFS(element); + int indices[3]={18,19,20}; + element->SetTemporaryElementType(MINIcondensedEnum); // P1 needed for HO + ElementMatrix* Ke = CreateKMatrixFS(element); + element->SetTemporaryElementType(init); // P1 needed for HO + pe2->StaticCondensation(Ke,3,&indices[0]); + delete Ke; + ElementVector* pe3=CreatePVectorCouplingSSAFS(element); + ElementVector* pe =new ElementVector(pe1,pe2,pe3); + + /*clean-up and return*/ + delete pe1; + delete pe2; + delete pe3; + return pe; +}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreatePVectorHOFS(Element* element){/*{{{*/ + + /*compute all load vectors for this element*/ + int init = element->FiniteElement(); + element->SetTemporaryElementType(P1Enum); + ElementVector* pe1=CreatePVectorHO(element); + element->SetTemporaryElementType(init); + ElementVector* pe2=CreatePVectorFS(element); + int indices[3]={18,19,20}; + element->SetTemporaryElementType(MINIcondensedEnum); + ElementMatrix* Ke = CreateKMatrixFS(element); + element->SetTemporaryElementType(init); + pe2->StaticCondensation(Ke,3,&indices[0]); + delete Ke; + ElementVector* pe3=CreatePVectorCouplingHOFS(element); + ElementVector* pe =new ElementVector(pe1,pe2,pe3); + + /*clean-up and return*/ + delete pe1; + delete pe2; + delete pe3; + return pe; +}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreatePVectorCouplingHOFS(Element* element){/*{{{*/ + + /*compute all load vectors for this element*/ + ElementVector* pe1=CreatePVectorCouplingHOFSViscous(element); + ElementVector* pe2=CreatePVectorCouplingHOFSFriction(element); + ElementVector* pe =new ElementVector(pe1,pe2); + + /*clean-up and return*/ + delete pe1; + delete pe2; + return pe; +}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreatePVectorCouplingHOFSFriction(Element* element){/*{{{*/ + + /*Intermediaries*/ + int i,j,approximation; + int dim=3; + IssmDouble Jdet,Jdet2d,FSreconditioning; + IssmDouble bed_normal[3]; + IssmDouble viscosity, w, alpha2_gauss; + IssmDouble dw[3]; + IssmDouble *xyz_list_tria = NULL; + IssmDouble *xyz_list = NULL; + IssmDouble basis[6]; //for the six nodes of the penta + + /*Initialize Element vector and return if necessary*/ + if(!element->IsOnBase() || element->IsFloating()) return NULL; + element->GetInputValue(&approximation,ApproximationEnum); + if(approximation!=HOFSApproximationEnum) return NULL; + + int vnumnodes = element->NumberofNodesVelocity(); + int pnumnodes = element->NumberofNodesPressure(); + int numnodes = vnumnodes+pnumnodes; + + /*Prepare coordinate system list*/ + int* cs_list = xNew(vnumnodes+pnumnodes); + Node **node_list = xNew(vnumnodes+pnumnodes); + for(i=0;iGetNode(i); + } + for(i=0;iGetNode(vnumnodes+i); + } + + ElementVector* pe=element->NewElementVector(FSvelocityEnum); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + element->GetVerticesCoordinatesBase(&xyz_list_tria); + element->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); + Input* vx_input= element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input= element->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input= element->GetInput(VzEnum); _assert_(vz_input); + Input* vzHO_input=element->GetInput(VzHOEnum); _assert_(vzHO_input); + + /*build friction object, used later on: */ + Friction* friction=new Friction(element,3); + + /* Start looping on the number of gauss 2d (nodes on the bedrock) */ + Gauss* gauss=element->NewGaussBase(2); + for(int ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); + + element->JacobianDeterminantBase(&Jdet2d,xyz_list_tria,gauss); + element->NodalFunctionsP1(basis, gauss); + + vzHO_input->GetInputValue(&w, gauss); + vzHO_input->GetInputDerivativeValue(&dw[0],xyz_list,gauss); + + element->NormalBase(&bed_normal[0],xyz_list_tria); + element->ViscosityFS(&viscosity,dim,xyz_list,gauss,vx_input,vy_input,vz_input); + friction->GetAlpha2(&alpha2_gauss, gauss,vx_input,vy_input,vz_input); + + for(i=0;i<3;i++){ + pe->values[i*3+0]+=Jdet2d*gauss->weight*(alpha2_gauss*w*bed_normal[0]*bed_normal[2]+2*viscosity*dw[2]*bed_normal[0])*basis[i]; + pe->values[i*3+1]+=Jdet2d*gauss->weight*(alpha2_gauss*w*bed_normal[1]*bed_normal[2]+2*viscosity*dw[2]*bed_normal[1])*basis[i]; + pe->values[i*3+2]+=Jdet2d*gauss->weight*2*viscosity*(dw[0]*bed_normal[0]+dw[1]*bed_normal[1]+dw[2]*bed_normal[2])*basis[i]; + } + } + + /*Transform coordinate system*/ + element->TransformLoadVectorCoord(pe,node_list,vnumnodes+pnumnodes,cs_list); + + /*Clean up and return*/ + xDelete(cs_list); + xDelete(node_list); + xDelete(xyz_list); + xDelete(xyz_list_tria); + delete gauss; + delete friction; + return pe; +}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreatePVectorCouplingHOFSViscous(Element* element){/*{{{*/ + + /*Intermediaries */ + int i,approximation; + int dim=3; + IssmDouble viscosity,Jdet,FSreconditioning; + IssmDouble dw[3]; + IssmDouble *xyz_list = NULL; + IssmDouble basis[6]; //for the six nodes of the penta + IssmDouble dbasis[3][6]; //for the six nodes of the penta + + /*Initialize Element vector and return if necessary*/ + element->GetInputValue(&approximation,ApproximationEnum); + if(approximation!=HOFSApproximationEnum) return NULL; + int vnumnodes = element->NumberofNodesVelocity(); + int pnumnodes = element->NumberofNodesPressure(); + + /*Prepare coordinate system list*/ + int* cs_list = xNew(vnumnodes+pnumnodes); + Node **node_list = xNew(vnumnodes+pnumnodes); + for(i=0;iGetNode(i); + } + for(i=0;iGetNode(vnumnodes+i); + } + ElementVector* pe = element->NewElementVector(FSvelocityEnum); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + element->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); + Input* vx_input =element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input =element->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input =element->GetInput(VzEnum); _assert_(vz_input); + Input* vzHO_input=element->GetInput(VzHOEnum); _assert_(vzHO_input); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(5); + for(int ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet, xyz_list,gauss); + element->NodalFunctionsP1(&basis[0],gauss); + element->NodalFunctionsP1Derivatives(&dbasis[0][0],xyz_list,gauss); + + element->ViscosityFS(&viscosity,dim,xyz_list,gauss,vx_input,vy_input,vz_input); + vzHO_input->GetInputDerivativeValue(&dw[0],xyz_list,gauss); + + for(i=0;i<6;i++){ + pe->values[i*3+0]+=-Jdet*gauss->weight*viscosity*dw[0]*dbasis[2][i]; + pe->values[i*3+1]+=-Jdet*gauss->weight*viscosity*dw[1]*dbasis[2][i]; + pe->values[i*3+2]+=-Jdet*gauss->weight*viscosity*(dw[0]*dbasis[0][i]+dw[1]*dbasis[1][i]+2*dw[2]*dbasis[2][i]); + pe->values[3*vnumnodes+i]+=Jdet*gauss->weight*FSreconditioning*dw[2]*basis[i]; + } + } + + /*Transform coordinate system*/ + element->TransformLoadVectorCoord(pe,node_list,vnumnodes+pnumnodes,cs_list); + + /*Clean up and return*/ + xDelete(cs_list); + xDelete(node_list); + xDelete(xyz_list); + delete gauss; + return pe; +}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreatePVectorCouplingSSAFS(Element* element){/*{{{*/ + + /*compute all load vectors for this element*/ + ElementVector* pe1=CreatePVectorCouplingSSAFSViscous(element); + ElementVector* pe2=CreatePVectorCouplingSSAFSFriction(element); + ElementVector* pe =new ElementVector(pe1,pe2); + + /*clean-up and return*/ + delete pe1; + delete pe2; + return pe; +}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreatePVectorCouplingSSAFSFriction(Element* element){/*{{{*/ + + /*Intermediaries*/ + int i,j,approximation; + int dim=3; + IssmDouble Jdet,Jdet2d,FSreconditioning; + IssmDouble bed_normal[3]; + IssmDouble viscosity, w, alpha2_gauss; + IssmDouble dw[3]; + IssmDouble basis[6]; //for the six nodes of the penta + IssmDouble *xyz_list_tria = NULL; + IssmDouble *xyz_list = NULL; + + /*Initialize Element vector and return if necessary*/ + if(!element->IsOnBase() || element->IsFloating()) return NULL; + element->GetInputValue(&approximation,ApproximationEnum); + if(approximation!=SSAFSApproximationEnum) return NULL; + int vnumnodes = element->NumberofNodesVelocity(); + int pnumnodes = element->NumberofNodesPressure(); + + /*Prepare coordinate system list*/ + int* cs_list = xNew(vnumnodes+pnumnodes); + Node **node_list = xNew(vnumnodes+pnumnodes); + for(i=0;iGetNode(i); + } + for(i=0;iGetNode(vnumnodes+i); + } + ElementVector* pe=element->NewElementVector(FSvelocityEnum); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + element->GetVerticesCoordinatesBase(&xyz_list_tria); + element->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); + Input* vx_input= element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input= element->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input= element->GetInput(VzEnum); _assert_(vz_input); + Input* vzSSA_input=element->GetInput(VzSSAEnum); _assert_(vzSSA_input); + + /*build friction object, used later on: */ + Friction* friction=new Friction(element,3); + + /* Start looping on the number of gauss 2d (nodes on the bedrock) */ + Gauss* gauss=element->NewGaussBase(2); + for(int ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); + + element->JacobianDeterminantBase(&Jdet2d,xyz_list_tria,gauss); + element->NodalFunctionsP1(basis, gauss); + + vzSSA_input->GetInputValue(&w, gauss); + vzSSA_input->GetInputDerivativeValue(&dw[0],xyz_list,gauss); + + element->NormalBase(&bed_normal[0],xyz_list_tria); + element->ViscosityFS(&viscosity,dim,xyz_list,gauss,vx_input,vy_input,vz_input); + friction->GetAlpha2(&alpha2_gauss, gauss,vx_input,vy_input,vz_input); + + for(i=0;i<3;i++){ + pe->values[i*3+0]+=Jdet2d*gauss->weight*(alpha2_gauss*w*bed_normal[0]*bed_normal[2]+2*viscosity*dw[2]*bed_normal[0])*basis[i]; + pe->values[i*3+1]+=Jdet2d*gauss->weight*(alpha2_gauss*w*bed_normal[1]*bed_normal[2]+2*viscosity*dw[2]*bed_normal[1])*basis[i]; + pe->values[i*3+2]+=Jdet2d*gauss->weight*2*viscosity*(dw[0]*bed_normal[0]+dw[1]*bed_normal[1]+dw[2]*bed_normal[2])*basis[i]; + } + } + + /*Transform coordinate system*/ + element->TransformLoadVectorCoord(pe,node_list,vnumnodes+pnumnodes,cs_list); + + /*Clean up and return*/ + xDelete(cs_list); + xDelete(xyz_list); + xDelete(xyz_list_tria); + xDelete(node_list); + delete gauss; + delete friction; + return pe; +}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreatePVectorCouplingSSAFSViscous(Element* element){/*{{{*/ + + /*Intermediaries */ + int i,approximation; + IssmDouble viscosity,Jdet,FSreconditioning; + IssmDouble dw[3]; + IssmDouble *xyz_list = NULL; + IssmDouble basis[6]; //for the six nodes of the penta + IssmDouble dbasis[3][6]; //for the six nodes of the penta + + /*Initialize Element vector and return if necessary*/ + element->GetInputValue(&approximation,ApproximationEnum); + if(approximation!=SSAFSApproximationEnum) return NULL; + int vnumnodes = element->NumberofNodesVelocity(); + int pnumnodes = element->NumberofNodesPressure(); + + /*Prepare coordinate system list*/ + int* cs_list = xNew(vnumnodes+pnumnodes); + Node **node_list = xNew(vnumnodes+pnumnodes); + for(i=0;iGetNode(i); + } + for(i=0;iGetNode(vnumnodes+i); + } + ElementVector* pe=element->NewElementVector(FSvelocityEnum); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + element->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); + Input* vx_input =element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input =element->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input =element->GetInput(VzEnum); _assert_(vz_input); + Input* vzSSA_input=element->GetInput(VzSSAEnum); _assert_(vzSSA_input); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(5); + for(int ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctionsP1(&basis[0], gauss); + element->NodalFunctionsP1Derivatives(&dbasis[0][0],xyz_list, gauss); + + vzSSA_input->GetInputDerivativeValue(&dw[0],xyz_list,gauss); + element->ViscosityFS(&viscosity,3,xyz_list,gauss,vx_input,vy_input,vz_input); + + for(i=0;i<6;i++){ + pe->values[i*3+0]+=-Jdet*gauss->weight*viscosity*dw[0]*dbasis[2][i]; + pe->values[i*3+1]+=-Jdet*gauss->weight*viscosity*dw[1]*dbasis[2][i]; + pe->values[i*3+2]+=-Jdet*gauss->weight*viscosity*(dw[0]*dbasis[0][i]+dw[1]*dbasis[1][i]+2*dw[2]*dbasis[2][i]); + pe->values[3*vnumnodes+i]+=Jdet*gauss->weight*FSreconditioning*dw[2]*basis[i]; + } + } + + /*Transform coordinate system*/ + element->TransformLoadVectorCoord(pe,node_list,vnumnodes+pnumnodes,cs_list); + + /*Clean up and return*/ + xDelete(cs_list); + xDelete(node_list); + xDelete(xyz_list); + delete gauss; + return pe; +}/*}}}*/ +void StressbalanceAnalysis::GetBSSAHO(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 3*NDOF2. + * For node i, Bi can be expressed in the actual coordinate system + * by: + * Bi=[ dh/dx 0 ] + * [ 0 dh/dy ] + * [ 1/2*dh/dy 1/2*dh/dx ] + * where h is the interpolation function for node i. + * + * We assume B has been allocated already, of size: 5x(NDOF2*NUMNODESP1) + */ + + int numnodes = element->GetNumberOfNodes(); + IssmDouble* dbasis=xNew(3*numnodes); + + /*Get dbasis in actual coordinate system: */ + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B: */ + for(int i=0;i(dbasis); +}/*}}}*/ +void StressbalanceAnalysis::GetBSSAFS(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF2. + * For node i, Bi can be expressed in the actual coordinate system + * by: + * Bi=[ dh/dx 0 0 0 ] + * [ 0 dh/dy 0 0 ] + * [ 1/2*dh/dy 1/2*dh/dx 0 0 ] + * [ 0 0 0 h ] + * where h is the interpolation function for node i. + * + * We assume B has been allocated already, of size: 5x(NDOF2*NUMNODESP1) + */ + + int i; + IssmDouble dbasismini[3][7]; + IssmDouble basis[6]; + + /*Get dbasis in actual coordinate system: */ + element->NodalFunctionsMINIDerivatives(&dbasismini[0][0],xyz_list, gauss); + element->NodalFunctionsP1(basis,gauss); + + /*Build B: */ + for(i=0;i<6;i++){ + B[(3*7+6)*0+3*i+0] = dbasismini[0][i]; + B[(3*7+6)*0+3*i+1] = 0.; + B[(3*7+6)*0+3*i+2] = 0.; + B[(3*7+6)*1+3*i+0] = 0.; + B[(3*7+6)*1+3*i+1] = dbasismini[1][i]; + B[(3*7+6)*1+3*i+2] = 0.; + B[(3*7+6)*2+3*i+0] = 0.5*dbasismini[1][i]; + B[(3*7+6)*2+3*i+1] = 0.5*dbasismini[0][i]; + B[(3*7+6)*2+3*i+2] = 0.; + B[(3*7+6)*3+3*i+0] = 0.; + B[(3*7+6)*3+3*i+1] = 0.; + B[(3*7+6)*3+3*i+2] = 0.; + } + for(i=0;i<1;i++){ + B[(3*7+6)*0+3*(6+i)+0] = 0.; + B[(3*7+6)*0+3*(6+i)+1] = 0.; + B[(3*7+6)*0+3*(6+i)+2] = 0.; + B[(3*7+6)*1+3*(6+i)+0] = 0.; + B[(3*7+6)*1+3*(6+i)+1] = 0.; + B[(3*7+6)*1+3*(6+i)+2] = 0.; + B[(3*7+6)*2+3*(6+i)+0] = 0.; + B[(3*7+6)*2+3*(6+i)+1] = 0.; + B[(3*7+6)*2+3*(6+i)+2] = 0.; + B[(3*7+6)*3+3*(6+i)+0] = 0.; + B[(3*7+6)*3+3*(6+i)+1] = 0.; + B[(3*7+6)*3+3*(6+i)+2] = 0.; + } + + for(i=0;i<6;i++){ //last column not for the bubble function + B[(3*7+6)*0+7*3+i] = 0; + B[(3*7+6)*1+7*3+i] = 0; + B[(3*7+6)*2+7*3+i] = 0; + B[(3*7+6)*3+7*3+i] = basis[i]; + } +}/*}}}*/ +void StressbalanceAnalysis::GetBprimeSSAFS(IssmDouble* Bprime,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute Bprime matrix. Bprime=[Bprime1 Bprime2 Bprime3 Bprime4 Bprime5 Bprime6] where Bprimei is of size 5*NDOF2. + * For node i, Bprimei can be expressed in the actual coordinate system + * by: + * Bprimei=[ 2*dh/dx dh/dy 0 0 ] + * [ dh/dx 2*dh/dy 0 0 ] + * [ dh/dy dh/dx 0 0 ] + * where h is the interpolation function for node i. + * + * We assume Bprime has been allocated already, of size: 5x(NDOF2*NUMNODESP1) + */ + + int i; + IssmDouble dbasismini[3][7]; + + /*Get dbasis in actual coordinate system: */ + element->NodalFunctionsMINIDerivatives(&dbasismini[0][0],xyz_list, gauss); + + /*Build Bprime: */ + for(i=0;i<6;i++){ + Bprime[(3*7+6)*0+3*i+0] = 2.*dbasismini[0][i]; + Bprime[(3*7+6)*0+3*i+1] = dbasismini[1][i]; + Bprime[(3*7+6)*0+3*i+2] = 0.; + Bprime[(3*7+6)*1+3*i+0] = dbasismini[0][i]; + Bprime[(3*7+6)*1+3*i+1] = 2.*dbasismini[1][i]; + Bprime[(3*7+6)*1+3*i+2] = 0.; + Bprime[(3*7+6)*2+3*i+0] = dbasismini[1][i]; + Bprime[(3*7+6)*2+3*i+1] = dbasismini[0][i]; + Bprime[(3*7+6)*2+3*i+2] = 0.; + } + + for(i=0;i<1;i++){ //Add zeros for the bubble function + Bprime[(3*7+6)*0+3*(6+i)+0] = 0.; + Bprime[(3*7+6)*0+3*(6+i)+1] = 0.; + Bprime[(3*7+6)*0+3*(6+i)+2] = 0.; + Bprime[(3*7+6)*1+3*(6+i)+0] = 0.; + Bprime[(3*7+6)*1+3*(6+i)+1] = 0.; + Bprime[(3*7+6)*1+3*(6+i)+2] = 0.; + Bprime[(3*7+6)*2+3*(6+i)+0] = 0.; + Bprime[(3*7+6)*2+3*(6+i)+1] = 0.; + Bprime[(3*7+6)*2+3*(6+i)+2] = 0.; + } + + for(i=0;i<6;i++){ //last column not for the bubble function + Bprime[(3*7+6)*0+7*3+i] = 0.; + Bprime[(3*7+6)*1+7*3+i] = 0.; + Bprime[(3*7+6)*2+7*3+i] = 0.; + } +}/*}}}*/ +void StressbalanceAnalysis::GetBSSAFSTria(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2. + * For node i, Bi can be expressed in the actual coordinate system + * by: + * Bi=[ dN/dx 0 ] + * [ 0 dN/dy ] + * [ 1/2*dN/dy 1/2*dN/dx ] + * where N is the finiteelement function for node i. + * + * We assume B has been allocated already, of size: 3x(NDOF2*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(2*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B': */ + for(int i=0;i(dbasis); +}/*}}}*/ +void StressbalanceAnalysis::GetBprimeSSAFSTria(IssmDouble* Bprime,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute Bprime matrix. Bprime=[Bprime1 Bprime2 Bprime3] where Bprimei is of size 3*NDOF2. + * For node i, Bprimei can be expressed in the actual coordinate system + * by: + * Bprimei=[ dN/dx 0 ] + * [ 0 dN/dy ] + * [ dN/dy dN/dx ] + N [ dN/dx dN/dy ] + * where N is the finiteelement function for node i. + * + * We assume Bprime has been allocated already, of size: 3x(NDOF2*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions*/ + IssmDouble* dbasis=xNew(2*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build Bprime: */ + for(int i=0;i(dbasis); +}/*}}}*/ +void StressbalanceAnalysis::GetLSSAFS(IssmDouble* LFS,Element* element,Gauss* gauss_in){/*{{{*/ + /* + * Compute L matrix. L=[L1 L2 L3] where Li is square and of size numdof. + * For node i, Li can be expressed in the actual coordinate system + * by: + * Li=[ h 0 ] + * [ 0 h ] + * [ h 0 ] + * [ 0 h ] + * [ h 0 ] + * [ 0 h ] + * [ h 0 ] + * [ 0 h ] + * where h is the interpolation function for node i. + */ + + int num_dof=2; + IssmDouble L1L2l3[3]; + + /*Cast gauss to GaussPenta*/ + _assert_(gauss_in->Enum()==GaussPentaEnum); + GaussPenta* gauss = dynamic_cast(gauss_in); + + /*Get L1L2l3 in actual coordinate system: */ + L1L2l3[0]=gauss->coord1*(1-gauss->coord4)/2.0; + L1L2l3[1]=gauss->coord2*(1-gauss->coord4)/2.0; + L1L2l3[2]=gauss->coord3*(1-gauss->coord4)/2.0; + + /*Build LFS: */ + for(int i=0;i<3;i++){ + LFS[num_dof*3*0+num_dof*i+0] = L1L2l3[i]; + LFS[num_dof*3*0+num_dof*i+1] = 0; + LFS[num_dof*3*1+num_dof*i+0] = 0; + LFS[num_dof*3*1+num_dof*i+1] = L1L2l3[i]; + LFS[num_dof*3*2+num_dof*i+0] = L1L2l3[i]; + LFS[num_dof*3*2+num_dof*i+1] = 0; + LFS[num_dof*3*3+num_dof*i+0] = 0; + LFS[num_dof*3*3+num_dof*i+1] = L1L2l3[i]; + LFS[num_dof*3*4+num_dof*i+0] = L1L2l3[i]; + LFS[num_dof*3*4+num_dof*i+1] = 0; + LFS[num_dof*3*5+num_dof*i+0] = 0; + LFS[num_dof*3*5+num_dof*i+1] = L1L2l3[i]; + LFS[num_dof*3*6+num_dof*i+0] = L1L2l3[i]; + LFS[num_dof*3*6+num_dof*i+1] = 0; + LFS[num_dof*3*7+num_dof*i+0] = 0; + LFS[num_dof*3*7+num_dof*i+1] = L1L2l3[i]; + } +}/*}}}*/ +void StressbalanceAnalysis::GetLprimeSSAFS(IssmDouble* LprimeFS,Element* element,IssmDouble* xyz_list,Gauss* gauss_in){/*{{{*/ + /* Compute Lprime matrix. Lprime=[Lp1 Lp2 Lp3] where Lpi is square and of size numdof. + * For node i, Lpi can be expressed in the actual coordinate system + * by: + * Lpi=[ h 0 0 0] + * [ 0 h 0 0] + * [ 0 0 h 0] + * [ 0 0 h 0] + * [ 0 0 dh/dz 0] + * [ 0 0 dh/dz 0] + * [ 0 0 0 h] + * [ 0 0 0 h] + * where h is the interpolation function for node i. + */ + int num_dof=3; + int num_dof_vel=3*7; + int num_dof_total=3*7+1*6; + IssmDouble L1L2l3[3]; + IssmDouble dbasis[3][6]; + + /*Cast gauss to GaussPenta*/ + _assert_(gauss_in->Enum()==GaussPentaEnum); + GaussPenta* gauss = dynamic_cast(gauss_in); + + /*Get L1L2l3 in actual coordinate system: */ + L1L2l3[0]=gauss->coord1*(1-gauss->coord4)/2.0; + L1L2l3[1]=gauss->coord2*(1-gauss->coord4)/2.0; + L1L2l3[2]=gauss->coord3*(1-gauss->coord4)/2.0; + + element->NodalFunctionsP1Derivatives(&dbasis[0][0],xyz_list,gauss); + + /*Build LprimeFS: */ + for(int i=0;i<3;i++){ + LprimeFS[num_dof_total*0+num_dof*i+0] = L1L2l3[i]; + LprimeFS[num_dof_total*0+num_dof*i+1] = 0.; + LprimeFS[num_dof_total*0+num_dof*i+2] = 0.; + LprimeFS[num_dof_total*1+num_dof*i+0] = 0.; + LprimeFS[num_dof_total*1+num_dof*i+1] = L1L2l3[i]; + LprimeFS[num_dof_total*1+num_dof*i+2] = 0.; + LprimeFS[num_dof_total*2+num_dof*i+0] = 0.; + LprimeFS[num_dof_total*2+num_dof*i+1] = 0.; + LprimeFS[num_dof_total*2+num_dof*i+2] = L1L2l3[i]; + LprimeFS[num_dof_total*3+num_dof*i+0] = 0.; + LprimeFS[num_dof_total*3+num_dof*i+1] = 0.; + LprimeFS[num_dof_total*3+num_dof*i+2] = L1L2l3[i]; + LprimeFS[num_dof_total*4+num_dof*i+0] = 0.; + LprimeFS[num_dof_total*4+num_dof*i+1] = 0.; + LprimeFS[num_dof_total*4+num_dof*i+2] = dbasis[2][i]; + LprimeFS[num_dof_total*5+num_dof*i+0] = 0.; + LprimeFS[num_dof_total*5+num_dof*i+1] = 0.; + LprimeFS[num_dof_total*5+num_dof*i+2] = dbasis[2][i]; + LprimeFS[num_dof_total*6+num_dof*i+0] = 0.; + LprimeFS[num_dof_total*6+num_dof*i+1] = 0.; + LprimeFS[num_dof_total*6+num_dof*i+2] = 0.; + LprimeFS[num_dof_total*7+num_dof*i+0] = 0.; + LprimeFS[num_dof_total*7+num_dof*i+1] = 0.; + LprimeFS[num_dof_total*7+num_dof*i+2] = 0.; + } + for(int i=3;i<7;i++){ + LprimeFS[num_dof_total*0+num_dof*i+0] = 0.; + LprimeFS[num_dof_total*0+num_dof*i+1] = 0.; + LprimeFS[num_dof_total*0+num_dof*i+2] = 0.; + LprimeFS[num_dof_total*1+num_dof*i+0] = 0.; + LprimeFS[num_dof_total*1+num_dof*i+1] = 0.; + LprimeFS[num_dof_total*1+num_dof*i+2] = 0.; + LprimeFS[num_dof_total*2+num_dof*i+0] = 0.; + LprimeFS[num_dof_total*2+num_dof*i+1] = 0.; + LprimeFS[num_dof_total*2+num_dof*i+2] = 0.; + LprimeFS[num_dof_total*3+num_dof*i+0] = 0.; + LprimeFS[num_dof_total*3+num_dof*i+1] = 0.; + LprimeFS[num_dof_total*3+num_dof*i+2] = 0.; + LprimeFS[num_dof_total*4+num_dof*i+0] = 0.; + LprimeFS[num_dof_total*4+num_dof*i+1] = 0.; + LprimeFS[num_dof_total*4+num_dof*i+2] = 0.; + LprimeFS[num_dof_total*5+num_dof*i+0] = 0.; + LprimeFS[num_dof_total*5+num_dof*i+1] = 0.; + LprimeFS[num_dof_total*5+num_dof*i+2] = 0.; + LprimeFS[num_dof_total*6+num_dof*i+0] = 0.; + LprimeFS[num_dof_total*6+num_dof*i+1] = 0.; + LprimeFS[num_dof_total*6+num_dof*i+2] = 0.; + LprimeFS[num_dof_total*7+num_dof*i+0] = 0.; + LprimeFS[num_dof_total*7+num_dof*i+1] = 0.; + LprimeFS[num_dof_total*7+num_dof*i+2] = 0.; + } + for(int i=0;i<3;i++){ + LprimeFS[num_dof_total*0+num_dof_vel+i] = 0.; + LprimeFS[num_dof_total*1+num_dof_vel+i] = 0.; + LprimeFS[num_dof_total*2+num_dof_vel+i] = 0.; + LprimeFS[num_dof_total*3+num_dof_vel+i] = 0.; + LprimeFS[num_dof_total*4+num_dof_vel+i] = 0.; + LprimeFS[num_dof_total*5+num_dof_vel+i] = 0.; + LprimeFS[num_dof_total*6+num_dof_vel+i] = L1L2l3[i]; + LprimeFS[num_dof_total*7+num_dof_vel+i] = L1L2l3[i]; + } + for(int i=3;i<6;i++){ + LprimeFS[num_dof_total*0+num_dof_vel+i] = 0.; + LprimeFS[num_dof_total*1+num_dof_vel+i] = 0.; + LprimeFS[num_dof_total*2+num_dof_vel+i] = 0.; + LprimeFS[num_dof_total*3+num_dof_vel+i] = 0.; + LprimeFS[num_dof_total*4+num_dof_vel+i] = 0.; + LprimeFS[num_dof_total*5+num_dof_vel+i] = 0.; + LprimeFS[num_dof_total*6+num_dof_vel+i] = 0.; + LprimeFS[num_dof_total*7+num_dof_vel+i] = 0.; + } +}/*}}}*/ +void StressbalanceAnalysis::GetLFSSSA(IssmDouble* LFS,Element* element,Gauss* gauss_in){/*{{{*/ + /* Compute L matrix. L=[L1 L2 L3] where Li is square and of size numdof. + * For node i, Li can be expressed in the actual coordinate system + * by: + * Li=[ h 0 0 ] + * [ 0 h 0 ] + * [ 0 0 h ] + * [ 0 0 h ] + * where h is the interpolation function for node i. + */ + + int num_dof=3; + IssmDouble L1L2l3[3]; + + /*Cast gauss to GaussPenta*/ + _assert_(gauss_in->Enum()==GaussPentaEnum); + GaussPenta* gauss = dynamic_cast(gauss_in); + + /*Get L1L2l3 in actual coordinate system: */ + L1L2l3[0]=gauss->coord1*(1-gauss->coord4)/2.0; + L1L2l3[1]=gauss->coord2*(1-gauss->coord4)/2.0; + L1L2l3[2]=gauss->coord3*(1-gauss->coord4)/2.0; + + /*Build LFS: */ + for(int i=0;i<3;i++){ + LFS[num_dof*3*0+num_dof*i+0] = L1L2l3[i]; + LFS[num_dof*3*0+num_dof*i+1] = 0.; + LFS[num_dof*3*0+num_dof*i+2] = 0.; + LFS[num_dof*3*1+num_dof*i+0] = 0.; + LFS[num_dof*3*1+num_dof*i+1] = L1L2l3[i]; + LFS[num_dof*3*1+num_dof*i+2] = 0.; + LFS[num_dof*3*2+num_dof*i+0] = 0.; + LFS[num_dof*3*2+num_dof*i+1] = 0.; + LFS[num_dof*3*2+num_dof*i+2] = L1L2l3[i]; + LFS[num_dof*3*3+num_dof*i+0] = 0.; + LFS[num_dof*3*3+num_dof*i+1] = 0.; + LFS[num_dof*3*3+num_dof*i+2] = L1L2l3[i]; + } +}/*}}}*/ +void StressbalanceAnalysis::GetLprimeFSSSA(IssmDouble* LprimeFS,Element* element,IssmDouble* xyz_list,Gauss* gauss_in){/*{{{*/ + /* Compute Lprime matrix. Lprime=[Lp1 Lp2 Lp3] where Lpi is square and of size numdof. + * For node i, Lpi can be expressed in the actual coordinate system + * by: + * Lpi=[ h 0 ] + * [ 0 h ] + * [ h 0 ] + * [ 0 h ] + * where h is the interpolation function for node i. + */ + int num_dof=2; + IssmDouble L1L2l3[3]; + + /*Cast gauss to GaussPenta*/ + _assert_(gauss_in->Enum()==GaussPentaEnum); + GaussPenta* gauss = dynamic_cast(gauss_in); + + /*Get L1L2l3 in actual coordinate system: */ + L1L2l3[0]=gauss->coord1*(1-gauss->coord4)/2.0; + L1L2l3[1]=gauss->coord2*(1-gauss->coord4)/2.0; + L1L2l3[2]=gauss->coord3*(1-gauss->coord4)/2.0; + + /*Build LprimeFS: */ + for(int i=0;i<3;i++){ + LprimeFS[num_dof*3*0+num_dof*i+0] = L1L2l3[i]; + LprimeFS[num_dof*3*0+num_dof*i+1] = 0.; + LprimeFS[num_dof*3*1+num_dof*i+0] = 0.; + LprimeFS[num_dof*3*1+num_dof*i+1] = L1L2l3[i]; + LprimeFS[num_dof*3*2+num_dof*i+0] = L1L2l3[i]; + LprimeFS[num_dof*3*2+num_dof*i+1] = 0.; + LprimeFS[num_dof*3*3+num_dof*i+0] = 0.; + LprimeFS[num_dof*3*3+num_dof*i+1] = L1L2l3[i]; + } +}/*}}}*/ +void StressbalanceAnalysis::InputUpdateFromSolutionHOFS(IssmDouble* solution,Element* element){/*{{{*/ + + int i; + IssmDouble rho_ice,g,FSreconditioning; + int* doflistHO = NULL; + int* doflistFSv = NULL; + int* doflistFSp = NULL; + + /*Only works with Penta for now*/ + if(element->ObjectEnum()!=PentaEnum) _error_("Coupling not supported for "<ObjectEnum())); + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = 6; + int numdofHO = 6*2; + int numdofFSv = 6*3; + int numdofFSp = 6; + + /*Fetch dof list and allocate solution vectors*/ + element->GetDofList(&doflistFSv,FSvelocityEnum,GsetEnum); + element->GetDofList(&doflistHO, HOApproximationEnum, GsetEnum); + element->GetDofListPressure(&doflistFSp,GsetEnum); + IssmDouble* HOvalues = xNew(numdofHO); + IssmDouble* FSvalues = xNew(numdofFSv+numdofFSp); + IssmDouble* vx = xNew(numnodes); + IssmDouble* vy = xNew(numnodes); + IssmDouble* vz = xNew(numnodes); + IssmDouble* vzHO = xNew(numnodes); + IssmDouble* vzFS = xNew(numnodes); + IssmDouble* vel = xNew(numnodes); + IssmDouble* pressure = xNew(numnodes); + + /*Prepare coordinate system list*/ + int* cs_list = xNew(2*numnodes); + for(i=0;iFindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); + for(i=0;iTransformSolutionCoord(FSvalues,2*numnodes,cs_list); + element->TransformSolutionCoord(HOvalues,numnodes,XYEnum); + + /*Ok, we have vx and vy in values, fill in vx and vy arrays: */ + for(i=0;i(vx[i])) _error_("NaN found in solution vector"); + if(xIsNan(vy[i])) _error_("NaN found in solution vector"); + if(xIsNan(vzFS[i])) _error_("NaN found in solution vector"); + if(xIsNan(pressure[i])) _error_("NaN found in solution vector"); + } + + /*Get Vz and compute vel*/ + element->GetInputListOnVertices(vzHO,VzHOEnum); + for(i=0;iInputChangeName(VxEnum,VxPicardEnum); + element->InputChangeName(VyEnum,VyPicardEnum); + element->InputChangeName(VzEnum,VzPicardEnum); + element->InputChangeName(PressureEnum,PressurePicardEnum); + + /*Add vx and vy as inputs to element: */ + element->AddInput(VxEnum,vx,P1Enum); + element->AddInput(VyEnum,vy,P1Enum); + element->AddInput(VzEnum,vz,P1Enum); + element->AddInput(VzFSEnum,vzFS,P1Enum); + element->AddInput(VelEnum,vel,P1Enum); + element->AddInput(PressureEnum,pressure,P1Enum); + + /*Free ressources:*/ + xDelete(pressure); + xDelete(vel); + xDelete(vz); + xDelete(vzHO); + xDelete(vzFS); + xDelete(vy); + xDelete(vx); + xDelete(FSvalues); + xDelete(HOvalues); + xDelete(doflistFSp); + xDelete(doflistFSv); + xDelete(doflistHO); + xDelete(cs_list); +}/*}}}*/ +void StressbalanceAnalysis::InputUpdateFromSolutionSSAFS(IssmDouble* solution,Element* element){/*{{{*/ + + int i; + IssmDouble rho_ice,g,FSreconditioning; + int* doflistSSA = NULL; + int* doflistFSv = NULL; + int* doflistFSp = NULL; + + /*we have to add results of this element for FS and results from the element + * at base for SSA, so we need to have the pointer toward the basal element*/ + Element* basalelement=element->GetBasalElement(); + if(basalelement->ObjectEnum()!=PentaEnum){ + _error_("Coupling not supported for "<ObjectEnum())); + } + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = 6; + int numdof2d = numnodes; + int numdofSSA = 6*2; + int numdofFSv = 6*3; + int numdofFSp = 6; + + /*Fetch dof list and allocate solution vectors*/ + element->GetDofList(&doflistFSv,FSvelocityEnum,GsetEnum); + element->GetDofListPressure(&doflistFSp,GsetEnum); + basalelement->GetDofList(&doflistSSA, SSAApproximationEnum, GsetEnum); + IssmDouble* SSAvalues = xNew(numdofSSA); + IssmDouble* FSvalues = xNew(numdofFSv+numdofFSp); + IssmDouble* vx = xNew(numnodes); + IssmDouble* vy = xNew(numnodes); + IssmDouble* vz = xNew(numnodes); + IssmDouble* vzSSA = xNew(numnodes); + IssmDouble* vzFS = xNew(numnodes); + IssmDouble* vel = xNew(numnodes); + IssmDouble* pressure = xNew(numnodes); + + /*Prepare coordinate system list*/ + int* cs_list = xNew(2*numnodes); + for(i=0;iFindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); + for(i=0;iTransformSolutionCoord(FSvalues,2*numnodes,cs_list); + element->TransformSolutionCoord(SSAvalues,numnodes,XYEnum); + + /*Ok, we have vx and vy in values, fill in vx and vy arrays: */ + + for(i=0;i(vx[i])) _error_("NaN found in solution vector"); + if(xIsNan(vy[i])) _error_("NaN found in solution vector"); + if(xIsNan(vzFS[i])) _error_("NaN found in solution vector"); + if(xIsNan(pressure[i])) _error_("NaN found in solution vector"); + } + + /*Get Vz and compute vel*/ + element->GetInputListOnVertices(vzSSA,VzSSAEnum); + for(i=0;iInputChangeName(VxEnum,VxPicardEnum); + element->InputChangeName(VyEnum,VyPicardEnum); + element->InputChangeName(VzEnum,VzPicardEnum); + element->InputChangeName(PressureEnum,PressurePicardEnum); + + /*Add vx and vy as inputs to element: */ + element->AddInput(VxEnum,vx,P1Enum); + element->AddInput(VyEnum,vy,P1Enum); + element->AddInput(VzEnum,vz,P1Enum); + element->AddInput(VzFSEnum,vzFS,P1Enum); + element->AddInput(VelEnum,vel,P1Enum); + element->AddInput(PressureEnum,pressure,P1Enum); + + /*Free ressources:*/ + xDelete(pressure); + xDelete(vel); + xDelete(vz); + xDelete(vzSSA); + xDelete(vzFS); + xDelete(vy); + xDelete(vx); + xDelete(FSvalues); + xDelete(SSAvalues); + xDelete(doflistFSp); + xDelete(doflistFSv); + xDelete(doflistSSA); + xDelete(cs_list); +}/*}}}*/ +void StressbalanceAnalysis::InputUpdateFromSolutionSSAHO(IssmDouble* solution,Element* element){/*{{{*/ + + int i,domaintype; + IssmDouble rho_ice,g; + int* SSAdoflist = NULL; + int* HOdoflist = NULL; + IssmDouble* xyz_list = NULL; + + /*we have to add results of this element for HO and results from the element + * at base for SSA, so we need to have the pointer toward the basal element*/ + Element* basalelement=element->GetBasalElement(); + if(basalelement->ObjectEnum()!=PentaEnum){ + _error_("Coupling not supported for "<ObjectEnum())); + } + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + int numdof = numnodes*2; + int numdof2d = numnodes; + + /*Fetch dof list and allocate solution vectors*/ + basalelement->GetDofList(&SSAdoflist,SSAApproximationEnum,GsetEnum); + element ->GetDofList(&HOdoflist, HOApproximationEnum, GsetEnum); + IssmDouble* HOvalues = xNew(numdof); + IssmDouble* SSAvalues = xNew(numdof); + IssmDouble* vx = xNew(numnodes); + IssmDouble* vy = xNew(numnodes); + IssmDouble* vz = xNew(numnodes); + IssmDouble* vel = xNew(numnodes); + IssmDouble* pressure = xNew(numnodes); + IssmDouble* surface = xNew(numnodes); + + /*Use the dof list to index into the solution vector: */ + for(i=0;iTransformSolutionCoord(SSAvalues,XYEnum); + element->TransformSolutionCoord(HOvalues,XYEnum); + + /*Ok, we have vx and vy in values, fill in vx and vy arrays: */ + for(i=0;i(vx[i])) _error_("NaN found in solution vector"); + if(xIsNan(vy[i])) _error_("NaN found in solution vector"); + } + + /*Get Vz and compute vel*/ + element->GetInputListOnNodes(&vz[0],VzEnum,0.); + for(i=0;iGetMaterialParameter(MaterialsRhoIceEnum); + g = element->GetMaterialParameter(ConstantsGEnum); + element->GetVerticesCoordinates(&xyz_list); + element->GetInputListOnNodes(&surface[0],SurfaceEnum); + for(i=0;iInputChangeName(VxEnum,VxPicardEnum); + element->InputChangeName(VyEnum,VyPicardEnum); + element->InputChangeName(PressureEnum,PressurePicardEnum); + + /*Add vx and vy as inputs to element: */ + element->AddInput(VxEnum,vx,P1Enum); + element->AddInput(VyEnum,vy,P1Enum); + element->AddInput(VelEnum,vel,P1Enum); + element->AddInput(PressureEnum,pressure,P1Enum); + + /*Free ressources:*/ + xDelete(surface); + xDelete(pressure); + xDelete(vel); + xDelete(vz); + xDelete(vy); + xDelete(vx); + xDelete(xyz_list); + xDelete(SSAvalues); + xDelete(HOvalues); + xDelete(SSAdoflist); + xDelete(HOdoflist); +}/*}}}*/ Index: /issm/trunk/src/c/analyses/StressbalanceAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/StressbalanceAnalysis.h (revision 17805) +++ /issm/trunk/src/c/analyses/StressbalanceAnalysis.h (revision 17806) @@ -11,6 +11,7 @@ class StressbalanceAnalysis: public Analysis{ - public: - int DofsPerNode(int** doflist,int meshtype,int approximation); + public: + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); @@ -18,4 +19,104 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); + void GetSolutionFromInputs(Vector* solution,Element* element); + void GetSolutionFromInputsHoriz(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); + + /*SSA*/ + ElementMatrix* CreateJacobianMatrixSSA(Element* element); + ElementMatrix* CreateKMatrixSSA(Element* element); + ElementMatrix* CreateKMatrixSSAViscous(Element* element); + ElementMatrix* CreateKMatrixSSAFriction(Element* element); + ElementVector* CreatePVectorSSA(Element* element); + ElementVector* CreatePVectorSSADrivingStress(Element* element); + ElementVector* CreatePVectorSSAFront(Element* element); + void GetBSSA(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); + void GetBSSAprime(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); + void GetBSSAFriction(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); + void InputUpdateFromSolutionSSA(IssmDouble* solution,Element* element); + /*L1L2*/ + ElementMatrix* CreateKMatrixL1L2(Element* element); + ElementMatrix* CreateKMatrixL1L2Viscous(Element* element); + ElementMatrix* CreateKMatrixL1L2Friction(Element* element); + ElementVector* CreatePVectorL1L2(Element* element); + ElementVector* CreatePVectorL1L2DrivingStress(Element* element); + ElementVector* CreatePVectorL1L2Front(Element* element); + void InputUpdateFromSolutionL1L2(IssmDouble* solution,Element* element); + /*HO*/ + ElementMatrix* CreateJacobianMatrixHO(Element* element); + ElementMatrix* CreateKMatrixHO(Element* element); + ElementMatrix* CreateKMatrixHOViscous(Element* element); + ElementMatrix* CreateKMatrixHOFriction(Element* element); + ElementVector* CreatePVectorHO(Element* element); + ElementVector* CreatePVectorHODrivingStress(Element* element); + ElementVector* CreatePVectorHOFront(Element* element); + void GetBHO(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); + void GetBHOprime(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); + void GetBHOFriction(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); + void InputUpdateFromSolutionHO(IssmDouble* solution,Element* element); + /*FS*/ + ElementVector* CreateDVectorFS(Element* element); + ElementMatrix* CreateJacobianMatrixFS(Element* element); + ElementMatrix* CreateKMatrixFS(Element* element); + ElementMatrix* CreateKMatrixFSViscousXTH(Element* element); + ElementMatrix* CreateKMatrixFSViscous(Element* element); + ElementMatrix* CreateKMatrixFSFriction(Element* element); + ElementMatrix* CreateKMatrixFSShelf(Element* element); + ElementVector* CreatePVectorFS(Element* element); + ElementVector* CreatePVectorFSViscous(Element* element); + ElementVector* CreatePVectorFSViscousXTH(Element* element); + ElementVector* CreatePVectorFSShelf(Element* element); + ElementVector* CreatePVectorFSFront(Element* element); + void GetBFS(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); + void GetBFSprime(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); + void GetBFSFriction(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); + void GetSolutionFromInputsFS(Vector* solution,Element* element); + void InputUpdateFromSolutionFS(IssmDouble* solution,Element* element); + void InputUpdateFromSolutionFSXTH_d(Elements* elements,Parameters* parameters); + void InputUpdateFromSolutionFSXTH_tau(Elements* elements,Parameters* parameters); + void InitializeXTH(Elements* elements,Parameters* parameters); + /*Coupling*/ + ElementMatrix* CreateKMatrixSSA3d(Element* element); + ElementMatrix* CreateKMatrixSSA3dFriction(Element* element); + ElementMatrix* CreateKMatrixSSA3dViscous(Element* element); + ElementMatrix* CreateKMatrixHOFS(Element* element); + ElementMatrix* CreateKMatrixSSAHO(Element* element); + ElementMatrix* CreateKMatrixSSAFS(Element* element); + ElementMatrix* CreateKMatrixCouplingHOFS(Element* element); + ElementMatrix* CreateKMatrixCouplingSSAHO(Element* element); + ElementMatrix* CreateKMatrixCouplingSSAHOFriction(Element* element); + ElementMatrix* CreateKMatrixCouplingSSAHOViscous(Element* element); + ElementMatrix* CreateKMatrixCouplingSSAFS(Element* element); + ElementMatrix* CreateKMatrixCouplingSSAFSFriction(Element* element); + ElementMatrix* CreateKMatrixCouplingSSAFSViscous(Element* element); + ElementVector* CreatePVectorSSAHO(Element* element); + ElementVector* CreatePVectorSSAFS(Element* element); + ElementVector* CreatePVectorCouplingSSAFS(Element* element); + ElementVector* CreatePVectorCouplingSSAFSFriction(Element* element); + ElementVector* CreatePVectorCouplingSSAFSViscous(Element* element); + ElementVector* CreatePVectorHOFS(Element* element); + ElementVector* CreatePVectorCouplingHOFS(Element* element); + ElementVector* CreatePVectorCouplingHOFSFriction(Element* element); + ElementVector* CreatePVectorCouplingHOFSViscous(Element* element); + void GetBSSAHO(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss); + void GetBSSAFS(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss); + void GetBprimeSSAFS(IssmDouble* Bprime,Element* element,IssmDouble* xyz_list,Gauss* gauss); + void GetBSSAFSTria(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss); + void GetBprimeSSAFSTria(IssmDouble* Bprime,Element* element,IssmDouble* xyz_list,Gauss* gauss); + void GetLFSSSA(IssmDouble* L,Element* element,Gauss* gauss); + void GetLSSAFS(IssmDouble* L,Element* element,Gauss* gauss); + void GetLprimeFSSSA(IssmDouble* Lprime,Element* element,IssmDouble* xyz_list,Gauss* gauss); + void GetLprimeSSAFS(IssmDouble* Lprime,Element* element,IssmDouble* xyz_list,Gauss* gauss); + void InputUpdateFromSolutionHOFS(IssmDouble* solution,Element* element); + void InputUpdateFromSolutionSSAFS(IssmDouble* solution,Element* element); + void InputUpdateFromSolutionSSAHO(IssmDouble* solution,Element* element); }; #endif Index: /issm/trunk/src/c/analyses/StressbalanceSIAAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/StressbalanceSIAAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/StressbalanceSIAAnalysis.cpp (revision 17806) @@ -4,7 +4,8 @@ #include "../shared/shared.h" #include "../modules/modules.h" +#include "../solutionsequences/solutionsequences.h" /*Model processing*/ -int StressbalanceSIAAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int StressbalanceSIAAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ return 2; }/*}}}*/ @@ -18,5 +19,7 @@ /*Fetch data needed: */ bool isSIA; + bool islevelset; iomodel->Constant(&isSIA,FlowequationIsSIAEnum); + iomodel->Constant(&islevelset,TransientIslevelsetEnum); /*Now, is the flag SIA on? otherwise, do nothing: */ @@ -36,4 +39,10 @@ iomodel->FetchDataToInput(elements,ThicknessEnum); + iomodel->FetchDataToInput(elements,FrictionCoefficientEnum); + if(islevelset){ + iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum) + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); // required for updating active nodes + } /*Free data: */ @@ -54,6 +63,8 @@ /*First create nodes*/ int lid=0; - iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum, - FlowequationVertexEquationEnum,StressbalanceReferentialEnum); + iomodel->FetchData(4,FlowequationBorderSSAEnum,FlowequationBorderFSEnum,FlowequationVertexEquationEnum,StressbalanceReferentialEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum){ + iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); + } for(int i=0;inumberofvertices;i++){ @@ -73,5 +84,5 @@ } - iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum, + iomodel->DeleteData(6,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum, FlowequationVertexEquationEnum,StressbalanceReferentialEnum); @@ -103,18 +114,18 @@ if (reCast(iomodel->Data(FlowequationVertexEquationEnum)[i])!=SIAApproximationEnum){ + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,0,0,StressbalanceSIAAnalysisEnum)); + count++; + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,0,StressbalanceSIAAnalysisEnum)); - count++; - - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,0,StressbalanceSIAAnalysisEnum)); count++; } else{ if (!xIsNan(iomodel->Data(StressbalanceSpcvxEnum)[i])){ - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,iomodel->Data(StressbalanceSpcvxEnum)[i]/yts,StressbalanceSIAAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,0,iomodel->Data(StressbalanceSpcvxEnum)[i]/yts,StressbalanceSIAAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; } if (!xIsNan(iomodel->Data(StressbalanceSpcvyEnum)[i])){ - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,iomodel->Data(StressbalanceSpcvyEnum)[i]/yts,StressbalanceSIAAnalysisEnum)); //add count'th spc, on node i+1, setting dof 2 to vy + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,iomodel->Data(StressbalanceSpcvyEnum)[i]/yts,StressbalanceSIAAnalysisEnum)); //add count'th spc, on node i+1, setting dof 2 to vy count++; } @@ -132,2 +143,445 @@ }/*}}}*/ + +/*Finite Element Analysis*/ +void StressbalanceSIAAnalysis::Core(FemModel* femmodel){/*{{{*/ + + if(VerboseSolution()) _printf0_(" computing SIA velocities\n"); + femmodel->SetCurrentConfiguration(StressbalanceSIAAnalysisEnum); + solutionsequence_linear(femmodel); +}/*}}}*/ +ElementVector* StressbalanceSIAAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* StressbalanceSIAAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* StressbalanceSIAAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + int domaintype; + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + return CreateKMatrix2D(element); + case Domain3DEnum: + return CreateKMatrix3D(element); + default: _error_("mesh "<IsIceInElement()) return NULL; + + /*Intermediaries */ + IssmDouble connectivity; + + /*Fetch number vertices for this element*/ + int numvertices = element->GetNumberOfVertices(); + + /*Initialize Element vector*/ + ElementMatrix* Ke=element->NewElementMatrix(); + for(int iv=0;ivVertexConnectivity(iv); + Ke->values[(2*iv+0)*2*numvertices+(2*iv+0)]=1./connectivity; + Ke->values[(2*iv+1)*2*numvertices+(2*iv+1)]=1./connectivity; + } + + /*Clean up and return*/ + return Ke; +}/*}}}*/ +ElementMatrix* StressbalanceSIAAnalysis::CreateKMatrix3D(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*Intermediaries */ + int i0,i1,j0,j1,nodeup,nodedown,numsegments; + IssmDouble slope[2],connectivity[2],one0,one1; + int *pairindices = NULL; + + /*Fetch number vertices for this element*/ + int numvertices = element->GetNumberOfVertices(); + int numdof = 2*numvertices; + + /*Initialize Element vector*/ + ElementMatrix* Ke=element->NewElementMatrix(); + + element->VerticalSegmentIndices(&pairindices,&numsegments); + for(int is=0;isVertexConnectivity(nodedown); + connectivity[1]=(IssmDouble)element->VertexConnectivity(nodeup); + one0=1./connectivity[0]; + one1=1./connectivity[1]; + + /*2 dofs of first node*/ + i0=2*nodedown; i1=2*nodedown+1; + /*2 dofs of second node*/ + j0=2*nodeup; j1=2*nodeup+1; + + /*Create matrix for these two nodes*/ + if(element->IsOnBase() && element->IsOnSurface()){ + Ke->values[i0*numdof+i0] = +one0; + Ke->values[i1*numdof+i1] = +one0; + Ke->values[j0*numdof+i0] = -one1; + Ke->values[j0*numdof+j0] = +one1; + Ke->values[j1*numdof+i1] = -one1; + Ke->values[j1*numdof+j1] = +one1; + } + else if(element->IsOnBase()){ + Ke->values[i0*numdof+i0] = one0; + Ke->values[i1*numdof+i1] = one0; + Ke->values[j0*numdof+i0] = -2.*one1; + Ke->values[j0*numdof+j0] = +2.*one1; + Ke->values[j1*numdof+i1] = -2.*one1; + Ke->values[j1*numdof+j1] = +2.*one1; + } + else if(element->IsOnSurface()){ + Ke->values[j0*numdof+i0] = -one1; + Ke->values[j0*numdof+j0] = +one1; + Ke->values[j1*numdof+i1] = -one1; + Ke->values[j1*numdof+j1] = +one1; + } + else{ //node is on two horizontal layers and beams include the values only once, so the have to use half of the connectivity + Ke->values[j0*numdof+i0] = -2.*one1; + Ke->values[j0*numdof+j0] = +2.*one1; + Ke->values[j1*numdof+i1] = -2.*one1; + Ke->values[j1*numdof+j1] = +2.*one1; + } + } + + /*Clean up and return*/ + xDelete(pairindices); + return Ke; +}/*}}}*/ +ElementVector* StressbalanceSIAAnalysis::CreatePVector(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + int domaintype; + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + return CreatePVector2D(element); + case Domain3DEnum: + return CreatePVector3D(element); + default: _error_("mesh "<IsIceInElement()) return NULL; + + /*Intermediaries */ + int frictionlaw = 1; + IssmDouble ub,vb,slope2,drag,thickness,surface,connectivity; + IssmDouble slope[2]; + + /*Fetch number vertices for this element*/ + int numvertices = element->GetNumberOfVertices(); + + /*Initialize Element vector*/ + ElementVector* pe=element->NewElementVector(); + + /*Retrieve all inputs and parameters*/ + IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble gravity = element->GetMaterialParameter(ConstantsGEnum); + IssmDouble n = element->GetMaterialParameter(MaterialsRheologyNEnum); + IssmDouble B = element->GetMaterialParameter(MaterialsRheologyBbarEnum); + Input* slopex_input = element->GetInput(SurfaceSlopeXEnum); _assert_(slopex_input); + Input* slopey_input = element->GetInput(SurfaceSlopeYEnum); _assert_(slopey_input); + Input* thickness_input = element->GetInput(ThicknessEnum); _assert_(thickness_input); + Input* surface_input = element->GetInput(SurfaceEnum); _assert_(surface_input); + Input* drag_input = element->GetInput(FrictionCoefficientEnum); _assert_(drag_input); + + Gauss* gauss=element->NewGauss(); + for(int iv=0;ivGaussVertex(iv); + + connectivity=(IssmDouble)element->VertexConnectivity(iv); + + thickness_input->GetInputValue(&thickness,gauss); + surface_input->GetInputValue(&surface,gauss); + drag_input->GetInputValue(&drag,gauss); + slopex_input->GetInputValue(&slope[0],gauss); + slopey_input->GetInputValue(&slope[1],gauss); + slope2=slope[0]*slope[0]+slope[1]*slope[1]; + + switch(frictionlaw){ + case 1: + /*Payne 1995 (m = 1, B = 5e-3/yts = 1.58e-10 m/s/Pa*/ + ub=-1.58*1.e-10*rho_ice*gravity*thickness*slope[0]; + vb=-1.58*1.e-10*rho_ice*gravity*thickness*slope[1]; + break; + case 2: + /*Ritz et al. 1996*/ + ub=drag*(rho_ice*gravity*thickness)*(rho_ice*gravity*thickness)*slope[0]/sqrt(slope2); + vb=drag*(rho_ice*gravity*thickness)*(rho_ice*gravity*thickness)*slope[1]/sqrt(slope2); + break; + case 3: + /*Rutt et al. 2009*/ + ub=-drag*rho_ice*gravity*thickness*slope[0]; + vb=-drag*rho_ice*gravity*thickness*slope[1]; + break; + case 4: + /*Henning Akesson*/ + drag = -4e-15 * surface + 8.6e-12; + ub=-drag*rho_ice*gravity*thickness*slope[0]; + vb=-drag*rho_ice*gravity*thickness*slope[1]; + break; + default: + _error_("Not supported yet"); + } + + pe->values[2*iv+0]=(ub-2.*pow(rho_ice*gravity,n)*pow(slope2,((n-1.)/2.))*pow(thickness,n)/(pow(B,n)*(n+1))*slope[0])/connectivity; + pe->values[2*iv+1]=(vb-2.*pow(rho_ice*gravity,n)*pow(slope2,((n-1.)/2.))*pow(thickness,n)/(pow(B,n)*(n+1))*slope[1])/connectivity; + } + + /*Clean up and return*/ + delete gauss; + return pe; +}/*}}}*/ +ElementVector* StressbalanceSIAAnalysis::CreatePVector3D(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*Intermediaries */ + int frictionlaw = 1; + int nodeup,nodedown,numsegments; + IssmDouble ub,vb,slope2,drag,surface,thickness,constant_part,z,Jdet; + IssmDouble slope[2],connectivity[2],xyz_list_line[2][3]; + IssmDouble *xyz_list = NULL; + int *pairindices = NULL; + + /*Fetch number vertices for this element*/ + int numvertices = element->GetNumberOfVertices(); + + /*Initialize Element vector*/ + ElementVector* pe=element->NewElementVector(); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble gravity = element->GetMaterialParameter(ConstantsGEnum); + IssmDouble n = element->GetMaterialParameter(MaterialsRheologyNEnum); + IssmDouble B = element->GetMaterialParameter(MaterialsRheologyBEnum); + Input* surface_input = element->GetInput(SurfaceEnum); _assert_(surface_input); + Input* slopex_input = element->GetInput(SurfaceSlopeXEnum); _assert_(slopex_input); + Input* slopey_input = element->GetInput(SurfaceSlopeYEnum); _assert_(slopey_input); + Input* thickness_input = element->GetInput(ThicknessEnum); _assert_(thickness_input); + Input* drag_input = element->GetInput(FrictionCoefficientEnum); _assert_(drag_input); + + /*Get Vertical segment indices*/ + element->VerticalSegmentIndices(&pairindices,&numsegments); + for(int is=0;isVertexConnectivity(nodedown); + connectivity[1]=(IssmDouble)element->VertexConnectivity(nodeup); + for(int i=0;i<3;i++){ + xyz_list_line[0][i]=xyz_list[nodedown*3+i]; + xyz_list_line[1][i]=xyz_list[nodeup*3+i]; + } + + Gauss* gauss=element->NewGaussLine(nodedown,nodeup,3); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + slopex_input->GetInputValue(&slope[0],gauss); + slopey_input->GetInputValue(&slope[1],gauss); + surface_input->GetInputValue(&surface,gauss); + thickness_input->GetInputValue(&thickness,gauss); + + slope2=slope[0]*slope[0]+slope[1]*slope[1]; + constant_part=-2.*pow(rho_ice*gravity,n)*pow(slope2,((n-1.)/2.)); + + z = element->GetZcoord(gauss); + element->JacobianDeterminantLine(&Jdet,&xyz_list_line[0][0],gauss); + + if(element->IsOnSurface()){ + pe->values[2*nodeup+0]+=constant_part*pow((surface-z)/B,n)*slope[0]*Jdet*gauss->weight/connectivity[1]; + pe->values[2*nodeup+1]+=constant_part*pow((surface-z)/B,n)*slope[1]*Jdet*gauss->weight/connectivity[1]; + } + else{/*connectivity is too large, should take only half on it*/ + pe->values[2*nodeup+0]+=constant_part*pow((surface-z)/B,n)*slope[0]*Jdet*gauss->weight*2./connectivity[1]; + pe->values[2*nodeup+1]+=constant_part*pow((surface-z)/B,n)*slope[1]*Jdet*gauss->weight*2./connectivity[1]; + } + } + + /*Deal with basal velocities*/ + if(element->IsOnBase()){ + drag_input->GetInputValue(&drag,gauss); + + switch(frictionlaw){ + case 1: + /*Payne 1995 (m = 1, B = 5e-3/yts = 1.58e-10 m/s/Pa*/ + ub=-1.58*1.e-10*rho_ice*gravity*thickness*slope[0]; + vb=-1.58*1.e-10*rho_ice*gravity*thickness*slope[1]; + break; + case 2: + /*Ritz et al. 1996*/ + ub=drag*(rho_ice*gravity*thickness)*(rho_ice*gravity*thickness)*slope[0]/sqrt(slope2); + vb=drag*(rho_ice*gravity*thickness)*(rho_ice*gravity*thickness)*slope[1]/sqrt(slope2); + break; + case 3: + /*Rutt et al. 2009*/ + ub=-drag*rho_ice*gravity*thickness*slope[0]; + vb=-drag*rho_ice*gravity*thickness*slope[1]; + break; + case 4: + /*Henning Akesson*/ + drag = -4e-15 * surface + 8.6e-12; + ub=-drag*rho_ice*gravity*thickness*slope[0]; + vb=-drag*rho_ice*gravity*thickness*slope[1]; + break; + default: + _error_("Not supported yet"); + } + + pe->values[2*nodedown+0]+=ub/connectivity[0]; + pe->values[2*nodedown+1]+=vb/connectivity[0]; + } + delete gauss; + } + + /*Clean up and return*/ + xDelete(pairindices); + xDelete(xyz_list); + return pe; + +}/*}}}*/ +void StressbalanceSIAAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + + IssmDouble vx,vy; + int *doflist = NULL; + + /*Fetch number of nodes and initialize values*/ + int numnodes = element->GetNumberOfNodes(); + int numdof = numnodes*2; + IssmDouble* values = xNew(numdof); + + /*Get dof list and inputs */ + element->GetDofList(&doflist,NoneApproximationEnum,GsetEnum); + Input* vx_input=element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=element->GetInput(VyEnum); _assert_(vy_input); + + /*Ok, we have the velocities in inputs, fill in solution */ + Gauss* gauss=element->NewGauss(); + for(int i=0;iGaussVertex(i); + vx_input->GetInputValue(&vx,gauss); + vy_input->GetInputValue(&vy,gauss); + values[i*2+0]=vx; + values[i*2+1]=vy; + } + + /*Add value to global vector*/ + solution->SetValues(numdof,doflist,values,INS_VAL); + + /*Free ressources:*/ + delete gauss; + xDelete(doflist); + xDelete(values); +}/*}}}*/ +void StressbalanceSIAAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + + int i,domaintype; + IssmDouble rho_ice,g; + int* doflist=NULL; + IssmDouble* xyz_list=NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + int numdof = numnodes*2; + + /*Fetch dof list and allocate solution vectors*/ + element->GetDofList(&doflist,NoneApproximationEnum,GsetEnum); + IssmDouble* values = xNew(numdof); + IssmDouble* vx = xNew(numdof); + IssmDouble* vy = xNew(numdof); + IssmDouble* vz = xNew(numdof); + IssmDouble* vel = xNew(numdof); + IssmDouble* pressure = xNew(numdof); + IssmDouble* thickness = xNew(numdof); + IssmDouble* surface = xNew(numnodes); + + /*Use the dof list to index into the solution vector: */ + for(i=0;iTransformSolutionCoord(&values[0],XYEnum); + + /*Ok, we have vx and vy in values, fill in vx and vy arrays: */ + for(i=0;i(vx[i])) _error_("NaN found in solution vector"); + if(xIsNan(vy[i])) _error_("NaN found in solution vector"); + } + + /*Get Vz and compute vel*/ + element->GetInputListOnNodes(&vz[0],VzEnum,0.); + for(i=0;iGetMaterialParameter(MaterialsRhoIceEnum); + g = element->GetMaterialParameter(ConstantsGEnum); + element->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + element->GetInputListOnNodes(&thickness[0],ThicknessEnum); + for(i=0;iGetVerticesCoordinates(&xyz_list); + element->GetInputListOnNodes(&surface[0],SurfaceEnum); + for(i=0;iInputChangeName(VxEnum,VxPicardEnum); + element->InputChangeName(VyEnum,VyPicardEnum); + element->InputChangeName(PressureEnum,PressurePicardEnum); + + /*Add vx and vy as inputs to the tria element: */ + element->AddInput(VxEnum,vx,P1Enum); + element->AddInput(VyEnum,vy,P1Enum); + element->AddInput(VelEnum,vel,P1Enum); + element->AddInput(PressureEnum,pressure,P1Enum); + + /*Free ressources:*/ + xDelete(thickness); + xDelete(surface); + xDelete(pressure); + xDelete(vel); + xDelete(vz); + xDelete(vy); + xDelete(vx); + xDelete(values); + xDelete(xyz_list); + xDelete(doflist); +}/*}}}*/ +void StressbalanceSIAAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ + + bool islevelset; + femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum); + if(islevelset){ + SetActiveNodesLSMx(femmodel); + } + return; +}/*}}}*/ Index: /issm/trunk/src/c/analyses/StressbalanceSIAAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/StressbalanceSIAAnalysis.h (revision 17805) +++ /issm/trunk/src/c/analyses/StressbalanceSIAAnalysis.h (revision 17806) @@ -12,5 +12,6 @@ public: - int DofsPerNode(int** doflist,int meshtype,int approximation); + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); @@ -18,4 +19,18 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementMatrix* CreateKMatrix2D(Element* element); + ElementMatrix* CreateKMatrix3D(Element* element); + ElementVector* CreatePVector(Element* element); + ElementVector* CreatePVector2D(Element* element); + ElementVector* CreatePVector3D(Element* element); + void GetSolutionFromInputs(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); }; #endif Index: /issm/trunk/src/c/analyses/StressbalanceVerticalAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 17806) @@ -4,7 +4,8 @@ #include "../shared/shared.h" #include "../modules/modules.h" +#include "../solutionsequences/solutionsequences.h" /*Model processing*/ -int StressbalanceVerticalAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int StressbalanceVerticalAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ return 1; }/*}}}*/ @@ -17,5 +18,5 @@ /*return if not 3d mesh*/ - if(iomodel->meshtype!=Mesh3DEnum) return; + if(iomodel->domaintype!=Domain3DEnum) return; /*Update elements: */ @@ -31,8 +32,11 @@ iomodel->FetchDataToInput(elements,ThicknessEnum); iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); - iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); + if(iomodel->meshelementtype==PentaEnum){ + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); + iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); + } + iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum); iomodel->FetchDataToInput(elements,VxEnum,0.); @@ -42,9 +46,9 @@ /*return if not 3d mesh*/ - if(iomodel->meshtype!=Mesh3DEnum) return; - - iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum); + if(iomodel->domaintype!=Domain3DEnum) return; + + iomodel->FetchData(3,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum); ::CreateNodes(nodes,iomodel,StressbalanceVerticalAnalysisEnum,P1Enum); - iomodel->DeleteData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum); + iomodel->DeleteData(3,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum); }/*}}}*/ void StressbalanceVerticalAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ @@ -58,5 +62,5 @@ /*return if not 3d mesh*/ - if(iomodel->meshtype!=Mesh3DEnum) return; + if(iomodel->domaintype!=Domain3DEnum) return; /*Fetch data: */ @@ -73,10 +77,10 @@ if (reCast(iomodel->Data(FlowequationBorderFSEnum)[i])){ - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,0,StressbalanceVerticalAnalysisEnum)); //spc to zero as vertical velocity is done in Horiz for FS + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,0,0,StressbalanceVerticalAnalysisEnum)); //spc to zero as vertical velocity is done in Horiz for FS count++; } else if (!xIsNan(iomodel->Data(StressbalanceSpcvzEnum)[i])){ - constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1, - iomodel->Data(StressbalanceSpcvzEnum)[i]/yts,StressbalanceVerticalAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,0, + iomodel->Data(StressbalanceSpcvzEnum)[i],StressbalanceVerticalAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx. count++; @@ -94,2 +98,379 @@ }/*}}}*/ + +/*Finite Element Analysis*/ +void StressbalanceVerticalAnalysis::Core(FemModel* femmodel){/*{{{*/ + + if(VerboseSolution()) _printf0_(" computing vertical velocities\n"); + femmodel->SetCurrentConfiguration(StressbalanceVerticalAnalysisEnum); + solutionsequence_linear(femmodel); +}/*}}}*/ +ElementVector* StressbalanceVerticalAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* StressbalanceVerticalAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* StressbalanceVerticalAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + /*compute all stiffness matrices for this element*/ + ElementMatrix* Ke1=CreateKMatrixVolume(element); + ElementMatrix* Ke2=CreateKMatrixSurface(element); + ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); + + /*clean-up and return*/ + delete Ke1; + delete Ke2; + return Ke; + +}/*}}}*/ +ElementMatrix* StressbalanceVerticalAnalysis::CreateKMatrixVolume(Element* element){/*{{{*/ + + /*Intermediaries*/ + IssmDouble D,Jdet; + IssmDouble *xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element matrix and vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(NoneApproximationEnum); + IssmDouble* B = xNew(numnodes); + IssmDouble* Bprime = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss = element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + this->GetB(B,element,xyz_list,gauss); + this->GetBprime(Bprime,element,xyz_list,gauss); + D=gauss->weight*Jdet; + + TripleMultiply(B,1,numnodes,1, + &D,1,1,0, + Bprime,1,numnodes,0, + &Ke->values[0],1); + } + + /*Clean up and return*/ + delete gauss; + xDelete(xyz_list); + xDelete(Bprime); + xDelete(B); + return Ke; + +}/*}}}*/ +ElementMatrix* StressbalanceVerticalAnalysis::CreateKMatrixSurface(Element* element){/*{{{*/ + + + if(!element->IsOnSurface()) return NULL; + + /*Intermediaries*/ + IssmDouble D,Jdet,normal[3]; + IssmDouble *xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element matrix and vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(NoneApproximationEnum); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinatesTop(&xyz_list); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss = element->NewGaussTop(2); + element->NormalTop(&normal[0],xyz_list); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminantTop(&Jdet,xyz_list,gauss); + element->NodalFunctions(basis,gauss); + D = -gauss->weight*Jdet*normal[2]; + + TripleMultiply( basis,1,numnodes,1, + &D,1,1,0, + basis,1,numnodes,0, + &Ke->values[0],1); + } + + /*Clean up and return*/ + delete gauss; + xDelete(xyz_list); + xDelete(basis); + return Ke; +}/*}}}*/ +ElementVector* StressbalanceVerticalAnalysis::CreatePVector(Element* element){/*{{{*/ + + /*compute all load vectors for this element*/ + ElementVector* pe1=CreatePVectorVolume(element); + ElementVector* pe2=CreatePVectorBase(element); + ElementVector* pe =new ElementVector(pe1,pe2); + + /*clean-up and return*/ + delete pe1; + delete pe2; + return pe; +}/*}}}*/ +ElementVector* StressbalanceVerticalAnalysis::CreatePVectorVolume(Element* element){/*{{{*/ + + /*Intermediaries*/ + int approximation; + IssmDouble Jdet,dudx,dvdy,dwdz; + IssmDouble du[3],dv[3],dw[3]; + IssmDouble* xyz_list = NULL; + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and basis functions*/ + ElementVector* pe = element->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + element->GetInputValue(&approximation,ApproximationEnum); + Input* vx_input=element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=element->GetInput(VyEnum); _assert_(vy_input); + Input* vzFS_input=NULL; + if(approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){ + vzFS_input=element->GetInput(VzFSEnum); _assert_(vzFS_input); + } + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctions(basis,gauss); + + vx_input->GetInputDerivativeValue(&du[0],xyz_list,gauss); + vy_input->GetInputDerivativeValue(&dv[0],xyz_list,gauss); + if(approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){ + vzFS_input->GetInputDerivativeValue(&dw[0],xyz_list,gauss); + dwdz=dw[2]; + } + else dwdz=0; + dudx=du[0]; + dvdy=dv[1]; + + for(int i=0;ivalues[i] += (dudx+dvdy+dwdz)*Jdet*gauss->weight*basis[i]; + } + + /*Clean up and return*/ + delete gauss; + xDelete(basis); + xDelete(xyz_list); + return pe; +}/*}}}*/ +ElementVector* StressbalanceVerticalAnalysis::CreatePVectorBase(Element* element){/*{{{*/ + + /*Intermediaries */ + int approximation; + IssmDouble *xyz_list = NULL; + IssmDouble *xyz_list_base = NULL; + IssmDouble Jdet,slope[3]; + IssmDouble vx,vy,vz=0.,dbdx,dbdy,basalmeltingvalue; + + if(!element->IsOnBase()) return NULL; + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector*/ + ElementVector* pe = element->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + element->GetVerticesCoordinatesBase(&xyz_list_base); + element->GetInputValue(&approximation,ApproximationEnum); + Input* base_input=element->GetInput(BaseEnum); _assert_(base_input); + Input* basal_melting_input=element->GetInput(BasalforcingsMeltingRateEnum); _assert_(basal_melting_input); + Input* vx_input=element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=element->GetInput(VyEnum); _assert_(vy_input); + Input* vzFS_input=NULL; + if(approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){ + vzFS_input=element->GetInput(VzFSEnum); _assert_(vzFS_input); + } + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGaussBase(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + basal_melting_input->GetInputValue(&basalmeltingvalue,gauss); + base_input->GetInputDerivativeValue(&slope[0],xyz_list,gauss); + vx_input->GetInputValue(&vx,gauss); + vy_input->GetInputValue(&vy,gauss); + if(approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){ + vzFS_input->GetInputValue(&vz,gauss); + } + dbdx=slope[0]; + dbdy=slope[1]; + + element->JacobianDeterminantBase(&Jdet,xyz_list_base,gauss); + element->NodalFunctions(basis,gauss); + + for(int i=0;ivalues[i]+=-Jdet*gauss->weight*(vx*dbdx+vy*dbdy-vz-basalmeltingvalue)*basis[i]; + } + + /*Clean up and return*/ + delete gauss; + xDelete(basis); + xDelete(xyz_list); + xDelete(xyz_list_base); + return pe; +}/*}}}*/ +void StressbalanceVerticalAnalysis::GetB(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /* Compute B matrix. B=[dh1/dz dh2/dz dh3/dz dh4/dz dh5/dz dh6/dz]; + where hi is the interpolation function for node i.*/ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(3*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B: */ + for(int i=0;i(dbasis); +}/*}}}*/ +void StressbalanceVerticalAnalysis::GetBprime(IssmDouble* Bprime,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + + element->NodalFunctions(Bprime,gauss); + +}/*}}}*/ +void StressbalanceVerticalAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + element->GetSolutionFromInputsOneDof(solution,VzEnum); +}/*}}}*/ +void StressbalanceVerticalAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + + int numnodes = element->GetNumberOfNodes(); + int numdof=numnodes*1; + + int i; + int approximation; + int* doflist = NULL; + IssmDouble* xyz_list = NULL; + IssmDouble rho_ice,g; + + /*Get the approximation and do nothing if the element in FS or None*/ + element->GetInputValue(&approximation,ApproximationEnum); + if(approximation==FSApproximationEnum || approximation==NoneApproximationEnum){ + return; + } + + /*Get dof list and vertices coordinates: */ + element->GetVerticesCoordinates(&xyz_list); + element->GetDofList(&doflist,NoneApproximationEnum,GsetEnum); + IssmDouble* values = xNew(numdof); + IssmDouble* vx = xNew(numnodes); + IssmDouble* vy = xNew(numnodes); + IssmDouble* vz = xNew(numnodes); + IssmDouble* vzSSA = xNew(numnodes); + IssmDouble* vzHO = xNew(numnodes); + IssmDouble* vzFS = xNew(numnodes); + IssmDouble* vel = xNew(numnodes); + IssmDouble* pressure = xNew(numnodes); + IssmDouble* surface = xNew(numnodes); + + /*Use the dof list to index into the solution vector vz: */ + for(i=0;i(vz[i])) _error_("NaN found in solution vector"); + } + + /*Get Vx and Vy*/ + element->GetInputListOnNodes(&vx[0],VxEnum,0.0); //default is 0 + element->GetInputListOnNodes(&vy[0],VyEnum,0.0); //default is 0 + + /*Do some modifications if we actually have a HOFS or SSAFS element*/ + if(approximation==HOFSApproximationEnum){ + Input* vzFS_input=element->GetInput(VzFSEnum); + if (vzFS_input){ + if (vzFS_input->ObjectEnum()!=PentaInputEnum) _error_("Cannot compute Vel as VzFS is of type " << EnumToStringx(vzFS_input->ObjectEnum())); + element->GetInputListOnNodes(&vzFS[0],VzFSEnum,0.); + } + else _error_("Cannot compute Vz as VzFS in not present in HOFS element"); + for(i=0;iGetInput(VzFSEnum); + if (vzFS_input){ + if (vzFS_input->ObjectEnum()!=PentaInputEnum) _error_("Cannot compute Vel as VzFS is of type " << EnumToStringx(vzFS_input->ObjectEnum())); + element->GetInputListOnNodes(&vzFS[0],VzFSEnum,0.); + } + else _error_("Cannot compute Vz as VzFS in not present in SSAFS element"); + for(i=0;iGetMaterialParameter(MaterialsRhoIceEnum); + g = element->GetMaterialParameter(ConstantsGEnum); + element->GetInputListOnNodes(&surface[0],SurfaceEnum,0.); + for(i=0;iInputChangeName(VzEnum,VzPicardEnum); + + if(approximation!=HOFSApproximationEnum && approximation!=SSAFSApproximationEnum){ + element->InputChangeName(PressureEnum,PressurePicardEnum); + element->AddInput(PressureEnum,pressure,element->GetElementType()); + } + else if(approximation==HOFSApproximationEnum){ + element->AddInput(VzHOEnum,vzHO,P1Enum); + } + else if(approximation==SSAFSApproximationEnum){ + element->AddInput(VzSSAEnum,vzSSA,P1Enum); + } + element->AddInput(VzEnum,vz,P1Enum); + element->AddInput(VelEnum,vel,P1Enum); + + /*Free ressources:*/ + xDelete(surface); + xDelete(pressure); + xDelete(vel); + xDelete(vz); + xDelete(vzSSA); + xDelete(vzHO); + xDelete(vzFS); + xDelete(vy); + xDelete(vx); + xDelete(values); + xDelete(xyz_list); + xDelete(doflist); +}/*}}}*/ +void StressbalanceVerticalAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ + /*Default, do nothing*/ + return; +}/*}}}*/ Index: /issm/trunk/src/c/analyses/StressbalanceVerticalAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/StressbalanceVerticalAnalysis.h (revision 17805) +++ /issm/trunk/src/c/analyses/StressbalanceVerticalAnalysis.h (revision 17806) @@ -12,5 +12,6 @@ public: - int DofsPerNode(int** doflist,int meshtype,int approximation); + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); @@ -18,4 +19,20 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementMatrix* CreateKMatrixVolume(Element* element); + ElementMatrix* CreateKMatrixSurface(Element* element); + ElementVector* CreatePVector(Element* element); + ElementVector* CreatePVectorVolume(Element* element); + ElementVector* CreatePVectorBase(Element* element); + void GetB(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss); + void GetBprime(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss); + void GetSolutionFromInputs(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); }; #endif Index: /issm/trunk/src/c/analyses/ThermalAnalysis.cpp =================================================================== --- /issm/trunk/src/c/analyses/ThermalAnalysis.cpp (revision 17805) +++ /issm/trunk/src/c/analyses/ThermalAnalysis.cpp (revision 17806) @@ -6,13 +6,30 @@ /*Model processing*/ -int ThermalAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/ +int ThermalAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/ return 1; }/*}}}*/ void ThermalAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/ + + int numoutputs; + char** requestedoutputs = NULL; + + parameters->AddObject(iomodel->CopyConstantObject(ThermalMaxiterEnum)); + parameters->AddObject(iomodel->CopyConstantObject(ThermalStabilizationEnum)); + parameters->AddObject(iomodel->CopyConstantObject(ThermalPenaltyFactorEnum)); + parameters->AddObject(iomodel->CopyConstantObject(ThermalPenaltyThresholdEnum)); + parameters->AddObject(iomodel->CopyConstantObject(ThermalPenaltyLockEnum)); + parameters->AddObject(iomodel->CopyConstantObject(ThermalIsenthalpyEnum)); + parameters->AddObject(iomodel->CopyConstantObject(ThermalIsdynamicbasalspcEnum)); + + iomodel->FetchData(&requestedoutputs,&numoutputs,ThermalRequestedOutputsEnum); + parameters->AddObject(new IntParam(ThermalNumRequestedOutputsEnum,numoutputs)); + if(numoutputs)parameters->AddObject(new StringArrayParam(ThermalRequestedOutputsEnum,requestedoutputs,numoutputs)); + iomodel->DeleteData(&requestedoutputs,numoutputs,ThermalRequestedOutputsEnum); + }/*}}}*/ void ThermalAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/ /*Now, is the model 3d? otherwise, do nothing: */ - if(iomodel->meshtype==Mesh2DhorizontalEnum)return; + if(iomodel->domaintype==Domain2DhorizontalEnum)return; /*Update elements: */ @@ -26,10 +43,11 @@ } - bool dakota_analysis; + bool dakota_analysis, islevelset; iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum); + iomodel->Constant(&islevelset,TransientIslevelsetEnum); iomodel->FetchDataToInput(elements,ThicknessEnum); iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,FrictionCoefficientEnum); iomodel->FetchDataToInput(elements,FrictionPEnum); @@ -37,5 +55,5 @@ iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum); - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); iomodel->FetchDataToInput(elements,FlowequationElementEquationEnum); @@ -58,15 +76,19 @@ elements->InputDuplicate(VxMeshEnum,QmuVzMeshEnum); } + if(islevelset){ + iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum); + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); // required for updating active nodes + } }/*}}}*/ void ThermalAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ - if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + if(iomodel->domaintype==Domain3DEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); ::CreateNodes(nodes,iomodel,ThermalAnalysisEnum,P1Enum); - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); }/*}}}*/ void ThermalAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ /*Only 3d mesh supported*/ - if(iomodel->meshtype==Mesh3DEnum){ + if(iomodel->domaintype==Domain3DEnum){ IoModelToConstraintsx(constraints,iomodel,ThermalSpctemperatureEnum,ThermalAnalysisEnum,P1Enum); } @@ -75,5 +97,5 @@ void ThermalAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/ - if(iomodel->meshtype==Mesh2DhorizontalEnum) _error_("2d meshes not supported yet"); + if(iomodel->domaintype==Domain2DhorizontalEnum) _error_("2d meshes not supported yet"); /*create penalties for nodes: no node can have a temperature over the melting point*/ @@ -93,2 +115,608 @@ }/*}}}*/ + +/*Finite Element Analysis*/ +void ThermalAnalysis::Core(FemModel* femmodel){/*{{{*/ + _error_("not implemented"); +}/*}}}*/ +ElementVector* ThermalAnalysis::CreateDVector(Element* element){/*{{{*/ + /*Default, return NULL*/ + return NULL; +}/*}}}*/ +ElementMatrix* ThermalAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/ +_error_("Not implemented"); +}/*}}}*/ +ElementMatrix* ThermalAnalysis::CreateKMatrix(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*compute all stiffness matrices for this element*/ + ElementMatrix* Ke1=CreateKMatrixVolume(element); + ElementMatrix* Ke2=CreateKMatrixShelf(element); + ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); + + /*clean-up and return*/ + delete Ke1; + delete Ke2; + return Ke; +}/*}}}*/ +ElementMatrix* ThermalAnalysis::CreateKMatrixVolume(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*Intermediaries */ + int stabilization; + IssmDouble Jdet,dt,u,v,w,um,vm,wm,vel; + IssmDouble h,hx,hy,hz,vx,vy,vz; + IssmDouble tau_parameter,diameter; + IssmDouble D_scalar; + IssmDouble* xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector and other vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(); + IssmDouble* basis = xNew(numnodes); + IssmDouble* dbasis = xNew(3*numnodes); + IssmDouble* B = xNew(3*numnodes); + IssmDouble* Bprime = xNew(3*numnodes); + IssmDouble D[3][3]={0.}; + IssmDouble K[3][3]; + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + element->FindParam(&dt,TimesteppingTimeStepEnum); + element->FindParam(&stabilization,ThermalStabilizationEnum); + IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoWaterEnum); + IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble gravity = element->GetMaterialParameter(ConstantsGEnum); + IssmDouble heatcapacity = element->GetMaterialParameter(MaterialsHeatcapacityEnum); + IssmDouble thermalconductivity = element->GetMaterialParameter(MaterialsThermalconductivityEnum); + IssmDouble kappa = thermalconductivity/(rho_ice*heatcapacity); + Input* vx_input = element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input = element->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input = element->GetInput(VzEnum); _assert_(vz_input); + Input* vxm_input = element->GetInput(VxMeshEnum); _assert_(vxm_input); + Input* vym_input = element->GetInput(VyMeshEnum); _assert_(vym_input); + Input* vzm_input = element->GetInput(VzMeshEnum); _assert_(vzm_input); + if(stabilization==2) diameter=element->MinEdgeLength(xyz_list); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + D_scalar=gauss->weight*Jdet; + if(dt!=0.) D_scalar=D_scalar*dt; + + /*Conduction: */ + GetBConduct(B,element,xyz_list,gauss); + D[0][0]=D_scalar*kappa; + D[1][1]=D_scalar*kappa; + D[2][2]=D_scalar*kappa; + TripleMultiply(B,3,numnodes,1, + &D[0][0],3,3,0, + B,3,numnodes,0, + &Ke->values[0],1); + + /*Advection: */ + GetBAdvec(B,element,xyz_list,gauss); + GetBAdvecprime(Bprime,element,xyz_list,gauss); + vx_input->GetInputValue(&u,gauss); vxm_input->GetInputValue(&um,gauss); vx=u-um; + vy_input->GetInputValue(&v,gauss); vym_input->GetInputValue(&vm,gauss); vy=v-vm; + vz_input->GetInputValue(&w,gauss); vzm_input->GetInputValue(&wm,gauss); vz=w-wm; + D[0][0]=D_scalar*vx; + D[1][1]=D_scalar*vy; + D[2][2]=D_scalar*vz; + TripleMultiply(B,3,numnodes,1, + &D[0][0],3,3,0, + Bprime,3,numnodes,0, + &Ke->values[0],1); + + /*Transient: */ + if(dt!=0.){ + D_scalar=gauss->weight*Jdet; + element->NodalFunctions(basis,gauss); + TripleMultiply(basis,numnodes,1,0, + &D_scalar,1,1,0, + basis,1,numnodes,0, + &Ke->values[0],1); + D_scalar=D_scalar*dt; + } + + /*Artifficial diffusivity*/ + if(stabilization==1){ + element->ElementSizes(&hx,&hy,&hz); + vel=sqrt(vx*vx + vy*vy + vz*vz)+1.e-14; + h=sqrt( pow(hx*vx/vel,2) + pow(hy*vy/vel,2) + pow(hz*vz/vel,2)); + K[0][0]=h/(2.*vel)*fabs(vx*vx); K[0][1]=h/(2.*vel)*fabs(vx*vy); K[0][2]=h/(2.*vel)*fabs(vx*vz); + K[1][0]=h/(2.*vel)*fabs(vy*vx); K[1][1]=h/(2.*vel)*fabs(vy*vy); K[1][2]=h/(2.*vel)*fabs(vy*vz); + K[2][0]=h/(2.*vel)*fabs(vz*vx); K[2][1]=h/(2.*vel)*fabs(vz*vy); K[2][2]=h/(2.*vel)*fabs(vz*vz); + for(int i=0;i<3;i++) for(int j=0;j<3;j++) K[i][j] = D_scalar*K[i][j]; + + GetBAdvecprime(Bprime,element,xyz_list,gauss); + + TripleMultiply(Bprime,3,numnodes,1, + &K[0][0],3,3,0, + Bprime,3,numnodes,0, + &Ke->values[0],1); + } + else if(stabilization==2){ + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + tau_parameter=element->StabilizationParameter(u-um,v-vm,w-wm,diameter,kappa); + for(int i=0;ivalues[i*numnodes+j]+=tau_parameter*D_scalar* + ((u-um)*dbasis[0*numnodes+i]+(v-vm)*dbasis[1*numnodes+i]+(w-wm)*dbasis[2*numnodes+i])*((u-um)*dbasis[0*numnodes+j]+(v-vm)*dbasis[1*numnodes+j]+(w-wm)*dbasis[2*numnodes+j]); + } + } + if(dt!=0.){ + D_scalar=gauss->weight*Jdet; + for(int i=0;ivalues[i*numnodes+j]+=tau_parameter*D_scalar*basis[j]*((u-um)*dbasis[0*numnodes+i]+(v-vm)*dbasis[1*numnodes+i]+(w-wm)*dbasis[2*numnodes+i]); + } + } + } + } + } + + /*Clean up and return*/ + xDelete(xyz_list); + xDelete(B); + xDelete(Bprime); + xDelete(basis); + xDelete(dbasis); + delete gauss; + return Ke; +}/*}}}*/ +ElementMatrix* ThermalAnalysis::CreateKMatrixShelf(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*Initialize Element matrix and return if necessary*/ + if(!element->IsOnBase() || !element->IsFloating()) return NULL; + + IssmDouble dt,Jdet,D; + IssmDouble *xyz_list_base = NULL; + + /*Get basal element*/ + if(!element->IsOnBase() || !element->IsFloating()) return NULL; + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize vectors*/ + ElementMatrix* Ke = element->NewElementMatrix(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinatesBase(&xyz_list_base); + element->FindParam(&dt,TimesteppingTimeStepEnum); + IssmDouble gravity = element->GetMaterialParameter(ConstantsGEnum); + IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoWaterEnum); + IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble heatcapacity = element->GetMaterialParameter(MaterialsHeatcapacityEnum); + IssmDouble mixed_layer_capacity= element->GetMaterialParameter(MaterialsMixedLayerCapacityEnum); + IssmDouble thermal_exchange_vel= element->GetMaterialParameter(MaterialsThermalExchangeVelocityEnum); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGaussBase(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminantBase(&Jdet,xyz_list_base,gauss); + element->NodalFunctions(basis,gauss); + + D=gauss->weight*Jdet*rho_water*mixed_layer_capacity*thermal_exchange_vel/(heatcapacity*rho_ice); + if(reCast(dt)) D=dt*D; + TripleMultiply(basis,numnodes,1,0, + &D,1,1,0, + basis,1,numnodes,0, + &Ke->values[0],1); + + } + + /*Clean up and return*/ + delete gauss; + xDelete(basis); + xDelete(xyz_list_base); + return Ke; +}/*}}}*/ +ElementVector* ThermalAnalysis::CreatePVector(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*compute all load vectors for this element*/ + ElementVector* pe1=CreatePVectorVolume(element); + ElementVector* pe2=CreatePVectorSheet(element); + ElementVector* pe3=CreatePVectorShelf(element); + ElementVector* pe =new ElementVector(pe1,pe2,pe3); + + /*clean-up and return*/ + delete pe1; + delete pe2; + delete pe3; + return pe; +}/*}}}*/ +ElementVector* ThermalAnalysis::CreatePVectorVolume(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /*Intermediaries*/ + int stabilization; + IssmDouble Jdet,phi,dt; + IssmDouble temperature; + IssmDouble tau_parameter,diameter; + IssmDouble u,v,w; + IssmDouble scalar_def,scalar_transient; + IssmDouble* xyz_list = NULL; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize Element vector*/ + ElementVector* pe = element->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + IssmDouble* dbasis = xNew(3*numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinates(&xyz_list); + IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble heatcapacity = element->GetMaterialParameter(MaterialsHeatcapacityEnum); + IssmDouble thermalconductivity = element->GetMaterialParameter(MaterialsThermalconductivityEnum); + IssmDouble kappa = thermalconductivity/(rho_ice*heatcapacity); + element->FindParam(&dt,TimesteppingTimeStepEnum); + element->FindParam(&stabilization,ThermalStabilizationEnum); + Input* vx_input=element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=element->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input=element->GetInput(VzEnum); _assert_(vz_input); + Input* temperature_input = NULL; + if(reCast(dt)){temperature_input = element->GetInput(TemperatureEnum); _assert_(temperature_input);} + if(stabilization==2) diameter=element->MinEdgeLength(xyz_list); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(3); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + element->NodalFunctions(basis,gauss); + element->ViscousHeating(&phi,xyz_list,gauss,vx_input,vy_input,vz_input); + + scalar_def=phi/(rho_ice*heatcapacity)*Jdet*gauss->weight; + if(reCast(dt)) scalar_def=scalar_def*dt; + + for(int i=0;ivalues[i]+=scalar_def*basis[i]; + + /* Build transient now */ + if(reCast(dt)){ + temperature_input->GetInputValue(&temperature, gauss); + scalar_transient=temperature*Jdet*gauss->weight; + for(int i=0;ivalues[i]+=scalar_transient*basis[i]; + } + + if(stabilization==2){ + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + vx_input->GetInputValue(&u,gauss); + vy_input->GetInputValue(&v,gauss); + vz_input->GetInputValue(&w,gauss); + + tau_parameter=element->StabilizationParameter(u,v,w,diameter,kappa); + + for(int i=0;ivalues[i]+=tau_parameter*scalar_def*(u*dbasis[0*numnodes+i]+v*dbasis[1*numnodes+i]+w*dbasis[2*numnodes+i]); + if(reCast(dt)){ + for(int i=0;ivalues[i]+=tau_parameter*scalar_transient*(u*dbasis[0*numnodes+i]+v*dbasis[1*numnodes+i]+w*dbasis[2*numnodes+i]); + } + } + } + + /*Clean up and return*/ + xDelete(basis); + xDelete(dbasis); + xDelete(xyz_list); + delete gauss; + return pe; + +}/*}}}*/ +ElementVector* ThermalAnalysis::CreatePVectorSheet(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + /* Geothermal flux on ice sheet base and basal friction */ + if(!element->IsOnBase() || element->IsFloating()) return NULL; + + IssmDouble dt,Jdet,geothermalflux,vx,vy,vz; + IssmDouble alpha2,scalar,basalfriction,heatflux; + IssmDouble *xyz_list_base = NULL; + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize vectors*/ + ElementVector* pe = element->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinatesBase(&xyz_list_base); + element->FindParam(&dt,TimesteppingTimeStepEnum); + Input* vx_input = element->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input = element->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input = element->GetInput(VzEnum); _assert_(vz_input); + Input* geothermalflux_input = element->GetInput(BasalforcingsGeothermalfluxEnum); _assert_(geothermalflux_input); + IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble heatcapacity = element->GetMaterialParameter(MaterialsHeatcapacityEnum); + + /*Build friction element, needed later: */ + Friction* friction=new Friction(element,3); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss = element->NewGaussBase(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminantBase(&Jdet,xyz_list_base,gauss); + element->NodalFunctions(basis,gauss); + + geothermalflux_input->GetInputValue(&geothermalflux,gauss); + friction->GetAlpha2(&alpha2,gauss,vx_input,vy_input,vz_input); + vx_input->GetInputValue(&vx,gauss); + vy_input->GetInputValue(&vy,gauss); + vz_input->GetInputValue(&vz,gauss); + vz = 0.;//FIXME + basalfriction = alpha2*(vx*vx + vy*vy + vz*vz); + heatflux = (basalfriction+geothermalflux)/(rho_ice*heatcapacity); + + scalar = gauss->weight*Jdet*heatflux; + if(dt!=0.) scalar=dt*scalar; + + for(int i=0;ivalues[i]+=scalar*basis[i]; + } + + /*Clean up and return*/ + delete gauss; + delete friction; + xDelete(basis); + xDelete(xyz_list_base); + return pe; +}/*}}}*/ +ElementVector* ThermalAnalysis::CreatePVectorShelf(Element* element){/*{{{*/ + + /* Check if ice in element */ + if(!element->IsIceInElement()) return NULL; + + IssmDouble t_pmp,dt,Jdet,scalar_ocean,pressure; + IssmDouble *xyz_list_base = NULL; + + /*Get basal element*/ + if(!element->IsOnBase() || !element->IsFloating()) return NULL; + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Initialize vectors*/ + ElementVector* pe = element->NewElementVector(); + IssmDouble* basis = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + element->GetVerticesCoordinatesBase(&xyz_list_base); + element->FindParam(&dt,TimesteppingTimeStepEnum); + Input* pressure_input=element->GetInput(PressureEnum); _assert_(pressure_input); + IssmDouble gravity = element->GetMaterialParameter(ConstantsGEnum); + IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoWaterEnum); + IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble heatcapacity = element->GetMaterialParameter(MaterialsHeatcapacityEnum); + IssmDouble mixed_layer_capacity= element->GetMaterialParameter(MaterialsMixedLayerCapacityEnum); + IssmDouble thermal_exchange_vel= element->GetMaterialParameter(MaterialsThermalExchangeVelocityEnum); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGaussBase(2); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + element->JacobianDeterminantBase(&Jdet,xyz_list_base,gauss); + element->NodalFunctions(basis,gauss); + + pressure_input->GetInputValue(&pressure,gauss); + t_pmp=element->TMeltingPoint(pressure); + + scalar_ocean=gauss->weight*Jdet*rho_water*mixed_layer_capacity*thermal_exchange_vel*(t_pmp)/(heatcapacity*rho_ice); + if(reCast(dt)) scalar_ocean=dt*scalar_ocean; + + for(int i=0;ivalues[i]+=scalar_ocean*basis[i]; + } + + /*Clean up and return*/ + delete gauss; + xDelete(basis); + xDelete(xyz_list_base); + return pe; +}/*}}}*/ +void ThermalAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ + element->GetSolutionFromInputsOneDof(solution,TemperatureEnum); +}/*}}}*/ +void ThermalAnalysis::GetBConduct(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF1. + * For node i, Bi' can be expressed in the actual coordinate system + * by: + * Bi_conduct=[ dh/dx ] + * [ dh/dy ] + * [ dh/dz ] + * where h is the interpolation function for node i. + * + * We assume B has been allocated already, of size: 3x(NDOF1*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(3*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B: */ + for(int i=0;i(dbasis); +}/*}}}*/ +void ThermalAnalysis::GetBAdvec(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF1. + * For node i, Bi' can be expressed in the actual coordinate system + * by: + * Bi_advec =[ h ] + * [ h ] + * [ h ] + * where h is the interpolation function for node i. + * + * We assume B has been allocated already, of size: 3x(NDOF1*NUMNODESP1) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions*/ + IssmDouble* basis=xNew(numnodes); + element->NodalFunctions(basis,gauss); + + /*Build B: */ + for(int i=0;i(basis); +}/*}}}*/ +void ThermalAnalysis::GetBAdvecprime(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/ + /*Compute B matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF1. + * For node i, Bi' can be expressed in the actual coordinate system + * by: + * Biprime_advec=[ dh/dx ] + * [ dh/dy ] + * [ dh/dz ] + * where h is the interpolation function for node i. + * + * We assume B has been allocated already, of size: 3x(NDOF1*numnodes) + */ + + /*Fetch number of nodes for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(3*numnodes); + element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Build B: */ + for(int i=0;i(dbasis); +}/*}}}*/ +void ThermalAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ + + bool converged; + int i,rheology_law; + int *doflist = NULL; + IssmDouble *xyz_list = NULL; + bool hack = false; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = element->GetNumberOfNodes(); + + /*Fetch dof list and allocate solution vector*/ + element->GetDofList(&doflist,NoneApproximationEnum,GsetEnum); + IssmDouble* values = xNew(numnodes); + IssmDouble* surface = xNew(numnodes); + IssmDouble* B = xNew(numnodes); + + /*Use the dof list to index into the solution vector: */ + for(i=0;i(values[i])) _error_("NaN found in solution vector"); + //if(values[i]<0) _printf_("temperature < 0Ā°K found in solution vector\n"); + //if(values[i]>275) _printf_("temperature > 275Ā°K found in solution vector (Paterson's rheology associated is negative)\n"); + } + + /*Force temperature between [Tpmp-50 Tpmp] to disable penalties*/ + if(hack){ + IssmDouble* pressure = xNew(numnodes); + element->GetInputListOnNodes(&pressure[0],PressureEnum); + for(i=0;ielement->TMeltingPoint(pressure[i])) values[i]=element->TMeltingPoint(pressure[i]); + if(values[i]TMeltingPoint(pressure[i])-50.) values[i]=element->TMeltingPoint(pressure[i])-50.; + } + xDelete(pressure); + } + + /*Get all inputs and parameters*/ + element->GetInputValue(&converged,ConvergedEnum); + if(converged){ + element->AddInput(TemperatureEnum,values,element->GetElementType()); + + /*Update Rheology only if converged (we must make sure that the temperature is below melting point + * otherwise the rheology could be negative*/ + element->FindParam(&rheology_law,MaterialsRheologyLawEnum); + element->GetInputListOnNodes(&surface[0],SurfaceEnum); + switch(rheology_law){ + case NoneEnum: + /*Do nothing: B is not temperature dependent*/ + break; + case CuffeyEnum: + for(i=0;iAddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType()); + break; + case PatersonEnum: + for(i=0;iAddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType()); + break; + case ArrheniusEnum:{ + element->GetVerticesCoordinates(&xyz_list); + for(i=0;iGetMaterialParameter(MaterialsRheologyNEnum)); + element->AddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType()); + break; + } + default: + _error_("Rheology law " << EnumToStringx(rheology_law) << " not supported yet"); + } + } + else{ + element->AddInput(TemperaturePicardEnum,values,element->GetElementType()); + } + + /*Free ressources:*/ + xDelete(values); + xDelete(surface); + xDelete(B); + xDelete(xyz_list); + xDelete(doflist); +}/*}}}*/ +void ThermalAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ + + bool islevelset; + femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum); + if(islevelset){ + SetActiveNodesLSMx(femmodel); + } + return; +}/*}}}*/ Index: /issm/trunk/src/c/analyses/ThermalAnalysis.h =================================================================== --- /issm/trunk/src/c/analyses/ThermalAnalysis.h (revision 17805) +++ /issm/trunk/src/c/analyses/ThermalAnalysis.h (revision 17806) @@ -12,5 +12,6 @@ public: - int DofsPerNode(int** doflist,int meshtype,int approximation); + /*Model processing*/ + int DofsPerNode(int** doflist,int domaintype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); @@ -18,4 +19,22 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + void Core(FemModel* femmodel); + ElementVector* CreateDVector(Element* element); + ElementMatrix* CreateJacobianMatrix(Element* element); + ElementMatrix* CreateKMatrix(Element* element); + ElementMatrix* CreateKMatrixVolume(Element* element); + ElementMatrix* CreateKMatrixShelf(Element* element); + ElementVector* CreatePVector(Element* element); + ElementVector* CreatePVectorVolume(Element* element); + ElementVector* CreatePVectorSheet(Element* element); + ElementVector* CreatePVectorShelf(Element* element); + void GetBConduct(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss); + void GetBAdvec(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss); + void GetBAdvecprime(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss); + void GetSolutionFromInputs(Vector* solution,Element* element); + void InputUpdateFromSolution(IssmDouble* solution,Element* element); + void UpdateConstraints(FemModel* femmodel); }; #endif Index: /issm/trunk/src/c/analyses/analyses.h =================================================================== --- /issm/trunk/src/c/analyses/analyses.h (revision 17805) +++ /issm/trunk/src/c/analyses/analyses.h (revision 17806) @@ -14,7 +14,9 @@ #include "./BalancevelocityAnalysis.h" #include "./DamageEvolutionAnalysis.h" +#include "./DepthAverageAnalysis.h" #include "./EnthalpyAnalysis.h" #include "./ExtrudeFromBaseAnalysis.h" #include "./ExtrudeFromTopAnalysis.h" +#include "./ExtrapolationAnalysis.h" #include "./FreeSurfaceBaseAnalysis.h" #include "./FreeSurfaceTopAnalysis.h" @@ -23,4 +25,6 @@ #include "./HydrologyDCInefficientAnalysis.h" #include "./HydrologyShreveAnalysis.h" +#include "./LevelsetAnalysis.h" +#include "./LsfReinitializationAnalysis.h" #include "./MasstransportAnalysis.h" #include "./MeltingAnalysis.h" @@ -32,6 +36,6 @@ #include "./StressbalanceVerticalAnalysis.h" #include "./L2ProjectionBaseAnalysis.h" +#include "./L2ProjectionEPLAnalysis.h" #include "./ThermalAnalysis.h" - -#include "EnumToAnalysis.h" +#include "./EnumToAnalysis.h" #endif Index: /issm/trunk/src/c/bamg/BamgOpts.cpp =================================================================== --- /issm/trunk/src/c/bamg/BamgOpts.cpp (revision 17805) +++ /issm/trunk/src/c/bamg/BamgOpts.cpp (revision 17806) @@ -20,4 +20,5 @@ this->omega=0; this->power=0; + this->random=0; this->verbose=0; Index: /issm/trunk/src/c/bamg/BamgOpts.h =================================================================== --- /issm/trunk/src/c/bamg/BamgOpts.h (revision 17805) +++ /issm/trunk/src/c/bamg/BamgOpts.h (revision 17806) @@ -25,4 +25,5 @@ double omega; double power; + bool random; int verbose; Index: /issm/trunk/src/c/bamg/BamgQuadtree.cpp =================================================================== --- /issm/trunk/src/c/bamg/BamgQuadtree.cpp (revision 17805) +++ /issm/trunk/src/c/bamg/BamgQuadtree.cpp (revision 17806) @@ -150,8 +150,8 @@ /*Get integer coodinate of current point w*/ - register long i=w.i.x, j=w.i.y; + long i=w.i.x, j=w.i.y; /*Initialize level*/ - register long level=MaxISize; + long level=MaxISize; /*Get inital box (the largest)*/ @@ -426,6 +426,6 @@ int pi[ MaxDepth ]; Icoor1 ii[ MaxDepth ], jj [ MaxDepth]; - register int l=0; // level - register BamgQuadtreeBox * b; + int l=0; // level + BamgQuadtreeBox * b; Icoor1 hb = MaxISize; Icoor1 i0=0,j0=0; @@ -444,5 +444,5 @@ b= pb[l]; while (pi[l]--){ - register int k = pi[l]; + int k = pi[l]; if (b->nbitems>0){ // BamgVertex BamgQuadtreeBox none empty @@ -457,9 +457,9 @@ } else{ // Pointer BamgQuadtreeBox - register BamgQuadtreeBox *b0=b; + BamgQuadtreeBox *b0=b; if ((b=b->b[k])){ hb >>=1 ; // div by 2 - register long iii = ii[l]+I_IJ(k,hb); - register long jjj = jj[l]+J_IJ(k,hb); + long iii = ii[l]+I_IJ(k,hb); + long jjj = jj[l]+J_IJ(k,hb); if (INTER_SEG(iii,iii+hb,i-hx,i+hx) && INTER_SEG(jjj,jjj+hb,j-hy,j+hy)){ Index: /issm/trunk/src/c/bamg/BamgVertex.cpp =================================================================== --- /issm/trunk/src/c/bamg/BamgVertex.cpp (revision 17805) +++ /issm/trunk/src/c/bamg/BamgVertex.cpp (revision 17806) @@ -125,10 +125,10 @@ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/Smoothing)*/ - register BamgVertex* s=this; + BamgVertex* s=this; BamgVertex &vP = *s,vPsave=vP; - register Triangle* tbegin= t , *tria = t , *ttc; - - register int k=0,kk=0,j = EdgesVertexTriangle[IndexInTriangle][0],jc; + Triangle* tbegin= t , *tria = t , *ttc; + + int k=0,kk=0,j = EdgesVertexTriangle[IndexInTriangle][0],jc; R2 P(s->r),PNew(0,0); do { Index: /issm/trunk/src/c/bamg/Geometry.cpp =================================================================== --- /issm/trunk/src/c/bamg/Geometry.cpp (revision 17805) +++ /issm/trunk/src/c/bamg/Geometry.cpp (revision 17806) @@ -598,5 +598,5 @@ long *po=p; long n=*p; - register float angleold=-1000 ; // angle = - infinity + float angleold=-1000 ; // angle = - infinity ord=0; exch=0; @@ -878,5 +878,5 @@ double sg; if (eg0 == eg1) { - register double s0=vg0,s1=vg1; + double s0=vg0,s1=vg1; sg = s0*(1.0-s) + s*s1; on=eg0; Index: /issm/trunk/src/c/bamg/ListofIntersectionTriangles.cpp =================================================================== --- /issm/trunk/src/c/bamg/ListofIntersectionTriangles.cpp (revision 17805) +++ /issm/trunk/src/c/bamg/ListofIntersectionTriangles.cpp (revision 17806) @@ -83,5 +83,5 @@ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/NewItem)*/ - register int n; + int n; R2 x(0,0); if ( d0) x = (*tt)[0].r * d0; @@ -97,5 +97,5 @@ lIntTria[Size].x = x; Metric m0,m1,m2; - register BamgVertex * v; + BamgVertex * v; if ((v=(*tt)(0))) m0 = v->m; if ((v=(*tt)(1))) m1 = v->m; @@ -111,5 +111,5 @@ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/NewItem)*/ - register int n; + int n; if(!Size || Norme2_2(lIntTria[Size-1].x-A)) { if (Size==MaxSize) ReShape(); @@ -183,5 +183,5 @@ void ListofIntersectionTriangles::ReShape(){ - register int newsize = MaxSize*2; + int newsize = MaxSize*2; IntersectionTriangles* nw = new IntersectionTriangles[newsize]; _assert_(nw); Index: /issm/trunk/src/c/bamg/Mesh.cpp =================================================================== --- /issm/trunk/src/c/bamg/Mesh.cpp (revision 17805) +++ /issm/trunk/src/c/bamg/Mesh.cpp (revision 17806) @@ -2775,5 +2775,5 @@ /*}}}*/ /*FUNCTION Mesh::Insert{{{*/ - void Mesh::Insert() { + void Mesh::Insert(bool random) { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/Insert)*/ @@ -2822,5 +2822,6 @@ //Get Prime number const long PrimeNumber= BigPrimeNumber(nbv); - int k0=rand()%nbv; + int temp = rand(); if(!random) temp = 756804110; + int k0=temp%nbv; //Build orderedvertices @@ -2904,28 +2905,8 @@ _printf_(" NbSwap/nbv: " << NbSwap/nbv << "\n"); } - -#ifdef NBLOOPOPTIM - - k0 = rand()%nbv ; - for (int is4=0; is4Optim(0,0); - if (verbose>3) { - _printf_(" Optim Loop: " << Nbloop << "\n"); - _printf_(" NbSwap/nbv: " << NbSwap/nbv << "\n"); - } - if(!NbSwap) break; - } - CreateSingleVertexToTriangleConnectivity(); - // because we break the TriangleContainingTheVertex -#endif } /*}}}*/ /*FUNCTION Mesh::InsertNewPoints{{{*/ - long Mesh::InsertNewPoints(long nbvold,long & NbTSwap) { + long Mesh::InsertNewPoints(long nbvold,long & NbTSwap,bool random) { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/InsertNewPoints)*/ @@ -2948,9 +2929,10 @@ const long PrimeNumber= BigPrimeNumber(nbv) ; //remainder of the division of rand() by nbvnew - long k3 = rand()%nbvnew; + int temp = rand(); if(!random) temp = 1098566905; + long k3 = temp%nbvnew; //loop over the new points for (int is3=0; is3ReferenceNumber=i; @@ -3212,5 +3194,5 @@ } Bh.CreateSingleVertexToTriangleConnectivity(); - InsertNewPoints(nbvold,NbTSwap) ; + InsertNewPoints(nbvold,NbTSwap,bamgopts->random); } else Bh.CreateSingleVertexToTriangleConnectivity(); @@ -3270,5 +3252,5 @@ }// for triangle - if (!InsertNewPoints(nbvold,NbTSwap)) break; + if (!InsertNewPoints(nbvold,NbTSwap,bamgopts->random)) break; for (i=nbtold;i=0;i=first_np_or_next_t0[ip=i],first_np_or_next_t0[ip]=-1) { // pour tous les triangles autour du sommet s - register Triangle* t= vertices[i].t; + Triangle* t= vertices[i].t; if (!t){ _error_("!t"); @@ -4119,5 +4101,5 @@ detop = det(*(*t)(VerticesOfTriangularEdge[jj][0]),*(*t)(VerticesOfTriangularEdge[jj][1]),B); - while(t->det>0) { + while(t->det>0){ /*Increase counter*/ @@ -4172,6 +4154,6 @@ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/ConsRefTriangle)*/ - register Triangle *t0,*t; - register long k=0, num; + Triangle *t0,*t; + long k=0, num; //initialize all triangles as -1 (outside) @@ -4231,5 +4213,5 @@ /*Insert Vertices*/ - Insert(); + Insert(true); } /*}}}*/ @@ -4534,5 +4516,5 @@ if (verbose>3) _printf_(" Creating initial Constrained Delaunay Triangulation...\n"); if (verbose>3) _printf_(" Inserting boundary points\n"); - Insert(); + Insert(bamgopts->random); //Force the boundary @@ -4725,5 +4707,5 @@ L=0;// length of the curve long i=0;// index of new points on the curve - register GeomVertex * GA0 = *(*peequi)[k0equi].GeomEdgeHook; + GeomVertex * GA0 = *(*peequi)[k0equi].GeomEdgeHook; BamgVertex *A0; A0 = GA0->MeshVertexHook; // the vertex in new mesh @@ -4799,5 +4781,5 @@ if (ee[k1].GeomEdgeHook->IsRequiredVertex()) { _assert_(eeequi[k1equi].GeomEdgeHook->IsRequiredVertex()); - register GeomVertex * GA1 = *eeequi[k1equi].GeomEdgeHook; + GeomVertex * GA1 = *eeequi[k1equi].GeomEdgeHook; A1=GA1->MeshVertexHook;// the vertex in new mesh _assert_(A1-vertices>=0 && A1-vertices3) _printf_(" Creating initial Constrained Delaunay Triangulation...\n"); if (verbose>3) _printf_(" Inserting boundary points\n"); - Insert(); + Insert(bamgopts->random); //Force the boundary Index: /issm/trunk/src/c/bamg/Mesh.h =================================================================== --- /issm/trunk/src/c/bamg/Mesh.h (revision 17805) +++ /issm/trunk/src/c/bamg/Mesh.h (revision 17806) @@ -77,5 +77,5 @@ R2 I2ToR2(const I2 & P) const; void AddVertex(BamgVertex & s,Triangle * t,Icoor2 * =0) ; - void Insert(); + void Insert(bool random); void Echo(void); void ForceBoundary(); @@ -92,5 +92,5 @@ void MakeBamgQuadtree(); void NewPoints(Mesh &,BamgOpts* bamgopts,int KeepVertices=1); - long InsertNewPoints(long nbvold,long & NbTSwap) ; + long InsertNewPoints(long nbvold,long & NbTSwap,bool random); void TrianglesRenumberBySubDomain(bool justcompress=false); void SmoothingVertex(int =3,double=0.3); Index: /issm/trunk/src/c/bamg/Triangle.cpp =================================================================== --- /issm/trunk/src/c/bamg/Triangle.cpp (revision 17805) +++ /issm/trunk/src/c/bamg/Triangle.cpp (revision 17806) @@ -231,7 +231,7 @@ // Copy all the mark a &= 3; - register Triangle *tt=adj[a]; + Triangle *tt=adj[a]; AdjEdgeIndex [a] &= 55; // remove MarkUnSwap - register short aatt = AdjEdgeIndex[a] & 3; + short aatt = AdjEdgeIndex[a] & 3; if(tt){ tt->adj[aatt]=this; @@ -255,5 +255,5 @@ void Triangle::SetHidden(int a){ //Get Adjacent Triangle number a - register Triangle* t = adj[a]; + Triangle* t = adj[a]; //if it exist //C|=D -> C=(C|D) bitwise inclusive OR @@ -264,5 +264,5 @@ void Triangle::SetLocked(int a){ //mark the edge as on Boundary - register Triangle * t = adj[a]; + Triangle * t = adj[a]; t->AdjEdgeIndex[AdjEdgeIndex[a] & 3] |=4; AdjEdgeIndex[a] |= 4; @@ -270,5 +270,5 @@ /*FUNCTION Triangle::SetMarkUnSwap{{{*/ void Triangle::SetMarkUnSwap(int a){ - register Triangle * t = adj[a]; + Triangle * t = adj[a]; t->AdjEdgeIndex[AdjEdgeIndex[a] & 3] |=8; AdjEdgeIndex[a] |=8 ; @@ -282,5 +282,5 @@ /*FUNCTION Triangle::SetUnMarkUnSwap{{{*/ void Triangle::SetUnMarkUnSwap(int a){ - register Triangle * t = adj[a]; + Triangle * t = adj[a]; t->AdjEdgeIndex[AdjEdgeIndex[a] & 3] &=55; // 23 + 32 AdjEdgeIndex[a] &=55 ; @@ -292,12 +292,12 @@ if(a/4 !=0) return 0;// arete lock or MarkUnSwap - register Triangle *t1=this,*t2=adj[a];// les 2 triangles adjacent - register short a1=a,a2=AdjEdgeIndex[a];// les 2 numero de l arete dans les 2 triangles + Triangle *t1=this,*t2=adj[a];// les 2 triangles adjacent + short a1=a,a2=AdjEdgeIndex[a];// les 2 numero de l arete dans les 2 triangles if(a2/4 !=0) return 0; // arete lock or MarkUnSwap - register BamgVertex *sa=t1->vertices[VerticesOfTriangularEdge[a1][0]]; - register BamgVertex *sb=t1->vertices[VerticesOfTriangularEdge[a1][1]]; - register BamgVertex *s1=t1->vertices[OppositeVertex[a1]]; - register BamgVertex *s2=t2->vertices[OppositeVertex[a2]]; + BamgVertex *sa=t1->vertices[VerticesOfTriangularEdge[a1][0]]; + BamgVertex *sb=t1->vertices[VerticesOfTriangularEdge[a1][1]]; + BamgVertex *s1=t1->vertices[OppositeVertex[a1]]; + BamgVertex *s2=t2->vertices[OppositeVertex[a2]]; Icoor2 det1=t1->det , det2=t2->det ; @@ -328,5 +328,5 @@ if(kopt) { // critere de Delaunay pure isotrope - register Icoor2 xb1 = sb->i.x - s1->i.x, + Icoor2 xb1 = sb->i.x - s1->i.x, x21 = s2->i.x - s1->i.x, yb1 = sb->i.y - s1->i.y, @@ -336,5 +336,5 @@ yba = sb->i.y - sa->i.y, y2a = s2->i.y - sa->i.y; - register double + double cosb12 = double(xb1*x21 + yb1*y21), cosba2 = double(xba*x2a + yba*y2a) , Index: /issm/trunk/src/c/classes/Constraints/SpcDynamic.cpp =================================================================== --- /issm/trunk/src/c/classes/Constraints/SpcDynamic.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Constraints/SpcDynamic.cpp (revision 17806) @@ -124,5 +124,5 @@ Node* node=(Node*)nodes->GetObjectById(NULL,nodeid); - pos=node->GetDof(dof-1,GsetEnum); + pos=node->GetDof(dof,GsetEnum); this->value=yg_serial[pos]; Index: /issm/trunk/src/c/classes/Elements/Element.cpp =================================================================== --- /issm/trunk/src/c/classes/Elements/Element.cpp (revision 17806) +++ /issm/trunk/src/c/classes/Elements/Element.cpp (revision 17806) @@ -0,0 +1,1513 @@ +/*!\file Element.cpp + * \brief: implementation of the Element object + */ +/*Headers:*/ +/*{{{*/ +#ifdef HAVE_CONFIG_H +#include +#else +#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" +#endif +#include +#include +#include "../classes.h" +#include "../../shared/shared.h" +/*}}}*/ + +/*Constructors/destructor/copy*/ +Element::Element(){/*{{{*/ + this->id = -1; + this->sid = -1; + this->inputs = NULL; + this->nodes = NULL; + this->vertices = NULL; + this->material = NULL; + this->matpar = NULL; + this->inputs = NULL; + this->parameters = NULL; +}/*}}}*/ +Element::~Element(){/*{{{*/ + delete inputs; +} +/*}}}*/ + +/*Other*/ +void Element::AddInput(Input* input_in){/*{{{*/ + + /*Call inputs method*/ + _assert_(this->inputs); + this->inputs->AddInput(input_in); +}/*}}}*/ +/* bool Element::AllActive(void){/\*{{{*\/ */ + +/* int numnodes = this->GetNumberOfNodes(); */ +/* for(int i=0;inodes[i]->IsActive()) return false; */ +/* } */ +/* return true; */ +/* }/\*}}}*\/ */ +/* bool Element::AnyActive(void){/\*{{{*\/ */ + +/* int numnodes = this->GetNumberOfNodes(); */ +/* for(int i=0;inodes[i]->IsActive()) return true; */ +/* } */ +/* return false; */ +/* }/\*}}}*\/ */ +void Element::CoordinateSystemTransform(IssmDouble** ptransform,Node** nodes_list,int numnodes,int* cs_array){/*{{{*/ + + int i,counter; + int numdofs = 0; + IssmDouble norm; + IssmDouble *transform = NULL; + IssmDouble coord_system[3][3]; + + /*Some checks in debugging mode*/ + _assert_(numnodes && nodes_list); + + /*Get total number of dofs*/ + for(i=0;i(numdofs*numdofs); + for(i=0;iGetCoordinateSystem(&coord_system[0][0]); + switch(cs_array[i]){ + case PressureEnum: + /*DO NOT change anything*/ + transform[(numdofs)*(counter) + counter] = 1.; + counter+=1; + break; + case XYEnum: + /*We remove the z component, we need to renormalize x and y: x=[x1 x2 0] y=[-x2 x1 0]*/ + norm = sqrt( coord_system[0][0]*coord_system[0][0] + coord_system[1][0]*coord_system[1][0]); _assert_(norm>1.e-4); + transform[(numdofs)*(counter+0) + counter+0] = coord_system[0][0]/norm; + transform[(numdofs)*(counter+0) + counter+1] = - coord_system[1][0]/norm; + transform[(numdofs)*(counter+1) + counter+0] = coord_system[1][0]/norm; + transform[(numdofs)*(counter+1) + counter+1] = coord_system[0][0]/norm; + counter+=2; + break; + case XYZEnum: + /*The 3 coordinates are changed (x,y,z)*/ + transform[(numdofs)*(counter+0) + counter+0] = coord_system[0][0]; + transform[(numdofs)*(counter+0) + counter+1] = coord_system[0][1]; + transform[(numdofs)*(counter+0) + counter+2] = coord_system[0][2]; + transform[(numdofs)*(counter+1) + counter+0] = coord_system[1][0]; + transform[(numdofs)*(counter+1) + counter+1] = coord_system[1][1]; + transform[(numdofs)*(counter+1) + counter+2] = coord_system[1][2]; + transform[(numdofs)*(counter+2) + counter+0] = coord_system[2][0]; + transform[(numdofs)*(counter+2) + counter+1] = coord_system[2][1]; + transform[(numdofs)*(counter+2) + counter+2] = coord_system[2][2]; + counter+=3; + break; + default: + _error_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet"); + } + } + + /*Assign output pointer*/ + *ptransform=transform; +} +/*}}}*/ +void Element::DeleteMaterials(void){/*{{{*/ + delete this->material; +}/*}}}*/ +void Element::DeepEcho(void){/*{{{*/ + + _printf_(EnumToStringx(this->ObjectEnum())<<" element:\n"); + _printf_(" id : "<id <<"\n"); + _printf_(" sid: "<sid<<"\n"); + if(vertices){ + int numvertices = this->GetNumberOfVertices(); + for(int i=0;iEcho(); + } + else _printf_("vertices = NULL\n"); + + if(nodes){ + int numnodes = this->GetNumberOfNodes(); + for(int i=0;iDeepEcho(); + } + else _printf_("nodes = NULL\n"); + + if (material) material->DeepEcho(); + else _printf_("material = NULL\n"); + + if (matpar) matpar->DeepEcho(); + else _printf_("matpar = NULL\n"); + + _printf_(" parameters\n"); + if (parameters) parameters->DeepEcho(); + else _printf_("parameters = NULL\n"); + + _printf_(" inputs\n"); + if (inputs) inputs->DeepEcho(); + else _printf_("inputs=NULL\n"); + + return; +} +/*}}}*/ +void Element::Echo(void){/*{{{*/ + _printf_(EnumToStringx(this->ObjectEnum())<<" element:\n"); + _printf_(" id : "<id <<"\n"); + _printf_(" sid: "<sid<<"\n"); + if(vertices){ + int numvertices = this->GetNumberOfVertices(); + for(int i=0;iEcho(); + } + else _printf_("vertices = NULL\n"); + + if(nodes){ + int numnodes = this->GetNumberOfNodes(); + for(int i=0;iEcho(); + } + else _printf_("nodes = NULL\n"); + + if (material) material->Echo(); + else _printf_("material = NULL\n"); + + if (matpar) matpar->Echo(); + else _printf_("matpar = NULL\n"); + + _printf_(" parameters\n"); + if (parameters) parameters->Echo(); + else _printf_("parameters = NULL\n"); + + _printf_(" inputs\n"); + if (inputs) inputs->Echo(); + else _printf_("inputs=NULL\n"); +} +/*}}}*/ +IssmDouble Element::Divergence(void){/*{{{*/ + /*Compute element divergence*/ + + /*Intermediaries*/ + IssmDouble Jdet; + IssmDouble divergence=0.; + IssmDouble dvx[3],dvy[3],dvz[3]; + IssmDouble *xyz_list = NULL; + + /*Get inputs and parameters*/ + Input* vx_input = this->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input = this->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input = this->GetInput(VzEnum); _assert_(vz_input); + this->GetVerticesCoordinates(&xyz_list); + + Gauss* gauss=this->NewGaussBase(5); + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + this->JacobianDeterminant(&Jdet,xyz_list,gauss); + + /*Get strain rate assuming that epsilon has been allocated*/ + vx_input->GetInputDerivativeValue(&dvx[0],xyz_list,gauss); + vy_input->GetInputDerivativeValue(&dvy[0],xyz_list,gauss); + vz_input->GetInputDerivativeValue(&dvz[0],xyz_list,gauss); + + divergence += (dvx[0]+dvy[1]+dvz[2])*gauss->weight*Jdet; + } + + /*Clean up and return*/ + delete gauss; + return divergence; +}/*}}}*/ +void Element::ThermalToEnthalpy(IssmDouble* penthalpy,IssmDouble temperature,IssmDouble waterfraction,IssmDouble pressure){/*{{{*/ + matpar->ThermalToEnthalpy(penthalpy,temperature,waterfraction,pressure); +}/*}}}*/ +void Element::EnthalpyToThermal(IssmDouble* ptemperature,IssmDouble* pwaterfraction,IssmDouble enthalpy,IssmDouble pressure){/*{{{*/ + matpar->EnthalpyToThermal(ptemperature,pwaterfraction,enthalpy,pressure); +}/*}}}*/ +IssmDouble Element::EnthalpyDiffusionParameter(IssmDouble enthalpy,IssmDouble pressure){/*{{{*/ + return matpar->GetEnthalpyDiffusionParameter(enthalpy,pressure); +}/*}}}*/ +IssmDouble Element::EnthalpyDiffusionParameterVolume(int numvertices,IssmDouble* enthalpy,IssmDouble* pressure){/*{{{*/ + return matpar->GetEnthalpyDiffusionParameterVolume(numvertices,enthalpy,pressure); +}/*}}}*/ +void Element::FindParam(bool* pvalue,int paramenum){/*{{{*/ + this->parameters->FindParam(pvalue,paramenum); +}/*}}}*/ +void Element::FindParam(int* pvalue,int paramenum){/*{{{*/ + this->parameters->FindParam(pvalue,paramenum); +}/*}}}*/ +void Element::FindParam(IssmDouble* pvalue,int paramenum){/*{{{*/ + this->parameters->FindParam(pvalue,paramenum); +}/*}}}*/ +void Element::FindParam(int** pvalues,int* psize,int paramenum){/*{{{*/ + this->parameters->FindParam(pvalues,psize,paramenum); +}/*}}}*/ +void Element::GetDofList(int** pdoflist,int approximation_enum,int setenum){/*{{{*/ + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = this->GetNumberOfNodes(); + + /*First, figure out size of doflist and create it: */ + int numberofdofs=0; + for(int i=0;iGetNumberOfDofs(approximation_enum,setenum); + + /*Allocate output*/ + int* doflist=xNew(numberofdofs); + + /*Populate: */ + int count=0; + for(int i=0;iGetDofList(doflist+count,approximation_enum,setenum); + count+=nodes[i]->GetNumberOfDofs(approximation_enum,setenum); + } + + /*Assign output pointers:*/ + *pdoflist=doflist; +} +/*}}}*/ +void Element::GetDofListVelocity(int** pdoflist,int setenum){/*{{{*/ + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = this->NumberofNodesVelocity(); + + /*First, figure out size of doflist and create it: */ + int numberofdofs=0; + for(int i=0;iGetNumberOfDofs(FSvelocityEnum,setenum); + + /*Allocate output*/ + int* doflist=xNew(numberofdofs); + + /*Populate: */ + int count=0; + for(int i=0;iGetDofList(doflist+count,FSvelocityEnum,setenum); + count+=nodes[i]->GetNumberOfDofs(FSvelocityEnum,setenum); + } + + /*Assign output pointers:*/ + *pdoflist=doflist; +} +/*}}}*/ +void Element::GetDofListPressure(int** pdoflist,int setenum){/*{{{*/ + + /*Fetch number of nodes and dof for this finite element*/ + int vnumnodes = this->NumberofNodesVelocity(); + int pnumnodes = this->NumberofNodesPressure(); + + /*First, figure out size of doflist and create it: */ + int numberofdofs=0; + for(int i=vnumnodes;iGetNumberOfDofs(FSApproximationEnum,setenum); + + /*Allocate output*/ + int* doflist=xNew(numberofdofs); + + /*Populate: */ + int count=0; + for(int i=vnumnodes;iGetDofList(doflist+count,FSApproximationEnum,setenum); + count+=nodes[i]->GetNumberOfDofs(FSApproximationEnum,setenum); + } + + /*Assign output pointers:*/ + *pdoflist=doflist; +} +/*}}}*/ +IssmDouble Element::GetMaterialParameter(int enum_in){/*{{{*/ + + _assert_(this->matpar); + switch(enum_in){ // FIXME: change this to material + case MaterialsRheologyNEnum: + return this->material->GetN(); + case MaterialsRheologyBEnum: + return this->material->GetB(); + case MaterialsRheologyBbarEnum: + return this->material->GetBbar(); + default: + return this->matpar->GetMaterialParameter(enum_in); + } +}/*}}}*/ +void Element::GetPhi(IssmDouble* phi, IssmDouble* epsilon, IssmDouble viscosity){/*{{{*/ + /*Compute deformational heating from epsilon and viscosity */ + + IssmDouble epsilon_matrix[3][3]; + IssmDouble epsilon_eff; + IssmDouble epsilon_sqr[3][3]; + + /* Build epsilon matrix */ + epsilon_matrix[0][0]=epsilon[0]; + epsilon_matrix[1][0]=epsilon[3]; + epsilon_matrix[2][0]=epsilon[4]; + epsilon_matrix[0][1]=epsilon[3]; + epsilon_matrix[1][1]=epsilon[1]; + epsilon_matrix[2][1]=epsilon[5]; + epsilon_matrix[0][2]=epsilon[4]; + epsilon_matrix[1][2]=epsilon[5]; + epsilon_matrix[2][2]=epsilon[2]; + + /* Effective value of epsilon_matrix */ + epsilon_sqr[0][0]=epsilon_matrix[0][0]*epsilon_matrix[0][0]; + epsilon_sqr[1][0]=epsilon_matrix[1][0]*epsilon_matrix[1][0]; + epsilon_sqr[2][0]=epsilon_matrix[2][0]*epsilon_matrix[2][0]; + epsilon_sqr[0][1]=epsilon_matrix[0][1]*epsilon_matrix[0][1]; + epsilon_sqr[1][1]=epsilon_matrix[1][1]*epsilon_matrix[1][1]; + epsilon_sqr[2][1]=epsilon_matrix[2][1]*epsilon_matrix[2][1]; + epsilon_sqr[0][2]=epsilon_matrix[0][2]*epsilon_matrix[0][2]; + epsilon_sqr[1][2]=epsilon_matrix[1][2]*epsilon_matrix[1][2]; + epsilon_sqr[2][2]=epsilon_matrix[2][2]*epsilon_matrix[2][2]; + epsilon_eff=1/sqrt(2.)*sqrt(epsilon_sqr[0][0]+epsilon_sqr[0][1]+ epsilon_sqr[0][2]+ epsilon_sqr[1][0]+ epsilon_sqr[1][1]+ epsilon_sqr[1][2]+ epsilon_sqr[2][0]+ epsilon_sqr[2][1]+ epsilon_sqr[2][2]); + + /*Phi = Tr(sigma * eps) + * = Tr(sigma'* eps) + * = 2 * eps_eff * sigma'_eff + * = 4 * mu * eps_eff ^2*/ + *phi=4.*epsilon_eff*epsilon_eff*viscosity; +} +/*}}}*/ +Input* Element::GetInput(int inputenum){/*{{{*/ + return inputs->GetInput(inputenum); +}/*}}}*/ +void Element::GetInputListOnVertices(IssmDouble* pvalue,int enumtype){/*{{{*/ + + /*Recover input*/ + Input* input=this->GetInput(enumtype); + if (!input) _error_("Input " << EnumToStringx(enumtype) << " not found in element"); + + /*Fetch number vertices for this element*/ + int numvertices = this->GetNumberOfVertices(); + + /*Checks in debugging mode*/ + _assert_(pvalue); + + /* Start looping on the number of vertices: */ + Gauss*gauss=this->NewGauss(); + for(int iv=0;ivGaussVertex(iv); + input->GetInputValue(&pvalue[iv],gauss); + } + + /*clean-up*/ + delete gauss; +} +/*}}}*/ +void Element::GetInputListOnVertices(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue){/*{{{*/ + + /*Recover input*/ + Input* input=this->GetInput(enumtype); + + /*Checks in debugging mode*/ + _assert_(pvalue); + + /*Fetch number vertices for this element*/ + int numvertices = this->GetNumberOfVertices(); + + /* Start looping on the number of vertices: */ + if (input){ + Gauss* gauss=this->NewGauss(); + for (int iv=0;ivGaussVertex(iv); + input->GetInputValue(&pvalue[iv],gauss); + } + delete gauss; + } + else{ + for(int iv=0;ivGetInput(enumtype); + int numnodes = this->GetNumberOfNodes(); + + /* Start looping on the number of vertices: */ + if(input){ + Gauss* gauss=this->NewGauss(); + for(int iv=0;ivGaussNode(this->FiniteElement(),iv); + input->GetInputValue(&pvalue[iv],gauss); + } + delete gauss; + } + else{ + for(int iv=0;ivGetNumberOfNodes(); + Input *input = this->GetInput(enumtype); + if(!input) _error_("Input " << EnumToStringx(enumtype) << " not found in element"); + + /* Start looping on the number of vertices: */ + Gauss* gauss=this->NewGauss(); + for(int iv=0;ivGaussNode(this->FiniteElement(),iv); + input->GetInputValue(&pvalue[iv],gauss); + } + delete gauss; +} +/*}}}*/ +void Element::GetInputListOnNodesVelocity(IssmDouble* pvalue,int enumtype){/*{{{*/ + + _assert_(pvalue); + + int numnodes = this->NumberofNodesVelocity(); + Input *input = this->GetInput(enumtype); + if(!input) _error_("Input " << EnumToStringx(enumtype) << " not found in element"); + + /* Start looping on the number of vertices: */ + Gauss* gauss=this->NewGauss(); + for(int iv=0;ivGaussNode(this->VelocityInterpolation(),iv); + input->GetInputValue(&pvalue[iv],gauss); + } + delete gauss; +} +/*}}}*/ +void Element::GetInputValue(bool* pvalue,int inputenum){/*{{{*/ + + Input* input=inputs->GetInput(inputenum); + if(!input) _error_("Input " << EnumToStringx(inputenum) << " not found in element"); + input->GetInputValue(pvalue); + +}/*}}}*/ +void Element::GetInputValue(int* pvalue,int inputenum){/*{{{*/ + + Input* input=inputs->GetInput(inputenum); + if(!input) _error_("Input " << EnumToStringx(inputenum) << " not found in element"); + input->GetInputValue(pvalue); + +}/*}}}*/ +void Element::GetInputValue(IssmDouble* pvalue,int inputenum){/*{{{*/ + + Input* input=inputs->GetInput(inputenum); + if(!input) _error_("Input " << EnumToStringx(inputenum) << " not found in element"); + input->GetInputValue(pvalue); + +}/*}}}*/ +void Element::GetInputValue(IssmDouble* pvalue,Gauss* gauss,int inputenum){/*{{{*/ + + Input* input=inputs->GetInput(inputenum); + if(!input) _error_("Input " << EnumToStringx(inputenum) << " not found in element"); + input->GetInputValue(pvalue,gauss); + +}/*}}}*/ +void Element::GetNodesSidList(int* sidlist){/*{{{*/ + + _assert_(sidlist); + _assert_(nodes); + int numnodes = this->GetNumberOfNodes(); + for(int i=0;iSid(); + } +} +/*}}}*/ +void Element::GetNodesLidList(int* lidlist){/*{{{*/ + + _assert_(lidlist); + _assert_(nodes); + int numnodes = this->GetNumberOfNodes(); + for(int i=0;iLid(); + } +} +/*}}}*/ +void Element::GetVectorFromInputs(Vector* vector,int input_enum){/*{{{*/ + + /*Fetch number vertices for this element and allocate arrays*/ + int numvertices = this->GetNumberOfVertices(); + int* vertexpidlist = xNew(numvertices); + IssmDouble* values = xNew(numvertices); + + /*Fill in values*/ + this->GetVertexPidList(vertexpidlist); + this->GetInputListOnVertices(values,input_enum); + vector->SetValues(numvertices,vertexpidlist,values,INS_VAL); + + /*Clean up*/ + xDelete(vertexpidlist); + xDelete(values); + +} +/*}}}*/ +void Element::GetVertexPidList(int* pidlist){/*{{{*/ + + int numvertices = this->GetNumberOfVertices(); + for(int i=0;iPid(); + +} +/*}}}*/ +void Element::GetVerticesCoordinates(IssmDouble** pxyz_list){/*{{{*/ + + int numvertices = this->GetNumberOfVertices(); + IssmDouble* xyz_list = xNew(numvertices*3); + ::GetVerticesCoordinates(xyz_list,this->vertices,numvertices); + + *pxyz_list = xyz_list; + +}/*}}}*/ +void Element::GetVerticesSidList(int* sidlist){/*{{{*/ + + int numvertices = this->GetNumberOfVertices(); + for(int i=0;ivertices[i]->Sid(); +} +/*}}}*/ +void Element::GetVerticesConnectivityList(int* connectivity){/*{{{*/ + + int numvertices = this->GetNumberOfVertices(); + for(int i=0;ivertices[i]->Connectivity(); +} +/*}}}*/ +bool Element::HasNodeOnBase(){/*{{{*/ + return (this->inputs->Max(MeshVertexonbaseEnum)>0.); +}/*}}}*/ +bool Element::HasNodeOnSurface(){/*{{{*/ + return (this->inputs->Max(MeshVertexonsurfaceEnum)>0.); +}/*}}}*/ +int Element::Id(){/*{{{*/ + + return this->id; + +} +/*}}}*/ +void Element::InputChangeName(int original_enum,int new_enum){/*{{{*/ + this->inputs->ChangeEnum(original_enum,new_enum); +} +/*}}}*/ +void Element::InputCreate(IssmDouble* vector,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code){/*{{{*/ + + /*Intermediaries*/ + int i,t,row; + IssmDouble time; + + /*Branch on type of vector: nodal or elementary: */ + if(vector_type==1){ //nodal vector + + int numvertices = this->GetNumberOfVertices(); + int *vertexids = xNew(numvertices); + IssmDouble *values = xNew(numvertices); + + /*Recover vertices ids needed to initialize inputs*/ + _assert_(iomodel->elements); + for(i=0;i(iomodel->elements[numvertices*this->Sid()+i]); //ids for vertices are in the elements array from Matlab + } + + /*Are we in transient or static? */ + if(M==iomodel->numberofvertices){ + for(i=0;iAddInput(vector_enum,values,P1Enum); + } + else if(M==iomodel->numberofvertices+1){ + /*create transient input: */ + IssmDouble* times = xNew(N); + for(t=0;tObjectEnum()){ + case TriaEnum: transientinput->AddTimeInput(new TriaInput( vector_enum,values,P1Enum)); break; + case PentaEnum: transientinput->AddTimeInput(new PentaInput(vector_enum,values,P1Enum)); break; + case TetraEnum: transientinput->AddTimeInput(new TetraInput(vector_enum,values,P1Enum)); break; + default: _error_("Not implemented yet"); + } + } + this->inputs->AddInput(transientinput); + xDelete(times); + } + else _error_("nodal vector is either numberofvertices or numberofvertices+1 long. Field provided (" << EnumToStringx(vector_enum) << ") is " << M << " long"); + + xDelete(values); + xDelete(vertexids); + } + else if(vector_type==2){ //element vector + /*Are we in transient or static? */ + if(M==iomodel->numberofelements){ + if (code==5){ //boolean + this->inputs->AddInput(new BoolInput(vector_enum,reCast(vector[this->Sid()]))); + } + else if (code==6){ //integer + this->inputs->AddInput(new IntInput(vector_enum,reCast(vector[this->Sid()]))); + } + else if (code==7){ //IssmDouble + this->inputs->AddInput(new DoubleInput(vector_enum,vector[this->Sid()])); + } + else _error_("could not recognize nature of vector from code " << code); + } + else { + _error_("transient element inputs not supported yet!"); + } + } + else{ + _error_("Cannot add input for vector type " << vector_type << " (not supported)"); + } +}/*}}}*/ +void Element::InputUpdateFromConstant(int constant, int name){/*{{{*/ + + /*Check that name is an element input*/ + if(!IsInput(name)) return; + + /*update input*/ + this->inputs->AddInput(new IntInput(name,constant)); +} +/*}}}*/ +void Element::InputUpdateFromConstant(IssmDouble constant, int name){/*{{{*/ + + /*Check that name is an element input*/ + if(!IsInput(name)) return; + + /*update input*/ + this->inputs->AddInput(new DoubleInput(name,constant)); +} +/*}}}*/ +void Element::InputUpdateFromConstant(bool constant, int name){/*{{{*/ + + /*Check that name is an element input*/ + if(!IsInput(name)) return; + + /*update input*/ + this->inputs->AddInput(new BoolInput(name,constant)); +} +/*}}}*/ +bool Element::IsFloating(){/*{{{*/ + + bool shelf; + int migration_style; + parameters->FindParam(&migration_style,GroundinglineMigrationEnum); + + if(migration_style==SubelementMigrationEnum || migration_style==SubelementMigration2Enum || migration_style==ContactEnum){ //Floating if all nodes are floating + if(this->inputs->Max(MaskGroundediceLevelsetEnum) <= 0.) shelf=true; + else shelf=false; + } + else if(migration_style==NoneEnum || migration_style==AgressiveMigrationEnum || migration_style==SoftMigrationEnum){ //Floating if all nodes are floating + if(this->inputs->Min(MaskGroundediceLevelsetEnum) > 0.) shelf=false; + else shelf=true; + } + else _error_("migration_style not implemented yet"); + + return shelf; +}/*}}}*/ +bool Element::IsIceInElement(){/*{{{*/ + return (this->inputs->Min(MaskIceLevelsetEnum)<0.); +} +/*}}}*/ +bool Element::IsInput(int name){/*{{{*/ + if ( + name==ThicknessEnum || + name==SurfaceEnum || + name==BaseEnum || + name==BedEnum || + name==SurfaceSlopeXEnum || + name==SurfaceSlopeYEnum || + name==SurfaceforcingsMassBalanceEnum || + name==BasalforcingsMeltingRateEnum || + name==BasalforcingsGeothermalfluxEnum || + name==SurfaceAreaEnum|| + name==DamageDEnum || + name==DamageDbarEnum || + name==PressureEnum || + name==VxEnum || + name==VyEnum || + name==VzEnum || + name==VxMeshEnum || + name==VyMeshEnum || + name==VzMeshEnum || + name==InversionVxObsEnum || + name==InversionVyObsEnum || + name==InversionVzObsEnum || + name==TemperatureEnum || + name==EnthalpyEnum || + name==EnthalpyPicardEnum || + name==WaterfractionEnum|| + name==WatercolumnEnum || + name==FrictionCoefficientEnum || + name==MaskGroundediceLevelsetEnum || + name==MaskIceLevelsetEnum || + name==IceMaskNodeActivationEnum || + name==LevelsetfunctionSlopeXEnum || + name==LevelsetfunctionSlopeYEnum || + name==LevelsetfunctionPicardEnum || + name==MasstransportCalvingrateEnum || + name==GradientEnum || + name==OldGradientEnum || + name==ConvergedEnum || + name==QmuVxEnum || + name==QmuVyEnum || + name==QmuVzEnum || + name==QmuVxMeshEnum || + name==QmuVyMeshEnum || + name==QmuVzMeshEnum || + name==QmuPressureEnum || + name==QmuBaseEnum || + name==QmuThicknessEnum || + name==QmuSurfaceEnum || + name==QmuTemperatureEnum || + name==QmuMeltingEnum || + name==QmuMaskGroundediceLevelsetEnum || + name==QmuMaskIceLevelsetEnum || + name==QmuMaterialsRheologyBEnum || + name==MaterialsRheologyBEnum || + name==MaterialsRheologyBbarEnum || + name==MaterialsRheologyNEnum || + name==GiaWEnum || + name==GiadWdtEnum || + name==SedimentHeadEnum || + name==EplHeadEnum || + name==SedimentHeadOldEnum || + name==EplHeadOldEnum || + name==HydrologydcEplThicknessOldEnum || + name==HydrologydcEplInitialThicknessEnum || + name==HydrologydcEplThicknessEnum || + name==HydrologydcMaskEplactiveNodeEnum || + name==MeshVertexonbaseEnum + + ) { + return true; + } + else return false; +} +/*}}}*/ +ElementVector* Element::NewElementVector(int approximation_enum){/*{{{*/ + return new ElementVector(nodes,this->GetNumberOfNodes(),this->parameters,approximation_enum); +} +/*}}}*/ +ElementMatrix* Element::NewElementMatrix(int approximation_enum){/*{{{*/ + return new ElementMatrix(nodes,this->GetNumberOfNodes(),this->parameters,approximation_enum); +} +/*}}}*/ +ElementMatrix* Element::NewElementMatrixCoupling(int number_nodes,int approximation_enum){/*{{{*/ + return new ElementMatrix(nodes,number_nodes,this->parameters,approximation_enum); +} +/*}}}*/ +IssmDouble Element::PureIceEnthalpy(IssmDouble pressure){/*{{{*/ + return this->matpar->PureIceEnthalpy(pressure); +}/*}}}*/ +void Element::ResultInterpolation(int* pinterpolation,int* pnodesperelement,int output_enum){/*{{{*/ + + Input* input=this->inputs->GetInput(output_enum); + + /*If this input is not already in Inputs, maybe it needs to be computed?*/ + if(!input){ + switch(output_enum){ + case ViscousHeatingEnum: + this->ViscousHeatingCreateInput(); + input=this->inputs->GetInput(output_enum); + break; + case StressTensorxxEnum: + case StressTensorxyEnum: + case StressTensorxzEnum: + case StressTensoryyEnum: + case StressTensoryzEnum: + case StressTensorzzEnum: + this->ComputeStressTensor(); + input=this->inputs->GetInput(output_enum); + break; + case DeviatoricStressxxEnum: + case DeviatoricStressxyEnum: + case DeviatoricStressxzEnum: + case DeviatoricStressyyEnum: + case DeviatoricStressyzEnum: + case DeviatoricStresszzEnum: + this->ComputeDeviatoricStressTensor(); + input=this->inputs->GetInput(output_enum); + break; + case SigmaNNEnum: + this->ComputeSigmaNN(); + input=this->inputs->GetInput(output_enum); + break; + default: + _error_("input "<GetResultInterpolation(); + *pnodesperelement = input->GetResultNumberOfNodes(); +}/*}}}*/ +void Element::ResultToVector(Vector* vector,int output_enum){/*{{{*/ + + Input* input=this->inputs->GetInput(output_enum); + if(!input) _error_("input "<GetResultInterpolation()){ + case P0Enum:{ + IssmDouble value; + bool bvalue; + Input* input = this->GetInput(output_enum); _assert_(input); + switch(input->ObjectEnum()){ + case DoubleInputEnum: + input->GetInputValue(&value); + break; + case BoolInputEnum: + input->GetInputValue(&bvalue); + value=reCast(bvalue); + break; + default: + _error_("Input of type "<GetResultInterpolation())<<" not supported"); + } + vector->SetValue(this->Sid(),value,INS_VAL); + break; + } + case P1Enum:{ + int numvertices = this->GetNumberOfVertices(); + IssmDouble *values = xNew(numvertices); + int *connectivity= xNew(numvertices); + int *sidlist = xNew(numvertices); + + this->GetVerticesSidList(sidlist); + this->GetVerticesConnectivityList(connectivity); + this->GetInputListOnVertices(values,output_enum); + for(int i=0;i(connectivity[i]); + + vector->SetValues(numvertices,sidlist,values,ADD_VAL); + + xDelete(values); + xDelete(connectivity); + xDelete(sidlist); + break; + } + default: + _error_("interpolation "<GetResultInterpolation())<<" not supported yet"); + } +} /*}}}*/ +void Element::ResultToPatch(IssmDouble* values,int nodesperelement,int output_enum){/*{{{*/ + + Input* input=this->inputs->GetInput(output_enum); + if(!input) _error_("input "<ResultToPatch(values,nodesperelement,this->Sid()); + +} /*}}}*/ +void Element::SetwiseNodeConnectivity(int* pd_nz,int* po_nz,Node* node,bool* flags,int* flagsindices,int set1_enum,int set2_enum){/*{{{*/ + + /*Intermediaries*/ + const int numnodes = this->GetNumberOfNodes(); + + /*Output */ + int d_nz = 0; + int o_nz = 0; + + /*Loop over all nodes*/ + for(int i=0;inodes[i]->Lid()]){ + + /*flag current node so that no other element processes it*/ + flags[this->nodes[i]->Lid()]=true; + + int counter=0; + while(flagsindices[counter]>=0) counter++; + flagsindices[counter]=this->nodes[i]->Lid(); + + /*if node is clone, we have an off-diagonal non-zero, else it is a diagonal non-zero*/ + switch(set2_enum){ + case FsetEnum: + if(nodes[i]->indexing.fsize){ + if(this->nodes[i]->IsClone()) + o_nz += 1; + else + d_nz += 1; + } + break; + case GsetEnum: + if(nodes[i]->indexing.gsize){ + if(this->nodes[i]->IsClone()) + o_nz += 1; + else + d_nz += 1; + } + break; + case SsetEnum: + if(nodes[i]->indexing.ssize){ + if(this->nodes[i]->IsClone()) + o_nz += 1; + else + d_nz += 1; + } + break; + default: _error_("not supported"); + } + } + } + + /*Special case: 2d/3d coupling, the node of this element might be connected + *to the basal element*/ + int analysis_type,approximation,numlayers; + parameters->FindParam(&analysis_type,AnalysisTypeEnum); + if(analysis_type==StressbalanceAnalysisEnum){ + inputs->GetInputValue(&approximation,ApproximationEnum); + if(approximation==SSAHOApproximationEnum || approximation==SSAFSApproximationEnum){ + parameters->FindParam(&numlayers,MeshNumberoflayersEnum); + o_nz += numlayers*3; + d_nz += numlayers*3; + } + } + + /*Assign output pointers: */ + *pd_nz=d_nz; + *po_nz=o_nz; +} +/*}}}*/ +int Element::Sid(){/*{{{*/ + + return this->sid; + +} +/*}}}*/ +IssmDouble Element::TMeltingPoint(IssmDouble pressure){/*{{{*/ + _assert_(matpar); + return this->matpar->TMeltingPoint(pressure); +}/*}}}*/ +void Element::ViscousHeatingCreateInput(void){/*{{{*/ + + /*Intermediaries*/ + IssmDouble phi; + IssmDouble viscosity; + IssmDouble epsilon[6]; + IssmDouble thickness; + IssmDouble *xyz_list = NULL; + + /*Fetch number vertices and allocate memory*/ + int numvertices = this->GetNumberOfVertices(); + IssmDouble* viscousheating = xNew(numvertices); + + /*Retrieve all inputs and parameters*/ + this->GetVerticesCoordinatesBase(&xyz_list); + Input* vx_input = this->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input = this->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input = this->GetInput(VzEnum); _assert_(vz_input); + Input* thickness_input = this->GetInput(ThicknessEnum); _assert_(thickness_input); + + /*loop over vertices: */ + Gauss* gauss=this->NewGauss(); + for (int iv=0;ivGaussVertex(iv); + + thickness_input->GetInputValue(&thickness,gauss); + + this->StrainRateFS(&epsilon[0],xyz_list,gauss,vx_input,vy_input,vz_input); + this->ViscosityFS(&viscosity,3,xyz_list,gauss,vx_input,vy_input,vz_input); + this->GetPhi(&phi,&epsilon[0],viscosity); + + viscousheating[iv]=phi*thickness; + } + + /*Create PentaVertex input, which will hold the basal friction:*/ + this->AddInput(ViscousHeatingEnum,viscousheating,P1Enum); + + /*Clean up and return*/ + xDelete(viscousheating); + delete gauss; +} +/*}}}*/ +void Element::ViscosityFS(IssmDouble* pviscosity,int dim,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){/*{{{*/ + /*The effective strain rate is defined in Paterson 3d Ed p 91 eq 9, + * and Cuffey p 303 eq 8.18: + * + * 2 eps_eff^2 = eps_xx^2 + eps_yy^2 + eps_zz^2 + 2(eps_xy^2 + eps_xz^2 + eps_yz^2) + * + * or + * + * eps_eff = 1/sqrt(2) sqrt( \sum_ij eps_ij^2 ) + * + * = 1/sqrt(2) ||eps||_F + * + * where ||.||_F is the Frobenius norm */ + + /*Intermediaries*/ + IssmDouble viscosity; + IssmDouble epsilon3d[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ + IssmDouble epsilon2d[3]; /* epsilon=[exx,eyy,exy]; */ + IssmDouble eps_eff; + IssmDouble eps0=1.e-27; + + if(dim==3){ + /* eps_eff^2 = exx^2 + eyy^2 + exy^2 + exz^2 + eyz^2 + exx*eyy */ + this->StrainRateFS(&epsilon3d[0],xyz_list,gauss,vx_input,vy_input,vz_input); + eps_eff = sqrt(epsilon3d[0]*epsilon3d[0] + epsilon3d[1]*epsilon3d[1] + epsilon3d[3]*epsilon3d[3] + epsilon3d[4]*epsilon3d[4] + epsilon3d[5]*epsilon3d[5] + epsilon3d[0]*epsilon3d[1]+eps0*eps0); + } + else{ + /* eps_eff^2 = 1/2 ( exx^2 + eyy^2 + 2*exy^2 )*/ + this->StrainRateSSA(&epsilon2d[0],xyz_list,gauss,vx_input,vy_input); + eps_eff = 1./sqrt(2.)*sqrt(epsilon2d[0]*epsilon2d[0] + epsilon2d[1]*epsilon2d[1] + 2.*epsilon2d[2]*epsilon2d[2]); + } + + /*Get viscosity*/ + material->GetViscosity(&viscosity,eps_eff); + + /*Assign output pointer*/ + *pviscosity=viscosity; +} +/*}}}*/ +void Element::ViscosityL1L2(IssmDouble* pviscosity,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* surface_input){/*{{{*/ + /*Compute the L1L2 viscosity + * + * 1 + * mu = - A^-1 (sigma'_e)^(1-n) + * 2 + * + * sigma'_e^2 = |sigma'_//|^2 + |sigma'_perp|^2 (see Perego 2012 eq. 17,18) + * + * L1L2 assumptions: + * + * (1) |eps_b|_// = A (|sigma'_//|^2 + |sigma'_perp|^2)^((n-1)/2) |sigma'_//| + * (2) |sigma'_perp|^2 = |rho g (s-z) grad(s)|^2 + * + * Assuming that n = 3, we have a polynom of degree 3 to solve (the only unkown is X=|sigma'_//|) + * + * A X^3 + A |rho g (s-z) grad(s)|^2 X - |eps_b|_// = 0 */ + + IssmDouble z,s,viscosity,p,q,delta; + IssmDouble tau_perp,tau_par,eps_b,A; + IssmDouble epsilon[5]; /*exx eyy exy exz eyz*/ + IssmDouble slope[3]; + + /*Check that both inputs have been found*/ + if (!vx_input || !vy_input || !surface_input) _error_("Input missing"); + + /*Get tau_perp*/ + surface_input->GetInputValue(&s,gauss); + surface_input->GetInputDerivativeValue(&slope[0],xyz_list,gauss); + z=GetZcoord(gauss); + tau_perp = matpar->GetRhoIce() * matpar->GetG() * fabs(s-z)*sqrt(slope[0]*slope[0]+slope[1]*slope[1]); + + /* Get eps_b*/ + this->StrainRateHO(&epsilon[0],xyz_list,gauss,vx_input,vy_input); + eps_b = sqrt(epsilon[0]*epsilon[0] + epsilon[1]*epsilon[1] + epsilon[0]*epsilon[1] + epsilon[2]*epsilon[2]); + if(eps_b==0.){ + *pviscosity = 2.5e+17; + return; + } + + /*Get A*/ + _assert_(material->GetN()==3.0); + A=material->GetA(); + + /*Solve for tau_perp (http://fr.wikipedia.org/wiki/MĆ©thode_de_Cardan)*/ + p = tau_perp *tau_perp; + q = - eps_b/A; + delta = q *q + p*p*p*4./27.; + _assert_(delta>0); + tau_par = pow(0.5*(-q+sqrt(delta)),1./3.) - pow(0.5*(q+sqrt(delta)),1./3.); + + /*Viscosity*/ + viscosity = 1./(2.*A*(tau_par*tau_par + tau_perp*tau_perp)); + _assert_(!xIsNan(viscosity)); + _assert_(viscosity > 0.); + + /*Assign output pointer*/ + *pviscosity = viscosity; +}/*}}}*/ +void Element::ViscosityHO(IssmDouble* pviscosity,int dim,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){/*{{{*/ + + /*Intermediaries*/ + IssmDouble viscosity; + IssmDouble epsilon3d[5];/* epsilon=[exx,eyy,exy,exz,eyz];*/ + IssmDouble epsilon2d[2];/* epsilon=[exx,exy]; */ + IssmDouble eps_eff; + + if(dim==3){ + /* eps_eff^2 = exx^2 + eyy^2 + exy^2 + exz^2 + eyz^2 + exx*eyy */ + this->StrainRateHO(&epsilon3d[0],xyz_list,gauss,vx_input,vy_input); + eps_eff = sqrt(epsilon3d[0]*epsilon3d[0] + epsilon3d[1]*epsilon3d[1] + epsilon3d[2]*epsilon3d[2] + epsilon3d[3]*epsilon3d[3] + epsilon3d[4]*epsilon3d[4] + epsilon3d[0]*epsilon3d[1]); + } + else{ + /* eps_eff^2 = 1/2 (exx^2 + 2*exy^2 )*/ + this->StrainRateHO2dvertical(&epsilon2d[0],xyz_list,gauss,vx_input,vy_input); + eps_eff = 1./sqrt(2.)*sqrt(epsilon2d[0]*epsilon2d[0] + 2.*epsilon2d[1]*epsilon2d[1]); + } + + /*Get viscosity*/ + material->GetViscosity(&viscosity,eps_eff); + + /*Assign output pointer*/ + *pviscosity=viscosity; +}/*}}}*/ +void Element::ViscositySSA(IssmDouble* pviscosity,int dim,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){/*{{{*/ + + /*Intermediaries*/ + IssmDouble viscosity; + IssmDouble epsilon2d[3];/* epsilon=[exx,eyy,exy]; */ + IssmDouble epsilon1d; /* epsilon=[exx]; */ + IssmDouble eps_eff; + + if(dim==2){ + /* eps_eff^2 = exx^2 + eyy^2 + exy^2 + exx*eyy*/ + this->StrainRateSSA(&epsilon2d[0],xyz_list,gauss,vx_input,vy_input); + eps_eff = sqrt(epsilon2d[0]*epsilon2d[0] + epsilon2d[1]*epsilon2d[1] + epsilon2d[2]*epsilon2d[2] + epsilon2d[0]*epsilon2d[1]); + } + else{ + /* eps_eff^2 = 1/2 exx^2*/ + this->StrainRateSSA1d(&epsilon1d,xyz_list,gauss,vx_input); + eps_eff = sqrt(epsilon1d*epsilon1d/2.); + } + + /*Get viscosity*/ + material->GetViscosityBar(&viscosity,eps_eff); + + /*Assign output pointer*/ + *pviscosity=viscosity; +}/*}}}*/ +void Element::ViscositySSADerivativeEpsSquare(IssmDouble* pmu_prime,IssmDouble* epsilon){/*{{{*/ + this->material->GetViscosity2dDerivativeEpsSquare(pmu_prime,epsilon); +}/*}}}*/ +void Element::ViscosityHODerivativeEpsSquare(IssmDouble* pmu_prime,IssmDouble* epsilon){/*{{{*/ + this->material->GetViscosityDerivativeEpsSquare(pmu_prime,epsilon); +}/*}}}*/ +void Element::ViscosityFSDerivativeEpsSquare(IssmDouble* pmu_prime,IssmDouble* epsilon){/*{{{*/ + this->material->GetViscosityDerivativeEpsSquare(pmu_prime,epsilon); +}/*}}}*/ +void Element::StrainRateFS(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){/*{{{*/ + /*Compute the 3d Strain Rate (6 components): + * + * epsilon=[exx eyy ezz exy exz eyz] + */ + + /*Intermediaries*/ + IssmDouble dvx[3]; + IssmDouble dvy[3]; + IssmDouble dvz[3]; + + /*Check that both inputs have been found*/ + if (!vx_input || !vy_input || !vz_input){ + _error_("Input missing. Here are the input pointers we have for vx: " << vx_input << ", vy: " << vy_input << ", vz: " << vz_input << "\n"); + } + + /*Get strain rate assuming that epsilon has been allocated*/ + vx_input->GetInputDerivativeValue(&dvx[0],xyz_list,gauss); + vy_input->GetInputDerivativeValue(&dvy[0],xyz_list,gauss); + vz_input->GetInputDerivativeValue(&dvz[0],xyz_list,gauss); + epsilon[0] = dvx[0]; + epsilon[1] = dvy[1]; + epsilon[2] = dvz[2]; + epsilon[3] = 0.5*(dvx[1] + dvy[0]); + epsilon[4] = 0.5*(dvx[2] + dvz[0]); + epsilon[5] = 0.5*(dvy[2] + dvz[1]); + +}/*}}}*/ +void Element::StrainRateHO(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){/*{{{*/ + /*Compute the 3d Blatter/HOStrain Rate (5 components): + * + * epsilon=[exx eyy exy exz eyz] + * + * with exz=1/2 du/dz + * eyz=1/2 dv/dz + * + * the contribution of vz is neglected + */ + + /*Intermediaries*/ + IssmDouble dvx[3]; + IssmDouble dvy[3]; + + /*Check that both inputs have been found*/ + if (!vx_input || !vy_input){ + _error_("Input missing. Here are the input pointers we have for vx: " << vx_input << ", vy: " << vy_input << "\n"); + } + + /*Get strain rate assuming that epsilon has been allocated*/ + vx_input->GetInputDerivativeValue(&dvx[0],xyz_list,gauss); + vy_input->GetInputDerivativeValue(&dvy[0],xyz_list,gauss); + epsilon[0] = dvx[0]; + epsilon[1] = dvy[1]; + epsilon[2] = 0.5*(dvx[1] + dvy[0]); + epsilon[3] = 0.5*dvx[2]; + epsilon[4] = 0.5*dvy[2]; + +}/*}}}*/ +void Element::StrainRateHO2dvertical(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){/*{{{*/ + /*Compute the 2d Blatter/HOStrain Rate (2 components): + * + * epsilon=[exx exz] + * + * with exz=1/2 du/dz + * + * the contribution of vz is neglected + */ + + /*Intermediaries*/ + IssmDouble dvx[3]; + + /*Check that both inputs have been found*/ + if (!vx_input){ + _error_("Input missing. Here are the input pointers we have for vx: " << vx_input <<"\n"); + } + + /*Get strain rate assuming that epsilon has been allocated*/ + vx_input->GetInputDerivativeValue(&dvx[0],xyz_list,gauss); + epsilon[0] = dvx[0]; + epsilon[1] = 0.5*dvx[1]; + +}/*}}}*/ +void Element::StrainRateSSA(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){/*{{{*/ + + /*Intermediaries*/ + IssmDouble dvx[3]; + IssmDouble dvy[3]; + + /*Check that both inputs have been found*/ + if(!vx_input || !vy_input){ + _error_("Input missing. Here are the input pointers we have for vx: " << vx_input << ", vy: " << vy_input << "\n"); + } + + /*Get strain rate assuming that epsilon has been allocated*/ + vx_input->GetInputDerivativeValue(&dvx[0],xyz_list,gauss); + vy_input->GetInputDerivativeValue(&dvy[0],xyz_list,gauss); + epsilon[0] = dvx[0]; + epsilon[1] = dvy[1]; + epsilon[2] = 0.5*(dvx[1] + dvy[0]); + +}/*}}}*/ +void Element::StrainRateSSA1d(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input){/*{{{*/ + + /*Intermediaries*/ + IssmDouble dvx[3]; + + /*Check that both inputs have been found*/ + if (!vx_input){ + _error_("Input missing. Here are the input pointers we have for vx: " << vx_input << "\n"); + } + + /*Get strain rate assuming that epsilon has been allocated*/ + vx_input->GetInputDerivativeValue(&dvx[0],xyz_list,gauss); + *epsilon = dvx[0]; + +}/*}}}*/ +void Element::TransformInvStiffnessMatrixCoord(ElementMatrix* Ke,int transformenum){/*{{{*/ + + /*All nodes have the same Coordinate System*/ + int numnodes = this->GetNumberOfNodes(); + int* cs_array = xNew(numnodes); + for(int i=0;inodes,numnodes,cs_array); + + /*Clean-up*/ + xDelete(cs_array); +}/*}}}*/ +void Element::TransformInvStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes_list,int numnodes,int* cs_array){/*{{{*/ + + int i,j; + int numdofs = 0; + IssmDouble *transform = NULL; + IssmDouble *values = NULL; + + /*Get total number of dofs*/ + for(i=0;i(Ke->nrows*Ke->ncols); + for(i=0;inrows;i++) for(j=0;jncols;j++) values[i*Ke->ncols+j]=Ke->values[i*Ke->ncols+j]; + + /*Get Coordinate Systems transform matrix*/ + CoordinateSystemTransform(&transform,nodes_list,numnodes,cs_array); + + /*Transform matrix: R*Ke*R^T */ + TripleMultiply(transform,numdofs,numdofs,0, + values,Ke->nrows,Ke->ncols,0, + transform,numdofs,numdofs,1, + &Ke->values[0],0); + + /*Free Matrix*/ + xDelete(transform); + xDelete(values); +}/*}}}*/ +void Element::TransformLoadVectorCoord(ElementVector* pe,int transformenum){/*{{{*/ + + /*All nodes have the same Coordinate System*/ + int numnodes = this->GetNumberOfNodes(); + int* cs_array = xNew(numnodes); + for(int i=0;iTransformLoadVectorCoord(pe,this->nodes,numnodes,cs_array); + + /*Clean-up*/ + xDelete(cs_array); +}/*}}}*/ +void Element::TransformLoadVectorCoord(ElementVector* pe,int* cs_array){/*{{{*/ + + this->TransformLoadVectorCoord(pe,this->nodes,this->GetNumberOfNodes(),cs_array); + +}/*}}}*/ +void Element::TransformLoadVectorCoord(ElementVector* pe,Node** nodes_list,int numnodes,int* cs_array){/*{{{*/ + + int i; + int numdofs = 0; + IssmDouble *transform = NULL; + IssmDouble *values = NULL; + + /*Get total number of dofs*/ + for(i=0;i(pe->nrows); + for(i=0;inrows;i++) values[i]=pe->values[i]; + + /*Get Coordinate Systems transform matrix*/ + CoordinateSystemTransform(&transform,nodes_list,numnodes,cs_array); + + /*Transform matrix: R^T*pe */ + MatrixMultiply(transform,numdofs,numdofs,1, + values,pe->nrows,1,0, + &pe->values[0],0); + + /*Free Matrices*/ + xDelete(transform); + xDelete(values); +}/*}}}*/ +void Element::TransformSolutionCoord(IssmDouble* values,int transformenum){/*{{{*/ + + /*All nodes have the same Coordinate System*/ + int numnodes = this->GetNumberOfNodes(); + int* cs_array = xNew(numnodes); + for(int i=0;iTransformSolutionCoord(values,this->nodes,numnodes,cs_array); + + /*Clean-up*/ + xDelete(cs_array); +}/*}}}*/ +void Element::TransformSolutionCoord(IssmDouble* values,int* transformenum_list){/*{{{*/ + this->TransformSolutionCoord(values,this->nodes,this->GetNumberOfNodes(),transformenum_list); +}/*}}}*/ +void Element::TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum){/*{{{*/ + + /*All nodes have the same Coordinate System*/ + int* cs_array = xNew(numnodes); + for(int i=0;iTransformSolutionCoord(values,this->nodes,numnodes,cs_array); + + /*Clean-up*/ + xDelete(cs_array); +}/*}}}*/ +void Element::TransformSolutionCoord(IssmDouble* solution,int numnodes,int* cs_array){/*{{{*/ + this->TransformSolutionCoord(solution,this->nodes,numnodes,cs_array); +}/*}}}*/ +void Element::TransformSolutionCoord(IssmDouble* values,Node** nodes_list,int numnodes,int transformenum){/*{{{*/ + /*NOT NEEDED*/ + /*All nodes have the same Coordinate System*/ + int* cs_array = xNew(numnodes); + for(int i=0;iTransformSolutionCoord(values,nodes_list,numnodes,cs_array); + + /*Clean-up*/ + xDelete(cs_array); +}/*}}}*/ +void Element::TransformSolutionCoord(IssmDouble* solution,Node** nodes_list,int numnodes,int* cs_array){/*{{{*/ + + int i; + int numdofs = 0; + IssmDouble *transform = NULL; + IssmDouble *values = NULL; + + /*Get total number of dofs*/ + for(i=0;i(numdofs); + for(i=0;i(transform); + xDelete(values); +}/*}}}*/ +void Element::TransformStiffnessMatrixCoord(ElementMatrix* Ke,int transformenum){/*{{{*/ + + /*All nodes have the same Coordinate System*/ + int numnodes = this->GetNumberOfNodes(); + int* cs_array = xNew(numnodes); + for(int i=0;iTransformStiffnessMatrixCoord(Ke,this->nodes,numnodes,cs_array); + + /*Clean-up*/ + xDelete(cs_array); +}/*}}}*/ +void Element::TransformStiffnessMatrixCoord(ElementMatrix* Ke,int* transformenum_list){/*{{{*/ + this->TransformStiffnessMatrixCoord(Ke,this->nodes,this->GetNumberOfNodes(),transformenum_list); +}/*}}}*/ +void Element::TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes_list,int numnodes,int* cs_array){/*{{{*/ + + int numdofs = 0; + IssmDouble *transform = NULL; + IssmDouble *values = NULL; + + /*Get total number of dofs*/ + for(int i=0;i(Ke->nrows*Ke->ncols); + for(int i=0;inrows*Ke->ncols;i++) values[i]=Ke->values[i]; + + /*Get Coordinate Systems transform matrix*/ + CoordinateSystemTransform(&transform,nodes_list,numnodes,cs_array); + + /*Transform matrix: R^T*Ke*R */ + TripleMultiply(transform,numdofs,numdofs,1, + values,Ke->nrows,Ke->ncols,0, + transform,numdofs,numdofs,0, + &Ke->values[0],0); + + /*Free Matrix*/ + xDelete(transform); + xDelete(values); +}/*}}}*/ Index: /issm/trunk/src/c/classes/Elements/Element.h =================================================================== --- /issm/trunk/src/c/classes/Elements/Element.h (revision 17805) +++ /issm/trunk/src/c/classes/Elements/Element.h (revision 17806) @@ -11,68 +11,239 @@ /*{{{*/ #include "../../datastructures/datastructures.h" +#include "../../toolkits/toolkits.h" #include "../Update.h" - class DataSet; class Parameters; +class Parameter; class Elements; class Loads; +class Nodes; class Node; -class Nodes; class Vertices; +class Vertex; class Materials; +class Material; +class Matpar; +class Inputs; +class Input; +class Gauss; +class ElementVector; template class Matrix; template class Vector; - -#include "../../toolkits/toolkits.h" +class ElementMatrix; +class ElementVector; /*}}}*/ class Element: public Object,public Update{ + public: + int id; + int sid; + Inputs *inputs; + Node **nodes; + Vertex **vertices; + Material *material; + Matpar *matpar; + Parameters *parameters; + public: - - virtual ~Element(){}; - - virtual void Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters)=0; - virtual void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Materials* materials,Parameters* parameters)=0; - virtual void SetwiseNodeConnectivity(int* d_nz,int* o_nz,Node* node,bool* flags,int* flagsindices,int set1_enum,int set2_enum)=0; - virtual void CreateKMatrix(Matrix* Kff, Matrix* Kfs)=0; - virtual void CreateDVector(Vector* df)=0; - virtual void CreatePVector(Vector* pf)=0; - virtual void CreateJacobianMatrix(Matrix* Jff)=0; - virtual void GetSolutionFromInputs(Vector* solution)=0; + /*Constructors/Destructores*/ + Element(); + ~Element(); + + /*Functions*/ + void AddInput(Input* input_in); + /* bool AllActive(void); */ + /* bool AnyActive(void); */ + void CoordinateSystemTransform(IssmDouble** ptransform,Node** nodes,int numnodes,int* cs_array); + void Echo(); + void DeepEcho(); + void DeleteMaterials(void); + IssmDouble Divergence(void); + void ThermalToEnthalpy(IssmDouble* penthalpy,IssmDouble temperature,IssmDouble waterfraction,IssmDouble pressure); + void EnthalpyToThermal(IssmDouble* ptemperature,IssmDouble* pwaterfraction,IssmDouble enthalpy,IssmDouble pressure); + IssmDouble EnthalpyDiffusionParameter(IssmDouble enthalpy,IssmDouble pressure); + IssmDouble EnthalpyDiffusionParameterVolume(int numvertices,IssmDouble* enthalpy,IssmDouble* pressure); + void FindParam(bool* pvalue,int paramenum); + void FindParam(int* pvalue,int paramenum); + void FindParam(IssmDouble* pvalue,int paramenum); + void FindParam(int** pvalues,int* psize,int paramenum); + void GetDofList(int** pdoflist,int approximation_enum,int setenum); + void GetDofListVelocity(int** pdoflist,int setenum); + void GetDofListPressure(int** pdoflist,int setenum); + Input* GetInput(int inputenum); + void GetInputListOnNodes(IssmDouble* pvalue,int enumtype); + void GetInputListOnNodes(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue); + void GetInputListOnNodesVelocity(IssmDouble* pvalue,int enumtype); + void GetInputListOnVertices(IssmDouble* pvalue,int enumtype); + void GetInputListOnVertices(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue); + void GetInputValue(bool* pvalue,int enum_type); + void GetInputValue(int* pvalue,int enum_type); + void GetInputValue(IssmDouble* pvalue,int enum_type); + void GetInputValue(IssmDouble* pvalue,Gauss* gauss,int enum_type); + IssmDouble GetMaterialParameter(int enum_in); + void GetNodesSidList(int* sidlist); + void GetNodesLidList(int* lidlist); + void GetPhi(IssmDouble* phi, IssmDouble* epsilon, IssmDouble viscosity); + void GetVectorFromInputs(Vector* vector, int name_enum); + void GetVertexPidList(int* pidlist); + void GetVerticesCoordinates(IssmDouble** xyz_list); + void GetVerticesSidList(int* sidlist); + void GetVerticesConnectivityList(int* connectivitylist); + bool HasNodeOnBase(); + bool HasNodeOnSurface(); + int Id(); + int Sid(); + void InputChangeName(int enum_type,int enum_type_old); + void InputCreate(IssmDouble* vector,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code); + void InputUpdateFromConstant(IssmDouble constant, int name); + void InputUpdateFromConstant(int constant, int name); + void InputUpdateFromConstant(bool constant, int name); + bool IsIceInElement(); + bool IsInput(int name); + bool IsFloating(); + ElementVector* NewElementVector(int approximation_enum=NoneApproximationEnum); + ElementMatrix* NewElementMatrix(int approximation_enum=NoneApproximationEnum); + ElementMatrix* NewElementMatrixCoupling(int number_nodes,int approximation_enum=NoneApproximationEnum); + IssmDouble PureIceEnthalpy(IssmDouble pressure); + void ResultInterpolation(int* pinterpolation,int*nodesperelement,int output_enum); + void ResultToVector(Vector* vector,int output_enum); + void ResultToPatch(IssmDouble* values,int nodesperelement,int output_enum); + void SetwiseNodeConnectivity(int* d_nz,int* o_nz,Node* node,bool* flags,int* flagsindices,int set1_enum,int set2_enum); + void StrainRateSSA(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input); + void StrainRateSSA1d(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input); + void StrainRateHO(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input); + void StrainRateHO2dvertical(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input); + void StrainRateFS(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input); + IssmDouble TMeltingPoint(IssmDouble pressure); + void TransformInvStiffnessMatrixCoord(ElementMatrix* Ke,int cs_enum); + void TransformInvStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes,int numnodes,int cs_enum); + void TransformInvStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes,int numnodes,int* cs_array); + void TransformLoadVectorCoord(ElementVector* pe,int cs_enum); + void TransformLoadVectorCoord(ElementVector* pe,int* cs_array); + void TransformLoadVectorCoord(ElementVector* pe,Node** nodes,int numnodes,int cs_enum); + void TransformLoadVectorCoord(ElementVector* pe,Node** nodes,int numnodes,int* cs_array); + void TransformSolutionCoord(IssmDouble* solution,int cs_enum); + void TransformSolutionCoord(IssmDouble* solution,int* cs_array); + void TransformSolutionCoord(IssmDouble* solution,int numnodes,int cs_enum); + void TransformSolutionCoord(IssmDouble* solution,int numnodes,int* cs_array); + void TransformSolutionCoord(IssmDouble* solution,Node** nodes,int numnodes,int cs_enum); + void TransformSolutionCoord(IssmDouble* solution,Node** nodes,int numnodes,int* cs_array); + void TransformStiffnessMatrixCoord(ElementMatrix* Ke,int cs_enum); + void TransformStiffnessMatrixCoord(ElementMatrix* Ke,int* cs_array); + void TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes,int numnodes,int cs_enum); + void TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes,int numnodes,int* cs_array); + void ViscousHeatingCreateInput(void); + void ViscosityFS(IssmDouble* pviscosity,int dim,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input); + void ViscosityHO(IssmDouble* pviscosity,int dim,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input); + void ViscosityL1L2(IssmDouble* pviscosity,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* surf); + void ViscositySSA(IssmDouble* pviscosity,int dim,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input); + void ViscositySSADerivativeEpsSquare(IssmDouble* pmu_prime,IssmDouble* epsilon); + void ViscosityHODerivativeEpsSquare(IssmDouble* pmu_prime,IssmDouble* epsilon); + void ViscosityFSDerivativeEpsSquare(IssmDouble* pmu_prime,IssmDouble* epsilon); + void TransformLoadVectorCoord(ElementVector* pe,int numnodes,int transformenum){_error_("not implemented yet");};/*Tiling only*/ + void TransformLoadVectorCoord(ElementVector* pe,int numnodes,int* transformenum_list){_error_("not implemented yet");};/*Tiling only*/ + void TransformStiffnessMatrixCoord(ElementMatrix* Ke,int numnodes,int* transformenum_list){_error_("not implemented yet");};/*Tiling only*/ + + /*Virtual functions*/ + virtual void AddBasalInput(int input_enum, IssmDouble* values, int interpolation_enum)=0; + virtual void AddInput(int input_enum, IssmDouble* values, int interpolation_enum)=0; + virtual IssmDouble CharacteristicLength(void)=0; + virtual void Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters)=0; + virtual void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Materials* materials,Parameters* parameters)=0; + virtual void ElementSizes(IssmDouble* phx,IssmDouble* phy,IssmDouble* phz)=0; + + virtual int FiniteElement(void)=0; + virtual IssmDouble MinEdgeLength(IssmDouble* xyz_list)=0; + virtual void NodalFunctions(IssmDouble* basis,Gauss* gauss)=0; + virtual void NodalFunctionsP1(IssmDouble* basis,Gauss* gauss)=0; + virtual void NodalFunctionsVelocity(IssmDouble* basis, Gauss* gauss)=0; + virtual void NodalFunctionsPressure(IssmDouble* basis, Gauss* gauss)=0; + virtual void NodalFunctionsTensor(IssmDouble* basis, Gauss* gauss)=0; + virtual void NodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss)=0; + virtual void NodalFunctionsP1Derivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss)=0; + virtual void NodalFunctionsMINIDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss)=0; + virtual void NodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss)=0; + virtual void NormalSection(IssmDouble* normal,IssmDouble* xyz_list)=0; + virtual void NormalTop(IssmDouble* normal,IssmDouble* xyz_list)=0; + virtual void NormalBase(IssmDouble* normal,IssmDouble* xyz_list)=0; + + virtual Element* GetUpperElement(void)=0; + virtual Element* GetLowerElement(void)=0; + virtual Element* GetSurfaceElement(void)=0; + virtual Element* GetBasalElement(void)=0; + + virtual void JacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss)=0; + virtual void JacobianDeterminantLine(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss)=0; + virtual void JacobianDeterminantSurface(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss)=0; + virtual void JacobianDeterminantBase(IssmDouble* Jdet,IssmDouble* xyz_list_base,Gauss* gauss)=0; + virtual void JacobianDeterminantTop(IssmDouble* Jdet,IssmDouble* xyz_list_base,Gauss* gauss)=0; + virtual void GetSolutionFromInputsOneDof(Vector* solution,int solutionenum)=0; virtual int GetNodeIndex(Node* node)=0; virtual int GetNumberOfNodes(void)=0; - virtual void GetNodesSidList(int* sidlist)=0; - virtual void GetNodesLidList(int* sidlist)=0; - - virtual int Sid()=0; - virtual bool IsFloating()=0; + virtual int GetNumberOfVertices(void)=0; + virtual bool IsNodeOnShelfFromFlags(IssmDouble* flags)=0; - virtual bool IsOnBed()=0; - virtual void GetInputListOnVertices(IssmDouble* pvalue,int enumtype)=0; - virtual void GetInputListOnVertices(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue)=0; + virtual bool IsOnBase()=0; + virtual bool IsOnSurface()=0; + virtual void GetGroundedPart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* mainlyfloating)=0; + virtual IssmDouble GetGroundedPortion(IssmDouble* xyz_list)=0; virtual void GetInputValue(IssmDouble* pvalue,Node* node,int enumtype)=0; - virtual void GetMaterialInputValue(IssmDouble* pvalue,Node* node,int enumtype)=0; + virtual Node* GetNode(int node_number)=0; + virtual void GetVerticesCoordinatesBase(IssmDouble** xyz_list)=0; + virtual void GetVerticesCoordinatesTop(IssmDouble** xyz_list)=0; + virtual IssmDouble GetXcoord(Gauss* gauss)=0; + virtual IssmDouble GetYcoord(Gauss* gauss)=0; + virtual IssmDouble GetZcoord(Gauss* gauss)=0; + virtual int GetElementType(void)=0; virtual IssmDouble SurfaceArea(void)=0; - virtual void InputDepthAverageAtBase(int enum_type,int average_enum_type,int object_enum)=0; + virtual void InputDepthAverageAtBase(int enum_type,int average_enum_type)=0; + virtual void ComputeSigmaNN(void)=0; virtual void ComputeBasalStress(Vector* sigma_b)=0; virtual void ComputeStrainRate(Vector* eps)=0; - virtual void ResultInterpolation(int* pinterpolation,int output_enum)=0; - virtual void ResultToVector(Vector* vector,int output_enum)=0; + virtual void ComputeStressTensor(void)=0; + virtual void ComputeDeviatoricStressTensor(void)=0; + virtual void Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finite_element)=0; virtual void InputDuplicate(int original_enum,int new_enum)=0; - virtual void InputCreate(IssmDouble* vector,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code)=0; + virtual void InputUpdateFromSolutionOneDofCollapsed(IssmDouble* solution,int inputenum)=0; + virtual void InputUpdateFromSolutionOneDof(IssmDouble* solution,int inputenum)=0; virtual int NodalValue(IssmDouble* pvalue, int index, int natureofdataenum)=0; + virtual int NumberofNodesVelocity(void)=0; + virtual int NumberofNodesPressure(void)=0; + virtual Gauss* NewGauss(void)=0; + virtual Gauss* NewGauss(int order)=0; + virtual Gauss* NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order)=0; + virtual Gauss* NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert)=0; + virtual Gauss* NewGauss(int point1,IssmDouble fraction1,IssmDouble fraction2,bool mainlyfloating,int order)=0; + virtual Gauss* NewGaussBase(int order)=0; + virtual Gauss* NewGaussLine(int vertex1,int vertex2,int order)=0; + virtual Gauss* NewGaussTop(int order)=0; + virtual void InputScale(int enum_type,IssmDouble scale_factor)=0; - virtual void GetVectorFromInputs(Vector* vector, int name_enum)=0; virtual IssmDouble TimeAdapt()=0; virtual void PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm)=0; virtual void Delta18oParameterization(void)=0; - virtual void SmbGradients()=0; - virtual void ResetCoordinateSystem()=0; - - #ifdef _HAVE_RESPONSES_ + virtual void SmbGradients(void)=0; + virtual Element* SpawnBasalElement(void)=0; + virtual Element* SpawnTopElement(void)=0; + virtual void ReduceMatrices(ElementMatrix* Ke,ElementVector* pe)=0; + virtual void ResetFSBasalBoundaryCondition()=0; + virtual void SetTemporaryElementType(int element_type_in)=0; + virtual IssmDouble StabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa)=0; + virtual void ValueP1OnGauss(IssmDouble* pvalue,IssmDouble* values,Gauss* gauss)=0; + virtual void ValueP1DerivativesOnGauss(IssmDouble* dvalue,IssmDouble* values,IssmDouble* xyz_list,Gauss* gauss)=0; + virtual void ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input)=0; + + virtual int VelocityInterpolation()=0; + virtual int PressureInterpolation()=0; + virtual bool IsZeroLevelset(int levelset_enum)=0; + virtual bool IsIcefront(void)=0; + virtual void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum)=0; + virtual void GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum)=0; + virtual void GetNormalFromLSF(IssmDouble *pnormal)=0; + virtual void AverageOntoPartition(Vector* partition_contributions,Vector* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part)=0; virtual void MinVel(IssmDouble* pminvel)=0; @@ -93,5 +264,8 @@ virtual IssmDouble IceVolumeAboveFloatation(void)=0; virtual IssmDouble TotalSmb(void)=0; - #endif + virtual IssmDouble Misfit(int modelenum,int observationenum,int weightsenum)=0; + virtual IssmDouble MisfitArea(int weightsenum)=0; + virtual int VertexConnectivity(int vertexindex)=0; + virtual void VerticalSegmentIndices(int** pindices,int* pnumseg)=0; #ifdef _HAVE_GIA_ @@ -99,5 +273,4 @@ #endif - #ifdef _HAVE_CONTROL_ virtual void Gradj(Vector* gradient,int control_type,int control_index)=0; virtual IssmDouble ThicknessAbsMisfit(void)=0; @@ -120,27 +293,12 @@ virtual void SetControlInputsFromVector(IssmDouble* vector,int control_enum,int control_index)=0; virtual void InputControlUpdate(IssmDouble scalar,bool save_parameter)=0; - #endif virtual void UpdateConstraintsExtrudeFromBase(void)=0; virtual void UpdateConstraintsExtrudeFromTop(void)=0; - #ifdef _HAVE_THERMAL_ - virtual void UpdateBasalConstraintsEnthalpy(void)=0; - virtual void ComputeBasalMeltingrate(void)=0; - virtual void DrainWaterfraction(void)=0; - #endif - - #ifdef _HAVE_HYDROLOGY_ - virtual void GetHydrologyDCInefficientHmax(IssmDouble* ph_max, Node* innode)=0; - virtual void GetHydrologyTransfer(Vector* transfer)=0; - virtual void HydrologyEPLGetMask(Vector* mask)=0; - virtual void HydrologyEPLGetActive(Vector* active)=0; - #endif - - #ifdef _HAVE_GROUNDINGLINE_ virtual void MigrateGroundingLine(IssmDouble* sheet_ungrounding)=0; + virtual void FSContactMigration(Vector* vertexgrounded,Vector* vertexfloating)=0; virtual void PotentialUngrounding(Vector* potential_sheet_ungrounding)=0; virtual int UpdatePotentialUngrounding(IssmDouble* potential_sheet_ungrounding,Vector* vec_nodes_on_iceshelf,IssmDouble* nodes_on_iceshelf)=0; - #endif }; Index: /issm/trunk/src/c/classes/Elements/ElementHook.cpp =================================================================== --- /issm/trunk/src/c/classes/Elements/ElementHook.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Elements/ElementHook.cpp (revision 17806) @@ -89,22 +89,11 @@ /*}}}*/ /*FUNCTION ElementHook::SpawnTriaHook{{{*/ -void ElementHook::SpawnTriaHook(ElementHook* triahook,int location){ +void ElementHook::SpawnTriaHook(ElementHook* triahook,int index1,int index2,int index3){ /*Create arrow of indices depending on location (0=base 1=surface)*/ int indices[3]; - switch(location){ - case 0: - indices[0] = 0; - indices[1] = 1; - indices[2] = 2; - break; - case 1: - indices[0] = 3; - indices[1] = 4; - indices[2] = 5; - break; - default: - _error_("case "<numanalyses=this->numanalyses; Index: /issm/trunk/src/c/classes/Elements/ElementHook.h =================================================================== --- /issm/trunk/src/c/classes/Elements/ElementHook.h (revision 17805) +++ /issm/trunk/src/c/classes/Elements/ElementHook.h (revision 17806) @@ -25,5 +25,5 @@ void SetHookNodes(int* node_ids,int numnodes,int analysis_counter); - void SpawnTriaHook(ElementHook* triahook,int location); //3d only + void SpawnTriaHook(ElementHook* triahook,int index1,int index2,int index3); //3d only void SpawnSegHook(ElementHook* triahook,int ndex1,int index2); //2d only void InitHookNeighbors(int* element_ids); //3d only Index: /issm/trunk/src/c/classes/Elements/Penta.cpp =================================================================== --- /issm/trunk/src/c/classes/Elements/Penta.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Elements/Penta.cpp (revision 17806) @@ -20,19 +20,6 @@ /*Constructors/destructor/copy*/ -/*FUNCTION Penta::Penta(){{{*/ -Penta::Penta(){ - - this->nodes = NULL; - this->vertices = NULL; - this->material = NULL; - this->matpar = NULL; - this->verticalneighbors = NULL; - this->inputs = NULL; - this->parameters = NULL; -} -/*}}}*/ /*FUNCTION Penta::~Penta(){{{*/ Penta::~Penta(){ - delete inputs; this->parameters=NULL; } @@ -41,5 +28,5 @@ Penta::Penta(int penta_id, int penta_sid, int index, IoModel* iomodel,int nummodels) :PentaRef(nummodels) - ,ElementHook(nummodels,index+1,6,iomodel){ + ,ElementHook(nummodels,index+1,NUMVERTICES,iomodel){ int penta_elements_ids[2]; @@ -121,26 +108,35 @@ /*Other*/ -/*FUNCTION Penta::BedNormal {{{*/ -void Penta::BedNormal(IssmDouble* bed_normal, IssmDouble xyz_list[3][3]){ - - int i; - IssmDouble v13[3],v23[3]; - IssmDouble normal[3]; - IssmDouble normal_norm; - - for (i=0;i<3;i++){ - v13[i]=xyz_list[0][i]-xyz_list[2][i]; - v23[i]=xyz_list[1][i]-xyz_list[2][i]; - } - - normal[0]=v13[1]*v23[2]-v13[2]*v23[1]; - normal[1]=v13[2]*v23[0]-v13[0]*v23[2]; - normal[2]=v13[0]*v23[1]-v13[1]*v23[0]; - normal_norm=sqrt( pow(normal[0],2)+pow(normal[1],2)+pow(normal[2],2) ); - - /*Bed normal is opposite to surface normal*/ - *(bed_normal)=-normal[0]/normal_norm; - *(bed_normal+1)=-normal[1]/normal_norm; - *(bed_normal+2)=-normal[2]/normal_norm; +/*FUNCTION Penta::AddInput{{{*/ +void Penta::AddInput(int input_enum,IssmDouble* values, int interpolation_enum){ + + _assert_(this->inputs); + this->inputs->AddInput(new PentaInput(input_enum,values,interpolation_enum)); +} +/*}}}*/ +/*FUNCTION Penta::AddBasalInput{{{*/ +void Penta::AddBasalInput(int input_enum,IssmDouble* values, int interpolation_enum){ + + _assert_(this->inputs); + if(!IsOnBase()) return; + else{ + if(interpolation_enum==P1Enum){ + int i; + IssmDouble extrudedvalues[NUMVERTICES]; + Penta* penta=NULL; + + for(i=0;iinputs->AddInput(new PentaInput(input_enum,&extrudedvalues[0],P1Enum)); + if (penta->IsOnSurface()) break; + penta=penta->GetUpperPenta(); _assert_(penta->Id()!=this->id); + } + } + else _error_("not implemented yet"); + } } /*}}}*/ @@ -156,5 +152,5 @@ /* Basal friction can only be found at the base of an ice sheet: */ - if (!IsOnBed() || IsFloating()){ + if (!IsOnBase() || IsFloating()){ //empty friction: this->inputs->AddInput(new PentaInput(BasalFrictionEnum,&basalfriction[0],P1Enum)); @@ -168,5 +164,5 @@ /*Build friction element, needed later: */ - friction=new Friction("3d",inputs,matpar,StressbalanceAnalysisEnum); + friction=new Friction(this,3); /* Start looping on the number of gauss 2d (nodes on the bedrock) */ @@ -177,5 +173,5 @@ gauss->GaussPoint(ig); - friction->GetAlpha2(&alpha2,gauss,VxEnum,VyEnum,VzEnum); + friction->GetAlpha2(&alpha2,gauss,vx_input,vy_input,vz_input); vx_input->GetInputValue(&vx,gauss); vy_input->GetInputValue(&vy,gauss); @@ -204,5 +200,5 @@ IssmDouble pressure,viscosity,Jdet2d; IssmDouble bed_normal[3]; - IssmDouble basalforce[3]; + IssmDouble basalforce[3] = {0.}; IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ IssmDouble stresstensor[6]={0.0}; @@ -223,5 +219,5 @@ this->parameters->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); - if(!IsOnBed()){ + if(!IsOnBase()){ //put zero sigma_b->SetValue(id-1,0.0,INS_VAL); @@ -234,5 +230,5 @@ /* Get node coordinates and dof list: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); for(i=0;i<3;i++) for(j=0;j<3;j++) xyz_list_tria[i][j]=xyz_list[i][j]; @@ -250,6 +246,6 @@ /*Compute strain rate viscosity and pressure: */ - this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); - material->GetViscosity3dFS(&viscosity,&epsilon[0]); + this->StrainRateFS(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); + this->ViscosityFS(&viscosity,3,&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); pressure_input->GetInputValue(&pressure,gauss); @@ -263,5 +259,5 @@ /*Get normal vector to the bed */ - BedNormal(&bed_normal[0],xyz_list_tria); + NormalBase(&bed_normal[0],&xyz_list_tria[0][0]); /*basalforce*/ @@ -302,5 +298,5 @@ /* Get node coordinates and dof list: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); /*Retrieve all inputs we will be needing: */ @@ -316,6 +312,6 @@ /*Compute strain rate viscosity and pressure: */ - this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); - material->GetViscosity3d(&viscosity,&epsilon[0]); + this->StrainRateFS(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); + this->ViscosityFS(&viscosity,3,&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); pressure_input->GetInputValue(&pressure,gauss); @@ -341,4 +337,56 @@ } /*}}}*/ +/*FUNCTION Penta::ComputeDeviatoricStressTensor {{{*/ +void Penta::ComputeDeviatoricStressTensor(){ + + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble viscosity; + IssmDouble epsilon[6]; /* epsilon=[exx,eyy,exy];*/ + IssmDouble tau_xx[NUMVERTICES]; + IssmDouble tau_yy[NUMVERTICES]; + IssmDouble tau_zz[NUMVERTICES]; + IssmDouble tau_xy[NUMVERTICES]; + IssmDouble tau_xz[NUMVERTICES]; + IssmDouble tau_yz[NUMVERTICES]; + GaussPenta* gauss=NULL; + + /* Get node coordinates and dof list: */ + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + + /*Retrieve all inputs we will be needing: */ + Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); + + /* Start looping on the number of vertices: */ + gauss=new GaussPenta(); + for (int iv=0;ivGaussVertex(iv); + + /*Compute strain rate viscosity and pressure: */ + this->StrainRateFS(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); + this->ViscosityFS(&viscosity,3,&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); + + /*Compute Stress*/ + tau_xx[iv]=2*viscosity*epsilon[0]; // tau = nu eps + tau_yy[iv]=2*viscosity*epsilon[1]; + tau_zz[iv]=2*viscosity*epsilon[2]; + tau_xy[iv]=2*viscosity*epsilon[3]; + tau_xz[iv]=2*viscosity*epsilon[4]; + tau_yz[iv]=2*viscosity*epsilon[5]; + } + + /*Add Stress tensor components into inputs*/ + this->inputs->AddInput(new PentaInput(StressTensorxxEnum,&tau_xx[0],P1Enum)); + this->inputs->AddInput(new PentaInput(StressTensorxyEnum,&tau_xy[0],P1Enum)); + this->inputs->AddInput(new PentaInput(StressTensorxzEnum,&tau_xz[0],P1Enum)); + this->inputs->AddInput(new PentaInput(StressTensoryyEnum,&tau_yy[0],P1Enum)); + this->inputs->AddInput(new PentaInput(StressTensoryzEnum,&tau_yz[0],P1Enum)); + this->inputs->AddInput(new PentaInput(StressTensorzzEnum,&tau_zz[0],P1Enum)); + + /*Clean up and return*/ + delete gauss; +} +/*}}}*/ /*FUNCTION Penta::Configure {{{*/ void Penta::Configure(Elements* elementsin, Loads* loadsin, Nodes* nodesin,Vertices* verticesin, Materials* materialsin, Parameters* parametersin){ @@ -375,471 +423,8 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrix(Matrix* Kff, Matrix* Kfs) {{{*/ -void Penta::CreateKMatrix(Matrix* Kff, Matrix* Kfs){ - - /*Skip if water element*/ - if(NoIceInElement()) return; - - /*Create element stiffness matrix*/ - ElementMatrix* Ke=CreateKMatrix(); - - if(Ke){ - int analysis_type; - parameters->FindParam(&analysis_type,AnalysisTypeEnum); - if(analysis_type==StressbalanceAnalysisEnum){ - int approximation; - inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){ - //Do nothing condensatino already done for Stokes part - } - else{ - /*Condense if requested*/ - if(this->element_type==MINIcondensedEnum){ - int indices[3]={18,19,20}; - Ke->StaticCondensation(3,&indices[0]); - } - else if(this->element_type==P1bubblecondensedEnum){ - int size = nodes[6]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum); - int offset = 0; - for(int i=0;i<6;i++) offset+=nodes[i]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum); - int* indices=xNew(size); - for(int i=0;iStaticCondensation(size,indices); - xDelete(indices); - } - } - } - - /*Add to global matrix*/ - Ke->AddToGlobal(Kff,Kfs); - delete Ke; - } -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrix(void){{{*/ -ElementMatrix* Penta::CreateKMatrix(void){ - - /*retrieve parameters: */ - int analysis_type; - parameters->FindParam(&analysis_type,AnalysisTypeEnum); - - /*Checks in debugging {{{*/ - _assert_(this->nodes && this->material && this->matpar && this->verticalneighbors && this->parameters && this->inputs); - /*}}}*/ - - /*Skip if water element*/ - if(NoIceInElement()) return NULL; - - /*Just branch to the correct element stiffness matrix generator, according to the type of analysis we are carrying out: */ - switch(analysis_type){ - #ifdef _HAVE_STRESSBALANCE_ - case StressbalanceAnalysisEnum: - return CreateKMatrixStressbalanceHoriz(); - break; - case AdjointHorizAnalysisEnum: - return CreateKMatrixAdjointHoriz(); - break; - case StressbalanceSIAAnalysisEnum: - return CreateKMatrixStressbalanceSIA(); - break; - case StressbalanceVerticalAnalysisEnum: - return CreateKMatrixStressbalanceVert(); - break; - #endif - case L2ProjectionBaseAnalysisEnum: - return CreateBasalMassMatrix(); - break; - case MasstransportAnalysisEnum: - return CreateKMatrixMasstransport(); - break; - case FreeSurfaceTopAnalysisEnum: - return CreateKMatrixFreeSurfaceTop(); - break; - case FreeSurfaceBaseAnalysisEnum: - return CreateKMatrixFreeSurfaceBase(); - break; - #ifdef _HAVE_BALANCED_ - case BalancethicknessAnalysisEnum: - return CreateKMatrixBalancethickness(); - break; - #endif - #ifdef _HAVE_THERMAL_ - case ThermalAnalysisEnum: - return CreateKMatrixThermal(); - break; - case EnthalpyAnalysisEnum: - return CreateKMatrixEnthalpy(); - break; - case MeltingAnalysisEnum: - return CreateKMatrixMelting(); - break; - #endif - #ifdef _HAVE_HYDROLOGY_ - case HydrologyDCInefficientAnalysisEnum: - return CreateKMatrixHydrologyDCInefficient(); - break; - case HydrologyDCEfficientAnalysisEnum: - return CreateKMatrixHydrologyDCEfficient(); - break; - #endif - default: - _error_("analysis " << EnumToStringx(analysis_type) << " not supported yet"); - } - - /*Make compiler happy*/ - return NULL; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixMasstransport {{{*/ -ElementMatrix* Penta::CreateKMatrixMasstransport(void){ - - if (!IsOnBed()) return NULL; - - /*Depth Averaging Vx and Vy*/ - this->InputDepthAverageAtBase(VxEnum,VxAverageEnum); - this->InputDepthAverageAtBase(VyEnum,VyAverageEnum); - - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - ElementMatrix* Ke=tria->CreateKMatrixMasstransport(); - delete tria->material; delete tria; - - /*Delete Vx and Vy averaged*/ - this->inputs->DeleteInput(VxAverageEnum); - this->inputs->DeleteInput(VyAverageEnum); - - /*clean up and return*/ - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixFreeSurfaceTop {{{*/ -ElementMatrix* Penta::CreateKMatrixFreeSurfaceTop(void){ - - if(!IsOnSurface()) return NULL; - - Tria* tria=(Tria*)SpawnTria(1); //lower face is 0, upper face is 1. - ElementMatrix* Ke=tria->CreateKMatrixFreeSurfaceTop(); - delete tria->material; delete tria; - - /*clean up and return*/ - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixFreeSurfaceBase {{{*/ -ElementMatrix* Penta::CreateKMatrixFreeSurfaceBase(void){ - - if(!IsOnBed()) return NULL; - - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - ElementMatrix* Ke=tria->CreateKMatrixFreeSurfaceBase(); - delete tria->material; delete tria; - - /*clean up and return*/ - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateBasalMassMatrix{{{*/ -ElementMatrix* Penta::CreateBasalMassMatrix(void){ - - if (!IsOnBed()) return NULL; - - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - ElementMatrix* Ke=tria->CreateMassMatrix(); - delete tria->material; delete tria; - - /*clean up and return*/ - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateDVector {{{*/ -void Penta::CreateDVector(Vector* df){ - - /*retrieve parameters: */ - ElementVector* De=NULL; - int analysis_type; - parameters->FindParam(&analysis_type,AnalysisTypeEnum); - - /*Checks in debugging*/ - _assert_(this->nodes && this->material && this->matpar && this->verticalneighbors && this->parameters && this->inputs); - - switch(analysis_type){ - #ifdef _HAVE_STRESSBALANCE_ - case StressbalanceAnalysisEnum: - De=CreateDVectorStressbalanceHoriz(); - break; - #endif - } - - /*Add to global Vector*/ - if(De){ - De->InsertIntoGlobal(df); - delete De; - } -} -/*}}}*/ -/*FUNCTION Penta::CreatePVector(Vector* pf) {{{*/ -void Penta::CreatePVector(Vector* pf){ - - /*Skip if water element*/ - if(NoIceInElement()) return; - - /*Create element load vector*/ - ElementVector* pe = CreatePVector(); - - if(pe){ - int analysis_type; - parameters->FindParam(&analysis_type,AnalysisTypeEnum); - if(analysis_type==StressbalanceAnalysisEnum){ - /*StaticCondensation if requested*/ - if(this->element_type==MINIcondensedEnum){ - int approximation; - inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){ - //Do nothing, condensation already done in PVectorCoupling - } - else{ - int indices[3]={18,19,20}; - - this->element_type=MINIEnum; - ElementMatrix* Ke = CreateKMatrixStressbalanceFS(); - this->element_type=MINIcondensedEnum; - - pe->StaticCondensation(Ke,3,&indices[0]); - delete Ke; - } - } - else if(this->element_type==P1bubblecondensedEnum){ - int size = nodes[6]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum); - int offset = 0; - for(int i=0;i<6;i++) offset+=nodes[i]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum); - int* indices=xNew(size); - for(int i=0;ielement_type=P1bubbleEnum; - ElementMatrix* Ke = CreateKMatrix(); - this->element_type=P1bubblecondensedEnum; - pe->StaticCondensation(Ke,size,indices); - xDelete(indices); - delete Ke; - } - } - - /*Add to global Vector*/ - pe->AddToGlobal(pf); - delete pe; - } -} -/*}}}*/ -/*FUNCTION Penta::CreatePVector(void) {{{*/ -ElementVector* Penta::CreatePVector(void){ - - /*retrieve parameters: */ - int analysis_type; - parameters->FindParam(&analysis_type,AnalysisTypeEnum); - - /*if debugging mode, check that all pointers exist {{{*/ - _assert_(this->nodes && this->material && this->matpar && this->verticalneighbors && this->parameters && this->inputs); - /*}}}*/ - - /*Skip if water element*/ - if(NoIceInElement()) return NULL; - - /*Just branch to the correct element stiffness matrix generator, according to the type of analysis we are carrying out: */ - switch(analysis_type){ - #ifdef _HAVE_STRESSBALANCE_ - case StressbalanceAnalysisEnum: - return CreatePVectorStressbalanceHoriz(); - break; - case StressbalanceSIAAnalysisEnum: - return CreatePVectorStressbalanceSIA(); - break; - case StressbalanceVerticalAnalysisEnum: - return CreatePVectorStressbalanceVert(); - break; - #endif - #ifdef _HAVE_CONTROL_ - case AdjointHorizAnalysisEnum: - return CreatePVectorAdjointHoriz(); - break; - #endif - #ifdef _HAVE_THERMAL_ - case ThermalAnalysisEnum: - return CreatePVectorThermal(); - break; - case EnthalpyAnalysisEnum: - return CreatePVectorEnthalpy(); - break; - case MeltingAnalysisEnum: - return CreatePVectorMelting(); - break; - #endif - case L2ProjectionBaseAnalysisEnum: - return CreatePVectorL2ProjectionBase(); - break; - case MasstransportAnalysisEnum: - return CreatePVectorMasstransport(); - break; - case FreeSurfaceTopAnalysisEnum: - return CreatePVectorFreeSurfaceTop(); - break; - case FreeSurfaceBaseAnalysisEnum: - return CreatePVectorFreeSurfaceBase(); - break; - #ifdef _HAVE_BALANCED_ - case BalancethicknessAnalysisEnum: - return CreatePVectorBalancethickness(); - break; - #endif - #ifdef _HAVE_HYDROLOGY_ - case HydrologyDCInefficientAnalysisEnum: - return CreatePVectorHydrologyDCInefficient(); - break; - case HydrologyDCEfficientAnalysisEnum: - return CreatePVectorHydrologyDCEfficient(); - break; - #endif - default: - _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet"); - } - - /*make compiler happy*/ - return NULL; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorMasstransport {{{*/ -ElementVector* Penta::CreatePVectorMasstransport(void){ - - if (!IsOnBed()) return NULL; - - /*Depth Averaging Vx and Vy*/ - this->InputDepthAverageAtBase(VxEnum,VxAverageEnum); - this->InputDepthAverageAtBase(VyEnum,VyAverageEnum); - - /*Call Tria function*/ - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - ElementVector* pe=tria->CreatePVectorMasstransport(); - delete tria->material; delete tria; - - /*Delete Vx and Vy averaged*/ - this->inputs->DeleteInput(VxAverageEnum); - this->inputs->DeleteInput(VyAverageEnum); - - /*Clean up and return*/ - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorFreeSurfaceTop {{{*/ -ElementVector* Penta::CreatePVectorFreeSurfaceTop(void){ - - if(!IsOnSurface()) return NULL; - - /*Call Tria function*/ - Tria* tria=(Tria*)SpawnTria(1); //lower face is 0, upper face is 1. - ElementVector* pe=tria->CreatePVectorFreeSurfaceTop(); - delete tria->material; delete tria; - - /*Clean up and return*/ - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorFreeSurfaceBase {{{*/ -ElementVector* Penta::CreatePVectorFreeSurfaceBase(void){ - - if(!IsOnBed()) return NULL; - - /*Call Tria function*/ - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - ElementVector* pe=tria->CreatePVectorFreeSurfaceBase(); - delete tria->material; delete tria; - - /*Clean up and return*/ - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorL2ProjectionBase {{{*/ -ElementVector* Penta::CreatePVectorL2ProjectionBase(void){ - - if (!IsOnBed()) return NULL; - - /*Call Tria function*/ - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - ElementVector* pe=tria->CreatePVectorL2Projection(); - delete tria->material; delete tria; - - /*clean up and return*/ - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreateJacobianMatrix{{{*/ -void Penta::CreateJacobianMatrix(Matrix* Jff){ - - /*retrieve parameters: */ - ElementMatrix* Ke=NULL; - int analysis_type; - parameters->FindParam(&analysis_type,AnalysisTypeEnum); - - /*Checks in debugging {{{*/ - _assert_(this->nodes && this->material && this->matpar && this->verticalneighbors && this->parameters && this->inputs); - /*}}}*/ - - /*Skip if water element*/ - if(NoIceInElement()) return; - - /*Just branch to the correct element stiffness matrix generator, according to the type of analysis we are carrying out: */ - switch(analysis_type){ -#ifdef _HAVE_STRESSBALANCE_ - case StressbalanceAnalysisEnum: - Ke=CreateJacobianStressbalanceHoriz(); - break; -#endif - default: - _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet"); - } - - /*Add to global matrix*/ - if(Ke){ - /*Condense if requested*/ - if(this->element_type==MINIcondensedEnum){ - int indices[3]={18,19,20}; - Ke->StaticCondensation(3,&indices[0]); - } - else if(this->element_type==P1bubblecondensedEnum){ - int size = nodes[6]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum); - int offset = 0; - for(int i=0;i<6;i++) offset+=nodes[i]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum); - int* indices=xNew(size); - for(int i=0;iStaticCondensation(size,indices); - xDelete(indices); - } - - Ke->AddToGlobal(Jff); - delete Ke; - } -} -/*}}}*/ -/*FUNCTION Penta::DeepEcho{{{*/ -void Penta::DeepEcho(void){ - - _printf_("Penta:\n"); - _printf_(" id: " << id << "\n"); - nodes[0]->DeepEcho(); - nodes[1]->DeepEcho(); - nodes[2]->DeepEcho(); - nodes[3]->DeepEcho(); - nodes[4]->DeepEcho(); - nodes[5]->DeepEcho(); - material->DeepEcho(); - matpar->DeepEcho(); - _printf_(" neighbor ids: " << verticalneighbors[0]->Id() << "-" << verticalneighbors[1]->Id() << "\n"); - _printf_(" parameters\n"); - parameters->DeepEcho(); - _printf_(" inputs\n"); - inputs->DeepEcho(); -} -/*}}}*/ /*FUNCTION Penta::Delta18oParameterization{{{*/ void Penta::Delta18oParameterization(void){ /*Are we on the base? If not, return*/ - if(!IsOnBed()) return; + if(!IsOnBase()) return; int i; @@ -905,6 +490,6 @@ this->inputs->AddInput(NewPrecipitationInput); - this->InputExtrude(SurfaceforcingsMonthlytemperaturesEnum,ElementEnum); - this->InputExtrude(SurfaceforcingsPrecipitationEnum,ElementEnum); + this->InputExtrude(SurfaceforcingsMonthlytemperaturesEnum); + this->InputExtrude(SurfaceforcingsPrecipitationEnum); /*clean-up*/ @@ -912,8 +497,89 @@ } /*}}}*/ -/*FUNCTION Penta::Echo{{{*/ - -void Penta::Echo(void){ - this->DeepEcho(); +/*FUNCTION Penta::FiniteElement{{{*/ +int Penta::FiniteElement(void){ + return this->element_type; +} +/*}}}*/ +/*FUNCTION Penta::FSContactMigration{{{*/ +void Penta::FSContactMigration(Vector* vertexgrounded,Vector* vertexfloating){ + + if(!IsOnBase()) return; + + /*Intermediaries*/ + IssmDouble* xyz_list = NULL; + IssmDouble pressure,water_pressure,sigma_nn,viscosity,bed,base; + IssmDouble bed_normal[3]; + IssmDouble epsilon[6]; /* epsilon=[exx eyy ezz exy exz eyz];*/ + IssmDouble surface=0,value=0; + bool grounded; + + /* Get node coordinates and dof list: */ + GetVerticesCoordinates(&xyz_list); + + /*Retrieve all inputs we will be needing: */ + Input* pressure_input = inputs->GetInput(PressureEnum); _assert_(pressure_input); + Input* base_input = inputs->GetInput(BaseEnum); _assert_(base_input); + Input* bed_input = inputs->GetInput(BedEnum); _assert_(bed_input); + Input* vx_input = inputs->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input = inputs->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input = inputs->GetInput(VzEnum); _assert_(vz_input); + + /*Create gauss point in the middle of the basal edge*/ + Gauss* gauss=NewGaussBase(1); + gauss->GaussPoint(0); + + if(!IsFloating()){ + /*Check for basal force only if grounded and touching GL*/ + if(this->inputs->Min(MaskGroundediceLevelsetEnum)==0.){ + this->StrainRateFS(&epsilon[0],xyz_list,gauss,vx_input,vy_input,vz_input); + this->ViscosityFS(&viscosity,3,xyz_list,gauss,vx_input,vy_input,vz_input); + pressure_input->GetInputValue(&pressure, gauss); + base_input->GetInputValue(&base, gauss); _assert_(base<0.); + + /*Compute Stress*/ + IssmDouble sigma_xx=2.*viscosity*epsilon[0]-pressure; + IssmDouble sigma_yy=2.*viscosity*epsilon[1]-pressure; + IssmDouble sigma_zz=2.*viscosity*epsilon[2]-pressure; + IssmDouble sigma_xy=2.*viscosity*epsilon[3]; + IssmDouble sigma_xz=2.*viscosity*epsilon[4]; + IssmDouble sigma_yz=2.*viscosity*epsilon[5]; + + /*Get normal vector to the bed */ + NormalBase(&bed_normal[0],xyz_list); + + /*basalforce*/ + sigma_nn = sigma_xx*bed_normal[0]*bed_normal[0] + sigma_yy*bed_normal[1]*bed_normal[1] + sigma_zz*bed_normal[2]*bed_normal[2] + + 2.*sigma_xy*bed_normal[0]*bed_normal[1] + 2.*sigma_xz*bed_normal[0]*bed_normal[2] + 2.*sigma_yz*bed_normal[1]*bed_normal[2]; + + /*Compute water pressure*/ + IssmDouble rho_ice = matpar->GetRhoIce(); + IssmDouble rho_water = matpar->GetRhoWater(); + IssmDouble gravity = matpar->GetG(); + water_pressure=gravity*rho_water*base; + + /*Compare basal stress to water pressure and determine whether it should ground*/ + if (sigma_nnGetInputValue(&base, gauss); + bed_input->GetInputValue(&bed, gauss); + if (baseSetValue(vertices[i]->Pid(),+1.,INS_VAL); + else vertexfloating->SetValue(vertices[i]->Pid(),+1.,INS_VAL); + } + + /*clean up*/ + delete gauss; + xDelete(xyz_list); } /*}}}*/ @@ -926,5 +592,5 @@ /*}}}*/ /*FUNCTION Penta::GetAreaCoordinates{{{*/ -void Penta::GetAreaCoordinates(IssmDouble* area_coordinates,IssmDouble xyz_zero[4][3],IssmDouble xyz_list[6][3],int numpoints){ +void Penta::GetAreaCoordinates(IssmDouble* area_coordinates,IssmDouble* xyz_zero,IssmDouble* xyz_list,int numpoints){ /*Computeportion of the element that is grounded*/ @@ -933,10 +599,10 @@ IssmDouble xyz_bis[3][3]; - area_init=fabs(xyz_list[1][0]*xyz_list[2][1] - xyz_list[1][1]*xyz_list[2][0] + xyz_list[0][0]*xyz_list[1][1] - xyz_list[0][1]*xyz_list[1][0] + xyz_list[2][0]*xyz_list[0][1] - xyz_list[2][1]*xyz_list[0][0])/2.; + area_init=fabs(xyz_list[1*3+0]*xyz_list[2*3+1] - xyz_list[1*3+1]*xyz_list[2*3+0] + xyz_list[0*3+0]*xyz_list[1*3+1] - xyz_list[0*3+1]*xyz_list[1*3+0] + xyz_list[2*3+0]*xyz_list[0*3+1] - xyz_list[2*3+1]*xyz_list[0*3+0])/2.; /*Initialize xyz_list with original xyz_list of triangle coordinates*/ for(j=0;j<3;j++){ for(k=0;k<3;k++){ - xyz_bis[j][k]=xyz_list[j][k]; + xyz_bis[j][k]=xyz_list[j*3+k]; } } @@ -945,5 +611,5 @@ for(k=0;k<3;k++){ /*Change appropriate line*/ - xyz_bis[j][k]=xyz_zero[i][k]; + xyz_bis[j][k]=xyz_zero[i*3+k]; } @@ -955,5 +621,5 @@ for(k=0;k<3;k++){ /*Reinitialize xyz_list with original coordinates*/ - xyz_bis[j][k]=xyz_list[j][k]; + xyz_bis[j][k]=xyz_list[j*3+k]; } } @@ -961,18 +627,59 @@ } /*}}}*/ -/*FUNCTION Penta::GetBasalElement{{{*/ -Penta* Penta::GetBasalElement(void){ +/*FUNCTION Penta::GetUpperPenta{{{*/ +Penta* Penta::GetUpperPenta(void){ + + Penta* upper_penta=NULL; + + upper_penta=(Penta*)verticalneighbors[1]; //first one (0) under, second one (1) above + + return upper_penta; +} +/*}}}*/ +/*FUNCTION Penta::GetLowerPenta{{{*/ +Penta* Penta::GetLowerPenta(void){ + + Penta* lower_penta=NULL; + + lower_penta=(Penta*)verticalneighbors[0]; //first one (0) under, second one (1) above + + return lower_penta; +} +/*}}}*/ +/*FUNCTION Penta::GetSurfacePenta{{{*/ +Penta* Penta::GetSurfacePenta(void){ /*Output*/ Penta* penta=NULL; - /*Go through all elements till the bed is reached*/ + /*Go through all pentas till the surface is reached*/ + penta=this; + for(;;){ + /*Stop if we have reached the surface, else, take upper penta*/ + if (penta->IsOnSurface()) break; + + /* get upper Penta*/ + penta=penta->GetUpperPenta(); + _assert_(penta->Id()!=this->id); + } + + /*return output*/ + return penta; +} +/*}}}*/ +/*FUNCTION Penta::GetBasalPenta{{{*/ +Penta* Penta::GetBasalPenta(void){ + + /*Output*/ + Penta* penta=NULL; + + /*Go through all pentas till the bed is reached*/ penta=this; for(;;){ /*Stop if we have reached the surface, else, take lower penta*/ - if (penta->IsOnBed()) break; + if (penta->IsOnBase()) break; /* get lower Penta*/ - penta=penta->GetLowerElement(); + penta=penta->GetLowerPenta(); _assert_(penta->Id()!=this->id); } @@ -982,75 +689,34 @@ } /*}}}*/ -/*FUNCTION Penta::GetDofList {{{*/ -void Penta::GetDofList(int** pdoflist,int approximation_enum,int setenum){ - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*First, figure out size of doflist and create it: */ - int numberofdofs=0; - for(int i=0;iGetNumberOfDofs(approximation_enum,setenum); - - /*Allocate output*/ - int* doflist=xNew(numberofdofs); - - /*Populate: */ - int count=0; - for(int i=0;iGetDofList(doflist+count,approximation_enum,setenum); - count+=nodes[i]->GetNumberOfDofs(approximation_enum,setenum); - } - - /*Assign output pointers:*/ - *pdoflist=doflist; -} -/*}}}*/ -/*FUNCTION Penta::GetDofListVelocity{{{*/ -void Penta::GetDofListVelocity(int** pdoflist,int setenum){ - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodesVelocity(); - - /*First, figure out size of doflist and create it: */ - int numberofdofs=0; - for(int i=0;iGetNumberOfDofs(FSvelocityEnum,setenum); - - /*Allocate output*/ - int* doflist=xNew(numberofdofs); - - /*Populate: */ - int count=0; - for(int i=0;iGetDofList(doflist+count,FSvelocityEnum,setenum); - count+=nodes[i]->GetNumberOfDofs(FSvelocityEnum,setenum); - } - - /*Assign output pointers:*/ - *pdoflist=doflist; -} -/*}}}*/ -/*FUNCTION Penta::GetDofListPressure{{{*/ -void Penta::GetDofListPressure(int** pdoflist,int setenum){ - - /*Fetch number of nodes and dof for this finite element*/ - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - - /*First, figure out size of doflist and create it: */ - int numberofdofs=0; - for(int i=vnumnodes;iGetNumberOfDofs(FSApproximationEnum,setenum); - - /*Allocate output*/ - int* doflist=xNew(numberofdofs); - - /*Populate: */ - int count=0; - for(int i=vnumnodes;iGetDofList(doflist+count,FSApproximationEnum,setenum); - count+=nodes[i]->GetNumberOfDofs(FSApproximationEnum,setenum); - } - - /*Assign output pointers:*/ - *pdoflist=doflist; +/*FUNCTION Penta::GetUpperElement{{{*/ +Element* Penta::GetUpperElement(void){ + + /*Output*/ + Element* upper_element=this->GetUpperPenta(); + return upper_element; +} +/*}}}*/ +/*FUNCTION Penta::GetLowerElement{{{*/ +Element* Penta::GetLowerElement(void){ + + /*Output*/ + Element* lower_element=this->GetLowerPenta(); + return lower_element; +} +/*}}}*/ +/*FUNCTION Penta::GetSurfaceElement{{{*/ +Element* Penta::GetSurfaceElement(void){ + + /*Output*/ + Element* element=this->GetSurfacePenta(); + return element; +} +/*}}}*/ +/*FUNCTION Penta::GetBasalElement{{{*/ +Element* Penta::GetBasalElement(void){ + + /*Output*/ + Element* element=this->GetBasalPenta(); + return element; } /*}}}*/ @@ -1211,23 +877,4 @@ } /*}}}*/ -/*FUNCTION Penta::GetVertexPidList {{{*/ -void Penta::GetVertexPidList(int* doflist){ - - for(int i=0;i<6;i++) doflist[i]=vertices[i]->Pid(); - -} -/*}}}*/ -/*FUNCTION Penta::GetVertexSidList{{{*/ -void Penta::GetVertexSidList(int* sidlist){ - - for(int i=0;iSid(); - -} -/*}}}*/ -/*FUNCTION Penta::GetConnectivityList {{{*/ -void Penta::GetConnectivityList(int* connectivity){ - for(int i=0;iConnectivity(); -} -/*}}}*/ /*FUNCTION Penta::GetElementType {{{*/ int Penta::GetElementType(){ @@ -1237,6 +884,6 @@ } /*}}}*/ -/*FUNCTION Penta::GetElementSizes{{{*/ -void Penta::GetElementSizes(IssmDouble* hx,IssmDouble* hy,IssmDouble* hz){ +/*FUNCTION Penta::ElementSizes{{{*/ +void Penta::ElementSizes(IssmDouble* hx,IssmDouble* hy,IssmDouble* hz){ IssmDouble xyz_list[NUMVERTICES][3]; @@ -1245,5 +892,5 @@ /*Get xyz list: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); xmin=xyz_list[0][0]; xmax=xyz_list[0][0]; ymin=xyz_list[0][1]; ymax=xyz_list[0][1]; @@ -1264,14 +911,4 @@ } /*}}}*/ -/*FUNCTION Penta::GetLowerElement{{{*/ -Penta* Penta::GetLowerElement(void){ - - Penta* upper_penta=NULL; - - upper_penta=(Penta*)verticalneighbors[0]; //first one (0) under, second one (1) above - - return upper_penta; -} -/*}}}*/ /*FUNCTION Penta::GetNodeIndex {{{*/ int Penta::GetNodeIndex(Node* node){ @@ -1285,28 +922,4 @@ _error_("Node provided not found among element nodes"); -} -/*}}}*/ -/*FUNCTION Penta::GetNodesSidList{{{*/ -void Penta::GetNodesSidList(int* sidlist){ - - _assert_(sidlist); - _assert_(nodes); - int numnodes = this->NumberofNodes(); - - for(int i=0;iSid(); - } -} -/*}}}*/ -/*FUNCTION Penta::GetNodesLidList{{{*/ -void Penta::GetNodesLidList(int* lidlist){ - - _assert_(lidlist); - _assert_(nodes); - int numnodes = this->NumberofNodes(); - - for(int i=0;iLid(); - } } /*}}}*/ @@ -1316,86 +929,14 @@ } /*}}}*/ -/*FUNCTION Penta::GetInputListOnVertices(IssmDouble* pvalue,int enumtype) {{{*/ -void Penta::GetInputListOnVertices(IssmDouble* pvalue,int enumtype){ - - /*Recover input*/ - Input* input=inputs->GetInput(enumtype); - if (!input) _error_("Input " << EnumToStringx(enumtype) << " not found in element"); - - /*Checks in debugging mode*/ - _assert_(pvalue); - - /* Start looping on the number of vertices: */ - GaussPenta *gauss=new GaussPenta(); - for (int iv=0;ivGaussVertex(iv); - input->GetInputValue(&pvalue[iv],gauss); - } - - /*clean-up*/ - delete gauss; -} -/*}}}*/ -/*FUNCTION Penta::GetInputListOnVertices(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue) {{{*/ -void Penta::GetInputListOnVertices(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue){ - - /*Recover input*/ - Input* input=inputs->GetInput(enumtype); - - /*Checks in debugging mode*/ - _assert_(pvalue); - - /* Start looping on the number of vertices: */ - if (input){ - GaussPenta *gauss=new GaussPenta(); - for (int iv=0;ivGaussVertex(iv); - input->GetInputValue(&pvalue[iv],gauss); - } - delete gauss; - } - else{ - for (int iv=0;ivGetInput(enumtype); - int numnodes = this->NumberofNodes(); - - /* Start looping on the number of vertices: */ - if(input){ - GaussPenta* gauss=new GaussPenta(); - for(int iv=0;ivNumberofNodes();iv++){ - gauss->GaussNode(this->element_type,iv); - input->GetInputValue(&pvalue[iv],gauss); - } - delete gauss; - } - else{ - for(int iv=0;ivGetInput(enumtype); - if(!input) _error_("Input " << EnumToStringx(enumtype) << " not found in element"); - - /* Start looping on the number of vertices: */ - GaussPenta* gauss=new GaussPenta(); - for(int iv=0;ivNumberofNodes();iv++){ - gauss->GaussNode(this->element_type,iv); - input->GetInputValue(&pvalue[iv],gauss); - } - delete gauss; +/*FUNCTION Penta::GetNumberOfVertices;{{{*/ +int Penta::GetNumberOfVertices(void){ + return NUMVERTICES; +} +/*}}}*/ +/*FUNCTION Penta::GetNode(int node_number) {{{*/ +Node* Penta::GetNode(int node_number){ + _assert_(node_number>=0); + _assert_(node_numberNumberofNodes()); + return this->nodes[node_number]; } /*}}}*/ @@ -1413,57 +954,26 @@ } /*}}}*/ -/*FUNCTION Penta::GetMaterialInputValue(IssmDouble* pvalue,Node* node,int enumtype) {{{*/ -void Penta::GetMaterialInputValue(IssmDouble* pvalue,Node* node,int enumtype){ - - Input* input=this->material->inputs->GetInput(enumtype); - if(!input) _error_("No input of type " << EnumToStringx(enumtype) << " found in tria"); - - GaussPenta* gauss=new GaussPenta(); - gauss->GaussVertex(this->GetNodeIndex(node)); - - input->GetInputValue(pvalue,gauss); - delete gauss; -} -/*}}}*/ -/*FUNCTION Penta::GetPhi {{{*/ -void Penta::GetPhi(IssmDouble* phi, IssmDouble* epsilon, IssmDouble viscosity){ - /*Compute deformational heating from epsilon and viscosity */ - - IssmDouble epsilon_matrix[3][3]; - IssmDouble epsilon_eff; - IssmDouble epsilon_sqr[3][3]; - - /* Build epsilon matrix */ - epsilon_matrix[0][0]=*(epsilon+0); - epsilon_matrix[1][0]=*(epsilon+3); - epsilon_matrix[2][0]=*(epsilon+4); - epsilon_matrix[0][1]=*(epsilon+3); - epsilon_matrix[1][1]=*(epsilon+1); - epsilon_matrix[2][1]=*(epsilon+5); - epsilon_matrix[0][2]=*(epsilon+4); - epsilon_matrix[1][2]=*(epsilon+5); - epsilon_matrix[2][2]=*(epsilon+2); - - /* Effective value of epsilon_matrix */ - epsilon_sqr[0][0]=pow(epsilon_matrix[0][0],2); - epsilon_sqr[1][0]=pow(epsilon_matrix[1][0],2); - epsilon_sqr[2][0]=pow(epsilon_matrix[2][0],2); - epsilon_sqr[0][1]=pow(epsilon_matrix[0][1],2); - epsilon_sqr[1][1]=pow(epsilon_matrix[1][1],2); - epsilon_sqr[2][1]=pow(epsilon_matrix[2][1],2); - epsilon_sqr[0][2]=pow(epsilon_matrix[0][2],2); - epsilon_sqr[1][2]=pow(epsilon_matrix[1][2],2); - epsilon_sqr[2][2]=pow(epsilon_matrix[2][2],2); - epsilon_eff=1/pow(2,0.5)*pow((epsilon_sqr[0][0]+epsilon_sqr[0][1]+ epsilon_sqr[0][2]+ epsilon_sqr[1][0]+ epsilon_sqr[1][1]+ epsilon_sqr[1][2]+ epsilon_sqr[2][0]+ epsilon_sqr[2][1]+ epsilon_sqr[2][2]),0.5); - - /*Phi = Tr(sigma * eps) - * = Tr(sigma'* eps) - * = 2 * eps_eff * sigma'_eff - * = 4 * mu * eps_eff ^2*/ - *phi=4*pow(epsilon_eff,2.0)*viscosity; -} -/*}}}*/ -/*FUNCTION Penta::GetQuadNormal {{{*/ -void Penta:: GetQuadNormal(IssmDouble* normal,IssmDouble xyz_list[4][3]){ +/*FUNCTION Penta::GetVerticesCoordinatesBase(IssmDouble** pxyz_list){{{*/ +void Penta::GetVerticesCoordinatesBase(IssmDouble** pxyz_list){ + + IssmDouble* xyz_list = xNew(NUMVERTICES2D*3); + ::GetVerticesCoordinates(xyz_list,this->vertices,NUMVERTICES2D); + + /*Assign output pointer*/ + *pxyz_list = xyz_list; + +}/*}}}*/ +/*FUNCTION Penta::GetVerticesCoordinatesTop(IssmDouble** pxyz_list){{{*/ +void Penta::GetVerticesCoordinatesTop(IssmDouble** pxyz_list){ + + IssmDouble* xyz_list = xNew(NUMVERTICES2D*3); + ::GetVerticesCoordinates(xyz_list,&this->vertices[3],NUMVERTICES2D); + + /*Assign output pointer*/ + *pxyz_list = xyz_list; + +}/*}}}*/ +/*FUNCTION Penta::NormalSection{{{*/ +void Penta::NormalSection(IssmDouble* normal,IssmDouble* xyz_list){ /*Build unit outward pointing vector*/ @@ -1472,71 +982,19 @@ IssmDouble norm; - AB[0]=xyz_list[1][0] - xyz_list[0][0]; - AB[1]=xyz_list[1][1] - xyz_list[0][1]; - AB[2]=xyz_list[1][2] - xyz_list[0][2]; - AC[0]=xyz_list[2][0] - xyz_list[0][0]; - AC[1]=xyz_list[2][1] - xyz_list[0][1]; - AC[2]=xyz_list[2][2] - xyz_list[0][2]; + AB[0]=xyz_list[1*3+0] - xyz_list[0*3+0]; + AB[1]=xyz_list[1*3+1] - xyz_list[0*3+1]; + AB[2]=xyz_list[1*3+2] - xyz_list[0*3+2]; + AC[0]=xyz_list[2*3+0] - xyz_list[0*3+0]; + AC[1]=xyz_list[2*3+1] - xyz_list[0*3+1]; + AC[2]=xyz_list[2*3+2] - xyz_list[0*3+2]; cross(normal,AB,AC); - norm=sqrt(pow(normal[0],2.0)+pow(normal[1],2.0)+pow(normal[2],2.0)); + norm=sqrt(normal[0]*normal[0]+normal[1]*normal[1]+normal[2]*normal[2]); for(int i=0;i<3;i++) normal[i]=normal[i]/norm; } /*}}}*/ -/*FUNCTION Penta::GetSolutionFromInputs{{{*/ -void Penta::GetSolutionFromInputs(Vector* solution){ - - int analysis_type; - - /*retrive parameters: */ - parameters->FindParam(&analysis_type,AnalysisTypeEnum); - - /*Just branch to the correct InputUpdateFromSolution generator, according to the type of analysis we are carrying out: */ - switch(analysis_type){ - #ifdef _HAVE_STRESSBALANCE_ - case StressbalanceAnalysisEnum: - int approximation; - inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation==FSApproximationEnum || approximation==NoneApproximationEnum){ - GetSolutionFromInputsStressbalanceFS(solution); - } - else if (approximation==SSAApproximationEnum || approximation==HOApproximationEnum || approximation==SIAApproximationEnum){ - GetSolutionFromInputsStressbalanceHoriz(solution); - } - else if (approximation==SSAHOApproximationEnum || approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){ - return; //the elements around will create the solution - } - break; - case StressbalanceSIAAnalysisEnum: - GetSolutionFromInputsStressbalanceSIA(solution); - break; - case StressbalanceVerticalAnalysisEnum: - GetSolutionFromInputsOneDof(solution, VzEnum); - break; - #endif - #ifdef _HAVE_THERMAL_ - case ThermalAnalysisEnum: - GetSolutionFromInputsOneDof(solution, TemperatureEnum); - break; - case EnthalpyAnalysisEnum: - GetSolutionFromInputsOneDof(solution, EnthalpyEnum); - break; - #endif - #ifdef _HAVE_HYDROLOGY_ - case HydrologyDCInefficientAnalysisEnum: - GetSolutionFromInputsOneDof(solution, SedimentHeadEnum); - break; - case HydrologyDCEfficientAnalysisEnum: - GetSolutionFromInputsOneDof(solution, EplHeadEnum); - break; - #endif - default: - _error_("analysis: " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet"); - } -} -/*}}}*/ -/*FUNCTION Penta::GetStabilizationParameter {{{*/ -IssmDouble Penta::GetStabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa){ +/*FUNCTION Penta::StabilizationParameter {{{*/ +IssmDouble Penta::StabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa){ /*Compute stabilization parameter*/ /*kappa=thermalconductivity/(rho_ice*hearcapacity) for thermal model*/ @@ -1555,89 +1013,36 @@ } /*}}}*/ -/*FUNCTION Penta::GetStrainRate3dHO{{{*/ -void Penta::GetStrainRate3dHO(IssmDouble* epsilon,IssmDouble* xyz_list, GaussPenta* gauss, Input* vx_input, Input* vy_input){ - /*Compute the 3d Blatter/HOStrain Rate (5 components): - * - * epsilon=[exx eyy exy exz eyz] - * - * with exz=1/2 du/dz - * eyz=1/2 dv/dz - * - * the contribution of vz is neglected - */ - - int i; - IssmDouble epsilonvx[5]; - IssmDouble epsilonvy[5]; - - /*Check that both inputs have been found*/ - if (!vx_input || !vy_input){ - _error_("Input missing. Here are the input pointers we have for vx: " << vx_input << ", vy: " << vy_input << "\n"); - } - - /*Get strain rate assuming that epsilon has been allocated*/ - vx_input->GetVxStrainRate3dHO(epsilonvx,xyz_list,gauss); - vy_input->GetVyStrainRate3dHO(epsilonvy,xyz_list,gauss); - - /*Sum all contributions*/ - for(i=0;i<5;i++) epsilon[i]=epsilonvx[i]+epsilonvy[i]; -} -/*}}}*/ -/*FUNCTION Penta::GetStrainRate3d{{{*/ -void Penta::GetStrainRate3d(IssmDouble* epsilon,IssmDouble* xyz_list, GaussPenta* gauss, Input* vx_input, Input* vy_input, Input* vz_input){ - /*Compute the 3d Strain Rate (6 components): - * - * epsilon=[exx eyy ezz exy exz eyz] - */ - - IssmDouble epsilonvx[6]; - IssmDouble epsilonvy[6]; - IssmDouble epsilonvz[6]; - - /*Check that both inputs have been found*/ - if (!vx_input || !vy_input || !vz_input){ - _error_("Input missing. Here are the input pointers we have for vx: " << vx_input << ", vy: " << vy_input << ", vz: " << vz_input << "\n"); - } - - /*Get strain rate assuming that epsilon has been allocated*/ - vx_input->GetVxStrainRate3d(epsilonvx,xyz_list,gauss); - vy_input->GetVyStrainRate3d(epsilonvy,xyz_list,gauss); - vz_input->GetVzStrainRate3d(epsilonvz,xyz_list,gauss); - - /*Sum all contributions*/ - for(int i=0;i<6;i++) epsilon[i]=epsilonvx[i]+epsilonvy[i]+epsilonvz[i]; -} -/*}}}*/ -/*FUNCTION Penta::GetUpperElement{{{*/ -Penta* Penta::GetUpperElement(void){ - - Penta* upper_penta=NULL; - - upper_penta=(Penta*)verticalneighbors[1]; //first one under, second one above - - return upper_penta; -} -/*}}}*/ -/*FUNCTION Penta::GetVectorFromInputs{{{*/ -void Penta::GetVectorFromInputs(Vector* vector,int input_enum){ - - int vertexpidlist[NUMVERTICES]; - - /*Get out if this is not an element input*/ - if (!IsInput(input_enum)) return; - - /*Prepare index list*/ - this->GetVertexPidList(&vertexpidlist[0]); - - /*Get input (either in element or material)*/ - Input* input=inputs->GetInput(input_enum); - if(!input) _error_("Input " << EnumToStringx(input_enum) << " not found in element"); - - /*We found the enum. Use its values to fill into the vector, using the vertices ids: */ - input->GetVectorFromInputs(vector,&vertexpidlist[0]); +/*FUNCTION Penta::GetXcoord {{{*/ +IssmDouble Penta::GetXcoord(Gauss* gauss){ + + int i; + IssmDouble x; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble x_list[NUMVERTICES]; + + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + for(i=0;i(4*3); /*Recover parameters and values*/ @@ -1669,24 +1075,24 @@ s2=levelset[2]/(levelset[2]-levelset[0]); - if(levelset[2]>0.) normal_orientation=1; + if(levelset[2]<0.) normal_orientation=1; //orientation of quadrangle at base and top, depending on distribution of levelsetfunction /*New point 1*/ - xyz_zero[3*normal_orientation+0]=xyz_list[2][0]+s1*(xyz_list[1][0]-xyz_list[2][0]); - xyz_zero[3*normal_orientation+1]=xyz_list[2][1]+s1*(xyz_list[1][1]-xyz_list[2][1]); - xyz_zero[3*normal_orientation+2]=xyz_list[2][2]+s1*(xyz_list[1][2]-xyz_list[2][2]); + xyz_zero[3*normal_orientation+0]=xyz_list[2*3+0]+s1*(xyz_list[1*3+0]-xyz_list[2*3+0]); + xyz_zero[3*normal_orientation+1]=xyz_list[2*3+1]+s1*(xyz_list[1*3+1]-xyz_list[2*3+1]); + xyz_zero[3*normal_orientation+2]=xyz_list[2*3+2]+s1*(xyz_list[1*3+2]-xyz_list[2*3+2]); /*New point 0*/ - xyz_zero[3*(1-normal_orientation)+0]=xyz_list[2][0]+s2*(xyz_list[0][0]-xyz_list[2][0]); - xyz_zero[3*(1-normal_orientation)+1]=xyz_list[2][1]+s2*(xyz_list[0][1]-xyz_list[2][1]); - xyz_zero[3*(1-normal_orientation)+2]=xyz_list[2][2]+s2*(xyz_list[0][2]-xyz_list[2][2]); + xyz_zero[3*(1-normal_orientation)+0]=xyz_list[2*3+0]+s2*(xyz_list[0*3+0]-xyz_list[2*3+0]); + xyz_zero[3*(1-normal_orientation)+1]=xyz_list[2*3+1]+s2*(xyz_list[0*3+1]-xyz_list[2*3+1]); + xyz_zero[3*(1-normal_orientation)+2]=xyz_list[2*3+2]+s2*(xyz_list[0*3+2]-xyz_list[2*3+2]); /*New point 3*/ - xyz_zero[3*(2+1-normal_orientation)+0]=xyz_list[5][0]+s1*(xyz_list[4][0]-xyz_list[5][0]); - xyz_zero[3*(2+1-normal_orientation)+1]=xyz_list[5][1]+s1*(xyz_list[4][1]-xyz_list[5][1]); - xyz_zero[3*(2+1-normal_orientation)+2]=xyz_list[5][2]+s1*(xyz_list[4][2]-xyz_list[5][2]); + xyz_zero[3*(2+1-normal_orientation)+0]=xyz_list[5*3+0]+s1*(xyz_list[4*3+0]-xyz_list[5*3+0]); + xyz_zero[3*(2+1-normal_orientation)+1]=xyz_list[5*3+1]+s1*(xyz_list[4*3+1]-xyz_list[5*3+1]); + xyz_zero[3*(2+1-normal_orientation)+2]=xyz_list[5*3+2]+s1*(xyz_list[4*3+2]-xyz_list[5*3+2]); /*New point 4*/ - xyz_zero[3*(2+normal_orientation)+0]=xyz_list[5][0]+s2*(xyz_list[3][0]-xyz_list[5][0]); - xyz_zero[3*(2+normal_orientation)+1]=xyz_list[5][1]+s2*(xyz_list[3][1]-xyz_list[5][1]); - xyz_zero[3*(2+normal_orientation)+2]=xyz_list[5][2]+s2*(xyz_list[3][2]-xyz_list[5][2]); + xyz_zero[3*(2+normal_orientation)+0]=xyz_list[5*3+0]+s2*(xyz_list[3*3+0]-xyz_list[5*3+0]); + xyz_zero[3*(2+normal_orientation)+1]=xyz_list[5*3+1]+s2*(xyz_list[3*3+1]-xyz_list[5*3+1]); + xyz_zero[3*(2+normal_orientation)+2]=xyz_list[5*3+2]+s2*(xyz_list[3*3+2]-xyz_list[5*3+2]); } else if(levelset[1]*levelset[2]>0.){ //Nodes 1 and 2 are similar, so points must be found on segment 0-1 and 0-2 @@ -1695,24 +1101,24 @@ s2=levelset[0]/(levelset[0]-levelset[1]); - if(levelset[0]>0.) normal_orientation=1; + if(levelset[0]<0.) normal_orientation=1; /*New point 1*/ - xyz_zero[3*normal_orientation+0]=xyz_list[0][0]+s1*(xyz_list[2][0]-xyz_list[0][0]); - xyz_zero[3*normal_orientation+1]=xyz_list[0][1]+s1*(xyz_list[2][1]-xyz_list[0][1]); - xyz_zero[3*normal_orientation+2]=xyz_list[0][2]+s1*(xyz_list[2][2]-xyz_list[0][2]); + xyz_zero[3*normal_orientation+0]=xyz_list[0*3+0]+s1*(xyz_list[2*3+0]-xyz_list[0*3+0]); + xyz_zero[3*normal_orientation+1]=xyz_list[0*3+1]+s1*(xyz_list[2*3+1]-xyz_list[0*3+1]); + xyz_zero[3*normal_orientation+2]=xyz_list[0*3+2]+s1*(xyz_list[2*3+2]-xyz_list[0*3+2]); /*New point 2*/ - xyz_zero[3*(1-normal_orientation)+0]=xyz_list[0][0]+s2*(xyz_list[1][0]-xyz_list[0][0]); - xyz_zero[3*(1-normal_orientation)+1]=xyz_list[0][1]+s2*(xyz_list[1][1]-xyz_list[0][1]); - xyz_zero[3*(1-normal_orientation)+2]=xyz_list[0][2]+s2*(xyz_list[1][2]-xyz_list[0][2]); + xyz_zero[3*(1-normal_orientation)+0]=xyz_list[0*3+0]+s2*(xyz_list[1*3+0]-xyz_list[0*3+0]); + xyz_zero[3*(1-normal_orientation)+1]=xyz_list[0*3+1]+s2*(xyz_list[1*3+1]-xyz_list[0*3+1]); + xyz_zero[3*(1-normal_orientation)+2]=xyz_list[0*3+2]+s2*(xyz_list[1*3+2]-xyz_list[0*3+2]); /*New point 3*/ - xyz_zero[3*(2+1-normal_orientation)+0]=xyz_list[3][0]+s1*(xyz_list[5][0]-xyz_list[3][0]); - xyz_zero[3*(2+1-normal_orientation)+1]=xyz_list[3][1]+s1*(xyz_list[5][1]-xyz_list[3][1]); - xyz_zero[3*(2+1-normal_orientation)+2]=xyz_list[3][2]+s1*(xyz_list[5][2]-xyz_list[3][2]); + xyz_zero[3*(2+1-normal_orientation)+0]=xyz_list[3*3+0]+s1*(xyz_list[5*3+0]-xyz_list[3*3+0]); + xyz_zero[3*(2+1-normal_orientation)+1]=xyz_list[3*3+1]+s1*(xyz_list[5*3+1]-xyz_list[3*3+1]); + xyz_zero[3*(2+1-normal_orientation)+2]=xyz_list[3*3+2]+s1*(xyz_list[5*3+2]-xyz_list[3*3+2]); /*New point 4*/ - xyz_zero[3*(2+normal_orientation)+0]=xyz_list[3][0]+s2*(xyz_list[4][0]-xyz_list[3][0]); - xyz_zero[3*(2+normal_orientation)+1]=xyz_list[3][1]+s2*(xyz_list[4][1]-xyz_list[3][1]); - xyz_zero[3*(2+normal_orientation)+2]=xyz_list[3][2]+s2*(xyz_list[4][2]-xyz_list[3][2]); + xyz_zero[3*(2+normal_orientation)+0]=xyz_list[3*3+0]+s2*(xyz_list[4*3+0]-xyz_list[3*3+0]); + xyz_zero[3*(2+normal_orientation)+1]=xyz_list[3*3+1]+s2*(xyz_list[4*3+1]-xyz_list[3*3+1]); + xyz_zero[3*(2+normal_orientation)+2]=xyz_list[3*3+2]+s2*(xyz_list[4*3+2]-xyz_list[3*3+2]); } else if(levelset[0]*levelset[2]>0.){ //Nodes 0 and 2 are similar, so points must be found on segment 1-0 and 1-2 @@ -1721,178 +1127,93 @@ s2=levelset[1]/(levelset[1]-levelset[2]); - if(levelset[1]>0.) normal_orientation=1; + if(levelset[1]<0.) normal_orientation=1; /*New point 0*/ - xyz_zero[3*normal_orientation+0]=xyz_list[1][0]+s1*(xyz_list[0][0]-xyz_list[1][0]); - xyz_zero[3*normal_orientation+1]=xyz_list[1][1]+s1*(xyz_list[0][1]-xyz_list[1][1]); - xyz_zero[3*normal_orientation+2]=xyz_list[1][2]+s1*(xyz_list[0][2]-xyz_list[1][2]); + xyz_zero[3*normal_orientation+0]=xyz_list[1*3+0]+s1*(xyz_list[0*3+0]-xyz_list[1*3+0]); + xyz_zero[3*normal_orientation+1]=xyz_list[1*3+1]+s1*(xyz_list[0*3+1]-xyz_list[1*3+1]); + xyz_zero[3*normal_orientation+2]=xyz_list[1*3+2]+s1*(xyz_list[0*3+2]-xyz_list[1*3+2]); /*New point 2*/ - xyz_zero[3*(1-normal_orientation)+0]=xyz_list[1][0]+s2*(xyz_list[2][0]-xyz_list[1][0]); - xyz_zero[3*(1-normal_orientation)+1]=xyz_list[1][1]+s2*(xyz_list[2][1]-xyz_list[1][1]); - xyz_zero[3*(1-normal_orientation)+2]=xyz_list[1][2]+s2*(xyz_list[2][2]-xyz_list[1][2]); + xyz_zero[3*(1-normal_orientation)+0]=xyz_list[1*3+0]+s2*(xyz_list[2*3+0]-xyz_list[1*3+0]); + xyz_zero[3*(1-normal_orientation)+1]=xyz_list[1*3+1]+s2*(xyz_list[2*3+1]-xyz_list[1*3+1]); + xyz_zero[3*(1-normal_orientation)+2]=xyz_list[1*3+2]+s2*(xyz_list[2*3+2]-xyz_list[1*3+2]); /*New point 3*/ - xyz_zero[3*(2+1-normal_orientation)+0]=xyz_list[4][0]+s1*(xyz_list[3][0]-xyz_list[4][0]); - xyz_zero[3*(2+1-normal_orientation)+1]=xyz_list[4][1]+s1*(xyz_list[3][1]-xyz_list[4][1]); - xyz_zero[3*(2+1-normal_orientation)+2]=xyz_list[4][2]+s1*(xyz_list[3][2]-xyz_list[4][2]); + xyz_zero[3*(2+1-normal_orientation)+0]=xyz_list[4*3+0]+s1*(xyz_list[3*3+0]-xyz_list[4*3+0]); + xyz_zero[3*(2+1-normal_orientation)+1]=xyz_list[4*3+1]+s1*(xyz_list[3*3+1]-xyz_list[4*3+1]); + xyz_zero[3*(2+1-normal_orientation)+2]=xyz_list[4*3+2]+s1*(xyz_list[3*3+2]-xyz_list[4*3+2]); /*New point 4*/ - xyz_zero[3*(2+normal_orientation)+0]=xyz_list[4][0]+s2*(xyz_list[5][0]-xyz_list[4][0]); - xyz_zero[3*(2+normal_orientation)+1]=xyz_list[4][1]+s2*(xyz_list[5][1]-xyz_list[4][1]); - xyz_zero[3*(2+normal_orientation)+2]=xyz_list[4][2]+s2*(xyz_list[5][2]-xyz_list[4][2]); + xyz_zero[3*(2+normal_orientation)+0]=xyz_list[4*3+0]+s2*(xyz_list[5*3+0]-xyz_list[4*3+0]); + xyz_zero[3*(2+normal_orientation)+1]=xyz_list[4*3+1]+s2*(xyz_list[5*3+1]-xyz_list[4*3+1]); + xyz_zero[3*(2+normal_orientation)+2]=xyz_list[4*3+2]+s2*(xyz_list[5*3+2]-xyz_list[4*3+2]); } else if(levelset[0]==0. && levelset[1]==0.){ //front is on point 0 and 1 - xyz_zero[3*0+0]=xyz_list[0][0]; - xyz_zero[3*0+1]=xyz_list[0][1]; - xyz_zero[3*0+2]=xyz_list[0][2]; + xyz_zero[3*0+0]=xyz_list[0*3+0]; + xyz_zero[3*0+1]=xyz_list[0*3+1]; + xyz_zero[3*0+2]=xyz_list[0*3+2]; /*New point 2*/ - xyz_zero[3*1+0]=xyz_list[1][0]; - xyz_zero[3*1+1]=xyz_list[1][1]; - xyz_zero[3*1+2]=xyz_list[1][2]; + xyz_zero[3*1+0]=xyz_list[1*3+0]; + xyz_zero[3*1+1]=xyz_list[1*3+1]; + xyz_zero[3*1+2]=xyz_list[1*3+2]; /*New point 3*/ - xyz_zero[3*2+0]=xyz_list[4][0]; - xyz_zero[3*2+1]=xyz_list[4][1]; - xyz_zero[3*2+2]=xyz_list[4][2]; + xyz_zero[3*2+0]=xyz_list[4*3+0]; + xyz_zero[3*2+1]=xyz_list[4*3+1]; + xyz_zero[3*2+2]=xyz_list[4*3+2]; /*New point 4*/ - xyz_zero[3*3+0]=xyz_list[3][0]; - xyz_zero[3*3+1]=xyz_list[3][1]; - xyz_zero[3*3+2]=xyz_list[3][2]; + xyz_zero[3*3+0]=xyz_list[3*3+0]; + xyz_zero[3*3+1]=xyz_list[3*3+1]; + xyz_zero[3*3+2]=xyz_list[3*3+2]; } else if(levelset[0]==0. && levelset[2]==0.){ //front is on point 0 and 1 - xyz_zero[3*0+0]=xyz_list[2][0]; - xyz_zero[3*0+1]=xyz_list[2][1]; - xyz_zero[3*0+2]=xyz_list[2][2]; + xyz_zero[3*0+0]=xyz_list[2*3+0]; + xyz_zero[3*0+1]=xyz_list[2*3+1]; + xyz_zero[3*0+2]=xyz_list[2*3+2]; /*New point 2*/ - xyz_zero[3*1+0]=xyz_list[0][0]; - xyz_zero[3*1+1]=xyz_list[0][1]; - xyz_zero[3*1+2]=xyz_list[0][2]; + xyz_zero[3*1+0]=xyz_list[0*3+0]; + xyz_zero[3*1+1]=xyz_list[0*3+1]; + xyz_zero[3*1+2]=xyz_list[0*3+2]; /*New point 3*/ - xyz_zero[3*2+0]=xyz_list[3][0]; - xyz_zero[3*2+1]=xyz_list[3][1]; - xyz_zero[3*2+2]=xyz_list[3][2]; + xyz_zero[3*2+0]=xyz_list[3*3+0]; + xyz_zero[3*2+1]=xyz_list[3*3+1]; + xyz_zero[3*2+2]=xyz_list[3*3+2]; /*New point 4*/ - xyz_zero[3*3+0]=xyz_list[5][0]; - xyz_zero[3*3+1]=xyz_list[5][1]; - xyz_zero[3*3+2]=xyz_list[5][2]; + xyz_zero[3*3+0]=xyz_list[5*3+0]; + xyz_zero[3*3+1]=xyz_list[5*3+1]; + xyz_zero[3*3+2]=xyz_list[5*3+2]; } else if(levelset[1]==0. && levelset[2]==0.){ //front is on point 0 and 1 - xyz_zero[3*0+0]=xyz_list[1][0]; - xyz_zero[3*0+1]=xyz_list[1][1]; - xyz_zero[3*0+2]=xyz_list[1][2]; + xyz_zero[3*0+0]=xyz_list[1*3+0]; + xyz_zero[3*0+1]=xyz_list[1*3+1]; + xyz_zero[3*0+2]=xyz_list[1*3+2]; /*New point 2*/ - xyz_zero[3*1+0]=xyz_list[2][0]; - xyz_zero[3*1+1]=xyz_list[2][1]; - xyz_zero[3*1+2]=xyz_list[2][2]; + xyz_zero[3*1+0]=xyz_list[2*3+0]; + xyz_zero[3*1+1]=xyz_list[2*3+1]; + xyz_zero[3*1+2]=xyz_list[2*3+2]; /*New point 3*/ - xyz_zero[3*2+0]=xyz_list[5][0]; - xyz_zero[3*2+1]=xyz_list[5][1]; - xyz_zero[3*2+2]=xyz_list[5][2]; + xyz_zero[3*2+0]=xyz_list[5*3+0]; + xyz_zero[3*2+1]=xyz_list[5*3+1]; + xyz_zero[3*2+2]=xyz_list[5*3+2]; /*New point 4*/ - xyz_zero[3*3+0]=xyz_list[4][0]; - xyz_zero[3*3+1]=xyz_list[4][1]; - xyz_zero[3*3+2]=xyz_list[4][2]; + xyz_zero[3*3+0]=xyz_list[4*3+0]; + xyz_zero[3*3+1]=xyz_list[4*3+1]; + xyz_zero[3*3+2]=xyz_list[4*3+2]; } else _error_("Case not covered"); -} -/*}}}*/ -/*FUNCTION Penta::Sid {{{*/ -int Penta::Sid(){ - - return sid; - -} -/*}}}*/ -/*FUNCTION Penta::Id {{{*/ -int Penta::Id(void){ - return id; -} -/*}}}*/ -/*FUNCTION Penta::InputCreate(IssmDouble* vector,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code){{{*/ -void Penta::InputCreate(IssmDouble* vector,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code){ - - /*Intermediaries*/ - int i,t; - int penta_vertex_ids[6]; - int row; - IssmDouble nodeinputs[6]; - IssmDouble time; - TransientInput *transientinput = NULL; - - /*Branch on type of vector: nodal or elementary: */ - if(vector_type==1){ //nodal vector - - /*Recover vertices ids needed to initialize inputs*/ - for(i=0;i<6;i++){ - _assert_(iomodel->elements); - penta_vertex_ids[i]=iomodel->elements[6*this->sid+i]; //ids for vertices are in the elements array from Matlab - } - - /*Are we in transient or static? */ - if(M==iomodel->numberofvertices){ - - /*create input values: */ - for(i=0;i<6;i++)nodeinputs[i]=(IssmDouble)vector[penta_vertex_ids[i]-1]; - - /*create static input: */ - this->inputs->AddInput(new PentaInput(vector_enum,nodeinputs,P1Enum)); - } - else if(M==iomodel->numberofvertices+1){ - /*create transient input: */ - for(t=0;tAddTimeInput(new PentaInput(vector_enum,nodeinputs,P1Enum),time); - } - this->inputs->AddInput(transientinput); - } - else _error_("nodal vector is either numberofvertices (" << iomodel->numberofvertices << "), or numberofvertices+1 long. Field provided is " << M << " long. Enum " << EnumToStringx(vector_enum)); - } - else if(vector_type==2){ //element vector - /*Are we in transient or static? */ - if(M==iomodel->numberofelements){ - - /*static mode: create an input out of the element value: */ - - if (code==5){ //boolean - this->inputs->AddInput(new BoolInput(vector_enum,reCast(vector[this->sid]))); - } - else if (code==6){ //integer - this->inputs->AddInput(new IntInput(vector_enum,reCast(vector[this->sid]))); - } - else if (code==7){ //IssmDouble - this->inputs->AddInput(new DoubleInput(vector_enum,vector[this->sid])); - } - else _error_("could not recognize nature of vector from code " << code); - } - else { - _error_("transient elementary inputs not supported yet!"); - } - } - else{ - _error_("Cannot add input for vector type " << vector_type << " (not supported)"); - } - + + /*Assign output pointer*/ + *pxyz_zero= xyz_zero; } /*}}}*/ /*FUNCTION Penta::InputDepthAverageAtBase{{{*/ -void Penta::InputDepthAverageAtBase(int enum_type,int average_enum_type,int object_enum){ +void Penta::InputDepthAverageAtBase(int enum_type,int average_enum_type){ int step,i; @@ -1900,4 +1221,5 @@ IssmDouble Helem_list[NUMVERTICES]; IssmDouble zeros_list[NUMVERTICES]={0.0}; + IssmDouble p0top1_list[NUMVERTICES]; Penta* penta=NULL; Input* original_input=NULL; @@ -1911,5 +1233,5 @@ /*Are we on the base? If not, return*/ - if(!IsOnBed()) return; + if(!IsOnBase()) return; /*OK, we are on bed. Initialize global inputs as 0*/ @@ -1922,10 +1244,5 @@ /*Step1: Get original input (to be depth avegaged): */ - if (object_enum==MeshElementsEnum) - original_input=(Input*)penta->inputs->GetInput(enum_type); - else if (object_enum==MaterialsEnum) - original_input=(Input*)penta->material->inputs->GetInput(enum_type); - else - _error_("object " << EnumToStringx(object_enum) << " not supported yet"); + original_input=(Input*)penta->inputs->GetInput(enum_type); if(!original_input) _error_("could not find input with enum " << EnumToStringx(enum_type)); @@ -1938,10 +1255,11 @@ else if (original_input->ObjectEnum()==DoubleInputEnum) total_integrated_input=new DoubleInput(average_enum_type,0.0); - else + else{ _error_("object " << EnumToStringx(original_input->ObjectEnum()) << " not supported yet"); + } } /*Step2: Create element thickness input*/ - GetVerticesCoordinates(&xyz_list[0][0],penta->vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],penta->vertices,NUMVERTICES); for(i=0;i<3;i++){ Helem_list[i]=xyz_list[i+3][2]-xyz_list[i][2]; @@ -1951,6 +1269,19 @@ /*Step3: Vertically integrate A COPY of the original*/ - element_integrated_input=(Input*)original_input->copy(); - element_integrated_input->VerticallyIntegrate(element_thickness_input); + if(original_input->ObjectEnum()==PentaInputEnum){ + if(((PentaInput*)original_input)->element_type==P0Enum){ + original_input->GetInputValue(&p0top1_list[i]); + element_integrated_input= new PentaInput(original_input->InstanceEnum(),p0top1_list,P1Enum); + element_integrated_input->VerticallyIntegrate(element_thickness_input); + } + else{ + element_integrated_input= (Input*)original_input->copy(); + element_integrated_input->VerticallyIntegrate(element_thickness_input); + } + } + else{ + element_integrated_input= (Input*)original_input->copy(); + element_integrated_input->VerticallyIntegrate(element_thickness_input); + } /*Add contributions to global inputs*/ @@ -1966,5 +1297,5 @@ /* get upper Penta*/ - penta=penta->GetUpperElement(); + penta=penta->GetUpperPenta(); _assert_(penta->Id()!=this->id); @@ -1982,10 +1313,5 @@ /*Finally, add to inputs*/ - if (object_enum==MeshElementsEnum) - this->inputs->AddInput((Input*)depth_averaged_input); - else if (object_enum==MaterialsEnum) - this->material->inputs->AddInput((Input*)depth_averaged_input); - else - _error_("object " << EnumToStringx(object_enum) << " not supported yet"); + this->inputs->AddInput((Input*)depth_averaged_input); } /*}}}*/ @@ -1999,5 +1325,5 @@ /*}}}*/ /*FUNCTION Penta::InputExtrude {{{*/ -void Penta::InputExtrude(int enum_type,int object_type){ +void Penta::InputExtrude(int enum_type){ int i,num_inputs; @@ -2007,22 +1333,12 @@ /*Are we on the base, not on the surface?:*/ - if(!IsOnBed()) return; + if(!IsOnBase()) return; /*Step1: Get and Extrude original input: */ - if(object_type==ElementEnum){ - num_inputs=1; - base_inputs=xNew(num_inputs); - base_inputs[0]=(Input*)this->inputs->GetInput(enum_type); - } - else if(object_type==MaterialsEnum){ - num_inputs=1; - base_inputs=xNew(num_inputs); - base_inputs[0]=(Input*)material->inputs->GetInput(enum_type); - } - else{ - _error_("object of type " << EnumToStringx(object_type) << " not supported yet"); - } + num_inputs=1; + base_inputs=xNew(num_inputs); + base_inputs[0]=(Input*)this->inputs->GetInput(enum_type); for(i=0;iExtrude(); } @@ -2035,5 +1351,5 @@ for(;;){ /* get upper Penta*/ - penta=penta->GetUpperElement(); + penta=penta->GetUpperPenta(); _assert_(penta->Id()!=this->id); @@ -2041,13 +1357,5 @@ for(i=0;icopy(); - if (object_type==ElementEnum){ - penta->inputs->AddInput((Input*)copy); - } - else if(object_type==MaterialsEnum){ - penta->material->inputs->AddInput((Input*)copy); - } - else{ - _error_("object of type " << EnumToStringx(object_type) << " not supported yet"); - } + penta->inputs->AddInput((Input*)copy); } @@ -2073,41 +1381,13 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromConstant(bool value, int name);{{{*/ -void Penta::InputUpdateFromConstant(bool constant, int name){ - - /*Check that name is an element input*/ - if (!IsInput(name)) return; - - /*update input*/ - this->inputs->AddInput(new BoolInput(name,constant)); -} -/*}}}*/ -/*FUNCTION Penta::InputUpdateFromConstant(IssmDouble value, int name);{{{*/ -void Penta::InputUpdateFromConstant(IssmDouble constant, int name){ - /*Check that name is an element input*/ - if (!IsInput(name)) return; - - /*update input*/ - this->inputs->AddInput(new DoubleInput(name,constant)); -} -/*}}}*/ -/*FUNCTION Penta::InputUpdateFromConstant(int value, int name);{{{*/ -void Penta::InputUpdateFromConstant(int constant, int name){ - /*Check that name is an element input*/ - if (!IsInput(name)) return; - - /*update input*/ - this->inputs->AddInput(new IntInput(name,constant)); -} -/*}}}*/ /*FUNCTION Penta::InputUpdateFromIoModel {{{*/ void Penta::InputUpdateFromIoModel(int index,IoModel* iomodel){ /*Intermediaries*/ - IssmInt i,j; - int penta_vertex_ids[6]; - IssmDouble nodeinputs[6]; - IssmDouble cmmininputs[6]; - IssmDouble cmmaxinputs[6]; + int i,j; + int penta_vertex_ids[NUMVERTICES]; + IssmDouble nodeinputs[NUMVERTICES]; + IssmDouble cmmininputs[NUMVERTICES]; + IssmDouble cmmaxinputs[NUMVERTICES]; IssmDouble yts; @@ -2121,16 +1401,11 @@ if(control_analysis) iomodel->Constant(&num_responses,InversionNumCostFunctionsEnum); - /*Checks if debuging*/ - /*{{{*/ + /*Recover vertices ids needed to initialize inputs*/ _assert_(iomodel->elements); - /*}}}*/ - - /*Recover vertices ids needed to initialize inputs*/ - for(i=0;i<6;i++){ - penta_vertex_ids[i]=iomodel->elements[6*index+i]; //ids for vertices are in the elements array from Matlab + for(i=0;ielements[NUMVERTICES*index+i]; //ids for vertices are in the elements array from Matlab } /*Control Inputs*/ - #ifdef _HAVE_CONTROL_ if (control_analysis && iomodel->Data(InversionControlParametersEnum)){ for(i=0;iData(BalancethicknessThickeningRateEnum)){ - for(j=0;j<6;j++)nodeinputs[j]=iomodel->Data(BalancethicknessThickeningRateEnum)[penta_vertex_ids[j]-1]/yts; - for(j=0;j<6;j++)cmmininputs[j]=iomodel->Data(InversionMinParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts; - for(j=0;j<6;j++)cmmaxinputs[j]=iomodel->Data(InversionMaxParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts; + for(j=0;jData(BalancethicknessThickeningRateEnum)[penta_vertex_ids[j]-1]/yts; + for(j=0;jData(InversionMinParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts; + for(j=0;jData(InversionMaxParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts; this->inputs->AddInput(new ControlInput(BalancethicknessThickeningRateEnum,PentaInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); } @@ -2146,7 +1421,7 @@ case VxEnum: if (iomodel->Data(VxEnum)){ - for(j=0;j<6;j++)nodeinputs[j]=iomodel->Data(VxEnum)[penta_vertex_ids[j]-1]/yts; - for(j=0;j<6;j++)cmmininputs[j]=iomodel->Data(InversionMinParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts; - for(j=0;j<6;j++)cmmaxinputs[j]=iomodel->Data(InversionMaxParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts; + for(j=0;jData(VxEnum)[penta_vertex_ids[j]-1]/yts; + for(j=0;jData(InversionMinParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts; + for(j=0;jData(InversionMaxParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts; this->inputs->AddInput(new ControlInput(VxEnum,PentaInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); } @@ -2154,7 +1429,7 @@ case VyEnum: if (iomodel->Data(VyEnum)){ - for(j=0;j<6;j++)nodeinputs[j]=iomodel->Data(VyEnum)[penta_vertex_ids[j]-1]/yts; - for(j=0;j<6;j++)cmmininputs[j]=iomodel->Data(InversionMinParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts; - for(j=0;j<6;j++)cmmaxinputs[j]=iomodel->Data(InversionMaxParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts; + for(j=0;jData(VyEnum)[penta_vertex_ids[j]-1]/yts; + for(j=0;jData(InversionMinParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts; + for(j=0;jData(InversionMaxParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts; this->inputs->AddInput(new ControlInput(VyEnum,PentaInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); } @@ -2162,13 +1437,26 @@ case FrictionCoefficientEnum: if (iomodel->Data(FrictionCoefficientEnum)){ - for(j=0;j<6;j++)nodeinputs[j]=iomodel->Data(FrictionCoefficientEnum)[penta_vertex_ids[j]-1]; - for(j=0;j<6;j++)cmmininputs[j]=iomodel->Data(InversionMinParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]; - for(j=0;j<6;j++)cmmaxinputs[j]=iomodel->Data(InversionMaxParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]; + for(j=0;jData(FrictionCoefficientEnum)[penta_vertex_ids[j]-1]; + for(j=0;jData(InversionMinParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]; + for(j=0;jData(InversionMaxParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]; this->inputs->AddInput(new ControlInput(FrictionCoefficientEnum,PentaInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); } break; - /*Material will take care of it*/ - case MaterialsRheologyBbarEnum: break; - case DamageDbarEnum:break; + case MaterialsRheologyBbarEnum: + if(iomodel->Data(MaterialsRheologyBEnum)){ + for(j=0;jData(MaterialsRheologyBEnum)[penta_vertex_ids[j]-1]; + for(j=0;jData(InversionMinParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]; + for(j=0;jData(InversionMaxParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]; + this->inputs->AddInput(new ControlInput(MaterialsRheologyBEnum,PentaInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); + } + break; + case DamageDbarEnum: + if(iomodel->Data(DamageDEnum)){ + for(j=0;jData(DamageDEnum)[penta_vertex_ids[j]-1]; + for(j=0;jData(InversionMinParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]; + for(j=0;jData(InversionMaxParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]; + this->inputs->AddInput(new ControlInput(DamageDEnum,PentaInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); + } + break; default: _error_("Control " << EnumToStringx(reCast(iomodel->Data(InversionControlParametersEnum)[i])) << " not implemented yet"); @@ -2176,5 +1464,4 @@ } } - #endif /*Need to know the type of approximation for this element*/ @@ -2189,5 +1476,5 @@ DatasetInput* datasetinput=new DatasetInput(InversionCostFunctionsCoefficientsEnum); for(i=0;iData(InversionCostFunctionsCoefficientsEnum)[(penta_vertex_ids[j]-1)*num_responses+i]; + for(j=0;jData(InversionCostFunctionsCoefficientsEnum)[(penta_vertex_ids[j]-1)*num_responses+i]; datasetinput->AddInput(new PentaInput(InversionCostFunctionsCoefficientsEnum,nodeinputs,P1Enum),reCast(iomodel->Data(InversionCostFunctionsEnum)[i])); } @@ -2198,279 +1485,19 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolution {{{*/ -void Penta::InputUpdateFromSolution(IssmDouble* solution){ - - int analysis_type,inputenum; - - /*retreive parameters: */ - parameters->FindParam(&analysis_type,AnalysisTypeEnum); - - /*Just branch to the correct InputUpdateFromSolution generator, according to the type of analysis we are carrying out: */ - switch(analysis_type){ - #ifdef _HAVE_STRESSBALANCE_ - case StressbalanceAnalysisEnum: - InputUpdateFromSolutionStressbalanceHoriz( solution); - break; - case StressbalanceSIAAnalysisEnum: - InputUpdateFromSolutionStressbalanceSIA( solution); - break; - case StressbalanceVerticalAnalysisEnum: - InputUpdateFromSolutionStressbalanceVert( solution); - break; - #endif - #ifdef _HAVE_CONTROL_ - case AdjointHorizAnalysisEnum: - int approximation; - inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation==FSApproximationEnum || approximation==NoneApproximationEnum){ - InputUpdateFromSolutionAdjointFS( solution); - } - else{ - InputUpdateFromSolutionAdjointHoriz( solution); - } - break; - #endif - #ifdef _HAVE_THERMAL_ - case ThermalAnalysisEnum: - InputUpdateFromSolutionThermal( solution); - break; - case EnthalpyAnalysisEnum: - InputUpdateFromSolutionEnthalpy( solution); - break; - case MeltingAnalysisEnum: - InputUpdateFromSolutionOneDof(solution,BasalforcingsMeltingRateEnum); - break; - #endif - case L2ProjectionBaseAnalysisEnum: - this->parameters->FindParam(&inputenum,InputToL2ProjectEnum); - InputUpdateFromSolutionOneDofCollapsed(solution,inputenum); - break; - case MasstransportAnalysisEnum: - InputUpdateFromSolutionMasstransport(solution); - break; - case FreeSurfaceTopAnalysisEnum: - InputUpdateFromSolutionFreeSurfaceTop(solution); - break; - case FreeSurfaceBaseAnalysisEnum: - InputUpdateFromSolutionFreeSurfaceBase(solution); - break; - #ifdef _HAVE_BALANCED_ - case BalancethicknessAnalysisEnum: - InputUpdateFromSolutionOneDofCollapsed(solution,ThicknessEnum); - break; - #endif - #ifdef _HAVE_HYDROLOGY_ - case HydrologyDCInefficientAnalysisEnum: - InputUpdateFromSolutionHydrologyDCInefficient(solution); - break; - case HydrologyDCEfficientAnalysisEnum: - InputUpdateFromSolutionOneDofCollapsed(solution,EplHeadEnum); - break; - #endif - default: - _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet"); - } -} -/*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionMasstransport{{{*/ -void Penta::InputUpdateFromSolutionMasstransport(IssmDouble* solution){ - - const int numdof = NDOF1*NUMVERTICES; - const int numdof2d = NDOF1*NUMVERTICES2D; - - int i,hydroadjustment; - int* doflist = NULL; - IssmDouble rho_ice,rho_water,minthickness; - IssmDouble newthickness[numdof]; - IssmDouble newbed[numdof]; - IssmDouble newsurface[numdof]; - IssmDouble oldbed[NUMVERTICES]; - IssmDouble oldsurface[NUMVERTICES]; - IssmDouble oldthickness[NUMVERTICES]; - IssmDouble phi[NUMVERTICES]; - Penta *penta = NULL; - - /*If not on bed, return*/ - if (!IsOnBed()) return; - - /*Get dof list: */ - GetDofList(&doflist,NoneApproximationEnum,GsetEnum); - - /*Use the dof list to index into the solution vector and extrude it */ - this->parameters->FindParam(&minthickness,MasstransportMinThicknessEnum); - for(i=0;i(newthickness[i])) _error_("NaN found in solution vector"); - /*Constrain thickness to be at least 1m*/ - if(newthickness[i]parameters->FindParam(&hydroadjustment,MasstransportHydrostaticAdjustmentEnum); - - /*recover material parameters: */ - rho_ice=matpar->GetRhoIce(); - rho_water=matpar->GetRhoWater(); - - for(i=0;i0.){ - newsurface[i]=oldbed[i]+newthickness[i]; //surface = oldbed + newthickness - newbed[i]=oldbed[i]; //same bed: do nothing - } - else{ //so it is an ice shelf - if(hydroadjustment==AbsoluteEnum){ - newsurface[i]=newthickness[i]*(1-rho_ice/rho_water); - newbed[i]=newthickness[i]*(-rho_ice/rho_water); - } - else if(hydroadjustment==IncrementalEnum){ - newsurface[i]=oldsurface[i]+(1.0-rho_ice/rho_water)*(newthickness[i]-oldthickness[i]); //surface = oldsurface + (1-di) * dH - newbed[i]=oldbed[i]-rho_ice/rho_water*(newthickness[i]-oldthickness[i]); //bed = oldbed + di * dH - } - else _error_("Hydrostatic adjustment " << hydroadjustment << " (" << EnumToStringx(hydroadjustment) << ") not supported yet"); - } - } - - /*Start looping over all elements above current element and update all inputs*/ - penta=this; - for(;;){ - /*Add input to the element: */ - penta->inputs->AddInput(new PentaInput(ThicknessEnum,newthickness,P1Enum)); - penta->inputs->AddInput(new PentaInput(SurfaceEnum,newsurface,P1Enum)); - penta->inputs->AddInput(new PentaInput(BedEnum,newbed,P1Enum)); - - /*Stop if we have reached the surface*/ - if (penta->IsOnSurface()) break; - - /* get upper Penta*/ - penta=penta->GetUpperElement(); _assert_(penta->Id()!=this->id); - } - - /*Free ressources:*/ - xDelete(doflist); -} -/*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionFreeSurfaceTop{{{*/ -void Penta::InputUpdateFromSolutionFreeSurfaceTop(IssmDouble* solution){ - - const int numdof = NDOF1*NUMVERTICES; - const int numdof2d = NDOF1*NUMVERTICES2D; - - int i; - int* doflist = NULL; - IssmDouble newthickness[numdof]; - IssmDouble newbed[numdof]; - IssmDouble newsurface[numdof]; - - /*If not on bed, return*/ - if (!IsOnSurface()) return; - - /*Get dof list: */ - GetDofList(&doflist,NoneApproximationEnum,GsetEnum); - - /*Use the dof list to index into the solution vector and extrude it */ - for(i=0;i(newsurface[i+numdof2d])) _error_("NaN found in solution vector"); - newsurface[i]=newsurface[i+numdof2d]; - } - - /*Get previous bed and thickness*/ - GetInputListOnVertices(&newbed[0],BedEnum); - - for(i=0;i0.); - } - - /*Start looping over all elements above current element and update all inputs*/ - Penta* penta=this; - for(;;){ - /*Add input to the element: */ - penta->inputs->AddInput(new PentaInput(ThicknessEnum,newthickness,P1Enum)); - penta->inputs->AddInput(new PentaInput(SurfaceEnum,newsurface,P1Enum)); - - /*Stop if we have reached the surface*/ - if(penta->IsOnBed()) break; - - /* get upper Penta*/ - penta=penta->GetLowerElement(); _assert_(penta->Id()!=this->id); - } - - /*Free ressources:*/ - xDelete(doflist); -} -/*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionFreeSurfaceBase{{{*/ -void Penta::InputUpdateFromSolutionFreeSurfaceBase(IssmDouble* solution){ - - const int numdof = NDOF1*NUMVERTICES; - const int numdof2d = NDOF1*NUMVERTICES2D; - - int i; - int* doflist = NULL; - IssmDouble newthickness[numdof]; - IssmDouble newbed[numdof]; - IssmDouble newsurface[numdof]; - - /*If not on bed, return*/ - if (!IsOnBed()) return; - - /*Get dof list: */ - GetDofList(&doflist,NoneApproximationEnum,GsetEnum); - - /*Use the dof list to index into the solution vector and extrude it */ - for(i=0;i(newbed[i])) _error_("NaN found in solution vector"); - newbed[i+numdof2d]=newbed[i]; - } - - /*Get previous bed and thickness*/ - GetInputListOnVertices(&newsurface[0],SurfaceEnum); - - for(i=0;i0.); - } - - /*Start looping over all elements above current element and update all inputs*/ - Penta* penta=this; - for(;;){ - /*Add input to the element: */ - penta->inputs->AddInput(new PentaInput(ThicknessEnum,newthickness,P1Enum)); - penta->inputs->AddInput(new PentaInput(BedEnum,newbed,P1Enum)); - - /*Stop if we have reached the surface*/ - if(penta->IsOnSurface()) break; - - /* get upper Penta*/ - penta=penta->GetUpperElement(); _assert_(penta->Id()!=this->id); - } - - /*Free ressources:*/ - xDelete(doflist); -} -/*}}}*/ /*FUNCTION Penta::InputUpdateFromSolutionOneDof{{{*/ void Penta::InputUpdateFromSolutionOneDof(IssmDouble* solution,int enum_type){ - const int numdof = NDOF1*NUMVERTICES; - - IssmDouble values[numdof]; - int* doflist=NULL; - - /*Get dof list: */ + /*Intermediary*/ + int* doflist = NULL; + + /*Fetch number of nodes for this finite element*/ + int numnodes = this->NumberofNodes(); + + /*Fetch dof list and allocate solution vector*/ GetDofList(&doflist,NoneApproximationEnum,GsetEnum); + IssmDouble* values = xNew(numnodes); /*Use the dof list to index into the solution vector: */ - for(int i=0;i(values[i])) _error_("NaN found in solution vector"); @@ -2481,4 +1508,5 @@ /*Free ressources:*/ + xDelete(values); xDelete(doflist); } @@ -2495,5 +1523,5 @@ /*If not on bed, return*/ - if (!IsOnBed()) return; + if (!IsOnBase()) return; /*Get dof list: */ @@ -2517,5 +1545,5 @@ /* get upper Penta*/ - penta=penta->GetUpperElement(); _assert_(penta->Id()!=this->id); + penta=penta->GetUpperPenta(); _assert_(penta->Id()!=this->id); } @@ -2584,92 +1612,18 @@ } /*}}}*/ -/*FUNCTION Penta::IsOnBed{{{*/ -bool Penta::IsOnBed(void){ - - bool onbed; - inputs->GetInputValue(&onbed,MeshElementonbedEnum); - return onbed; -} -/*}}}*/ -/*FUNCTION Penta::IsInput{{{*/ -bool Penta::IsInput(int name){ - if ( - name==ThicknessEnum || - name==SurfaceEnum || - name==BedEnum || - name==BathymetryEnum || - name==SurfaceSlopeXEnum || - name==SurfaceSlopeYEnum || - name==SurfaceforcingsMassBalanceEnum || - name==BasalforcingsMeltingRateEnum || - name==BasalforcingsGeothermalfluxEnum || - name==SurfaceAreaEnum|| - name==PressureEnum || - name==VxEnum || - name==VyEnum || - name==VzEnum || - name==VxMeshEnum || - name==VyMeshEnum || - name==VzMeshEnum || - name==InversionVxObsEnum || - name==InversionVyObsEnum || - name==InversionVzObsEnum || - name==TemperatureEnum || - name==EnthalpyEnum || - name==EnthalpyPicardEnum || - name==WaterfractionEnum|| - name==FrictionCoefficientEnum || - name==MaskGroundediceLevelsetEnum || - name==MaskIceLevelsetEnum || - name==GradientEnum || - name==OldGradientEnum || - name==ConvergedEnum || - name==QmuVxEnum || - name==QmuVyEnum || - name==QmuVzEnum || - name==QmuVxMeshEnum || - name==QmuVyMeshEnum || - name==QmuVzMeshEnum || - name==QmuPressureEnum || - name==QmuBedEnum || - name==QmuThicknessEnum || - name==QmuSurfaceEnum || - name==QmuTemperatureEnum || - name==QmuMeltingEnum || - name==QmuMaskGroundediceLevelsetEnum || - name==QmuMaskIceLevelsetEnum || - name==GiaWEnum || - name==GiadWdtEnum || - name==SedimentHeadEnum || - name==EplHeadEnum || - name==SedimentHeadOldEnum || - name==EplHeadOldEnum || - name==HydrologydcMaskEplactiveEnum || - name==WaterTransferEnum - - ) { - return true; - } - else return false; -} -/*}}}*/ -/*FUNCTION Penta::IsFloating{{{*/ -bool Penta::IsFloating(){ - - bool shelf; - int migration_style; - parameters->FindParam(&migration_style,GroundinglineMigrationEnum); - - if(migration_style==SubelementMigrationEnum || migration_style==SubelementMigration2Enum){ //Floating if all nodes are floating - if(this->inputs->Max(MaskGroundediceLevelsetEnum) <= 0.) shelf=true; - else shelf=false; - } - else if(migration_style==NoneEnum || migration_style==AgressiveMigrationEnum || migration_style==SoftMigrationEnum){ //Floating if all nodes are floating - if(this->inputs->Min(MaskGroundediceLevelsetEnum) > 0.) shelf=false; - else shelf=true; - } - else _error_("migration_style not implemented yet"); - - return shelf; +/*FUNCTION Penta::IsOnBase{{{*/ +bool Penta::IsOnBase(void){ + + bool onbase; + inputs->GetInputValue(&onbase,MeshElementonbaseEnum); + return onbase; +} +/*}}}*/ +/*FUNCTION Penta::IsOnSurface{{{*/ +bool Penta::IsOnSurface(void){ + + bool onsurface; + inputs->GetInputValue(&onsurface,MeshElementonsurfaceEnum); + return onsurface; } /*}}}*/ @@ -2689,28 +1643,46 @@ } /*}}}*/ -/*FUNCTION Penta::IsOnSurface{{{*/ -bool Penta::IsOnSurface(void){ - - bool onsurface; - inputs->GetInputValue(&onsurface,MeshElementonsurfaceEnum); - return onsurface; -} -/*}}}*/ -/*FUNCTION Penta::NoIceInElement {{{*/ -bool Penta::NoIceInElement(){ - - /*Get levelset*/ - IssmDouble ls[NUMVERTICES]; - GetInputListOnVertices(&ls[0],MaskIceLevelsetEnum); - - /*If the level set is >0, ice is present in this element*/ - if(ls[0]>0. || ls[1]>0. || ls[2]>0.) return false; - - /*If the level set is awlays <=0, there is no ice here*/ - return true; +/*FUNCTION Penta::JacobianDeterminant{{{*/ +void Penta::JacobianDeterminant(IssmDouble* pJdet,IssmDouble* xyz_list,Gauss* gauss){ + + _assert_(gauss->Enum()==GaussPentaEnum); + this->GetJacobianDeterminant(pJdet,xyz_list,(GaussPenta*)gauss); + +} +/*}}}*/ +/*FUNCTION Penta::JacobianDeterminantBase{{{*/ +void Penta::JacobianDeterminantBase(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss){ + + _assert_(gauss->Enum()==GaussPentaEnum); + this->GetTriaJacobianDeterminant(pJdet,xyz_list_base,(GaussPenta*)gauss); + +} +/*}}}*/ +/*FUNCTION Penta::JacobianDeterminantLine{{{*/ +void Penta::JacobianDeterminantLine(IssmDouble* pJdet,IssmDouble* xyz_list_line,Gauss* gauss){ + + _assert_(gauss->Enum()==GaussPentaEnum); + this->GetSegmentJacobianDeterminant(pJdet,xyz_list_line,(GaussPenta*)gauss); + +} +/*}}}*/ +/*FUNCTION Penta::JacobianDeterminantTop{{{*/ +void Penta::JacobianDeterminantTop(IssmDouble* pJdet,IssmDouble* xyz_list_top,Gauss* gauss){ + + _assert_(gauss->Enum()==GaussPentaEnum); + this->GetTriaJacobianDeterminant(pJdet,xyz_list_top,(GaussPenta*)gauss); + +} +/*}}}*/ +/*FUNCTION Penta::JacobianDeterminantSurface{{{*/ +void Penta::JacobianDeterminantSurface(IssmDouble* pJdet,IssmDouble* xyz_list_quad,Gauss* gauss){ + + _assert_(gauss->Enum()==GaussPentaEnum); + this->GetQuadJacobianDeterminant(pJdet,xyz_list_quad,(GaussPenta*)gauss); + } /*}}}*/ /*FUNCTION Penta::MinEdgeLength{{{*/ -IssmDouble Penta::MinEdgeLength(IssmDouble xyz_list[6][3]){ +IssmDouble Penta::MinEdgeLength(IssmDouble* xyz_list){ /*Return the minimum lenght of the nine egdes of the penta*/ @@ -2726,5 +1698,5 @@ /*Compute the length of this edge and compare it to the minimal length*/ - length=sqrt(pow(xyz_list[node0][0]-xyz_list[node1][0],2)+pow(xyz_list[node0][1]-xyz_list[node1][1],2)+pow(xyz_list[node0][2]-xyz_list[node1][2],2)); + length=sqrt(pow(xyz_list[node0*3+0]-xyz_list[node1*3+0],2)+pow(xyz_list[node0*3+1]-xyz_list[node1*3+1],2)+pow(xyz_list[node0*3+2]-xyz_list[node1*3+2],2)); if(lengthEnum()==GaussPentaEnum); + this->GetNodalFunctions(basis,(GaussPenta*)gauss); + +} +/*}}}*/ +/*FUNCTION Penta::NodalFunctionsP1{{{*/ +void Penta::NodalFunctionsP1(IssmDouble* basis, Gauss* gauss){ + + _assert_(gauss->Enum()==GaussPentaEnum); + this->GetNodalFunctionsP1(basis,(GaussPenta*)gauss); + +} +/*}}}*/ +/*FUNCTION Penta::NodalFunctionsDerivatives{{{*/ +void Penta::NodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){ + + _assert_(gauss->Enum()==GaussPentaEnum); + this->GetNodalFunctionsDerivatives(dbasis,xyz_list,(GaussPenta*)gauss); + +} +/*}}}*/ +/*FUNCTION Penta::NodalFunctionsP1Derivatives{{{*/ +void Penta::NodalFunctionsP1Derivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){ + + _assert_(gauss->Enum()==GaussPentaEnum); + this->GetNodalFunctionsP1Derivatives(dbasis,xyz_list,(GaussPenta*)gauss); + +} +/*}}}*/ +/*FUNCTION Penta::NodalFunctionsMINIDerivatives{{{*/ +void Penta::NodalFunctionsMINIDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){ + + _assert_(gauss->Enum()==GaussPentaEnum); + this->GetNodalFunctionsMINIDerivatives(dbasis,xyz_list,(GaussPenta*)gauss); + +} +/*}}}*/ +/*FUNCTION Penta::NodalFunctionsDerivativesVelocity{{{*/ +void Penta::NodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){ + + _assert_(gauss->Enum()==GaussPentaEnum); + this->GetNodalFunctionsDerivativesVelocity(dbasis,xyz_list,(GaussPenta*)gauss); + +} +/*}}}*/ +/*FUNCTION Penta::NodalFunctionsVelocity{{{*/ +void Penta::NodalFunctionsVelocity(IssmDouble* basis, Gauss* gauss){ + + _assert_(gauss->Enum()==GaussPentaEnum); + this->GetNodalFunctionsVelocity(basis,(GaussPenta*)gauss); + +} +/*}}}*/ +/*FUNCTION Penta::NodalFunctionsPressure{{{*/ +void Penta::NodalFunctionsPressure(IssmDouble* basis, Gauss* gauss){ + + _assert_(gauss->Enum()==GaussPentaEnum); + this->GetNodalFunctionsPressure(basis,(GaussPenta*)gauss); + +} +/*}}}*/ +/*FUNCTION Penta::NodalFunctionsTensor{{{*/ +void Penta::NodalFunctionsTensor(IssmDouble* basis, Gauss* gauss){ + + _assert_(gauss->Enum()==GaussPentaEnum); + this->GetNodalFunctionsTensor(basis,(GaussPenta*)gauss); + +} +/*}}}*/ +/*FUNCTION Penta::NormalBase {{{*/ +void Penta::NormalBase(IssmDouble* bed_normal,IssmDouble* xyz_list){ + + IssmDouble v13[3],v23[3]; + IssmDouble normal[3]; + IssmDouble normal_norm; + + for(int i=0;i<3;i++){ + v13[i]=xyz_list[0*3+i]-xyz_list[2*3+i]; + v23[i]=xyz_list[1*3+i]-xyz_list[2*3+i]; + } + + normal[0]=v13[1]*v23[2]-v13[2]*v23[1]; + normal[1]=v13[2]*v23[0]-v13[0]*v23[2]; + normal[2]=v13[0]*v23[1]-v13[1]*v23[0]; + normal_norm=sqrt(normal[0]*normal[0]+ normal[1]*normal[1]+ normal[2]*normal[2]); + + /*Bed normal is opposite to surface normal*/ + bed_normal[0]=-normal[0]/normal_norm; + bed_normal[1]=-normal[1]/normal_norm; + bed_normal[2]=-normal[2]/normal_norm; +} +/*}}}*/ +/*FUNCTION Penta::NormalTop {{{*/ +void Penta::NormalTop(IssmDouble* top_normal,IssmDouble* xyz_list){ + + int i; + IssmDouble v13[3],v23[3]; + IssmDouble normal[3]; + IssmDouble normal_norm; + + for (i=0;i<3;i++){ + v13[i]=xyz_list[0*3+i]-xyz_list[2*3+i]; + v23[i]=xyz_list[1*3+i]-xyz_list[2*3+i]; + } + + normal[0]=v13[1]*v23[2]-v13[2]*v23[1]; + normal[1]=v13[2]*v23[0]-v13[0]*v23[2]; + normal[2]=v13[0]*v23[1]-v13[1]*v23[0]; + normal_norm=sqrt(normal[0]*normal[0] + normal[1]*normal[1] + normal[2]*normal[2]); + + top_normal[0]=normal[0]/normal_norm; + top_normal[1]=normal[1]/normal_norm; + top_normal[2]=normal[2]/normal_norm; +} +/*}}}*/ +/*FUNCTION Penta::NumberofNodesPressure{{{*/ +int Penta::NumberofNodesPressure(void){ + return PentaRef::NumberofNodesPressure(); +} +/*}}}*/ +/*FUNCTION Penta::NumberofNodesVelocity{{{*/ +int Penta::NumberofNodesVelocity(void){ + return PentaRef::NumberofNodesVelocity(); } /*}}}*/ @@ -2811,5 +1946,5 @@ this->inputs->AddInput(new PentaInput(SurfaceforcingsMassBalanceEnum,&agd[0],P1Enum)); //this->inputs->AddInput(new PentaVertexInput(ThermalSpcTemperatureEnum,&Tsurf[0])); - this->InputExtrude(SurfaceforcingsMassBalanceEnum,ElementEnum); + this->InputExtrude(SurfaceforcingsMassBalanceEnum); /*clean-up*/ @@ -2817,93 +1952,74 @@ } /*}}}*/ -/*FUNCTION Penta::ResultInterpolation{{{*/ -void Penta::ResultInterpolation(int* pinterpolation,int output_enum){ - - Input* input=this->inputs->GetInput(output_enum); - - /*If this input is not already in Inputs, maybe it needs to be computed?*/ - if(!input){ - switch(output_enum){ - case ViscousHeatingEnum: - this->ViscousHeatingCreateInput(); - input=this->inputs->GetInput(output_enum); - break; - case StressTensorxxEnum: - this->ComputeStressTensor(); - input=this->inputs->GetInput(output_enum); - break; - case StressTensorxyEnum: - this->ComputeStressTensor(); - input=this->inputs->GetInput(output_enum); - break; - case StressTensorxzEnum: - this->ComputeStressTensor(); - input=this->inputs->GetInput(output_enum); - break; - case StressTensoryyEnum: - this->ComputeStressTensor(); - input=this->inputs->GetInput(output_enum); - break; - case StressTensoryzEnum: - this->ComputeStressTensor(); - input=this->inputs->GetInput(output_enum); - break; - case StressTensorzzEnum: - this->ComputeStressTensor(); - input=this->inputs->GetInput(output_enum); - break; - default: - _error_("input "<FindParam(&analysis_type,AnalysisTypeEnum); + + if(pe){ + if(analysis_type==StressbalanceAnalysisEnum){ + if(this->element_type==MINIcondensedEnum){ + int approximation; + inputs->GetInputValue(&approximation,ApproximationEnum); + if(approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){ + //Do nothing, condensation already done in PVectorCoupling + } + else{ + int indices[3]={18,19,20}; + pe->StaticCondensation(Ke,3,&indices[0]); + } + } + else if(this->element_type==P1bubblecondensedEnum){ + int size = nodes[6]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum); + int offset = 0; + for(int i=0;i<6;i++) offset+=nodes[i]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum); + int* indices=xNew(size); + for(int i=0;iStaticCondensation(Ke,size,indices); + xDelete(indices); + } } } - /*Assign output pointer*/ - *pinterpolation = input->GetResultInterpolation(); - -} -/*}}}*/ -/*FUNCTION Penta::ResultToVector{{{*/ -void Penta::ResultToVector(Vector* vector,int output_enum){ - - Input* input=this->inputs->GetInput(output_enum); - if(!input) _error_("input "<GetResultInterpolation()){ - case P0Enum: - _error_("not implemented..."); - break; - case P1Enum:{ - IssmDouble values[NUMVERTICES]; - IssmPDouble pvalues[NUMVERTICES]; - int connectivity[NUMVERTICES]; - int sidlist[NUMVERTICES]; - - this->GetVertexSidList(&sidlist[0]); - this->GetConnectivityList(&connectivity[0]); - this->GetInputListOnVertices(&values[0],output_enum); - for(int i=0;i(values[i])/reCast(connectivity[i]); - - vector->SetValues(NUMVERTICES,&sidlist[0],&pvalues[0],ADD_VAL); - break; - } - default: - _error_("interpolation "<GetResultInterpolation())<<" not supported yet"); - } - - -} -/*}}}*/ -/*FUNCTION Penta::ResetCoordinateSystem{{{*/ -void Penta::ResetCoordinateSystem(void){ - - int approximation; - int numindices; - int *indices = NULL; - IssmDouble slopex,slopey; - IssmDouble xz_plane[6]; + if(Ke){ + if(analysis_type==StressbalanceAnalysisEnum){ + int approximation; + inputs->GetInputValue(&approximation,ApproximationEnum); + if(approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){ + //Do nothing condensatino already done for Stokes part + } + else{ + if(this->element_type==MINIcondensedEnum){ + int indices[3]={18,19,20}; + Ke->StaticCondensation(3,&indices[0]); + } + else if(this->element_type==P1bubblecondensedEnum){ + int size = nodes[6]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum); + int offset = 0; + for(int i=0;i<6;i++) offset+=nodes[i]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum); + int* indices=xNew(size); + for(int i=0;iStaticCondensation(size,indices); + xDelete(indices); + } + } + } + } +} +/*}}}*/ +/*FUNCTION Penta::ResetFSBasalBoundaryCondition{{{*/ +void Penta::ResetFSBasalBoundaryCondition(void){ + + int approximation; + int numindices; + int *indices = NULL; + IssmDouble slopex,slopey,groundedice; + IssmDouble xz_plane[6]; + IssmDouble* vertexapproximation= NULL; /*For FS only: we want the CS to be tangential to the bedrock*/ inputs->GetInputValue(&approximation,ApproximationEnum); - if(IsFloating() || !IsOnBed() || (approximation!=FSApproximationEnum && approximation!=SSAFSApproximationEnum && approximation!=HOFSApproximationEnum)) return; + if(!IsOnBase() || (approximation!=FSApproximationEnum && approximation!=SSAFSApproximationEnum && approximation!=HOFSApproximationEnum)) return; /*Get number of nodes for velocity only and base*/ @@ -2913,4 +2029,5 @@ Input* slopex_input=inputs->GetInput(BedSlopeXEnum); _assert_(slopex_input); Input* slopey_input=inputs->GetInput(BedSlopeYEnum); _assert_(slopey_input); + Input* groundedicelevelset_input=inputs->GetInput(MaskGroundediceLevelsetEnum); _assert_(groundedicelevelset_input); /*Loop over basal nodes and update their CS*/ @@ -2921,4 +2038,5 @@ slopex_input->GetInputValue(&slopex,gauss); slopey_input->GetInputValue(&slopey,gauss); + groundedicelevelset_input->GetInputValue(&groundedice,gauss); /*New X axis New Z axis*/ @@ -2927,4 +2045,23 @@ xz_plane[2]=slopex; xz_plane[5]=1.; + if(groundedice>=0){ + if(this->nodes[indices[i]]->GetApproximation()==FSvelocityEnum){ + this->nodes[indices[i]]->DofInSSet(2); //vz + } + else if(this->nodes[indices[i]]->GetApproximation()==SSAFSApproximationEnum || this->nodes[indices[i]]->GetApproximation()==HOFSApproximationEnum){ + this->nodes[indices[i]]->DofInSSet(4); //vz + } + else _error_("Flow equation approximation"<nodes[indices[i]]->GetApproximation())<<" not supported yet"); + } + else{ + if(this->nodes[indices[i]]->GetApproximation()==FSvelocityEnum){ + this->nodes[indices[i]]->DofInFSet(2); //vz + } + else if(this->nodes[indices[i]]->GetApproximation()==SSAFSApproximationEnum || this->nodes[indices[i]]->GetApproximation()==HOFSApproximationEnum){ + this->nodes[indices[i]]->DofInFSet(4); //vz + } + else _error_("Flow equation approximation"<nodes[indices[i]]->GetApproximation())<<" not supported yet"); + } + XZvectorsToCoordinateSystem(&this->nodes[indices[i]]->coord_system[0][0],&xz_plane[0]); } @@ -2944,7 +2081,6 @@ void Penta::SetCurrentConfiguration(Elements* elementsin, Loads* loadsin, Nodes* nodesin, Materials* materialsin, Parameters* parametersin){ + /*go into parameters and get the analysis_counter: */ int analysis_counter; - - /*go into parameters and get the analysis_counter: */ parametersin->FindParam(&analysis_counter,AnalysisCounterEnum); @@ -2952,82 +2088,17 @@ this->element_type=this->element_type_list[analysis_counter]; - /*Pick up nodes */ - if (this->hnodes[analysis_counter]) this->nodes=(Node**)this->hnodes[analysis_counter]->deliverp(); + /*Pick up nodes*/ + if(this->hnodes[analysis_counter]) this->nodes=(Node**)this->hnodes[analysis_counter]->deliverp(); else this->nodes=NULL; -} -/*}}}*/ -/*FUNCTION Penta::SetwiseNodeConnectivity{{{*/ -void Penta::SetwiseNodeConnectivity(int* pd_nz,int* po_nz,Node* node,bool* flags,int* flagsindices,int set1_enum,int set2_enum){ - - /*Intermediaries*/ - const int numnodes = this->NumberofNodes(); - - /*Output */ - int d_nz = 0; - int o_nz = 0; - - /*Loop over all nodes*/ - for(int i=0;inodes[i]->Lid()]){ - - /*flag current node so that no other element processes it*/ - flags[this->nodes[i]->Lid()]=true; - - int counter=0; - while(flagsindices[counter]>=0) counter++; - flagsindices[counter]=this->nodes[i]->Lid(); - - /*if node is clone, we have an off-diagonal non-zero, else it is a diagonal non-zero*/ - switch(set2_enum){ - case FsetEnum: - if(nodes[i]->indexing.fsize){ - if(this->nodes[i]->IsClone()) - o_nz += 1; - else - d_nz += 1; - } - break; - case GsetEnum: - if(nodes[i]->indexing.gsize){ - if(this->nodes[i]->IsClone()) - o_nz += 1; - else - d_nz += 1; - } - break; - case SsetEnum: - if(nodes[i]->indexing.ssize){ - if(this->nodes[i]->IsClone()) - o_nz += 1; - else - d_nz += 1; - } - break; - default: _error_("not supported"); - } - } - } - - /*Special case: 2d/3d coupling, the node of this element might be connected - *to the basal element*/ - int analysis_type,approximation,numlayers; - parameters->FindParam(&analysis_type,AnalysisTypeEnum); - if(analysis_type==StressbalanceAnalysisEnum){ - inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation==SSAHOApproximationEnum || approximation==SSAFSApproximationEnum){ - parameters->FindParam(&numlayers,MeshNumberoflayersEnum); - o_nz += numlayers*3; - d_nz += numlayers*3; - } - } - - /*Assign output pointers: */ - *pd_nz=d_nz; - *po_nz=o_nz; + +} +/*}}}*/ +/*FUNCTION Penta::SetTemporaryElementType{{{*/ +void Penta::SetTemporaryElementType(int element_type_in){ + this->element_type=element_type_in; } /*}}}*/ /*FUNCTION Penta::SpawnTria {{{*/ -Tria* Penta::SpawnTria(int location){ +Tria* Penta::SpawnTria(int index1,int index2,int index3){ int analysis_counter; @@ -3039,13 +2110,11 @@ Tria* tria=new Tria(); tria->id=this->id; - tria->inputs=(Inputs*)this->inputs->SpawnTriaInputs(location); + tria->inputs=(Inputs*)this->inputs->SpawnTriaInputs(index1,index2,index3); tria->parameters=this->parameters; tria->element_type=P1Enum; //Only P1 CG for now (TO BE CHANGED) - this->SpawnTriaHook(dynamic_cast(tria),location); + this->SpawnTriaHook(dynamic_cast(tria),index1,index2,index3); /*Spawn material*/ - tria->material=(Material*)this->material->copy(); - delete tria->material->inputs; - tria->material->inputs=(Inputs*)this->material->inputs->SpawnTriaInputs(location); + tria->material=(Material*)this->material->copy2(tria); /*recover nodes, material and matpar: */ @@ -3055,4 +2124,32 @@ /*Return new Tria*/ + return tria; +} +/*}}}*/ +/*FUNCTION Penta::SpawnBasalElement{{{*/ +Element* Penta::SpawnBasalElement(void){ + + _assert_(this->IsOnBase()); + + this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum); + if(this->material->IsDamage())this->InputDepthAverageAtBase(DamageDEnum,DamageDbarEnum); + if(this->inputs->GetInput(VxEnum)) this->InputDepthAverageAtBase(VxEnum,VxAverageEnum); + if(this->inputs->GetInput(VyEnum)) this->InputDepthAverageAtBase(VyEnum,VyAverageEnum); + Tria* tria=(Tria*)SpawnTria(0,1,2); + this->inputs->DeleteInput(MaterialsRheologyBbarEnum); + this->inputs->DeleteInput(DamageDbarEnum); + this->inputs->DeleteInput(VxAverageEnum); + this->inputs->DeleteInput(VyAverageEnum); + + return tria; +} +/*}}}*/ +/*FUNCTION Penta::SpawnTopElement{{{*/ +Element* Penta::SpawnTopElement(void){ + + _assert_(this->IsOnSurface()); + + Tria* tria=(Tria*)SpawnTria(3,4,5); + return tria; } @@ -3115,10 +2212,10 @@ /*If on water, return 0: */ - if(NoIceInElement())return 0; + if(!IsIceInElement())return 0; /*Bail out if this element if: * -> Non SSA not on the surface * -> SSA (2d model) and not on bed) */ - if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBed())){ + if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBase())){ return 0; } @@ -3127,5 +2224,5 @@ /*This element should be collapsed into a tria element at its base. Create this tria element, * and compute SurfaceArea*/ - tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. + tria=(Tria*)SpawnTria(0,1,2); S=tria->SurfaceArea(); delete tria->material; delete tria; @@ -3134,33 +2231,9 @@ else{ - tria=(Tria*)SpawnTria(1); //lower face is 0, upper face is 1. + tria=(Tria*)SpawnTria(3,4,5); S=tria->SurfaceArea(); delete tria->material; delete tria; return S; } -} -/*}}}*/ -/*FUNCTION Penta::SurfaceNormal {{{*/ -void Penta::SurfaceNormal(IssmDouble* surface_normal, IssmDouble xyz_list[3][3]){ - - int i; - IssmDouble v13[3],v23[3]; - IssmDouble normal[3]; - IssmDouble normal_norm; - - for (i=0;i<3;i++){ - v13[i]=xyz_list[0][i]-xyz_list[2][i]; - v23[i]=xyz_list[1][i]-xyz_list[2][i]; - } - - normal[0]=v13[1]*v23[2]-v13[2]*v23[1]; - normal[1]=v13[2]*v23[0]-v13[0]*v23[2]; - normal[2]=v13[0]*v23[1]-v13[1]*v23[0]; - - normal_norm=sqrt( pow(normal[0],2)+pow(normal[1],2)+pow(normal[2],2) ); - - *(surface_normal)=normal[0]/normal_norm; - *(surface_normal+1)=normal[1]/normal_norm; - *(surface_normal+2)=normal[2]/normal_norm; } /*}}}*/ @@ -3183,5 +2256,5 @@ /* Get node coordinates and dof list: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); minx=xyz_list[0][0]; @@ -3272,4 +2345,20 @@ penta_node_ids[ 8]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[9*index+2]+1; break; + case P1xP3Enum: + numnodes = 12; + penta_node_ids = xNew(numnodes); + penta_node_ids[ 0]=iomodel->nodecounter+iomodel->elements[6*index+0]; + penta_node_ids[ 1]=iomodel->nodecounter+iomodel->elements[6*index+1]; + penta_node_ids[ 2]=iomodel->nodecounter+iomodel->elements[6*index+2]; + penta_node_ids[ 3]=iomodel->nodecounter+iomodel->elements[6*index+3]; + penta_node_ids[ 4]=iomodel->nodecounter+iomodel->elements[6*index+4]; + penta_node_ids[ 5]=iomodel->nodecounter+iomodel->elements[6*index+5]; + penta_node_ids[ 6]=iomodel->nodecounter+iomodel->numberofvertices+2*iomodel->elementtoedgeconnectivity[9*index+0]+1; + penta_node_ids[ 7]=iomodel->nodecounter+iomodel->numberofvertices+2*iomodel->elementtoedgeconnectivity[9*index+1]+1; + penta_node_ids[ 8]=iomodel->nodecounter+iomodel->numberofvertices+2*iomodel->elementtoedgeconnectivity[9*index+2]+1; + penta_node_ids[ 9]=iomodel->nodecounter+iomodel->numberofvertices+2*iomodel->elementtoedgeconnectivity[9*index+0]+2; + penta_node_ids[10]=iomodel->nodecounter+iomodel->numberofvertices+2*iomodel->elementtoedgeconnectivity[9*index+1]+2; + penta_node_ids[11]=iomodel->nodecounter+iomodel->numberofvertices+2*iomodel->elementtoedgeconnectivity[9*index+2]+2; + break; case P2xP1Enum: numnodes = 12; @@ -3288,6 +2377,40 @@ penta_node_ids[11]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[9*index+8]+1; break; + case P2xP4Enum: + numnodes = 30; + penta_node_ids = xNew(numnodes); + penta_node_ids[ 0]=iomodel->nodecounter+iomodel->elements[6*index+0]; /*Vertex 1*/ + penta_node_ids[ 1]=iomodel->nodecounter+iomodel->elements[6*index+1]; /*Vertex 2*/ + penta_node_ids[ 2]=iomodel->nodecounter+iomodel->elements[6*index+2]; /*Vertex 3*/ + penta_node_ids[ 3]=iomodel->nodecounter+iomodel->elements[6*index+3]; /*Vertex 4*/ + penta_node_ids[ 4]=iomodel->nodecounter+iomodel->elements[6*index+4]; /*Vertex 5*/ + penta_node_ids[ 5]=iomodel->nodecounter+iomodel->elements[6*index+5]; /*Vertex 6*/ + penta_node_ids[ 6]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+0]+1; /*mid vertical edge 1*/ + penta_node_ids[ 7]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+1]+1; /*mid vertical edge 2*/ + penta_node_ids[ 8]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+2]+1; /*mid vertical edge 3*/ + penta_node_ids[ 9]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+3]+1; /*mid basal edge 1*/ + penta_node_ids[10]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+4]+1; /*mid basal edge 2*/ + penta_node_ids[11]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+5]+1; /*mid basal edge 3*/ + penta_node_ids[12]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+6]+1; /*mid top edge 1*/ + penta_node_ids[13]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+7]+1; /*mid top edge 2*/ + penta_node_ids[14]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+8]+1; /*mid top edge 3*/ + penta_node_ids[15]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+0]+2; /* 1/4 vertical edge 1*/ + penta_node_ids[16]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+1]+2; /* 1/4 vertical edge 2*/ + penta_node_ids[17]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+2]+2; /* 1/4 vertical edge 3*/ + penta_node_ids[18]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+0]+3; /* 2/4 vertical edge 1*/ + penta_node_ids[19]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+1]+3; /* 2/4 vertical edge 2*/ + penta_node_ids[20]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+2]+3; /* 2/4 vertical edge 3*/ + penta_node_ids[21]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->elementtofaceconnectivity[5*index+2]+1; /* 1/4 vertical face 1*/ + penta_node_ids[22]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->elementtofaceconnectivity[5*index+3]+1; /* 1/4 vertical face 2*/ + penta_node_ids[23]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->elementtofaceconnectivity[5*index+4]+1; /* 1/4 vertical face 3*/ + penta_node_ids[24]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->elementtofaceconnectivity[5*index+2]+2; /* 2/4 vertical face 1*/ + penta_node_ids[25]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->elementtofaceconnectivity[5*index+3]+2; /* 2/4 vertical face 2*/ + penta_node_ids[26]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->elementtofaceconnectivity[5*index+4]+2; /* 2/4 vertical face 3*/ + penta_node_ids[27]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->elementtofaceconnectivity[5*index+2]+3; /* 3/4 vertical face 1*/ + penta_node_ids[28]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->elementtofaceconnectivity[5*index+3]+3; /* 3/4 vertical face 2*/ + penta_node_ids[29]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->elementtofaceconnectivity[5*index+4]+3; /* 3/4 vertical face 3*/ + break; case P2Enum: - numnodes = 15; + numnodes = 18; penta_node_ids = xNew(numnodes); penta_node_ids[ 0]=iomodel->nodecounter+iomodel->elements[6*index+0]; @@ -3306,4 +2429,7 @@ penta_node_ids[13]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[9*index+7]+1; penta_node_ids[14]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[9*index+8]+1; + penta_node_ids[15]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->elementtofaceconnectivity[5*index+2]+1; + penta_node_ids[16]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->elementtofaceconnectivity[5*index+3]+1; + penta_node_ids[17]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->elementtofaceconnectivity[5*index+4]+1; break; case P1P1Enum: case P1P1GLSEnum: @@ -3343,5 +2469,5 @@ break; case TaylorHoodEnum: - numnodes = 21; + numnodes = 24; penta_node_ids = xNew(numnodes); penta_node_ids[ 0]=iomodel->nodecounter+iomodel->elements[6*index+0]; @@ -3360,11 +2486,55 @@ penta_node_ids[13]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[9*index+7]+1; penta_node_ids[14]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[9*index+8]+1; - - penta_node_ids[15]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->elements[6*index+0]; - penta_node_ids[16]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->elements[6*index+1]; - penta_node_ids[17]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->elements[6*index+2]; - penta_node_ids[18]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->elements[6*index+3]; - penta_node_ids[19]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->elements[6*index+4]; - penta_node_ids[20]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->elements[6*index+5]; + penta_node_ids[15]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->elementtofaceconnectivity[5*index+2]+1; + penta_node_ids[16]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->elementtofaceconnectivity[5*index+3]+1; + penta_node_ids[17]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->elementtofaceconnectivity[5*index+4]+1; + + penta_node_ids[18]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->numberoffaces+iomodel->elements[6*index+0]; + penta_node_ids[19]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->numberoffaces+iomodel->elements[6*index+1]; + penta_node_ids[20]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->numberoffaces+iomodel->elements[6*index+2]; + penta_node_ids[21]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->numberoffaces+iomodel->elements[6*index+3]; + penta_node_ids[22]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->numberoffaces+iomodel->elements[6*index+4]; + penta_node_ids[23]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->numberoffaces+iomodel->elements[6*index+5]; + break; + case OneLayerP4zEnum: + numnodes = 30+6; + penta_node_ids = xNew(numnodes); + penta_node_ids[ 0]=iomodel->nodecounter+iomodel->elements[6*index+0]; /*Vertex 1*/ + penta_node_ids[ 1]=iomodel->nodecounter+iomodel->elements[6*index+1]; /*Vertex 2*/ + penta_node_ids[ 2]=iomodel->nodecounter+iomodel->elements[6*index+2]; /*Vertex 3*/ + penta_node_ids[ 3]=iomodel->nodecounter+iomodel->elements[6*index+3]; /*Vertex 4*/ + penta_node_ids[ 4]=iomodel->nodecounter+iomodel->elements[6*index+4]; /*Vertex 5*/ + penta_node_ids[ 5]=iomodel->nodecounter+iomodel->elements[6*index+5]; /*Vertex 6*/ + penta_node_ids[ 6]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+0]+1; /*mid vertical edge 1*/ + penta_node_ids[ 7]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+1]+1; /*mid vertical edge 2*/ + penta_node_ids[ 8]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+2]+1; /*mid vertical edge 3*/ + penta_node_ids[ 9]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+3]+1; /*mid basal edge 1*/ + penta_node_ids[10]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+4]+1; /*mid basal edge 2*/ + penta_node_ids[11]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+5]+1; /*mid basal edge 3*/ + penta_node_ids[12]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+6]+1; /*mid top edge 1*/ + penta_node_ids[13]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+7]+1; /*mid top edge 2*/ + penta_node_ids[14]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+8]+1; /*mid top edge 3*/ + penta_node_ids[15]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+0]+2; /* 1/4 vertical edge 1*/ + penta_node_ids[16]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+1]+2; /* 1/4 vertical edge 2*/ + penta_node_ids[17]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+2]+2; /* 1/4 vertical edge 3*/ + penta_node_ids[18]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+0]+3; /* 2/4 vertical edge 1*/ + penta_node_ids[19]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+1]+3; /* 2/4 vertical edge 2*/ + penta_node_ids[20]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+2]+3; /* 2/4 vertical edge 3*/ + penta_node_ids[21]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->elementtofaceconnectivity[5*index+2]+1; /* 1/4 vertical face 1*/ + penta_node_ids[22]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->elementtofaceconnectivity[5*index+3]+1; /* 1/4 vertical face 2*/ + penta_node_ids[23]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->elementtofaceconnectivity[5*index+4]+1; /* 1/4 vertical face 3*/ + penta_node_ids[24]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->elementtofaceconnectivity[5*index+2]+2; /* 2/4 vertical face 1*/ + penta_node_ids[25]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->elementtofaceconnectivity[5*index+3]+2; /* 2/4 vertical face 2*/ + penta_node_ids[26]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->elementtofaceconnectivity[5*index+4]+2; /* 2/4 vertical face 3*/ + penta_node_ids[27]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->elementtofaceconnectivity[5*index+2]+3; /* 3/4 vertical face 1*/ + penta_node_ids[28]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->elementtofaceconnectivity[5*index+3]+3; /* 3/4 vertical face 2*/ + penta_node_ids[29]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->elementtofaceconnectivity[5*index+4]+3; /* 3/4 vertical face 3*/ + + penta_node_ids[30]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->numberoffaces+iomodel->elements[6*index+0]; + penta_node_ids[31]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->numberoffaces+iomodel->elements[6*index+1]; + penta_node_ids[32]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->numberoffaces+iomodel->elements[6*index+2]; + penta_node_ids[33]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->numberoffaces+iomodel->elements[6*index+3]; + penta_node_ids[34]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->numberoffaces+iomodel->elements[6*index+4]; + penta_node_ids[35]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->numberoffaces+iomodel->elements[6*index+5]; break; default: @@ -3419,45 +2589,146 @@ } /*}}}*/ -/*FUNCTION Penta::ViscousHeatingCreateInput {{{*/ -void Penta::ViscousHeatingCreateInput(void){ +/*FUNCTION Penta::UpdateConstraintsExtrudeFromBase{{{*/ +void Penta::UpdateConstraintsExtrudeFromBase(void){ + + if(!IsOnBase()) return; + + int extrusioninput; + IssmDouble value,isonbase; + + this->parameters->FindParam(&extrusioninput,InputToExtrudeEnum); + Input* input = inputs->GetInput(extrusioninput); _assert_(extrusioninput); + Input* onbase = inputs->GetInput(MeshVertexonbaseEnum); _assert_(onbase); + + GaussPenta* gauss=new GaussPenta(); + for(int iv=0;ivNumberofNodes();iv++){ + gauss->GaussNode(this->element_type,iv); + onbase->GetInputValue(&isonbase,gauss); + if(isonbase==1.){ + input->GetInputValue(&value,gauss); + this->nodes[iv]->ApplyConstraint(0,value); + } + } + delete gauss; + +} +/*}}}*/ +/*FUNCTION Penta::UpdateConstraintsExtrudeFromTop{{{*/ +void Penta::UpdateConstraintsExtrudeFromTop(void){ + + if(!IsOnSurface()) return; + + int extrusioninput; + int indices[3]={3,4,5}; + IssmDouble value; + + this->parameters->FindParam(&extrusioninput,InputToExtrudeEnum); + Input* input = inputs->GetInput(extrusioninput); _assert_(extrusioninput); + + GaussPenta* gauss=new GaussPenta(); + for(int i=0;i<3;i++){ + gauss->GaussNode(P1Enum,indices[i]); + input->GetInputValue(&value,gauss); + this->nodes[indices[i]]->ApplyConstraint(0,value); + } + delete gauss; + +} +/*}}}*/ +/*FUNCTION Penta::ValueP1OnGauss{{{*/ +void Penta::ValueP1OnGauss(IssmDouble* pvalue,IssmDouble* values,Gauss* gauss){ + PentaRef::GetInputValue(pvalue,values,gauss,P1Enum); +} +/*}}}*/ +/*FUNCTION Penta::ValueP1DerivativesOnGauss{{{*/ +void Penta::ValueP1DerivativesOnGauss(IssmDouble* dvalue,IssmDouble* values,IssmDouble* xyz_list,Gauss* gauss){ + PentaRef::GetInputDerivativeValue(dvalue,values,xyz_list,gauss); +} +/*}}}*/ +/*FUNCTION Penta::VertexConnectivity{{{*/ +int Penta::VertexConnectivity(int vertexindex){ + _assert_(this->vertices); + return this->vertices[vertexindex]->Connectivity(); +} +/*}}}*/ +/*FUNCTION Penta::VerticalSegmentIndices{{{*/ +void Penta::VerticalSegmentIndices(int** pindices,int* pnumseg){ + + /*output*/ + int *indices = xNew(3*2); + indices[0*2 + 0] = 0; indices[0*2 + 1] = 3; + indices[1*2 + 0] = 1; indices[1*2 + 1] = 4; + indices[2*2 + 0] = 2; indices[2*2 + 1] = 5; + + /*Assign output pointers*/ + *pindices = indices; + *pnumseg = 3; +} +/*}}}*/ +/*FUNCTION Penta::ViscousHeating{{{*/ +void Penta::ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){ /*Intermediaries*/ IssmDouble phi; IssmDouble viscosity; - IssmDouble xyz_list[NUMVERTICES][3]; IssmDouble epsilon[6]; - IssmDouble viscousheating[NUMVERTICES]; - IssmDouble thickness; + + _assert_(gauss->Enum()==GaussPentaEnum); + this->StrainRateFS(&epsilon[0],xyz_list,(GaussPenta*)gauss,vx_input,vy_input,vz_input); + this->ViscosityFS(&viscosity,3,xyz_list,(GaussPenta*)gauss,vx_input,vy_input,vz_input); + GetPhi(&phi,&epsilon[0],viscosity); + + /*Assign output pointer*/ + *pphi = phi; +} +/*}}}*/ +/*FUNCTION Penta::VelocityInterpolation{{{*/ +int Penta::VelocityInterpolation(void){ + return PentaRef::VelocityInterpolation(); +} +/*}}}*/ +/*FUNCTION Penta::PressureInterpolation{{{*/ +int Penta::PressureInterpolation(void){ + return PentaRef::PressureInterpolation(); +} +/*}}}*/ +/*FUNCTION Penta::IsZeroLevelset{{{*/ +bool Penta::IsZeroLevelset(int levelset_enum){ + + bool iszerols; + IssmDouble ls[NUMVERTICES]; /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input); - - /*loop over vertices: */ - GaussPenta* gauss=new GaussPenta(); - for (int iv=0;ivGaussVertex(iv); - - thickness_input->GetInputValue(&thickness,gauss); - - this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); - material->GetViscosity3dFS(&viscosity,&epsilon[0]); - GetPhi(&phi, &epsilon[0], viscosity); - - viscousheating[iv]=phi*thickness; - } - - /*Create PentaVertex input, which will hold the basal friction:*/ - this->inputs->AddInput(new PentaInput(ViscousHeatingEnum,&viscousheating[0],P1Enum)); - - /*Clean up and return*/ - delete gauss; -} -/*}}}*/ - -#ifdef _HAVE_RESPONSES_ + GetInputListOnVertices(&ls[0],levelset_enum); + + /*If the level set has always same sign, there is no ice front here*/ + iszerols = false; + if(IsIceInElement()){ + if(ls[0]*ls[1]<0. || ls[0]*ls[2]<0. || (ls[0]*ls[1]*ls[2]==0. && ls[0]*ls[1]+ls[0]*ls[2]+ls[1]*ls[2]<=0.)){ + iszerols = true; + } + } + return iszerols; +} +/*}}}*/ +bool Penta::IsIcefront(void){/*{{{*/ + + bool isicefront; + int i,nrice; + IssmDouble ls[NUMVERTICES]; + + /*Retrieve all inputs and parameters*/ + GetInputListOnVertices(&ls[0],MaskIceLevelsetEnum); + + /* If only one vertex has ice, there is an ice front here */ + isicefront=false; + if(IsIceInElement()){ + nrice=0; + for(i=0;i* partition_contributions,Vector* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part){ @@ -3472,7 +2743,7 @@ IssmDouble xyz_list[NUMVERTICES][3]; - if(NoIceInElement())return 0; - - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + if(!IsIceInElement())return 0; + + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); /*First calculate the area of the base (cross section triangle) @@ -3496,9 +2767,9 @@ IssmDouble xyz_list[NUMVERTICES][3]; - if(NoIceInElement() || IsFloating() || !IsOnBed())return 0; + if(!IsIceInElement() || IsFloating() || !IsOnBase())return 0; rho_ice=matpar->GetRhoIce(); rho_water=matpar->GetRhoWater(); - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); /*First calculate the area of the base (cross section triangle) @@ -3509,9 +2780,9 @@ /*Now get the average height above floatation*/ Input* surface_input = inputs->GetInput(SurfaceEnum); _assert_(surface_input); - Input* bed_input = inputs->GetInput(BedEnum); _assert_(bed_input); - Input* bathymetry_input = inputs->GetInput(BathymetryEnum); _assert_(bathymetry_input); + Input* base_input = inputs->GetInput(BaseEnum); _assert_(base_input); + Input* bed_input = inputs->GetInput(BedEnum); _assert_(bed_input); surface_input->GetInputAverage(&surface); - bed_input->GetInputAverage(&bed); - bathymetry_input->GetInputAverage(&bathymetry); + base_input->GetInputAverage(&bed); + bed_input->GetInputAverage(&bathymetry); /*Return: */ @@ -3564,5 +2835,5 @@ IssmDouble mass_flux=0; - if(!IsOnBed()) return mass_flux; + if(!IsOnBase()) return mass_flux; /*Depth Averaging Vx and Vy*/ @@ -3571,5 +2842,5 @@ /*Spawn Tria element from the base of the Penta: */ - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. + Tria* tria=(Tria*)SpawnTria(0,1,2); mass_flux=tria->MassFlux(segment); delete tria->material; delete tria; @@ -3588,5 +2859,5 @@ IssmDouble mass_flux=0; - if(!IsOnBed()) return mass_flux; + if(!IsOnBase()) return mass_flux; /*Depth Averaging Vx and Vy*/ @@ -3595,5 +2866,5 @@ /*Spawn Tria element from the base of the Penta: */ - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. + Tria* tria=(Tria*)SpawnTria(0,1,2); mass_flux=tria->MassFlux(x1,y1,x2,y2,segment_id); delete tria->material; delete tria; @@ -3719,7 +2990,7 @@ rho_ice=matpar->GetRhoIce(); - if(NoIceInElement() || !IsOnSurface()) return 0.; - - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + if(!IsIceInElement() || !IsOnSurface()) return 0.; + + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); /*First calculate the area of the base (cross section triangle) @@ -3738,5 +3009,4 @@ } /*}}}*/ -#endif #ifdef _HAVE_GIA_ @@ -3748,1374 +3018,4 @@ #endif -#ifdef _HAVE_THERMAL_ -/*FUNCTION Penta::CreateKMatrixEnthalpy {{{*/ -ElementMatrix* Penta::CreateKMatrixEnthalpy(void){ - - /*compute all stiffness matrices for this element*/ - ElementMatrix* Ke1=CreateKMatrixEnthalpyVolume(); - ElementMatrix* Ke2=CreateKMatrixEnthalpyShelf(); - ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); - - /*clean-up and return*/ - delete Ke1; - delete Ke2; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixEnthalpyVolume {{{*/ -ElementMatrix* Penta::CreateKMatrixEnthalpyVolume(void){ - - /*Constants*/ - const int numdof=NDOF1*NUMVERTICES; - - /*Intermediaries */ - int stabilization; - int i,j; - IssmDouble Jdet,u,v,w,um,vm,wm; - IssmDouble h,hx,hy,hz,vx,vy,vz,vel; - IssmDouble gravity,rho_ice,rho_water; - IssmDouble epsvel=2.220446049250313e-16; - IssmDouble heatcapacity,thermalconductivity,dt; - IssmDouble pressure,enthalpy; - IssmDouble latentheat,kappa; - IssmDouble tau_parameter,diameter; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble B_conduct[3][numdof]; - IssmDouble B_advec[3][numdof]; - IssmDouble Bprime_advec[3][numdof]; - IssmDouble L[numdof]; - IssmDouble dbasis[3][6]; - IssmDouble D_scalar_conduct,D_scalar_advec; - IssmDouble D_scalar_trans,D_scalar_stab; - IssmDouble D[3][3]; - IssmDouble K[3][3]={0.0}; - GaussPenta *gauss=NULL; - - /*Initialize Element matrix*/ - ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - rho_water=matpar->GetRhoWater(); - rho_ice=matpar->GetRhoIce(); - gravity=matpar->GetG(); - heatcapacity=matpar->GetHeatCapacity(); - latentheat=matpar->GetLatentHeat(); - thermalconductivity=matpar->GetThermalConductivity(); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - this->parameters->FindParam(&stabilization,ThermalStabilizationEnum); - Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input); - Input* enthalpy_input=inputs->GetInput(EnthalpyPicardEnum);_assert_(enthalpy_input); //for this iteration of the step - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - Input* vxm_input=inputs->GetInput(VxMeshEnum); _assert_(vxm_input); - Input* vym_input=inputs->GetInput(VyMeshEnum); _assert_(vym_input); - Input* vzm_input=inputs->GetInput(VzMeshEnum); _assert_(vzm_input); - if (stabilization==2) diameter=MinEdgeLength(xyz_list); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(2,2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - - /*Conduction: */ - GetBConduct(&B_conduct[0][0],&xyz_list[0][0],gauss); - - enthalpy_input->GetInputValue(&enthalpy, gauss); - pressure_input->GetInputValue(&pressure, gauss); - kappa=matpar->GetEnthalpyDiffusionParameter(enthalpy,pressure); _assert_(kappa>0.); - D_scalar_conduct=gauss->weight*Jdet*kappa/rho_ice; - if(reCast(dt)) D_scalar_conduct=D_scalar_conduct*dt; - - D[0][0]=D_scalar_conduct; D[0][1]=0; D[0][2]=0; - D[1][0]=0; D[1][1]=D_scalar_conduct; D[1][2]=0; - D[2][0]=0; D[2][1]=0; D[2][2]=D_scalar_conduct; - - TripleMultiply(&B_conduct[0][0],3,numdof,1, - &D[0][0],3,3,0, - &B_conduct[0][0],3,numdof,0, - &Ke->values[0],1); - - /*Advection: */ - GetBAdvec(&B_advec[0][0],&xyz_list[0][0],gauss); - GetBprimeAdvec(&Bprime_advec[0][0],&xyz_list[0][0],gauss); - - vx_input->GetInputValue(&u, gauss); vxm_input->GetInputValue(&um,gauss); vx=u-um; - vy_input->GetInputValue(&v, gauss); vym_input->GetInputValue(&vm,gauss); vy=v-vm; - vz_input->GetInputValue(&w, gauss); vzm_input->GetInputValue(&wm,gauss); vz=w-wm; - - D_scalar_advec=gauss->weight*Jdet; - if(reCast(dt)) D_scalar_advec=D_scalar_advec*dt; - - D[0][0]=D_scalar_advec*vx;D[0][1]=0; D[0][2]=0; - D[1][0]=0; D[1][1]=D_scalar_advec*vy;D[1][2]=0; - D[2][0]=0; D[2][1]=0; D[2][2]=D_scalar_advec*vz; - - TripleMultiply(&B_advec[0][0],3,numdof,1, - &D[0][0],3,3,0, - &Bprime_advec[0][0],3,numdof,0, - &Ke->values[0],1); - - /*Transient: */ - if(reCast(dt)){ - GetNodalFunctionsP1(&L[0], gauss); - D_scalar_trans=gauss->weight*Jdet; - - TripleMultiply(&L[0],numdof,1,0, - &D_scalar_trans,1,1,0, - &L[0],1,numdof,0, - &Ke->values[0],1); - } - - /*Artificial diffusivity*/ - if(stabilization==1){ - /*Build K: */ - GetElementSizes(&hx,&hy,&hz); - vel=sqrt(vx*vx + vy*vy + vz*vz)+1.e-14; - h=sqrt( pow(hx*vx/vel,2) + pow(hy*vy/vel,2) + pow(hz*vz/vel,2)); - - K[0][0]=h/(2*vel)*vx*vx; K[0][1]=h/(2*vel)*vx*vy; K[0][2]=h/(2*vel)*vx*vz; - K[1][0]=h/(2*vel)*vy*vx; K[1][1]=h/(2*vel)*vy*vy; K[1][2]=h/(2*vel)*vy*vz; - K[2][0]=h/(2*vel)*vz*vx; K[2][1]=h/(2*vel)*vz*vy; K[2][2]=h/(2*vel)*vz*vz; - - D_scalar_stab=gauss->weight*Jdet; - if(reCast(dt)) D_scalar_stab=D_scalar_stab*dt; - for(i=0;i<3;i++) for(j=0;j<3;j++) K[i][j] = D_scalar_stab*K[i][j]; - - GetBprimeAdvec(&Bprime_advec[0][0],&xyz_list[0][0],gauss); - - TripleMultiply(&Bprime_advec[0][0],3,numdof,1, - &K[0][0],3,3,0, - &Bprime_advec[0][0],3,numdof,0, - &Ke->values[0],1); - } - else if(stabilization==2){ - GetNodalFunctionsP1Derivatives(&dbasis[0][0],&xyz_list[0][0], gauss); - tau_parameter=GetStabilizationParameter(u-um,v-vm,w-wm,diameter,kappa); - - for(i=0;ivalues[i*numdof+j]+=tau_parameter*D_scalar_advec* - ((u-um)*dbasis[0][i]+(v-vm)*dbasis[1][i]+(w-wm)*dbasis[2][i])*((u-um)*dbasis[0][j]+(v-vm)*dbasis[1][j]+(w-wm)*dbasis[2][j]); - } - } - if(reCast(dt)){ - for(i=0;ivalues[i*numdof+j]+=tau_parameter*D_scalar_trans*L[j]*((u-um)*dbasis[0][i]+(v-vm)*dbasis[1][i]+(w-wm)*dbasis[2][i]); - } - } - } - } - } - - /*Clean up and return*/ - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixEnthalpyShelf {{{*/ -ElementMatrix* Penta::CreateKMatrixEnthalpyShelf(void){ - - /*Constants*/ - const int numdof=NDOF1*NUMVERTICES; - - /*Intermediaries */ - int i,j; - IssmDouble mixed_layer_capacity,thermal_exchange_velocity; - IssmDouble rho_ice,rho_water,heatcapacity; - IssmDouble Jdet2d,dt; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble basis[NUMVERTICES]; - IssmDouble D_scalar; - GaussPenta *gauss=NULL; - - /*Initialize Element matrix and return if necessary*/ - if (!IsOnBed() || !IsFloating()) return NULL; - ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum); - - /*Retrieve all inputs and parameters*/ - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - mixed_layer_capacity=matpar->GetMixedLayerCapacity(); - thermal_exchange_velocity=matpar->GetThermalExchangeVelocity(); - rho_water=matpar->GetRhoWater(); - rho_ice=matpar->GetRhoIce(); - heatcapacity=matpar->GetHeatCapacity(); - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - for(i=0;ibegin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetTriaJacobianDeterminant(&Jdet2d, &xyz_list_tria[0][0], gauss); - GetNodalFunctionsP1(&basis[0], gauss); - - D_scalar=gauss->weight*Jdet2d*rho_water*mixed_layer_capacity*thermal_exchange_velocity/(rho_ice*heatcapacity); - if(reCast(dt)) D_scalar=dt*D_scalar; - - TripleMultiply(&basis[0],numdof,1,0, - &D_scalar,1,1,0, - &basis[0],1,numdof,0, - &Ke->values[0],1); - } - - /*Clean up and return*/ - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixMelting {{{*/ -ElementMatrix* Penta::CreateKMatrixMelting(void){ - - if (!IsOnBed()) return NULL; - - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - ElementMatrix* Ke=tria->CreateKMatrixMelting(); - - delete tria->material; delete tria; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixThermal {{{*/ -ElementMatrix* Penta::CreateKMatrixThermal(void){ - - /*compute all stiffness matrices for this element*/ - ElementMatrix* Ke1=CreateKMatrixThermalVolume(); - ElementMatrix* Ke2=CreateKMatrixThermalShelf(); - ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); - - /*clean-up and return*/ - delete Ke1; - delete Ke2; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixThermalVolume {{{*/ -ElementMatrix* Penta::CreateKMatrixThermalVolume(void){ - - /*Constants*/ - const int numdof=NDOF1*NUMVERTICES; - - /*Intermediaries */ - int stabilization; - int i,j; - IssmDouble Jdet,u,v,w,um,vm,wm,vel; - IssmDouble h,hx,hy,hz,vx,vy,vz; - IssmDouble gravity,rho_ice,rho_water,kappa; - IssmDouble heatcapacity,thermalconductivity,dt; - IssmDouble tau_parameter,diameter; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble B_conduct[3][numdof]; - IssmDouble B_advec[3][numdof]; - IssmDouble Bprime_advec[3][numdof]; - IssmDouble L[numdof]; - IssmDouble dbasis[3][6]; - IssmDouble D_scalar_conduct,D_scalar_advec; - IssmDouble D_scalar_trans,D_scalar_stab; - IssmDouble D[3][3]; - IssmDouble K[3][3]={0.0}; - GaussPenta *gauss=NULL; - - /*Initialize Element matrix*/ - ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - rho_water=matpar->GetRhoWater(); - rho_ice=matpar->GetRhoIce(); - gravity=matpar->GetG(); - heatcapacity=matpar->GetHeatCapacity(); - thermalconductivity=matpar->GetThermalConductivity(); - kappa=thermalconductivity/(rho_ice*heatcapacity); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - this->parameters->FindParam(&stabilization,ThermalStabilizationEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - Input* vxm_input=inputs->GetInput(VxMeshEnum); _assert_(vxm_input); - Input* vym_input=inputs->GetInput(VyMeshEnum); _assert_(vym_input); - Input* vzm_input=inputs->GetInput(VzMeshEnum); _assert_(vzm_input); - if (stabilization==2) diameter=MinEdgeLength(xyz_list); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(2,2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - - /*Conduction: */ - - GetBConduct(&B_conduct[0][0],&xyz_list[0][0],gauss); - - D_scalar_conduct=gauss->weight*Jdet*kappa; - if(reCast(dt)) D_scalar_conduct=D_scalar_conduct*dt; - - D[0][0]=D_scalar_conduct; D[0][1]=0; D[0][2]=0; - D[1][0]=0; D[1][1]=D_scalar_conduct; D[1][2]=0; - D[2][0]=0; D[2][1]=0; D[2][2]=D_scalar_conduct; - - TripleMultiply(&B_conduct[0][0],3,numdof,1, - &D[0][0],3,3,0, - &B_conduct[0][0],3,numdof,0, - &Ke->values[0],1); - - /*Advection: */ - GetBAdvec(&B_advec[0][0],&xyz_list[0][0],gauss); - GetBprimeAdvec(&Bprime_advec[0][0],&xyz_list[0][0],gauss); - - vx_input->GetInputValue(&u, gauss); vxm_input->GetInputValue(&um,gauss); vx=u-um; - vy_input->GetInputValue(&v, gauss); vym_input->GetInputValue(&vm,gauss); vy=v-vm; - vz_input->GetInputValue(&w, gauss); vzm_input->GetInputValue(&wm,gauss); vz=w-wm; - - D_scalar_advec=gauss->weight*Jdet; - if(reCast(dt)) D_scalar_advec=D_scalar_advec*dt; - - D[0][0]=D_scalar_advec*vx; D[0][1]=0; D[0][2]=0; - D[1][0]=0; D[1][1]=D_scalar_advec*vy; D[1][2]=0; - D[2][0]=0; D[2][1]=0; D[2][2]=D_scalar_advec*vz; - - TripleMultiply(&B_advec[0][0],3,numdof,1, - &D[0][0],3,3,0, - &Bprime_advec[0][0],3,numdof,0, - &Ke->values[0],1); - - /*Transient: */ - if(reCast(dt)){ - GetNodalFunctionsP1(&L[0], gauss); - D_scalar_trans=gauss->weight*Jdet; - - TripleMultiply(&L[0],numdof,1,0, - &D_scalar_trans,1,1,0, - &L[0],1,numdof,0, - &Ke->values[0],1); - } - - /*Artifficial diffusivity*/ - if(stabilization==1){ - /*Build K: */ - GetElementSizes(&hx,&hy,&hz); - vel=sqrt(vx*vx + vy*vy + vz*vz)+1.e-14; - h=sqrt( pow(hx*vx/vel,2) + pow(hy*vy/vel,2) + pow(hz*vz/vel,2)); - - K[0][0]=h/(2*vel)*fabs(vx*vx); K[0][1]=h/(2*vel)*fabs(vx*vy); K[0][2]=h/(2*vel)*fabs(vx*vz); - K[1][0]=h/(2*vel)*fabs(vy*vx); K[1][1]=h/(2*vel)*fabs(vy*vy); K[1][2]=h/(2*vel)*fabs(vy*vz); - K[2][0]=h/(2*vel)*fabs(vz*vx); K[2][1]=h/(2*vel)*fabs(vz*vy); K[2][2]=h/(2*vel)*fabs(vz*vz); - - D_scalar_stab=gauss->weight*Jdet; - if(reCast(dt)) D_scalar_stab=D_scalar_stab*dt; - for(i=0;i<3;i++) for(j=0;j<3;j++) K[i][j] = D_scalar_stab*K[i][j]; - - GetBprimeAdvec(&Bprime_advec[0][0],&xyz_list[0][0],gauss); - - TripleMultiply(&Bprime_advec[0][0],3,numdof,1, - &K[0][0],3,3,0, - &Bprime_advec[0][0],3,numdof,0, - &Ke->values[0],1); - } - else if(stabilization==2){ - GetNodalFunctionsP1Derivatives(&dbasis[0][0],&xyz_list[0][0], gauss); - tau_parameter=GetStabilizationParameter(u-um,v-vm,w-wm,diameter,kappa); - - for(i=0;ivalues[i*numdof+j]+=tau_parameter*D_scalar_advec* - ((u-um)*dbasis[0][i]+(v-vm)*dbasis[1][i]+(w-wm)*dbasis[2][i])*((u-um)*dbasis[0][j]+(v-vm)*dbasis[1][j]+(w-wm)*dbasis[2][j]); - } - } - if(reCast(dt)){ - for(i=0;ivalues[i*numdof+j]+=tau_parameter*D_scalar_trans*L[j]*((u-um)*dbasis[0][i]+(v-vm)*dbasis[1][i]+(w-wm)*dbasis[2][i]); - } - } - } - } - } - - /*Clean up and return*/ - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixThermalShelf {{{*/ -ElementMatrix* Penta::CreateKMatrixThermalShelf(void){ - - /*Constants*/ - const int numdof=NDOF1*NUMVERTICES; - - /*Intermediaries */ - int i,j; - IssmDouble mixed_layer_capacity,thermal_exchange_velocity; - IssmDouble rho_ice,rho_water,heatcapacity; - IssmDouble Jdet2d,dt; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble basis[NUMVERTICES]; - IssmDouble D_scalar; - GaussPenta *gauss=NULL; - - /*Initialize Element matrix and return if necessary*/ - if (!IsOnBed() || !IsFloating()) return NULL; - ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum); - - /*Retrieve all inputs and parameters*/ - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - mixed_layer_capacity=matpar->GetMixedLayerCapacity(); - thermal_exchange_velocity=matpar->GetThermalExchangeVelocity(); - rho_water=matpar->GetRhoWater(); - rho_ice=matpar->GetRhoIce(); - heatcapacity=matpar->GetHeatCapacity(); - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - for(i=0;ibegin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetTriaJacobianDeterminant(&Jdet2d, &xyz_list_tria[0][0], gauss); - GetNodalFunctionsP1(&basis[0], gauss); - - D_scalar=gauss->weight*Jdet2d*rho_water*mixed_layer_capacity*thermal_exchange_velocity/(heatcapacity*rho_ice); - if(reCast(dt)) D_scalar=dt*D_scalar; - - TripleMultiply(&basis[0],numdof,1,0, - &D_scalar,1,1,0, - &basis[0],1,numdof,0, - &Ke->values[0],1); - } - - /*Clean up and return*/ - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorEnthalpy {{{*/ -ElementVector* Penta::CreatePVectorEnthalpy(void){ - - /*compute all load vectors for this element*/ - ElementVector* pe1=CreatePVectorEnthalpyVolume(); - ElementVector* pe2=CreatePVectorEnthalpySheet(); - ElementVector* pe3=CreatePVectorEnthalpyShelf(); - ElementVector* pe =new ElementVector(pe1,pe2,pe3); - - /*clean-up and return*/ - delete pe1; - delete pe2; - delete pe3; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorEnthalpyVolume {{{*/ -ElementVector* Penta::CreatePVectorEnthalpyVolume(void){ - - /*Constants*/ - const int numdof=NUMVERTICES*NDOF1; - - /*Intermediaries*/ - int i; - int stabilization; - IssmDouble Jdet,phi,dt; - IssmDouble rho_ice,heatcapacity; - IssmDouble thermalconductivity,kappa; - IssmDouble viscosity,pressure; - IssmDouble enthalpy,enthalpypicard; - IssmDouble tau_parameter,diameter; - IssmDouble u,v,w; - IssmDouble scalar_def,scalar_transient; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble L[numdof]; - IssmDouble dbasis[3][6]; - IssmDouble epsilon[6]; - GaussPenta *gauss=NULL; - - /*Initialize Element vector*/ - ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - rho_ice=matpar->GetRhoIce(); - heatcapacity=matpar->GetHeatCapacity(); - thermalconductivity=matpar->GetThermalConductivity(); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - this->parameters->FindParam(&stabilization,ThermalStabilizationEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input); - Input* enthalpy_input=NULL; - Input* enthalpypicard_input=NULL; - if(reCast(dt)){ - enthalpy_input=inputs->GetInput(EnthalpyEnum); _assert_(enthalpy_input); - } - if (stabilization==2){ - diameter=MinEdgeLength(xyz_list); - enthalpypicard_input=inputs->GetInput(EnthalpyPicardEnum); _assert_(enthalpypicard_input); - } - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(2,3); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctionsP1(&L[0], gauss); - - this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); - material->GetViscosity3dFS(&viscosity,&epsilon[0]); - GetPhi(&phi, &epsilon[0], viscosity); - - scalar_def=phi/rho_ice*Jdet*gauss->weight; - if(reCast(dt)) scalar_def=scalar_def*dt; - - /*TODO: add -beta*laplace T_m(p)*/ - for(i=0;ivalues[i]+=scalar_def*L[i]; - - /* Build transient now */ - if(reCast(dt)){ - enthalpy_input->GetInputValue(&enthalpy, gauss); - scalar_transient=enthalpy*Jdet*gauss->weight; - for(i=0;ivalues[i]+=scalar_transient*L[i]; - } - - if(stabilization==2){ - GetNodalFunctionsP1Derivatives(&dbasis[0][0],&xyz_list[0][0], gauss); - - vx_input->GetInputValue(&u, gauss); - vy_input->GetInputValue(&v, gauss); - vz_input->GetInputValue(&w, gauss); - pressure_input->GetInputValue(&pressure, gauss); - enthalpypicard_input->GetInputValue(&enthalpypicard, gauss); - kappa=matpar->GetEnthalpyDiffusionParameter(enthalpy,pressure); - kappa/=rho_ice; - tau_parameter=GetStabilizationParameter(u,v,w,diameter,kappa); - - for(i=0;ivalues[i]+=tau_parameter*scalar_def*(u*dbasis[0][i]+v*dbasis[1][i]+w*dbasis[2][i]); - if(reCast(dt)){ - for(i=0;ivalues[i]+=tau_parameter*scalar_transient*(u*dbasis[0][i]+v*dbasis[1][i]+w*dbasis[2][i]); - } - } - } - - /*Clean up and return*/ - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorEnthalpyShelf {{{*/ -ElementVector* Penta::CreatePVectorEnthalpyShelf(void){ - - /*Constants*/ - const int numdof=NUMVERTICES*NDOF1; - - /*Intermediaries */ - int i,j; - IssmDouble Jdet2d; - IssmDouble heatcapacity,h_pmp; - IssmDouble mixed_layer_capacity,thermal_exchange_velocity; - IssmDouble rho_ice,rho_water,pressure,dt,scalar_ocean; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble basis[NUMVERTICES]; - GaussPenta* gauss=NULL; - - /* Ice/ocean heat exchange flux on ice shelf base */ - if (!IsOnBed() || !IsFloating()) return NULL; - - /*Initialize Element vector*/ - ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - for(i=0;iGetMixedLayerCapacity(); - thermal_exchange_velocity=matpar->GetThermalExchangeVelocity(); - rho_water=matpar->GetRhoWater(); - rho_ice=matpar->GetRhoIce(); - heatcapacity=matpar->GetHeatCapacity(); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input); - - /* Start looping on the number of gauss 2d (nodes on the bedrock) */ - gauss=new GaussPenta(0,1,2,2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetTriaJacobianDeterminant(&Jdet2d, &xyz_list_tria[0][0], gauss); - GetNodalFunctionsP1(&basis[0], gauss); - - pressure_input->GetInputValue(&pressure,gauss); - h_pmp=matpar->PureIceEnthalpy(pressure); - - scalar_ocean=gauss->weight*Jdet2d*rho_water*mixed_layer_capacity*thermal_exchange_velocity*(h_pmp)/(rho_ice*heatcapacity); - if(reCast(dt)) scalar_ocean=dt*scalar_ocean; - - for(i=0;ivalues[i]+=scalar_ocean*basis[i]; - } - - /*Clean up and return*/ - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorEnthalpySheet {{{*/ -ElementVector* Penta::CreatePVectorEnthalpySheet(void){ - - /*Constants*/ - const int numdof=NUMVERTICES*NDOF1; - - /*Intermediaries */ - int i,j; - int analysis_type; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]={0.0}; - IssmDouble Jdet2d,dt; - IssmDouble rho_ice,heatcapacity; - IssmDouble geothermalflux_value, heatflux_value; - IssmDouble basalfriction,alpha2,vx,vy,vz; - IssmDouble scalar,enthalpy,enthalpyup; - IssmDouble pressure,pressureup; - IssmDouble watercolumn; - IssmDouble basis[NUMVERTICES]; - Friction* friction=NULL; - GaussPenta* gauss=NULL; - GaussPenta* gaussup=NULL; - - /* Geothermal flux on ice sheet base and basal friction */ - if (!IsOnBed() || IsFloating()) return NULL; - - /*Initialize Element vector*/ - ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - for(i=0;iFindParam(&analysis_type,AnalysisTypeEnum); - rho_ice=matpar->GetRhoIce(); - heatcapacity=matpar->GetHeatCapacity(); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - Input* enthalpy_input=inputs->GetInput(EnthalpyEnum); _assert_(enthalpy_input); - Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input); - Input* geothermalflux_input=inputs->GetInput(BasalforcingsGeothermalfluxEnum); _assert_(geothermalflux_input); - Input* watercolumn_input=inputs->GetInput(WatercolumnEnum); _assert_(watercolumn_input); - - /*Build friction element, needed later: */ - friction=new Friction("3d",inputs,matpar,analysis_type); - - /* Start looping on the number of gauss 2d (nodes on the bedrock) */ - gauss=new GaussPenta(0,1,2,2); - gaussup=new GaussPenta(3,4,5,2); - - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - gaussup->GaussPoint(ig); - - GetTriaJacobianDeterminant(&Jdet2d, &xyz_list_tria[0][0], gauss); - GetNodalFunctionsP1(&basis[0], gauss); - - enthalpy_input->GetInputValue(&enthalpy,gauss); - pressure_input->GetInputValue(&pressure,gauss); - watercolumn_input->GetInputValue(&watercolumn,gauss); - - if((watercolumn<=0.) && (enthalpyPureIceEnthalpy(pressure))){ - /* the above check is equivalent to - NOT ((watercolumn>0.) AND (enthalpyGetInputValue(&geothermalflux_value,gauss); - - friction->GetAlpha2(&alpha2,gauss,VxEnum,VyEnum,VzEnum); - vx_input->GetInputValue(&vx,gauss); - vy_input->GetInputValue(&vy,gauss); - vz_input->GetInputValue(&vz,gauss); - basalfriction=alpha2*(pow(vx,2.0)+pow(vy,2.0)+pow(vz,2.0)); - - heatflux_value=(basalfriction+geothermalflux_value)/(rho_ice); - scalar=gauss->weight*Jdet2d*heatflux_value; - if(reCast(dt)) scalar=dt*scalar; - for(i=0;ivalues[i]+=scalar*basis[i]; - } - else if(enthalpy>=matpar->PureIceEnthalpy(pressure)){ - /* check positive thickness of temperate basal ice layer */ - enthalpy_input->GetInputValue(&enthalpyup,gaussup); - pressure_input->GetInputValue(&pressureup,gaussup); - if(enthalpyup>=matpar->PureIceEnthalpy(pressureup)){ - // TODO: temperate ice has positive thickness: grad enthalpy*n=0. - } - else{ - // only base temperate, set Dirichlet BCs in Penta::UpdateBasalConstraintsEnthalpy() - } - } - else { - // base cold, but watercolumn positive. Set base to h_pmp. - } - } - - /*Clean up and return*/ - delete gauss; - delete gaussup; - delete friction; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorMelting {{{*/ -ElementVector* Penta::CreatePVectorMelting(void){ - return NULL; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorThermal {{{*/ -ElementVector* Penta::CreatePVectorThermal(void){ - - /*compute all load vectors for this element*/ - ElementVector* pe1=CreatePVectorThermalVolume(); - ElementVector* pe2=CreatePVectorThermalSheet(); - ElementVector* pe3=CreatePVectorThermalShelf(); - ElementVector* pe =new ElementVector(pe1,pe2,pe3); - - /*clean-up and return*/ - delete pe1; - delete pe2; - delete pe3; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorThermalVolume {{{*/ -ElementVector* Penta::CreatePVectorThermalVolume(void){ - - /*Constants*/ - const int numdof=NUMVERTICES*NDOF1; - - /*Intermediaries*/ - int i; - int stabilization; - IssmDouble Jdet,phi,dt; - IssmDouble rho_ice,heatcapacity; - IssmDouble thermalconductivity,kappa; - IssmDouble viscosity,temperature; - IssmDouble tau_parameter,diameter; - IssmDouble u,v,w; - IssmDouble scalar_def,scalar_transient; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble L[numdof]; - IssmDouble dbasis[3][6]; - IssmDouble epsilon[6]; - GaussPenta *gauss=NULL; - - /*Initialize Element vector*/ - ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - rho_ice=matpar->GetRhoIce(); - heatcapacity=matpar->GetHeatCapacity(); - thermalconductivity=matpar->GetThermalConductivity(); - kappa=thermalconductivity/(rho_ice*heatcapacity); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - this->parameters->FindParam(&stabilization,ThermalStabilizationEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - Input* temperature_input=NULL; - if(reCast(dt)) temperature_input=inputs->GetInput(TemperatureEnum); _assert_(inputs); - if(stabilization==2) diameter=MinEdgeLength(xyz_list); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(2,3); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctionsP1(&L[0], gauss); - - this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); - material->GetViscosity3dFS(&viscosity,&epsilon[0]); - GetPhi(&phi, &epsilon[0], viscosity); - - scalar_def=phi/(rho_ice*heatcapacity)*Jdet*gauss->weight; - if(reCast(dt)) scalar_def=scalar_def*dt; - - for(i=0;ivalues[i]+=scalar_def*L[i]; - - /* Build transient now */ - if(reCast(dt)){ - temperature_input->GetInputValue(&temperature, gauss); - scalar_transient=temperature*Jdet*gauss->weight; - for(i=0;ivalues[i]+=scalar_transient*L[i]; - } - - if(stabilization==2){ - GetNodalFunctionsP1Derivatives(&dbasis[0][0],&xyz_list[0][0], gauss); - - vx_input->GetInputValue(&u, gauss); - vy_input->GetInputValue(&v, gauss); - vz_input->GetInputValue(&w, gauss); - - tau_parameter=GetStabilizationParameter(u,v,w,diameter,kappa); - - for(i=0;ivalues[i]+=tau_parameter*scalar_def*(u*dbasis[0][i]+v*dbasis[1][i]+w*dbasis[2][i]); - if(reCast(dt)){ - for(i=0;ivalues[i]+=tau_parameter*scalar_transient*(u*dbasis[0][i]+v*dbasis[1][i]+w*dbasis[2][i]); - } - } - } - - /*Clean up and return*/ - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorThermalShelf {{{*/ -ElementVector* Penta::CreatePVectorThermalShelf(void){ - - /*Constants*/ - const int numdof=NUMVERTICES*NDOF1; - - /*Intermediaries */ - int i,j; - IssmDouble Jdet2d; - IssmDouble mixed_layer_capacity,thermal_exchange_velocity; - IssmDouble rho_ice,rho_water,pressure,dt,scalar_ocean; - IssmDouble heatcapacity,t_pmp; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble basis[NUMVERTICES]; - GaussPenta* gauss=NULL; - - /* Ice/ocean heat exchange flux on ice shelf base */ - if (!IsOnBed() || !IsFloating()) return NULL; - - /*Initialize Element vector*/ - ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - for(i=0;iGetMixedLayerCapacity(); - thermal_exchange_velocity=matpar->GetThermalExchangeVelocity(); - rho_water=matpar->GetRhoWater(); - rho_ice=matpar->GetRhoIce(); - heatcapacity=matpar->GetHeatCapacity(); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input); - - /* Start looping on the number of gauss 2d (nodes on the bedrock) */ - gauss=new GaussPenta(0,1,2,2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetTriaJacobianDeterminant(&Jdet2d, &xyz_list_tria[0][0], gauss); - GetNodalFunctionsP1(&basis[0], gauss); - - pressure_input->GetInputValue(&pressure,gauss); - t_pmp=matpar->TMeltingPoint(pressure); - - scalar_ocean=gauss->weight*Jdet2d*rho_water*mixed_layer_capacity*thermal_exchange_velocity*(t_pmp)/(heatcapacity*rho_ice); - if(reCast(dt)) scalar_ocean=dt*scalar_ocean; - - for(i=0;ivalues[i]+=scalar_ocean*basis[i]; - } - - /*Clean up and return*/ - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorThermalSheet {{{*/ -ElementVector* Penta::CreatePVectorThermalSheet(void){ - - /*Constants*/ - const int numdof=NUMVERTICES*NDOF1; - - /*Intermediaries */ - int i,j; - int analysis_type; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]={0.0}; - IssmDouble Jdet2d,dt; - IssmDouble rho_ice,heatcapacity,geothermalflux_value; - IssmDouble basalfriction,alpha2,vx,vy; - IssmDouble basis[NUMVERTICES]; - IssmDouble scalar; - Friction* friction=NULL; - GaussPenta* gauss=NULL; - - /* Geothermal flux on ice sheet base and basal friction */ - if (!IsOnBed() || IsFloating()) return NULL; - - /*Initialize Element vector*/ - ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - for(i=0;iFindParam(&analysis_type,AnalysisTypeEnum); - rho_ice=matpar->GetRhoIce(); - heatcapacity=matpar->GetHeatCapacity(); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - Input* geothermalflux_input=inputs->GetInput(BasalforcingsGeothermalfluxEnum); _assert_(geothermalflux_input); - - /*Build frictoin element, needed later: */ - friction=new Friction("3d",inputs,matpar,analysis_type); - - /* Start looping on the number of gauss 2d (nodes on the bedrock) */ - gauss=new GaussPenta(0,1,2,2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetTriaJacobianDeterminant(&Jdet2d, &xyz_list_tria[0][0], gauss); - GetNodalFunctionsP1(&basis[0], gauss); - - geothermalflux_input->GetInputValue(&geothermalflux_value,gauss); - friction->GetAlpha2(&alpha2,gauss,VxEnum,VyEnum,VzEnum); - vx_input->GetInputValue(&vx,gauss); - vy_input->GetInputValue(&vy,gauss); - basalfriction=alpha2*(pow(vx,2.0)+pow(vy,2.0)); - - scalar=gauss->weight*Jdet2d*(basalfriction+geothermalflux_value)/(heatcapacity*rho_ice); - if(reCast(dt)) scalar=dt*scalar; - - for(i=0;ivalues[i]+=scalar*basis[i]; - } - - /*Clean up and return*/ - delete gauss; - delete friction; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionThermal {{{*/ -void Penta::InputUpdateFromSolutionThermal(IssmDouble* solution){ - - const int numdof=NDOF1*NUMVERTICES; - - bool converged; - int i,rheology_law; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble values[numdof]; - IssmDouble B[numdof]; - IssmDouble B_average,s_average; - int *doflist = NULL; - bool hack = false; - - /*Get dof list: */ - GetDofList(&doflist,NoneApproximationEnum,GsetEnum); - - /*Use the dof list to index into the solution vector: */ - for(i=0;i(values[i])) _error_("NaN found in solution vector"); - //if(values[i]<0) _printf_("temperature < 0Ā°K found in solution vector\n"); - //if(values[i]>275) _printf_("temperature > 275Ā°K found in solution vector (Paterson's rheology associated is negative)\n"); - } - - if(hack){ - /*Force temperature between [Tpmp-50 Tpmp] to disable penalties*/ - IssmDouble pressure[numdof]; - GetInputListOnVertices(&pressure[0],PressureEnum); - for(i=0;imatpar->TMeltingPoint(pressure[i])) values[i]=matpar->TMeltingPoint(pressure[i]); - if(values[i]TMeltingPoint(pressure[i])-50.) values[i]=matpar->TMeltingPoint(pressure[i])-50.; - } - } - - - /*Get all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* surface_input=inputs->GetInput(SurfaceEnum); _assert_(surface_input); - - this->inputs->GetInputValue(&converged,ConvergedEnum); - if(converged){ - this->inputs->AddInput(new PentaInput(TemperatureEnum,values,P1Enum)); - - /*Update Rheology only if converged (we must make sure that the temperature is below melting point - * otherwise the rheology could be negative*/ - this->parameters->FindParam(&rheology_law,MaterialsRheologyLawEnum); - switch(rheology_law){ - case NoneEnum: - /*Do nothing: B is not temperature dependent*/ - break; - case PatersonEnum: - B_average=Paterson((values[0]+values[1]+values[2]+values[3]+values[4]+values[5])/6.0); - for(i=0;imaterial->inputs->AddInput(new PentaInput(MaterialsRheologyBEnum,B,P1Enum)); - break; - case ArrheniusEnum: - surface_input->GetInputAverage(&s_average); - B_average=Arrhenius((values[0]+values[1]+values[2]+values[3]+values[4]+values[5])/6.0, - s_average-((xyz_list[0][2]+xyz_list[1][2]+xyz_list[2][2]+xyz_list[3][2]+xyz_list[4][2]+xyz_list[5][2])/6.0), - material->GetN()); - for(i=0;imaterial->inputs->AddInput(new PentaInput(MaterialsRheologyBEnum,B,P1Enum)); - break; - default: - _error_("Rheology law " << EnumToStringx(rheology_law) << " not supported yet"); - - } - } - else{ - this->inputs->AddInput(new PentaInput(TemperaturePicardEnum,values,P1Enum)); - } - - /*Free ressources:*/ - xDelete(doflist); -} -/*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionEnthalpy {{{*/ -void Penta::InputUpdateFromSolutionEnthalpy(IssmDouble* solution){ - - const int numdof=NDOF1*NUMVERTICES; - - bool converged=false; - int i,rheology_law; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble values[numdof]; - IssmDouble pressure[NUMVERTICES]; - IssmDouble temperatures[numdof]; - IssmDouble waterfraction[numdof]; - IssmDouble B[numdof]; - IssmDouble B_average,s_average; - int* doflist=NULL; - - /*Get dof list: */ - GetDofList(&doflist,NoneApproximationEnum,GsetEnum); - - /*Use the dof list to index into the solution vector: */ - for(i=0;i(values[i])) _error_("NaN found in solution vector"); - } - - /*Get all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - GetInputListOnVertices(&pressure[0],PressureEnum); - Input* surface_input=inputs->GetInput(SurfaceEnum); _assert_(surface_input); - - this->inputs->GetInputValue(&converged,ConvergedEnum); - if(converged){ - /*Convert enthalpy into temperature and water fraction*/ - for(i=0;iEnthalpyToThermal(&temperatures[i],&waterfraction[i],values[i],pressure[i]); - if(waterfraction[i]<0) _error_("Negative water fraction found in solution vector"); - //if(waterfraction[i]>1) _error_("Water fraction >1 found in solution vector"); - } - - this->inputs->AddInput(new PentaInput(EnthalpyEnum,values,P1Enum)); - this->inputs->AddInput(new PentaInput(WaterfractionEnum,waterfraction,P1Enum)); - this->inputs->AddInput(new PentaInput(TemperatureEnum,temperatures,P1Enum)); - - /*Update Rheology only if converged (we must make sure that the temperature is below melting point - * otherwise the rheology could be negative*/ - this->parameters->FindParam(&rheology_law,MaterialsRheologyLawEnum); - switch(rheology_law){ - case NoneEnum: - /*Do nothing: B is not temperature dependent*/ - break; - case PatersonEnum: - B_average=Paterson((temperatures[0]+temperatures[1]+temperatures[2]+temperatures[3]+temperatures[4]+temperatures[5])/6.0); - for(i=0;imaterial->inputs->AddInput(new PentaInput(MaterialsRheologyBEnum,B,P1Enum)); - break; - case ArrheniusEnum: - surface_input->GetInputAverage(&s_average); - B_average=Arrhenius((temperatures[0]+temperatures[1]+temperatures[2]+temperatures[3]+temperatures[4]+temperatures[5])/6.0, - s_average-((xyz_list[0][2]+xyz_list[1][2]+xyz_list[2][2]+xyz_list[3][2]+xyz_list[4][2]+xyz_list[5][2])/6.0), - material->GetN()); - for(i=0;imaterial->inputs->AddInput(new PentaInput(MaterialsRheologyBEnum,B,P1Enum)); - break; - case LliboutryDuvalEnum: - B_average=LliboutryDuval((values[0]+values[1]+values[2]+values[3]+values[4]+values[5])/6.0, - (pressure[0]+pressure[1]+pressure[2]+pressure[3]+pressure[4]+pressure[5])/6.0, - material->GetN(), - matpar->GetBeta(), matpar->GetReferenceTemperature(), matpar->GetHeatCapacity(), matpar->GetLatentHeat()); - for(i=0;imaterial->inputs->AddInput(new PentaInput(MaterialsRheologyBEnum,B,P1Enum)); - break; - default: - _error_("Rheology law " << EnumToStringx(rheology_law) << " not supported yet"); - } - } - else{ - this->inputs->AddInput(new PentaInput(EnthalpyPicardEnum,values,P1Enum)); - } - - /*Free ressources:*/ - xDelete(doflist); -} -/*}}}*/ -/*FUNCTION Penta::UpdateBasalConstraintsEnthalpy{{{*/ -void Penta::UpdateBasalConstraintsEnthalpy(void){ - - /*Intermediary*/ - bool isenthalpy,isdynamicbasalspc,setspc; - int numindices, numindicesup; - IssmDouble pressure, pressureup; - IssmDouble h_pmp, enthalpy, enthalpyup; - IssmDouble watercolumn; - int *indices = NULL, *indicesup = NULL; - - /* Only update Constraints at the base of grounded ice*/ - if(!IsOnBed() || IsFloating()) return; - - /*Check wether dynamic basal boundary conditions are activated */ - parameters->FindParam(&isenthalpy,ThermalIsenthalpyEnum); - if(!isenthalpy) return; - parameters->FindParam(&isdynamicbasalspc,ThermalIsdynamicbasalspcEnum); - if(!isdynamicbasalspc) return; - - /*Fetch indices of basal & surface nodes for this finite element*/ - BasalNodeIndices(&numindices,&indices,this->element_type); - SurfaceNodeIndices(&numindicesup,&indicesup,this->element_type); - _assert_(numindices==numindicesup); - - /*Get parameters and inputs: */ - Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input); - Input* enthalpy_input=inputs->GetInput(EnthalpyEnum); _assert_(enthalpy_input); - Input* watercolumn_input=inputs->GetInput(WatercolumnEnum); //_assert_(watercolumn_input); - - /*if there is a temperate layer of zero thickness, set spc enthalpy=h_pmp at that node*/ - GaussPenta* gauss=new GaussPenta(); - GaussPenta* gaussup=new GaussPenta(); - for(int i=0;iGaussNode(this->element_type,indices[i]); - gaussup->GaussNode(this->element_type,indicesup[i]); - - /*Check wether there is a temperate layer at the base or not */ - /*check if node is temperate, if not, continue*/ - enthalpy_input->GetInputValue(&enthalpy, gauss); - pressure_input->GetInputValue(&pressure, gauss); - watercolumn_input->GetInputValue(&watercolumn,gauss); - setspc = false; - if (enthalpy>=matpar->PureIceEnthalpy(pressure)){ - /*check if upper node is temperate, too. - if yes, then we have a temperate layer of positive thickness and reset the spc. - if not, apply dirichlet BC.*/ - enthalpy_input->GetInputValue(&enthalpyup, gaussup); - pressure_input->GetInputValue(&pressureup, gaussup); - setspc=((enthalpyupPureIceEnthalpy(pressureup)) && (watercolumn>=0.))?true:false; - } - - if (setspc) { - /*Calculate enthalpy at pressure melting point */ - h_pmp=matpar->PureIceEnthalpy(pressure); - /*Apply Dirichlet condition (dof = 0 here, since there is only one degree of freedom per node)*/ - nodes[indices[i]]->ApplyConstraint(1,h_pmp); - } - else { - /*remove spc*/ - nodes[indices[i]]->DofInFSet(0); - } - } - - /*Free ressources:*/ - xDelete(indices); - xDelete(indicesup); - delete gauss; - delete gaussup; -} -/*}}}*/ -/*FUNCTION Penta::ComputeBasalMeltingrate{{{*/ -void Penta::ComputeBasalMeltingrate(void){ - /*Calculate the basal melt rates of the enthalpy model after Aschwanden 2012*/ - /* melting rate is positive when melting, negative when refreezing*/ - - /* Intermediaries */ - bool isenthalpy, checkpositivethickness, istemperatelayer; - int i,j,analysis_type; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble heatflux,kappa; - IssmDouble vec_heatflux[3]; - IssmDouble normal_base[3], d1enthalpy[3]; - IssmDouble basalmeltingrate[NUMVERTICES], watercolumn[NUMVERTICES]; - IssmDouble enthalpy[NUMVERTICES],pressure[NUMVERTICES]; - IssmDouble temperature, waterfraction; - IssmDouble latentheat, rho_ice; - IssmDouble basalfriction, alpha2; - IssmDouble vx[NUMVERTICES],vy[NUMVERTICES],vz[NUMVERTICES]; - IssmDouble geothermalflux[NUMVERTICES]; - IssmDouble dt, yts; - IssmDouble melting_overshoot,meltingrate_enthalpy; - IssmDouble lambda,heating; - Friction *friction = NULL; - - /* Only compute melt rates at the base of grounded ice*/ - if(!IsOnBed() || IsFloating()) return; - - /*Check wether enthalpy is activated*/ - parameters->FindParam(&isenthalpy,ThermalIsenthalpyEnum); - if(!isenthalpy) return; - - /*Fetch parameters and inputs */ - latentheat=matpar->GetLatentHeat(); - rho_ice=matpar->GetRhoIce(); - GetInputListOnVertices(&vx[0],VxEnum); - GetInputListOnVertices(&vy[0],VyEnum); - GetInputListOnVertices(&vz[0],VzEnum); - GetInputListOnVertices(&enthalpy[0],EnthalpyEnum); - GetInputListOnVertices(&pressure[0],PressureEnum); - GetInputListOnVertices(&watercolumn[0],WatercolumnEnum); - GetInputListOnVertices(&basalmeltingrate[0],BasalforcingsMeltingRateEnum); - GetInputListOnVertices(&geothermalflux[0],BasalforcingsGeothermalfluxEnum); - Input* enthalpy_input=inputs->GetInput(EnthalpyEnum); _assert_(enthalpy_input); - - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - for(i=0;iFindParam(&analysis_type,AnalysisTypeEnum); - friction=new Friction("3d",inputs,matpar,analysis_type); - - /*Ok, get meltingrates now from basal conditions*/ - GaussPenta* gauss=new GaussPenta(); - for(int iv=0;iv<3;iv++){ - - gauss->GaussVertex(iv); - checkpositivethickness=true; - - _assert_(watercolumn[iv]>=0.); - - /*Calculate basal meltingrate after Fig.5 of A.Aschwanden 2012*/ - meltingrate_enthalpy=0.; - heating=0.; - if((watercolumn[iv]>0.) && (enthalpy[iv]PureIceEnthalpy(pressure[iv]))){ - /*ensure that no ice is at TPureIceEnthalpy(pressure[iv]); - } - else if(enthalpy[iv]PureIceEnthalpy(pressure[iv])){ - /*cold base: set q*n=q_geo*n+frictionheating as Neumann BC in Penta::CreatePVectorEnthalpySheet*/ - checkpositivethickness=false; // cold base, skip next test - } - else {/*we have a temperate base, go to next test*/} - - if(checkpositivethickness){ - /*ok, from here on all basal ice is temperate. Check for positive thickness of layer of temperate ice. */ - istemperatelayer=false; - if(enthalpy[iv+3]>=matpar->PureIceEnthalpy(pressure[iv+3])) istemperatelayer=true; - if(istemperatelayer) for(i=0;i<3;i++) vec_heatflux[i]=0.; // TODO: add -k*nabla T_pmp - else{ - enthalpy_input->GetInputDerivativeValue(&d1enthalpy[0],&xyz_list[0][0],gauss); - kappa=matpar->GetEnthalpyDiffusionParameterVolume(enthalpy[iv],enthalpy[iv+NUMVERTICES2D], pressure[iv],pressure[iv+NUMVERTICES2D]); _assert_(kappa>0.); - for(i=0;i<3;i++) vec_heatflux[i]=-kappa*d1enthalpy[i]; - } - - /*geothermal heatflux*/ - BedNormal(&normal_base[0],xyz_list_tria); - heatflux=0.; - for(i=0;i<3;i++) heatflux+=(vec_heatflux[i])*normal_base[i]; - - /*basal friction*/ - friction->GetAlpha2(&alpha2,gauss,VxEnum,VyEnum,VzEnum); - basalfriction=alpha2*(pow(vx[iv],2.0)+pow(vy[iv],2.0)+pow(vz[iv],2.0)); - - matpar->EnthalpyToThermal(&temperature, &waterfraction, enthalpy[iv],pressure[iv]); - // -Mb= Fb-(q-q_geo)/((1-w)*L), cf Aschwanden 2012, eq.66 - heating=(heatflux+basalfriction+geothermalflux[iv]); - meltingrate_enthalpy=heating/((1-waterfraction)*latentheat*rho_ice); // m/s water equivalent - } - - /*Update water column, basal meltingrate*/ - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - if(reCast(dt)){ - if(watercolumn[iv]+meltingrate_enthalpy*dt<0.){ - melting_overshoot=watercolumn[iv]+meltingrate_enthalpy*dt; - lambda=melting_overshoot/(meltingrate_enthalpy*dt); _assert_(lambda>0); _assert_(lambda<1); - basalmeltingrate[iv]=(1.-lambda)*meltingrate_enthalpy; - watercolumn[iv]=0.; - yts=365*24*60*60; - enthalpy[iv]+=dt/yts*lambda*heating; - } - else{ - basalmeltingrate[iv]=meltingrate_enthalpy; - watercolumn[iv]+=dt*meltingrate_enthalpy; - } - } - else{ - basalmeltingrate[iv]=meltingrate_enthalpy; - watercolumn[iv]+=meltingrate_enthalpy; - } - } - /*feed updated variables back into model*/ - this->inputs->AddInput(new PentaInput(EnthalpyEnum,enthalpy,P1Enum)); - this->inputs->AddInput(new PentaInput(WatercolumnEnum,watercolumn,P1Enum)); - this->inputs->AddInput(new PentaInput(BasalforcingsMeltingRateEnum,basalmeltingrate,P1Enum)); - - /*Clean up and return*/ - delete gauss; - delete friction; -} -/*}}}*/ -/*FUNCTION Penta::DrainWaterfraction{{{*/ -void Penta::DrainWaterfraction(void){ - - /*Intermediaries*/ - bool isenthalpy; - IssmDouble waterfraction[NUMVERTICES], temperature[NUMVERTICES]; - IssmDouble watercolumnbase[NUMVERTICES]; - IssmDouble enthalpy[NUMVERTICES], pressure[NUMVERTICES]; - IssmDouble latentheat, dt; - IssmDouble dw, dwc; - Penta *pentabase = NULL; - - /*Check wether enthalpy is activated*/ - parameters->FindParam(&isenthalpy,ThermalIsenthalpyEnum); - if(!isenthalpy) return; - - /*get basal element, needed for basal watercolumn*/ - pentabase=this->GetBasalElement(); - - this->GetInputListOnVertices(&enthalpy[0],EnthalpyEnum); - this->GetInputListOnVertices(&pressure[0],PressureEnum); - pentabase->GetInputListOnVertices(&watercolumnbase[0], WatercolumnEnum); - - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - latentheat=matpar->GetLatentHeat(); - - for(int iv=0;ivEnthalpyToThermal(&temperature[iv],&waterfraction[iv], enthalpy[iv],pressure[iv]); - dw=DrainageFunctionWaterfraction(waterfraction[iv], dt); - /*drain water fraction & update enthalpy*/ - waterfraction[iv]-=dw; - matpar->ThermalToEnthalpy(&enthalpy[iv], temperature[iv], waterfraction[iv], pressure[iv]); - /*add drained water to watercolumn at base*/ - dwc=dw*this->IceVolume(); - watercolumnbase[iv%NUMVERTICES2D]+=dwc; - } - - /*feed updated results back into model*/ - this->inputs->AddInput(new PentaInput(EnthalpyEnum,enthalpy,P1Enum)); - this->inputs->AddInput(new PentaInput(WaterfractionEnum,waterfraction,P1Enum)); - pentabase->inputs->AddInput(new PentaInput(WatercolumnEnum, watercolumnbase,P1Enum)); - -} -/*}}}*/ -#endif - -#ifdef _HAVE_CONTROL_ /*FUNCTION Penta::ControlInputGetGradient{{{*/ void Penta::ControlInputGetGradient(Vector* gradient,int enum_type,int control_index){ @@ -5125,10 +3025,10 @@ if(enum_type==MaterialsRheologyBbarEnum){ - if(!IsOnBed()) return; - input=(Input*)material->inputs->GetInput(MaterialsRheologyBEnum); + if(!IsOnBase()) return; + input=(Input*)inputs->GetInput(MaterialsRheologyBEnum); } else if(enum_type==DamageDbarEnum){ - if(!IsOnBed()) return; - input=(Input*)material->inputs->GetInput(DamageDEnum); + if(!IsOnBase()) return; + input=(Input*)inputs->GetInput(DamageDEnum); } else{ @@ -5148,8 +3048,8 @@ if(enum_type==MaterialsRheologyBbarEnum){ - input=(Input*)material->inputs->GetInput(MaterialsRheologyBEnum); + input=(Input*)inputs->GetInput(MaterialsRheologyBEnum); } else if(enum_type==DamageDbarEnum){ - input=(Input*)material->inputs->GetInput(DamageDEnum); + input=(Input*)inputs->GetInput(DamageDEnum); } else{ @@ -5170,8 +3070,8 @@ if(enum_type==MaterialsRheologyBbarEnum){ - input=(Input*)material->inputs->GetInput(MaterialsRheologyBEnum); + input=(Input*)inputs->GetInput(MaterialsRheologyBEnum); } else if(enum_type==DamageDbarEnum){ - input=(Input*)material->inputs->GetInput(DamageDEnum); + input=(Input*)inputs->GetInput(DamageDEnum); } else{ @@ -5193,8 +3093,8 @@ if(control_enum==MaterialsRheologyBbarEnum){ - input=(Input*)material->inputs->GetInput(MaterialsRheologyBEnum); + input=(Input*)inputs->GetInput(MaterialsRheologyBEnum); } else if(control_enum==DamageDbarEnum){ - input=(Input*)material->inputs->GetInput(DamageDEnum); + input=(Input*)inputs->GetInput(DamageDEnum); } else{ @@ -5210,6 +3110,6 @@ IssmDouble value,gradient; - this->GetConnectivityList(&connectivity[0]); - this->GetVertexSidList(&sidlist[0]); + this->GetVerticesConnectivityList(&connectivity[0]); + this->GetVerticesSidList(&sidlist[0]); GaussPenta* gauss=new GaussPenta(); @@ -5229,622 +3129,4 @@ }/*}}}*/ -/*FUNCTION Penta::CreateKMatrixAdjointHoriz{{{*/ -ElementMatrix* Penta::CreateKMatrixAdjointHoriz(void){ - - int approximation; - inputs->GetInputValue(&approximation,ApproximationEnum); - - switch(approximation){ - case SSAApproximationEnum: - return CreateKMatrixAdjointSSA2d(); - case HOApproximationEnum: - return CreateKMatrixAdjointHO(); - case FSApproximationEnum: - return CreateKMatrixAdjointFS(); - case NoneApproximationEnum: - return NULL; - default: - _error_("Approximation " << EnumToStringx(approximation) << " not supported yet"); - } -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixAdjointSSA2d{{{*/ -ElementMatrix* Penta::CreateKMatrixAdjointSSA2d(void){ - - /*Figure out if this penta is collapsed. If so, then bailout, except if it is at the - bedrock, in which case we spawn a tria element using the 3 first nodes, and use it to build - the stiffness matrix. */ - if (!IsOnBed()) return NULL; - - /*Depth average some fields*/ - switch(this->material->ObjectEnum()){ - case MaticeEnum: - this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum,MaterialsEnum); - this->InputDepthAverageAtBase(DamageDEnum,DamageDbarEnum,MaterialsEnum); - break; - default: - _error_("material "<material->ObjectEnum())<<" not supported"); - } - - /*Call Tria function*/ - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - ElementMatrix* Ke=tria->CreateKMatrixAdjointSSA(); - delete tria->material; delete tria; - - /*Delete averaged fields*/ - this->material->inputs->DeleteInput(MaterialsRheologyBbarEnum); - this->material->inputs->DeleteInput(DamageDbarEnum); - - /*clean up and return*/ - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixAdjointHO{{{*/ -ElementMatrix* Penta::CreateKMatrixAdjointHO(void){ - - /*Intermediaries */ - int i,j; - bool incomplete_adjoint; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble Jdet; - IssmDouble eps1dotdphii,eps1dotdphij; - IssmDouble eps2dotdphii,eps2dotdphij; - IssmDouble mu_prime; - IssmDouble epsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ - IssmDouble eps1[3],eps2[3]; - IssmDouble dphi[3][NUMVERTICES]; - GaussPenta *gauss=NULL; - - /*Initialize Jacobian with regular HO (first part of the Gateau derivative)*/ - parameters->FindParam(&incomplete_adjoint,InversionIncompleteAdjointEnum); - ElementMatrix* Ke=CreateKMatrixStressbalanceHO(); - if(incomplete_adjoint) return Ke; - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(5,5); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctionsP1Derivatives(&dphi[0][0],&xyz_list[0][0],gauss); - - this->GetStrainRate3dHO(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); - material->GetViscosityDerivativeEpsSquare(&mu_prime,&epsilon[0]); - eps1[0]=2*epsilon[0]+epsilon[1]; eps2[0]=epsilon[2]; - eps1[1]=epsilon[2]; eps2[1]=epsilon[0]+2*epsilon[1]; - eps1[2]=epsilon[3]; eps2[2]=epsilon[4]; - - for(i=0;i<6;i++){ - for(j=0;j<6;j++){ - eps1dotdphii=eps1[0]*dphi[0][i]+eps1[1]*dphi[1][i]+eps1[2]*dphi[2][i]; - eps1dotdphij=eps1[0]*dphi[0][j]+eps1[1]*dphi[1][j]+eps1[2]*dphi[2][j]; - eps2dotdphii=eps2[0]*dphi[0][i]+eps2[1]*dphi[1][i]+eps2[2]*dphi[2][i]; - eps2dotdphij=eps2[0]*dphi[0][j]+eps2[1]*dphi[1][j]+eps2[2]*dphi[2][j]; - - Ke->values[12*(2*i+0)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps1dotdphii; - Ke->values[12*(2*i+0)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps1dotdphii; - Ke->values[12*(2*i+1)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps2dotdphii; - Ke->values[12*(2*i+1)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps2dotdphii; - } - } - } - - /*Transform Coordinate System*/ - TransformStiffnessMatrixCoord(Ke,nodes,NUMVERTICES,XYEnum); - - /*Clean up and return*/ - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixAdjointFS{{{*/ -ElementMatrix* Penta::CreateKMatrixAdjointFS(void){ - - /*Intermediaries */ - int i,j; - bool incomplete_adjoint; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble Jdet; - IssmDouble eps1dotdphii,eps1dotdphij; - IssmDouble eps2dotdphii,eps2dotdphij; - IssmDouble eps3dotdphii,eps3dotdphij; - IssmDouble mu_prime; - IssmDouble epsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ - IssmDouble eps1[3],eps2[3],eps3[3]; - IssmDouble dphi[3][NUMVERTICES]; - GaussPenta *gauss=NULL; - - /*Initialize Jacobian with regular FS (first part of the Gateau derivative)*/ - parameters->FindParam(&incomplete_adjoint,InversionIncompleteAdjointEnum); - ElementMatrix* Ke=CreateKMatrixStressbalanceFS(); - if(incomplete_adjoint) return Ke; - - /*Fetch number of nodes and dof for this finite element*/ - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - int numdof = vnumnodes*NDOF3 + pnumnodes*NDOF1; - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(5,5); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctionsP1Derivatives(&dphi[0][0],&xyz_list[0][0],gauss); - - this->GetStrainRate3dHO(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); - material->GetViscosityDerivativeEpsSquare(&mu_prime,&epsilon[0]); - eps1[0]=epsilon[0]; eps2[0]=epsilon[2]; eps3[0]=epsilon[3]; - eps1[1]=epsilon[2]; eps2[1]=epsilon[1]; eps3[1]=epsilon[4]; - eps1[2]=epsilon[3]; eps2[2]=epsilon[4]; eps3[2]= -epsilon[0] -epsilon[1]; - - for(i=0;i<6;i++){ - for(j=0;j<6;j++){ - eps1dotdphii=eps1[0]*dphi[0][i]+eps1[1]*dphi[1][i]+eps1[2]*dphi[2][i]; - eps1dotdphij=eps1[0]*dphi[0][j]+eps1[1]*dphi[1][j]+eps1[2]*dphi[2][j]; - eps2dotdphii=eps2[0]*dphi[0][i]+eps2[1]*dphi[1][i]+eps2[2]*dphi[2][i]; - eps2dotdphij=eps2[0]*dphi[0][j]+eps2[1]*dphi[1][j]+eps2[2]*dphi[2][j]; - eps3dotdphii=eps3[0]*dphi[0][i]+eps3[1]*dphi[1][i]+eps3[2]*dphi[2][i]; - eps3dotdphij=eps3[0]*dphi[0][j]+eps3[1]*dphi[1][j]+eps3[2]*dphi[2][j]; - - Ke->values[numdof*(4*i+0)+4*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps1dotdphii; - Ke->values[numdof*(4*i+0)+4*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps1dotdphii; - Ke->values[numdof*(4*i+0)+4*j+2]+=gauss->weight*Jdet*2*mu_prime*eps3dotdphij*eps1dotdphii; - - Ke->values[numdof*(4*i+1)+4*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps2dotdphii; - Ke->values[numdof*(4*i+1)+4*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps2dotdphii; - Ke->values[numdof*(4*i+1)+4*j+2]+=gauss->weight*Jdet*2*mu_prime*eps3dotdphij*eps2dotdphii; - - Ke->values[numdof*(4*i+2)+4*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps3dotdphii; - Ke->values[numdof*(4*i+2)+4*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps3dotdphii; - Ke->values[numdof*(4*i+2)+4*j+2]+=gauss->weight*Jdet*2*mu_prime*eps3dotdphij*eps3dotdphii; - } - } - } - - /*Transform Coordinate System*/ - TransformStiffnessMatrixCoord(Ke,nodes,NUMVERTICES,XYZEnum); - - /*Clean up and return*/ - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorAdjointHoriz{{{*/ -ElementVector* Penta::CreatePVectorAdjointHoriz(void){ - - int approximation; - inputs->GetInputValue(&approximation,ApproximationEnum); - - switch(approximation){ - case SSAApproximationEnum: - return CreatePVectorAdjointSSA(); - case HOApproximationEnum: - return CreatePVectorAdjointHO(); - case NoneApproximationEnum: - return NULL; - case FSApproximationEnum: - return CreatePVectorAdjointFS(); - default: - _error_("Approximation " << EnumToStringx(approximation) << " not supported yet"); - } -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorAdjointSSA{{{*/ -ElementVector* Penta::CreatePVectorAdjointSSA(){ - - if (!IsOnBed()) return NULL; - - /*Call Tria function*/ - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - ElementVector* pe=tria->CreatePVectorAdjointHoriz(); - delete tria->material; delete tria; - - /*clean up and return*/ - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorAdjointHO{{{*/ -ElementVector* Penta::CreatePVectorAdjointHO(void){ - - /*Nothing to be done if not on surface*/ - if (!IsOnSurface()) return NULL; - - /*Intermediaries */ - int i,j,resp; - int *responses=NULL; - int num_responses; - IssmDouble Jdet2d; - IssmDouble obs_velocity_mag,velocity_mag; - IssmDouble dux,duy; - IssmDouble epsvel=2.220446049250313e-16; - IssmDouble meanvel=3.170979198376458e-05; /*1000 m/yr*/ - IssmDouble scalex=0.,scaley=0.,scale=0.,S=0.; - IssmDouble vx,vy,vxobs,vyobs,weight; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector*/ - ElementVector* pe = new ElementVector(nodes,numnodes,this->parameters); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&num_responses,InversionNumCostFunctionsEnum); - this->parameters->FindParam(&responses,NULL,InversionCostFunctionsEnum); - Input* weights_input=inputs->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input); - Input* vx_input =inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input =inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vxobs_input =inputs->GetInput(InversionVxObsEnum); _assert_(vxobs_input); - Input* vyobs_input =inputs->GetInput(InversionVyObsEnum); _assert_(vyobs_input); - - for(i=0;iGetInputValue(&S,SurfaceAreaEnum); break; - } - } - - /* Start looping on the number of gaussian points: */ - GaussPenta* gauss=new GaussPenta(3,4,5,4); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - /* Get Jacobian determinant: */ - GetTriaJacobianDeterminant(&Jdet2d,&xyz_list_tria[0][0],gauss); - - /*Get all parameters at gaussian point*/ - vx_input->GetInputValue(&vx,gauss); - vy_input->GetInputValue(&vy,gauss); - vxobs_input->GetInputValue(&vxobs,gauss); - vyobs_input->GetInputValue(&vyobs,gauss); - GetNodalFunctions(basis, gauss); - - /*Loop over all requested responses*/ - for(resp=0;respGetInputValue(&weight,gauss,responses[resp]); - - switch(responses[resp]){ - case SurfaceAbsVelMisfitEnum: - /* - * 1 [ 2 2 ] - * J = --- | (u - u ) + (v - v ) | - * 2 [ obs obs ] - * - * dJ - * DU = - -- = (u - u ) - * du obs - */ - for(i=0;ivalues[i*NDOF2+0]+=dux*weight*Jdet2d*gauss->weight*basis[i]; - pe->values[i*NDOF2+1]+=duy*weight*Jdet2d*gauss->weight*basis[i]; - } - break; - case SurfaceRelVelMisfitEnum: - /* - * 1 [ \bar{v}^2 2 \bar{v}^2 2 ] - * J = --- | ------------- (u - u ) + ------------- (v - v ) | - * 2 [ (u + eps)^2 obs (v + eps)^2 obs ] - * obs obs - * - * dJ \bar{v}^2 - * DU = - -- = ------------- (u - u ) - * du (u + eps)^2 obs - * obs - */ - for(i=0;ivalues[i*NDOF2+0]+=dux*weight*Jdet2d*gauss->weight*basis[i]; - pe->values[i*NDOF2+1]+=duy*weight*Jdet2d*gauss->weight*basis[i]; - } - break; - case SurfaceLogVelMisfitEnum: - /* - * [ vel + eps ] 2 - * J = 4 \bar{v}^2 | log ( ----------- ) | - * [ vel + eps ] - * obs - * - * dJ 2 * log(...) - * DU = - -- = - 4 \bar{v}^2 ------------- u - * du vel^2 + eps - * - */ - for(i=0;ivalues[i*NDOF2+0]+=dux*weight*Jdet2d*gauss->weight*basis[i]; - pe->values[i*NDOF2+1]+=duy*weight*Jdet2d*gauss->weight*basis[i]; - } - break; - case SurfaceAverageVelMisfitEnum: - /* - * 1 2 2 - * J = --- sqrt( (u - u ) + (v - v ) ) - * S obs obs - * - * dJ 1 1 - * DU = - -- = - --- ----------- * 2 (u - u ) - * du S 2 sqrt(...) obs - */ - for(i=0;ivalues[i*NDOF2+0]+=dux*weight*Jdet2d*gauss->weight*basis[i]; - pe->values[i*NDOF2+1]+=duy*weight*Jdet2d*gauss->weight*basis[i]; - } - break; - case SurfaceLogVxVyMisfitEnum: - /* - * 1 [ |u| + eps 2 |v| + eps 2 ] - * J = --- \bar{v}^2 | log ( ----------- ) + log ( ----------- ) | - * 2 [ |u |+ eps |v |+ eps ] - * obs obs - * dJ 1 u 1 - * DU = - -- = - \bar{v}^2 log(u...) --------- ---- ~ - \bar{v}^2 log(u...) ------ - * du |u| + eps |u| u + eps - */ - for(i=0;ivalues[i*NDOF2+0]+=dux*weight*Jdet2d*gauss->weight*basis[i]; - pe->values[i*NDOF2+1]+=duy*weight*Jdet2d*gauss->weight*basis[i]; - } - break; - case DragCoefficientAbsGradientEnum: - /*Nothing in P vector*/ - break; - case ThicknessAbsGradientEnum: - /*Nothing in P vector*/ - break; - case ThicknessAlongGradientEnum: - /*Nothing in P vector*/ - break; - case ThicknessAcrossGradientEnum: - /*Nothing in P vector*/ - break; - case RheologyBbarAbsGradientEnum: - /*Nothing in P vector*/ - break; - default: - _error_("response " << EnumToStringx(responses[resp]) << " not supported yet"); - } - } - } - - /*Clean up and return*/ - xDelete(basis); - xDelete(responses); - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorAdjointFS{{{*/ -ElementVector* Penta::CreatePVectorAdjointFS(void){ - - if(!IsOnSurface()) return NULL; - - /*Intermediaries */ - int i,j,resp; - int *responses= NULL; - int num_responses; - IssmDouble Jdet2d; - IssmDouble obs_velocity_mag,velocity_mag; - IssmDouble dux,duy; - IssmDouble epsvel = 2.220446049250313e-16; - IssmDouble meanvel = 3.170979198376458e-05; /*1000 m/yr */ - IssmDouble scalex = 0,scaley=0,scale=0,S=0; - IssmDouble vx,vy,vxobs,vyobs,weight; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - - /*Fetch number of nodes and dof for this finite element*/ - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - - /*Prepare coordinate system list*/ - int* cs_list = xNew(vnumnodes+pnumnodes); - for(i=0;iparameters,FSApproximationEnum); - IssmDouble* vbasis = xNew(vnumnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&num_responses,InversionNumCostFunctionsEnum); - this->parameters->FindParam(&responses,NULL,InversionCostFunctionsEnum); - Input* weights_input = inputs->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input); - Input* vx_input = inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input = inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vxobs_input = inputs->GetInput(InversionVxObsEnum); _assert_(vxobs_input); - Input* vyobs_input = inputs->GetInput(InversionVyObsEnum); _assert_(vyobs_input); - - for(i=0;iGetInputValue(&S,SurfaceAreaEnum); break; - } - } - - /* Start looping on the number of gaussian points: */ - GaussPenta* gauss=new GaussPenta(3,4,5,4); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - /* Get Jacobian determinant: */ - GetTriaJacobianDeterminant(&Jdet2d,&xyz_list_tria[0][0],gauss); - - /*Get all parameters at gaussian point*/ - vx_input->GetInputValue(&vx,gauss); - vy_input->GetInputValue(&vy,gauss); - vxobs_input->GetInputValue(&vxobs,gauss); - vyobs_input->GetInputValue(&vyobs,gauss); - GetNodalFunctionsVelocity(vbasis,gauss); - - /*Loop over all requested responses*/ - for(resp=0;respGetInputValue(&weight,gauss,responses[resp]); - - switch(responses[resp]){ - - case SurfaceAbsVelMisfitEnum: - /* - * 1 [ 2 2 ] - * J = --- | (u - u ) + (v - v ) | - * 2 [ obs obs ] - * - * dJ - * DU = - -- = (u - u ) - * du obs - */ - for(i=0;ivalues[i*NDOF3+0]+=dux*weight*Jdet2d*gauss->weight*vbasis[i]; - pe->values[i*NDOF3+1]+=duy*weight*Jdet2d*gauss->weight*vbasis[i]; - } - break; - case SurfaceRelVelMisfitEnum: - /* - * 1 [ \bar{v}^2 2 \bar{v}^2 2 ] - * J = --- | ------------- (u - u ) + ------------- (v - v ) | - * 2 [ (u + eps)^2 obs (v + eps)^2 obs ] - * obs obs - * - * dJ \bar{v}^2 - * DU = - -- = ------------- (u - u ) - * du (u + eps)^2 obs - * obs - */ - for(i=0;ivalues[i*NDOF3+0]+=dux*weight*Jdet2d*gauss->weight*vbasis[i]; - pe->values[i*NDOF3+1]+=duy*weight*Jdet2d*gauss->weight*vbasis[i]; - } - break; - case SurfaceLogVelMisfitEnum: - /* - * [ vel + eps ] 2 - * J = 4 \bar{v}^2 | log ( ----------- ) | - * [ vel + eps ] - * obs - * - * dJ 2 * log(...) - * DU = - -- = - 4 \bar{v}^2 ------------- u - * du vel^2 + eps - * - */ - for(i=0;ivalues[i*NDOF3+0]+=dux*weight*Jdet2d*gauss->weight*vbasis[i]; - pe->values[i*NDOF3+1]+=duy*weight*Jdet2d*gauss->weight*vbasis[i]; - } - break; - case SurfaceAverageVelMisfitEnum: - /* - * 1 2 2 - * J = --- sqrt( (u - u ) + (v - v ) ) - * S obs obs - * - * dJ 1 1 - * DU = - -- = - --- ----------- * 2 (u - u ) - * du S 2 sqrt(...) obs - */ - for(i=0;ivalues[i*NDOF3+0]+=dux*weight*Jdet2d*gauss->weight*vbasis[i]; - pe->values[i*NDOF3+1]+=duy*weight*Jdet2d*gauss->weight*vbasis[i]; - } - break; - case SurfaceLogVxVyMisfitEnum: - /* - * 1 [ |u| + eps 2 |v| + eps 2 ] - * J = --- \bar{v}^2 | log ( ----------- ) + log ( ----------- ) | - * 2 [ |u |+ eps |v |+ eps ] - * obs obs - * dJ 1 u 1 - * DU = - -- = - \bar{v}^2 log(u...) --------- ---- ~ - \bar{v}^2 log(u...) ------ - * du |u| + eps |u| u + eps - */ - for(i=0;ivalues[i*NDOF3+0]+=dux*weight*Jdet2d*gauss->weight*vbasis[i]; - pe->values[i*NDOF3+1]+=duy*weight*Jdet2d*gauss->weight*vbasis[i]; - } - break; - case DragCoefficientAbsGradientEnum: - /*Nothing in P vector*/ - break; - case ThicknessAbsGradientEnum: - /*Nothing in P vector*/ - break; - case ThicknessAcrossGradientEnum: - /*Nothing in P vector*/ - break; - case ThicknessAlongGradientEnum: - /*Nothing in P vector*/ - break; - case RheologyBbarAbsGradientEnum: - /*Nothing in P vector*/ - break; - default: - _error_("response " << EnumToStringx(responses[resp]) << " not supported yet"); - } - } - } - - /*Clean up and return*/ - xDelete(responses); - xDelete(cs_list); - xDelete(vbasis); - delete gauss; - return pe; -} -/*}}}*/ /*FUNCTION Penta::GradientIndexing{{{*/ void Penta::GradientIndexing(int* indexing,int control_index){ @@ -5869,5 +3151,5 @@ /*If on water, skip grad (=0): */ - if(NoIceInElement())return; + if(!IsIceInElement())return; /*First deal with āˆ‚/āˆ‚alpha(KU-F)*/ @@ -5935,6 +3217,6 @@ break; case DragCoefficientAbsGradientEnum: - if(IsOnBed()){ - tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. + if(IsOnBase()){ + tria=(Tria*)SpawnTria(0,1,2); tria->GradjDragGradient(gradient,control_index); delete tria->material; delete tria; @@ -5942,6 +3224,6 @@ break; case RheologyBbarAbsGradientEnum: - if(IsOnBed()){ - tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. + if(IsOnBase()){ + tria=(Tria*)SpawnTria(0,1,2); tria->GradjBGradient(gradient,control_index); delete tria->material; delete tria; @@ -5958,8 +3240,8 @@ /*Gradient is 0 if on shelf or not on bed*/ - if(IsFloating() || !IsOnBed()) return; + if(IsFloating() || !IsOnBase()) return; /*Spawn tria*/ - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. + Tria* tria=(Tria*)SpawnTria(0,1,2); tria->GradjDragSSA(gradient,control_index); delete tria->material; delete tria; @@ -5984,10 +3266,10 @@ /*Gradient is 0 if on shelf or not on bed*/ - if(IsFloating() || !IsOnBed()) return; + if(IsFloating() || !IsOnBase()) return; /*Retrieve all inputs and parameters*/ parameters->FindParam(&analysis_type,AnalysisTypeEnum); GradientIndexing(&vertexpidlist[0],control_index); - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); for(i=0;iGetInput(AdjointxEnum); _assert_(adjointx_input); @@ -5998,5 +3280,5 @@ /*Build frictoin element, needed later: */ - friction=new Friction("2d",inputs,matpar,analysis_type); + friction=new Friction(this,2); /* Start looping on the number of gaussian points: */ @@ -6010,5 +3292,5 @@ /*Build alpha_complement_list: */ - friction->GetAlphaComplement(&alpha_complement, gauss,VxEnum,VyEnum,VzEnum); + friction->GetAlphaComplement(&alpha_complement,gauss,vx_input,vy_input,NULL); dragcoefficient_input->GetInputValue(&drag, gauss); @@ -6057,9 +3339,9 @@ /*Gradient is 0 if on shelf or not on bed*/ - if(IsFloating() || !IsOnBed()) return; + if(IsFloating() || !IsOnBase()) return; /*Retrieve all inputs and parameters*/ parameters->FindParam(&analysis_type,AnalysisTypeEnum); - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); for(i=0;iGetAlphaComplement(&alpha_complement, gauss,VxEnum,VyEnum,VzEnum); + friction->GetAlphaComplement(&alpha_complement,gauss,vx_input,vy_input,vz_input); drag_input->GetInputValue(&drag,gauss); @@ -6096,5 +3378,5 @@ /*Get normal vector to the bed */ - SurfaceNormal(&surface_normal[0],xyz_list_tria); + NormalTop(&surface_normal[0],&xyz_list_tria[0][0]); bed_normal[0]=-surface_normal[0]; //Function is for upper surface, so the normal to the bed is the opposite of the result @@ -6133,18 +3415,18 @@ /*This element should be collapsed into a tria element at its base*/ - if (!IsOnBed()) return; + if (!IsOnBase()) return; /*Depth Average B*/ - this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum,MaterialsEnum); - this->InputDepthAverageAtBase(DamageDEnum,DamageDbarEnum,MaterialsEnum); + this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum); + if(this->material->IsDamage())this->InputDepthAverageAtBase(DamageDEnum,DamageDbarEnum); /*Collapse element to the base*/ - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. + Tria* tria=(Tria*)SpawnTria(0,1,2); tria->GradjBSSA(gradient,control_index); delete tria->material; delete tria; /*delete Average B*/ - this->material->inputs->DeleteInput(MaterialsRheologyBbarEnum); - this->material->inputs->DeleteInput(DamageDbarEnum); + this->inputs->DeleteInput(MaterialsRheologyBbarEnum); + this->inputs->DeleteInput(DamageDbarEnum); } /*}}}*/ @@ -6153,18 +3435,18 @@ /*Gradient is computed on bed only (Bbar)*/ - if (!IsOnBed()) return; + if (!IsOnBase()) return; /*Depth Average B and D*/ - this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum,MaterialsEnum); - this->InputDepthAverageAtBase(DamageDEnum,DamageDbarEnum,MaterialsEnum); + this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum); + if(this->material->IsDamage())this->InputDepthAverageAtBase(DamageDEnum,DamageDbarEnum); /*Collapse element to the base*/ - Tria* tria=(Tria*)SpawnTria(0); + Tria* tria=(Tria*)SpawnTria(0,1,2); tria->GradjBSSA(gradient,control_index); //We use SSA as an estimate for now delete tria->material; delete tria; /*delete Average B*/ - this->material->inputs->DeleteInput(MaterialsRheologyBbarEnum); - this->material->inputs->DeleteInput(DamageDbarEnum); + this->inputs->DeleteInput(MaterialsRheologyBbarEnum); + this->inputs->DeleteInput(DamageDbarEnum); } /*}}}*/ /*FUNCTION Penta::GradjBbarFS {{{*/ @@ -6172,18 +3454,18 @@ /*Gradient is computed on bed only (Bbar)*/ - if (!IsOnBed()) return; + if (!IsOnBase()) return; /*Depth Average B and D*/ - this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum,MaterialsEnum); - this->InputDepthAverageAtBase(DamageDEnum,DamageDbarEnum,MaterialsEnum); + this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum); + if(this->material->IsDamage())this->InputDepthAverageAtBase(DamageDEnum,DamageDbarEnum); /*Collapse element to the base*/ - Tria* tria=(Tria*)SpawnTria(0); + Tria* tria=(Tria*)SpawnTria(0,1,2); tria->GradjBSSA(gradient,control_index); //We use SSA as an estimate for now delete tria->material; delete tria; /*delete Average B*/ - this->material->inputs->DeleteInput(MaterialsRheologyBbarEnum); - this->material->inputs->DeleteInput(DamageDbarEnum); + this->inputs->DeleteInput(MaterialsRheologyBbarEnum); + this->inputs->DeleteInput(DamageDbarEnum); } /*}}}*/ /*FUNCTION Penta::InputControlUpdate{{{*/ @@ -6202,16 +3484,15 @@ if(control_type[i]==MaterialsRheologyBbarEnum){ - if (!IsOnBed()) goto cleanup_and_return; - input=(Input*)material->inputs->GetInput(MaterialsRheologyBEnum); _assert_(input); + if (!IsOnBase()) goto cleanup_and_return; + input=(Input*)this->inputs->GetInput(MaterialsRheologyBEnum); _assert_(input); } else if(control_type[i]==DamageDbarEnum){ - if (!IsOnBed()) goto cleanup_and_return; - input=(Input*)material->inputs->GetInput(DamageDEnum); _assert_(input); + if (!IsOnBase()) goto cleanup_and_return; + input=(Input*)this->inputs->GetInput(DamageDEnum); _assert_(input); } else{ input=(Input*)this->inputs->GetInput(control_type[i]); _assert_(input); } - - if (input->ObjectEnum()!=ControlInputEnum) _error_("input " << EnumToStringx(control_type[i]) << " is not a ControlInput"); + if(input->ObjectEnum()!=ControlInputEnum) _error_("input " << EnumToStringx(control_type[i]) << " is not a ControlInput"); ((ControlInput*)input)->UpdateValue(scalar); @@ -6220,8 +3501,8 @@ if(control_type[i]==MaterialsRheologyBbarEnum){ - this->InputExtrude(MaterialsRheologyBEnum,MaterialsEnum); + this->InputExtrude(MaterialsRheologyBEnum); } else if(control_type[i]==DamageDbarEnum){ - this->InputExtrude(DamageDEnum,MaterialsEnum); + this->InputExtrude(DamageDEnum); } } @@ -6232,103 +3513,4 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionAdjointFS {{{*/ -void Penta::InputUpdateFromSolutionAdjointFS(IssmDouble* solution){ - - int i; - int* vdoflist=NULL; - int* pdoflist=NULL; - IssmDouble FSreconditioning; - - /*Fetch number of nodes and dof for this finite element*/ - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - int vnumdof = vnumnodes*NDOF3; - int pnumdof = pnumnodes*NDOF1; - - /*Initialize values*/ - IssmDouble* vvalues = xNew(vnumdof); - IssmDouble* pvalues = xNew(pnumdof); - IssmDouble* lambdax = xNew(vnumnodes); - IssmDouble* lambday = xNew(vnumnodes); - IssmDouble* lambdaz = xNew(vnumnodes); - IssmDouble* lambdap = xNew(pnumnodes); - - /*Get dof list: */ - GetDofListVelocity(&vdoflist,GsetEnum); - GetDofListPressure(&pdoflist,GsetEnum); - - /*Use the dof list to index into the solution vector: */ - for(i=0;i(lambdax[i])) _error_("NaN found in solution vector"); - lambday[i] = vvalues[i*NDOF3+1]; if(xIsNan(lambday[i])) _error_("NaN found in solution vector"); - lambdaz[i] = vvalues[i*NDOF3+2]; if(xIsNan(lambdaz[i])) _error_("NaN found in solution vector"); - } - for(i=0;i(lambdap[i])) _error_("NaN found in solution vector"); - } - - /*Recondition pressure and compute vel: */ - this->parameters->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); - for(i=0;iinputs->AddInput(new PentaInput(AdjointxEnum,lambdax,P1Enum)); - this->inputs->AddInput(new PentaInput(AdjointyEnum,lambday,P1Enum)); - this->inputs->AddInput(new PentaInput(AdjointzEnum,lambdaz,P1Enum)); - this->inputs->AddInput(new PentaInput(AdjointpEnum,lambdap,P1Enum)); - - /*Free ressources:*/ - xDelete(vdoflist); - xDelete(pdoflist); - xDelete(lambdap); - xDelete(lambdaz); - xDelete(lambday); - xDelete(lambdax); - xDelete(vvalues); - xDelete(pvalues); -} -/*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionAdjointHoriz {{{*/ -void Penta::InputUpdateFromSolutionAdjointHoriz(IssmDouble* solution){ - - const int numdof=NDOF2*NUMVERTICES; - - int i; - IssmDouble values[numdof]; - IssmDouble lambdax[NUMVERTICES]; - IssmDouble lambday[NUMVERTICES]; - int* doflist=NULL; - - /*Get dof list: */ - GetDofList(&doflist,NoneApproximationEnum,GsetEnum); - - /*Use the dof list to index into the solution vector: */ - for(i=0;i(lambdax[i])) _error_("NaN found in solution vector"); - if(xIsNan(lambday[i])) _error_("NaN found in solution vector"); - } - - /*Add vx and vy as inputs to the tria element: */ - this->inputs->AddInput(new PentaInput(AdjointxEnum,lambdax,P1Enum)); - this->inputs->AddInput(new PentaInput(AdjointyEnum,lambday,P1Enum)); - - /*Free ressources:*/ - xDelete(doflist); -} -/*}}}*/ /*FUNCTION Penta::SurfaceAverageVelMisfit {{{*/ IssmDouble Penta::SurfaceAverageVelMisfit(void){ @@ -6342,10 +3524,10 @@ /*If on water, return 0: */ - if(NoIceInElement())return 0; + if(!IsIceInElement())return 0; /*Bail out if this element if: * -> Non SSA and not on the surface * -> SSA (2d model) and not on bed) */ - if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBed())){ + if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBase())){ return 0; } @@ -6354,5 +3536,5 @@ /*This element should be collapsed into a tria element at its base. Create this tria element, * and compute SurfaceAverageVelMisfit*/ - tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. + tria=(Tria*)SpawnTria(0,1,2); J=tria->SurfaceAverageVelMisfit(); delete tria->material; delete tria; @@ -6361,5 +3543,5 @@ else{ - tria=(Tria*)SpawnTria(1); //lower face is 0, upper face is 1. + tria=(Tria*)SpawnTria(3,4,5); J=tria->SurfaceAverageVelMisfit(); delete tria->material; delete tria; @@ -6379,10 +3561,10 @@ /*If on water, return 0: */ - if(NoIceInElement())return 0; + if(!IsIceInElement())return 0; /*Bail out if this element if: * -> Non SSA and not on the surface * -> SSA (2d model) and not on bed) */ - if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBed())){ + if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBase())){ return 0; } @@ -6391,5 +3573,5 @@ /*This element should be collapsed into a tria element at its base. Create this tria element, * and compute SurfaceAbsVelMisfit*/ - tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. + tria=(Tria*)SpawnTria(0,1,2); J=tria->SurfaceAbsVelMisfit(); delete tria->material; delete tria; @@ -6398,5 +3580,5 @@ else{ - tria=(Tria*)SpawnTria(1); //lower face is 0, upper face is 1. + tria=(Tria*)SpawnTria(3,4,5); J=tria->SurfaceAbsVelMisfit(); delete tria->material; delete tria; @@ -6416,10 +3598,10 @@ /*If on water, return 0: */ - if(NoIceInElement())return 0; + if(!IsIceInElement())return 0; /*Bail out if this element if: * -> Non SSA and not on the surface * -> SSA (2d model) and not on bed) */ - if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBed())){ + if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBase())){ return 0; } @@ -6428,5 +3610,5 @@ /*This element should be collapsed into a tria element at its base. Create this tria element, * and compute SurfaceLogVelMisfit*/ - tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. + tria=(Tria*)SpawnTria(0,1,2); //lower face is 0, upper face is 1. J=tria->SurfaceLogVelMisfit(); delete tria->material; delete tria; @@ -6435,5 +3617,5 @@ else{ - tria=(Tria*)SpawnTria(1); //lower face is 0, upper face is 1. + tria=(Tria*)SpawnTria(3,4,5); //lower face is 0, upper face is 1. J=tria->SurfaceLogVelMisfit(); delete tria->material; delete tria; @@ -6455,10 +3637,10 @@ /*If on water, return 0: */ - if(NoIceInElement())return 0; + if(!IsIceInElement())return 0; /*Bail out if this element if: * -> Non SSA and not on the surface * -> SSA (2d model) and not on bed) */ - if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBed())){ + if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBase())){ return 0; } @@ -6467,5 +3649,5 @@ /*This element should be collapsed into a tria element at its base. Create this tria element, * and compute SurfaceLogVxVyMisfit*/ - tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. + tria=(Tria*)SpawnTria(0,1,2); J=tria->SurfaceLogVxVyMisfit(); delete tria->material; delete tria; @@ -6474,5 +3656,5 @@ else{ - tria=(Tria*)SpawnTria(1); //lower face is 0, upper face is 1. + tria=(Tria*)SpawnTria(3,4,5); J=tria->SurfaceLogVxVyMisfit(); delete tria->material; delete tria; @@ -6492,10 +3674,10 @@ /*If on water, return 0: */ - if(NoIceInElement())return 0; + if(!IsIceInElement())return 0; /*Bail out if this element if: * -> Non SSA and not on the surface * -> SSA (2d model) and not on bed) */ - if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBed())){ + if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBase())){ return 0; } @@ -6504,5 +3686,5 @@ /*This element should be collapsed into a tria element at its base. Create this tria element, * and compute SurfaceRelVelMisfit*/ - tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. + tria=(Tria*)SpawnTria(0,1,2); J=tria->SurfaceRelVelMisfit(); delete tria->material; delete tria; @@ -6511,5 +3693,5 @@ else{ - tria=(Tria*)SpawnTria(1); //lower face is 0, upper face is 1. + tria=(Tria*)SpawnTria(3,4,5); J=tria->SurfaceRelVelMisfit(); delete tria->material; delete tria; @@ -6535,8 +3717,8 @@ /*If on water, return 0: */ - if(NoIceInElement())return 0; + if(!IsIceInElement())return 0; _error_("Not implemented yet"); - tria=(Tria*)SpawnTria(0); + tria=(Tria*)SpawnTria(0,1,2); J=tria->ThicknessAbsMisfit(); delete tria->material; delete tria; @@ -6551,7 +3733,7 @@ /*If on water, on shelf or not on bed, skip: */ - if(NoIceInElement()|| IsFloating() || !IsOnBed()) return 0; - - tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1 + if(!IsIceInElement()|| IsFloating() || !IsOnBase()) return 0; + + tria=(Tria*)SpawnTria(0,1,2); //lower face is 0, upper face is 1 J=tria->DragCoefficientAbsGradient(); delete tria->material; delete tria; @@ -6566,7 +3748,7 @@ /*If on water, on shelf or not on bed, skip: */ - if(NoIceInElement() || !IsOnBed()) return 0; - - tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1 + if(!IsIceInElement() || !IsOnBase()) return 0; + + tria=(Tria*)SpawnTria(0,1,2); J=tria->RheologyBbarAbsGradient(); delete tria->material; delete tria; @@ -6616,11 +3798,5 @@ } new_input = new PentaInput(control_enum,values,P1Enum); - - if(control_enum==MaterialsRheologyBbarEnum){ - input=(Input*)material->inputs->GetInput(control_enum); _assert_(input); - } - else{ - input=(Input*)this->inputs->GetInput(control_enum); _assert_(input); - } + input=(Input*)this->inputs->GetInput(control_enum); _assert_(input); if (input->ObjectEnum()!=ControlInputEnum){ @@ -6631,5 +3807,4 @@ } /*}}}*/ -#endif #ifdef _HAVE_DAKOTA_ @@ -6667,5 +3842,5 @@ GetInputListOnVertices(&thickness_init[0],ThicknessEnum); GetInputListOnVertices(&hydrostatic_ratio[0],GeometryHydrostaticRatioEnum); - GetInputListOnVertices(&bed[0],BedEnum); + GetInputListOnVertices(&bed[0],BaseEnum); GetInputListOnVertices(&surface[0],SurfaceEnum); @@ -6720,8 +3895,8 @@ /*Add new inputs: */ this->inputs->AddInput(new PentaInput(ThicknessEnum,thickness,P1Enum)); - this->inputs->AddInput(new PentaInput(BedEnum,bed,P1Enum)); + this->inputs->AddInput(new PentaInput(BaseEnum,bed,P1Enum)); this->inputs->AddInput(new PentaInput(SurfaceEnum,surface,P1Enum)); - break; + default: this->inputs->AddInput(new PentaInput(name,values,P1Enum)); @@ -6775,4021 +3950,4 @@ /*}}}*/ #endif - -#ifdef _HAVE_STRESSBALANCE_ -/*FUNCTION Penta::CreateDVectorStressbalanceHoriz {{{*/ -ElementVector* Penta::CreateDVectorStressbalanceHoriz(void){ - - int approximation; - inputs->GetInputValue(&approximation,ApproximationEnum); - - switch(approximation){ - case FSApproximationEnum: - return CreateDVectorStressbalanceFS(); - default: - return NULL; //no need for doftypes outside of FS approximation - } -} -/*}}}*/ -/*FUNCTION Penta::CreateDVectorStressbalanceFS{{{*/ -ElementVector* Penta::CreateDVectorStressbalanceFS(void){ - - /*output: */ - ElementVector* De=NULL; - - /*Initialize Element vector and return if necessary*/ - int approximation; - inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation!=FSApproximationEnum) return NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - - De=new ElementVector(nodes,vnumnodes+pnumnodes,this->parameters,FSvelocityEnum); - - for(int i=0;ivalues[i*3+0]=VelocityEnum; - De->values[i*3+1]=VelocityEnum; - De->values[i*3+2]=VelocityEnum; - } - for(int i=0;ivalues[vnumnodes*3+i]=PressureEnum; - } - - return De; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixCouplingSSAHO{{{*/ -ElementMatrix* Penta::CreateKMatrixCouplingSSAHO(void){ - - /*compute all stiffness matrices for this element*/ - ElementMatrix* Ke1=CreateKMatrixCouplingSSAHOViscous(); - ElementMatrix* Ke2=CreateKMatrixCouplingSSAHOFriction(); - ElementMatrix* Ke=new ElementMatrix(Ke1,Ke2); - - /*clean-up and return*/ - delete Ke1; - delete Ke2; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixCouplingSSAHOViscous{{{*/ -ElementMatrix* Penta::CreateKMatrixCouplingSSAHOViscous(void){ - - /*Constants*/ - const int numnodes = 2 *NUMVERTICES; - const int numdofm = NDOF2 *NUMVERTICES2D; - const int numdofp = NDOF2 *NUMVERTICES; - const int numdoftotal = 2 *NDOF2*NUMVERTICES; - - /*Intermediaries */ - int i,j; - IssmDouble Jdet; - IssmDouble viscosity,oldviscosity,newviscosity,viscosity_overshoot; //viscosity - IssmDouble epsilon[5],oldepsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble B[3][numdofp]; - IssmDouble Bprime[3][numdofm]; - IssmDouble D[3][3]={0.0}; // material matrix, simple scalar matrix. - IssmDouble D_scalar; - IssmDouble Ke_gg[numdofp][numdofm]={0.0}; //local element stiffness matrix - IssmDouble Ke_gg_gaussian[numdofp][numdofm]; //stiffness matrix evaluated at the gaussian point. - GaussPenta *gauss=NULL; - GaussTria *gauss_tria=NULL; - Node *node_list[numnodes]; - int cs_list[numnodes]; - - /*Find penta on bed as HO must be coupled to the dofs on the bed: */ - Penta* pentabase=GetBasalElement(); - Tria* tria=pentabase->SpawnTria(0); //lower face is 0, upper face is 1. - - /*prepare node list*/ - for(i=0;inodes[i]; - node_list[i+1*NUMVERTICES] = this->nodes[i]; - cs_list[i+0*NUMVERTICES] = XYEnum; - cs_list[i+1*NUMVERTICES] = XYEnum; - } - - /*Initialize Element matrix*/ - ElementMatrix* Ke1=new ElementMatrix(pentabase->nodes,NUMVERTICES,this->parameters,SSAApproximationEnum); - ElementMatrix* Ke2=new ElementMatrix(this->nodes ,NUMVERTICES,this->parameters,HOApproximationEnum); - ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); - delete Ke1; delete Ke2; - - /* Get node coordinates and dof list: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&viscosity_overshoot,StressbalanceViscosityOvershootEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vxold_input=inputs->GetInput(VxPicardEnum); _assert_(vxold_input); - Input* vyold_input=inputs->GetInput(VyPicardEnum); _assert_(vyold_input); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(5,5); - gauss_tria=new GaussTria(); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - gauss->SynchronizeGaussTria(gauss_tria); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetBSSAHO(&B[0][0], &xyz_list[0][0], gauss); - tria->GetBprimeSSA(&Bprime[0][0], &xyz_list[0][0], gauss_tria); - - this->GetStrainRate3dHO(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); - this->GetStrainRate3dHO(&oldepsilon[0],&xyz_list[0][0],gauss,vxold_input,vyold_input); - material->GetViscosity3d(&viscosity, &epsilon[0]); - material->GetViscosity3d(&oldviscosity, &oldepsilon[0]); - - newviscosity=viscosity+viscosity_overshoot*(viscosity-oldviscosity); - D_scalar=2*newviscosity*gauss->weight*Jdet; - for (i=0;i<3;i++) D[i][i]=D_scalar; - - TripleMultiply( &B[0][0],3,numdofp,1, - &D[0][0],3,3,0, - &Bprime[0][0],3,numdofm,0, - &Ke_gg_gaussian[0][0],0); - - for( i=0; ivalues[(i+2*numdofm)*numdoftotal+j]+=Ke_gg[i][j]; - for(i=0;ivalues[i*numdoftotal+(j+2*numdofm)]+=Ke_gg[j][i]; - - /*Transform Coordinate System*/ - TransformStiffnessMatrixCoord(Ke,node_list,numnodes,cs_list); - - /*Clean-up and return*/ - delete tria->material; delete tria; - delete gauss; - delete gauss_tria; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixCouplingSSAHOFriction{{{*/ -ElementMatrix* Penta::CreateKMatrixCouplingSSAHOFriction(void){ - - /*Constants*/ - const int numnodes = 2 *NUMVERTICES; - const int numdof = NDOF2 *NUMVERTICES; - const int numdoftotal = NDOF4 *NUMVERTICES; - - /*Intermediaries */ - int i,j,analysis_type; - IssmDouble Jdet2d,alpha2; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]={0.0}; - IssmDouble L[2][numdof]; - IssmDouble DL[2][2] ={{ 0,0 },{0,0}}; //for basal drag - IssmDouble DL_scalar; - IssmDouble Ke_gg[numdof][numdof] ={0.0}; - IssmDouble Ke_gg_gaussian[numdof][numdof]; //stiffness matrix contribution from drag - Friction *friction = NULL; - GaussPenta *gauss=NULL; - Node *node_list[numnodes]; - int cs_list[numnodes]; - - /*Initialize Element matrix and return if necessary*/ - if(IsFloating() || !IsOnBed()) return NULL; - ElementMatrix* Ke1=new ElementMatrix(nodes,NUMVERTICES,this->parameters,SSAApproximationEnum); - ElementMatrix* Ke2=new ElementMatrix(nodes,NUMVERTICES,this->parameters,HOApproximationEnum); - ElementMatrix* Ke=new ElementMatrix(Ke1,Ke2); - delete Ke1; delete Ke2; - - /*Prepare node list*/ - for(i=0;inodes[i]; - node_list[i+1*NUMVERTICES] = this->nodes[i]; - cs_list[i+0*NUMVERTICES] = XYEnum; - cs_list[i+1*NUMVERTICES] = XYEnum; - } - - /*retrieve inputs :*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - for(i=0;iFindParam(&analysis_type,AnalysisTypeEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - - /*build friction object, used later on: */ - friction=new Friction("2d",inputs,matpar,analysis_type); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(0,1,2,2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - /*Friction: */ - friction->GetAlpha2(&alpha2, gauss,VxEnum,VyEnum,VzEnum); - - GetTriaJacobianDeterminant(&Jdet2d, &xyz_list_tria[0][0],gauss); - GetBHOFriction(&L[0][0],gauss); - - DL_scalar=alpha2*gauss->weight*Jdet2d; - for (i=0;i<2;i++) DL[i][i]=DL_scalar; - - /* Do the triple producte tL*D*L: */ - TripleMultiply( &L[0][0],2,numdof,1, - &DL[0][0],2,2,0, - &L[0][0],2,numdof,0, - &Ke_gg_gaussian[0][0],0); - - for(i=0;ivalues[i*numdoftotal+(numdof+j)]+=Ke_gg[i][j]; - for(i=0;ivalues[(i+numdof)*numdoftotal+j]+=Ke_gg[i][j]; - - /*Transform Coordinate System*/ - TransformStiffnessMatrixCoord(Ke,node_list,numnodes,cs_list); - - /*Clean up and return*/ - delete gauss; - delete friction; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixCouplingSSAFS{{{*/ -ElementMatrix* Penta::CreateKMatrixCouplingSSAFS(void){ - - /*compute all stiffness matrices for this element*/ - ElementMatrix* Ke1=CreateKMatrixCouplingSSAFSViscous(); - ElementMatrix* Ke2=CreateKMatrixCouplingSSAFSFriction(); - ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); - - /*clean-up and return*/ - delete Ke1; - delete Ke2; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixCouplingSSAFSViscous{{{*/ -ElementMatrix* Penta::CreateKMatrixCouplingSSAFSViscous(void){ - - /*Constants*/ - const int numdofm = NDOF2 *NUMVERTICES2D; - const int numdofs = NDOF4 *NUMVERTICES + NDOF3; - const int numdoftotal = 2 *numdofm+numdofs; - - /*Intermediaries */ - int i,j; - IssmDouble Jdet; - IssmDouble viscosity,FSreconditioning; //viscosity - IssmDouble epsilon[6]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble B[4][numdofs]; - IssmDouble Bprime[4][numdofm]; - IssmDouble B2[3][numdofm]; - IssmDouble Bprime2[3][numdofs]; - IssmDouble D[4][4]={0.0}; // material matrix, simple scalar matrix. - IssmDouble D2[3][3]={0.0}; // material matrix, simple scalar matrix. - IssmDouble D_scalar; - IssmDouble Ke_gg[numdofs][numdofm]={0.0}; //local element stiffness matrix - IssmDouble Ke_gg2[numdofm][numdofs]={0.0}; //local element stiffness matrix - IssmDouble Ke_gg_gaussian[numdofs][numdofm]; //stiffness matrix evaluated at the gaussian point. - IssmDouble Ke_gg_gaussian2[numdofm][numdofs]; //stiffness matrix evaluated at the gaussian point. - GaussPenta *gauss=NULL; - GaussTria *gauss_tria=NULL; - Node *node_list[20]; - - /*Find penta on bed as FS must be coupled to the dofs on the bed: */ - Penta* pentabase=GetBasalElement(); - Tria* tria=pentabase->SpawnTria(0); //lower face is 0, upper face is 1. - - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - int numnodes = 2*vnumnodes-1+pnumnodes; - - /*Prepare node list*/ - int* cs_list = xNew(2*vnumnodes+pnumnodes); - for(i=0;inodes[i]; - cs_list[i] = XYEnum; - } - for(i=0;inodes[i]; - cs_list[i+vnumnodes-1] = XYZEnum; - } - for(i=0;inodes[vnumnodes+i]; - cs_list[2*vnumnodes-1+i] = PressureEnum; - } - - /*Initialize Element matrix and return if necessary*/ - ElementMatrix* Ke1=new ElementMatrix(pentabase->nodes,NUMVERTICES, this->parameters,SSAApproximationEnum); - ElementMatrix* Ke2=new ElementMatrix(this->nodes ,2*NUMVERTICES+1,this->parameters,FSvelocityEnum); - ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); - delete Ke1; delete Ke2; - - /* Get node coordinates and dof list: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - parameters->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(5,5); - gauss_tria=new GaussTria(); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - gauss->SynchronizeGaussTria(gauss_tria); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetBSSAFS(&B[0][0], &xyz_list[0][0], gauss); - tria->GetBprimeSSAFS(&Bprime[0][0], &xyz_list[0][0], gauss_tria); - tria->GetBSSAFS(&B2[0][0], &xyz_list[0][0], gauss_tria); - GetBprimeSSAFS(&Bprime2[0][0], &xyz_list[0][0], gauss); - - this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); - material->GetViscosity3dFS(&viscosity, &epsilon[0]); - - D_scalar=2*viscosity*gauss->weight*Jdet; - for (i=0;i<3;i++) D[i][i]=D_scalar; - D[3][3]=-gauss->weight*Jdet*FSreconditioning; - for (i=0;i<3;i++) D2[i][i]=D_scalar; - - TripleMultiply( &B[0][0],4,numdofs,1, - &D[0][0],4,4,0, - &Bprime[0][0],4,numdofm,0, - &Ke_gg_gaussian[0][0],0); - - TripleMultiply( &B2[0][0],3,numdofm,1, - &D2[0][0],3,3,0, - &Bprime2[0][0],3,numdofs,0, - &Ke_gg_gaussian2[0][0],0); - - for( i=0; ivalues[(i+2*numdofm)*numdoftotal+j]+=Ke_gg[i][j]; - for(i=0;ivalues[i*numdoftotal+(j+2*numdofm)]+=Ke_gg2[i][j]; - - /*Transform Coordinate System*/ - TransformStiffnessMatrixCoord(Ke,node_list,numnodes,cs_list); - - /*Clean-up and return*/ - xDelete(cs_list); - delete tria->material; delete tria; - delete gauss; - delete gauss_tria; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixCouplingSSAFSFriction {{{*/ -ElementMatrix* Penta::CreateKMatrixCouplingSSAFSFriction(void){ - /*Constants*/ - const int numdofs = (NUMVERTICES+1)*NDOF3 + NUMVERTICES*NDOF1; - const int numdofm = NUMVERTICES *NDOF2; - const int numdof2d = NUMVERTICES2D *NDOF3; - const int numdof2dm = NUMVERTICES2D *NDOF2; - const int numdoftot = NUMVERTICES*2 + (NUMVERTICES+1)*3 +NUMVERTICES; // HO + FS vel + FS Pressure - - /*Intermediaries */ - int i,j; - int analysis_type,approximation; - IssmDouble FSreconditioning; - IssmDouble viscosity,alpha2_gauss,Jdet2d; - IssmDouble bed_normal[3]; - IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble LSSAFS[8][numdof2dm]; - IssmDouble LprimeSSAFS[8][numdofs]; - IssmDouble DLSSAFS[8][8]={0.0}; - IssmDouble LFSSSA[4][numdof2d]; - IssmDouble LprimeFSSSA[4][numdof2dm]; - IssmDouble DLFSSSA[4][4]={0.0}; - IssmDouble Ke_drag_gaussian[numdof2dm][numdofs]; - IssmDouble Ke_drag_gaussian2[numdof2d][numdof2dm]; - Friction* friction=NULL; - GaussPenta *gauss=NULL; - Node *node_list[20]; - - /*If on water or not FS, skip stiffness: */ - inputs->GetInputValue(&approximation,ApproximationEnum); - if(IsFloating() || !IsOnBed()) return NULL; - - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - int numnodes = 2*vnumnodes-1+pnumnodes; - - /*Prepare node list*/ - int* cs_list = xNew(2*vnumnodes+pnumnodes); - for(i=0;inodes[i]; - cs_list[i] = XYEnum; - } - for(i=0;inodes[i]; - cs_list[i+vnumnodes-1] = XYZEnum; - } - for(i=0;inodes[vnumnodes+i]; - cs_list[2*vnumnodes-1+i] = PressureEnum; - } - - ElementMatrix* Ke1=new ElementMatrix(this->nodes,NUMVERTICES, this->parameters,SSAApproximationEnum); - ElementMatrix* Ke2=new ElementMatrix(this->nodes,vnumnodes+pnumnodes,this->parameters,FSvelocityEnum); - ElementMatrix* Ke=new ElementMatrix(Ke1,Ke2); - delete Ke1; delete Ke2; - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - parameters->FindParam(&analysis_type,AnalysisTypeEnum); - parameters->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - for(i=0;ibegin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetTriaJacobianDeterminant(&Jdet2d, &xyz_list_tria[0][0],gauss); - GetLSSAFS(&LSSAFS[0][0], gauss); - GetLprimeSSAFS(&LprimeSSAFS[0][0], &xyz_list[0][0], gauss); - GetLFSSSA(&LFSSSA[0][0], gauss); - GetLprimeFSSSA(&LprimeFSSSA[0][0], &xyz_list[0][0], gauss); - - this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); - material->GetViscosity3dFS(&viscosity,&epsilon[0]); - - BedNormal(&bed_normal[0],xyz_list_tria); - friction->GetAlpha2(&alpha2_gauss, gauss,VxEnum,VyEnum,VzEnum); - - DLSSAFS[0][0]=alpha2_gauss*gauss->weight*Jdet2d; - DLSSAFS[1][1]=alpha2_gauss*gauss->weight*Jdet2d; - DLSSAFS[2][2]=-alpha2_gauss*gauss->weight*Jdet2d*bed_normal[0]*bed_normal[2]; - DLSSAFS[3][3]=-alpha2_gauss*gauss->weight*Jdet2d*bed_normal[1]*bed_normal[2]; - DLSSAFS[4][4]=-2*viscosity*gauss->weight*Jdet2d*bed_normal[0]; - DLSSAFS[5][5]=-2*viscosity*gauss->weight*Jdet2d*bed_normal[1]; - DLSSAFS[6][6]=FSreconditioning*gauss->weight*Jdet2d*bed_normal[0]; - DLSSAFS[7][7]=FSreconditioning*gauss->weight*Jdet2d*bed_normal[1]; - - DLFSSSA[0][0]=alpha2_gauss*gauss->weight*Jdet2d; - DLFSSSA[1][1]=alpha2_gauss*gauss->weight*Jdet2d; - DLFSSSA[2][2]=-alpha2_gauss*gauss->weight*Jdet2d*bed_normal[0]*bed_normal[2]; - DLFSSSA[3][3]=-alpha2_gauss*gauss->weight*Jdet2d*bed_normal[1]*bed_normal[2]; - - TripleMultiply( &LSSAFS[0][0],8,numdof2dm,1, - &DLSSAFS[0][0],8,8,0, - &LprimeSSAFS[0][0],8,numdofs,0, - &Ke_drag_gaussian[0][0],0); - - TripleMultiply( &LFSSSA[0][0],4,numdof2d,1, - &DLFSSSA[0][0],4,4,0, - &LprimeFSSSA[0][0],4,numdof2dm,0, - &Ke_drag_gaussian2[0][0],0); - for(i=0;ivalues[i*numdoftot+j+numdofm]+=Ke_drag_gaussian[i][j]; - for(i=0;ivalues[(i+numdofm)*numdoftot+j]+=Ke_drag_gaussian2[i][j]; - } - - /*Transform Coordinate System*/ - TransformStiffnessMatrixCoord(Ke,node_list,numnodes,cs_list); - - /*Clean up and return*/ - xDelete(cs_list); - delete gauss; - delete friction; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixCouplingHOFS{{{*/ -ElementMatrix* Penta::CreateKMatrixCouplingHOFS(void){ - - /*Constants*/ - const int numnodes = 3 *NUMVERTICES+1; - const int numdofp = NDOF2 *NUMVERTICES; - const int numdofs = NDOF4 * 6 + NDOF3; - const int numdoftotal = (NDOF2+NDOF4) *NUMVERTICES + NDOF3; - - /*Intermediaries*/ - int i,j,init; - Node *node_list[NUMVERTICES*3+1]; - int cs_list[NUMVERTICES*3+1]; - int cs_list2[NUMVERTICES*2+1]; - - /*Some parameters needed*/ - init=this->element_type; - - /*prepare node list*/ - for(i=0;inodes[i]; - cs_list[i+NUMVERTICES] = XYZEnum; - cs_list2[i] = XYZEnum; - } - for(i=0;inodes[i]; - node_list[i+2*NUMVERTICES+1] = this->nodes[i+NUMVERTICES+1]; - cs_list[i] = XYEnum; - cs_list[i+2*NUMVERTICES+1] = PressureEnum; - cs_list2[i+NUMVERTICES+1] = PressureEnum; - } - - /*compute all stiffness matrices for this element*/ - ElementMatrix* Ke1=new ElementMatrix(this->nodes,NUMVERTICES,this->parameters,HOApproximationEnum); - ElementMatrix* Ke2=new ElementMatrix(this->nodes,2*NUMVERTICES+1,this->parameters,FSvelocityEnum); - ElementMatrix* Ke=new ElementMatrix(Ke1,Ke2); - delete Ke1; delete Ke2; - - /*Compute HO Matrix with P1 element type\n");*/ - this->element_type=P1Enum; - Ke1=CreateKMatrixStressbalanceHO(); TransformInvStiffnessMatrixCoord(Ke1,this->nodes,NUMVERTICES,XYEnum); - this->element_type=init; - /*Compute FS Matrix and condense it \n");*/ - Ke2=CreateKMatrixStressbalanceFS(); TransformInvStiffnessMatrixCoord(Ke2,this->nodes,2*NUMVERTICES+1,cs_list2); - int indices[3]={18,19,20}; - Ke2->StaticCondensation(3,&indices[0]); - - for(i=0;ivalues[(i+numdofp)*numdoftotal+NDOF2*j+0]+=Ke2->values[i*numdofs+NDOF3*j+0]; - Ke->values[(i+numdofp)*numdoftotal+NDOF2*j+1]+=Ke2->values[i*numdofs+NDOF3*j+1]; - } - for(i=0;ivalues[i*numdoftotal+numdofp+NDOF3*j+0]+=Ke1->values[i*numdofp+NDOF2*j+0]; - Ke->values[i*numdoftotal+numdofp+NDOF3*j+1]+=Ke1->values[i*numdofp+NDOF2*j+1]; - } - - /*Transform Coordinate System*/ //Do not transform, already done in the matrices - TransformStiffnessMatrixCoord(Ke,node_list,numnodes,cs_list); - - /*clean-up and return*/ - delete Ke1; - delete Ke2; - return Ke; -} -//*}}}*/ -/*FUNCTION Penta::CreateKMatrixStressbalanceHoriz {{{*/ -ElementMatrix* Penta::CreateKMatrixStressbalanceHoriz(void){ - - int approximation; - inputs->GetInputValue(&approximation,ApproximationEnum); - switch(approximation){ - case SSAApproximationEnum: - return CreateKMatrixStressbalanceSSA2d(); - case L1L2ApproximationEnum: - return CreateKMatrixStressbalanceL1L2(); - case HOApproximationEnum: - return CreateKMatrixStressbalanceHO(); - case FSApproximationEnum: - return CreateKMatrixStressbalanceFS(); - case SIAApproximationEnum: - return NULL; - case NoneApproximationEnum: - return NULL; - case SSAHOApproximationEnum: - return CreateKMatrixStressbalanceSSAHO(); - case SSAFSApproximationEnum: - return CreateKMatrixStressbalanceSSAFS(); - case HOFSApproximationEnum: - return CreateKMatrixStressbalanceHOFS(); - default: - _error_("Approximation " << EnumToStringx(approximation) << " not supported yet"); - } -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixStressbalanceSIA{{{*/ -ElementMatrix* Penta::CreateKMatrixStressbalanceSIA(void){ - - /*Intermediaries*/ - IssmDouble connectivity[2]; - IssmDouble one0,one1; - int i,i0,i1,j0,j1; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); _assert_(numnodes==6); - int numdof = numnodes*NDOF2; - - /*Initialize Element matrix*/ - ElementMatrix* Ke=new ElementMatrix(nodes,numnodes,this->parameters,NoneApproximationEnum); - - /*3 vertical edges*/ - for(i=0;i<3;i++){ - - /*2 dofs of first node*/ - i0=2*i; i1=2*i+1; - /*2 dofs of second node*/ - j0=2*(i+3); j1=2*(i+3)+1; - - /*Find connectivity for the two nodes*/ - connectivity[0]=(IssmDouble)vertices[i]->Connectivity(); - connectivity[1]=(IssmDouble)vertices[i+3]->Connectivity(); - one0=1./connectivity[0]; - one1=1./connectivity[1]; - - /*Create matrix for these two nodes*/ - if (IsOnBed() && IsOnSurface()){ - Ke->values[i0*numdof+i0] = +one0; - Ke->values[i1*numdof+i1] = +one0; - Ke->values[j0*numdof+i0] = -one1; - Ke->values[j0*numdof+j0] = +one1; - Ke->values[j1*numdof+i1] = -one1; - Ke->values[j1*numdof+j1] = +one1; - } - else if (IsOnBed()){ - Ke->values[i0*numdof+i0] = one0; - Ke->values[i1*numdof+i1] = one0; - Ke->values[j0*numdof+i0] = -2.*one1; - Ke->values[j0*numdof+j0] = +2.*one1; - Ke->values[j1*numdof+i1] = -2.*one1; - Ke->values[j1*numdof+j1] = +2.*one1; - } - else if (IsOnSurface()){ - Ke->values[j0*numdof+i0] = -one1; - Ke->values[j0*numdof+j0] = +one1; - Ke->values[j1*numdof+i1] = -one1; - Ke->values[j1*numdof+j1] = +one1; - } - else{ //node is on two horizontal layers and beams include the values only once, so the have to use half of the connectivity - Ke->values[j0*numdof+i0] = -2.*one1; - Ke->values[j0*numdof+j0] = +2.*one1; - Ke->values[j1*numdof+i1] = -2.*one1; - Ke->values[j1*numdof+j1] = +2.*one1; - } - } - - /*Clean up and return*/ - return Ke; -}/*}}}*/ -/*FUNCTION Penta::CreateKMatrixStressbalanceSSA2d{{{*/ -ElementMatrix* Penta::CreateKMatrixStressbalanceSSA2d(void){ - - /*Figure out if this penta is collapsed. If so, then bailout, except if it is at the - bedrock, in which case we spawn a tria element using the 3 first nodes, and use it to build - the stiffness matrix. */ - if (!IsOnBed()) return NULL; - - /*Depth average some fields*/ - switch(this->material->ObjectEnum()){ - case MaticeEnum: - this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum,MaterialsEnum); - this->InputDepthAverageAtBase(DamageDEnum,DamageDbarEnum,MaterialsEnum); - break; - default: - _error_("material "<material->ObjectEnum())<<" not supported"); - } - - /*Call Tria function*/ - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - ElementMatrix* Ke=tria->CreateKMatrixStressbalanceSSA(); - delete tria->material; delete tria; - - /*Delete averaged fields*/ - this->material->inputs->DeleteInput(MaterialsRheologyBbarEnum); - this->material->inputs->DeleteInput(DamageDbarEnum); - - /*clean up and return*/ - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixStressbalanceSSA3d{{{*/ -ElementMatrix* Penta::CreateKMatrixStressbalanceSSA3d(void){ - - /*compute all stiffness matrices for this element*/ - ElementMatrix* Ke1=CreateKMatrixStressbalanceSSA3dViscous(); - ElementMatrix* Ke2=CreateKMatrixStressbalanceSSA3dFriction(); - ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); - - /*clean-up and return*/ - delete Ke1; - delete Ke2; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixStressbalanceSSA3dViscous{{{*/ -ElementMatrix* Penta::CreateKMatrixStressbalanceSSA3dViscous(void){ - - /*Constants*/ - const int numdof2d=2*NUMVERTICES2D; - - /*Intermediaries */ - int i,j,approximation; - IssmDouble Jdet; - IssmDouble viscosity , oldviscosity, newviscosity, viscosity_overshoot; - IssmDouble epsilon[5],oldepsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ - IssmDouble epsilons[6]; //6 for FS - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble B[3][numdof2d]; - IssmDouble Bprime[3][numdof2d]; - IssmDouble D[3][3]= {0.0}; // material matrix, simple scalar matrix. - IssmDouble D_scalar; - IssmDouble Ke_gg_gaussian[numdof2d][numdof2d]; - Tria *tria = NULL; - Penta *pentabase = NULL; - GaussPenta *gauss = NULL; - GaussTria *gauss_tria = NULL; - - /*Find penta on bed as this is a SSA elements: */ - pentabase=GetBasalElement(); - tria=pentabase->SpawnTria(0); //lower face is 0, upper face is 1. - - /*Initialize Element matrix*/ - ElementMatrix* Ke=new ElementMatrix(tria->nodes,NUMVERTICES2D,this->parameters,SSAApproximationEnum); - inputs->GetInputValue(&approximation,ApproximationEnum); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&viscosity_overshoot,StressbalanceViscosityOvershootEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vxold_input=inputs->GetInput(VxPicardEnum); _assert_(vxold_input); - Input* vyold_input=inputs->GetInput(VyPicardEnum); _assert_(vyold_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(5,5); - gauss_tria=new GaussTria(); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - gauss->SynchronizeGaussTria(gauss_tria); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - tria->GetBSSA(&B[0][0], &xyz_list[0][0], gauss_tria); - tria->GetBprimeSSA(&Bprime[0][0], &xyz_list[0][0], gauss_tria); - - if(approximation==SSAHOApproximationEnum){ - this->GetStrainRate3dHO(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); - this->GetStrainRate3dHO(&oldepsilon[0],&xyz_list[0][0],gauss,vxold_input,vyold_input); - material->GetViscosity3d(&viscosity, &epsilon[0]); - material->GetViscosity3d(&oldviscosity, &oldepsilon[0]); - - newviscosity=viscosity+viscosity_overshoot*(viscosity-oldviscosity); - } - else if (approximation==SSAFSApproximationEnum){ - this->GetStrainRate3d(&epsilons[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); - material->GetViscosity3dFS(&newviscosity,&epsilons[0]); - } - else _error_("approximation " << approximation << " (" << EnumToStringx(approximation) << ") not supported yet"); - - D_scalar=2*newviscosity*gauss->weight*Jdet; - for (i=0;i<3;i++) D[i][i]=D_scalar; - - TripleMultiply( &B[0][0],3,numdof2d,1, - &D[0][0],3,3,0, - &Bprime[0][0],3,numdof2d,0, - &Ke_gg_gaussian[0][0],0); - - for(i=0;ivalues[i*numdof2d+j]+=Ke_gg_gaussian[i][j]; - } - - /*Transform Coordinate System*/ - TransformStiffnessMatrixCoord(Ke,tria->nodes,NUMVERTICES2D,XYEnum); - - /*Clean up and return*/ - delete tria->material; - delete tria; - delete gauss_tria; - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixStressbalanceSSA3dFriction{{{*/ -ElementMatrix* Penta::CreateKMatrixStressbalanceSSA3dFriction(void){ - - /*Initialize Element matrix and return if necessary*/ - if(IsFloating() || !IsOnBed()) return NULL; - - /*Build a tria element using the 3 nodes of the base of the penta. Then use - * the tria functionality to build a friction stiffness matrix on these 3 - * nodes: */ - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - ElementMatrix* Ke=tria->CreateKMatrixStressbalanceSSAFriction(); - delete tria->material; delete tria; - - /*clean-up and return*/ - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixStressbalanceSSAHO{{{*/ -ElementMatrix* Penta::CreateKMatrixStressbalanceSSAHO(void){ - - /*compute all stiffness matrices for this element*/ - ElementMatrix* Ke1=CreateKMatrixStressbalanceSSA3d(); - ElementMatrix* Ke2=CreateKMatrixStressbalanceHO(); - ElementMatrix* Ke3=CreateKMatrixCouplingSSAHO(); - ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2,Ke3); - - /*clean-up and return*/ - delete Ke1; - delete Ke2; - delete Ke3; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixStressbalanceSSAFS{{{*/ -ElementMatrix* Penta::CreateKMatrixStressbalanceSSAFS(void){ - - /*compute all stiffness matrices for this element*/ - ElementMatrix* Ke1=CreateKMatrixStressbalanceFS(); - int indices[3]={18,19,20}; - Ke1->StaticCondensation(3,&indices[0]); - int init = this->element_type; - this->element_type=P1Enum; //P1 needed for HO - ElementMatrix* Ke2=CreateKMatrixStressbalanceSSA3d(); - this->element_type=init; - ElementMatrix* Ke3=CreateKMatrixCouplingSSAFS(); - ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2,Ke3); - - /*clean-up and return*/ - delete Ke1; - delete Ke2; - delete Ke3; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixStressbalanceL1L2{{{*/ -ElementMatrix* Penta::CreateKMatrixStressbalanceL1L2(void){ - - /*compute all stiffness matrices for this element*/ - ElementMatrix* Ke1=CreateKMatrixStressbalanceL1L2Viscous(); - ElementMatrix* Ke2=CreateKMatrixStressbalanceL1L2Friction(); - ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); - - /*clean-up and return*/ - delete Ke1; - delete Ke2; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixStressbalanceL1L2Viscous{{{*/ -ElementMatrix* Penta::CreateKMatrixStressbalanceL1L2Viscous(void){ - - /*Constants*/ - const int numdof2d=2*NUMVERTICES2D; - - /*Intermediaries */ - int i,j; - IssmDouble Jdet,viscosity; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble B[3][numdof2d]; - IssmDouble Bprime[3][numdof2d]; - IssmDouble Ke_gg_gaussian[numdof2d][numdof2d]; - IssmDouble D[3][3]= {0.0}; // material matrix, simple scalar matrix. - Tria *tria = NULL; - Penta *pentabase = NULL; - GaussPenta *gauss = NULL; - GaussTria *gauss_tria = NULL; - - /*Find penta on bed as this is a SSA elements: */ - pentabase=GetBasalElement(); - tria=pentabase->SpawnTria(0); //lower face is 0, upper face is 1. - - /*Initialize Element matrix*/ - ElementMatrix* Ke=new ElementMatrix(tria->nodes,NUMVERTICES2D,this->parameters,L1L2ApproximationEnum); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* surf_input=inputs->GetInput(SurfaceEnum); _assert_(surf_input); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(5,5); - gauss_tria=new GaussTria(); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - gauss->SynchronizeGaussTria(gauss_tria); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - tria->GetBSSA(&B[0][0], &xyz_list[0][0], gauss_tria); - tria->GetBprimeSSA(&Bprime[0][0], &xyz_list[0][0], gauss_tria); - - /*Get viscosity for L1L2 model*/ - GetL1L2Viscosity(&viscosity,&xyz_list[0][0],gauss,vx_input,vy_input,surf_input); - - for(i=0;i<3;i++) D[i][i]=2*viscosity*gauss->weight*Jdet; - - TripleMultiply( &B[0][0],3,numdof2d,1, - &D[0][0],3,3,0, - &Bprime[0][0],3,numdof2d,0, - &Ke_gg_gaussian[0][0],0); - for(i=0;ivalues[i*numdof2d+j]+=Ke_gg_gaussian[i][j]; - } - - /*Transform Coordinate System*/ - TransformStiffnessMatrixCoord(Ke,tria->nodes,NUMVERTICES2D,XYEnum); - - /*Clean up and return*/ - delete tria->material; - delete tria; - delete gauss_tria; - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixStressbalanceL1L2Friction{{{*/ -ElementMatrix* Penta::CreateKMatrixStressbalanceL1L2Friction(void){ - - /*Initialize Element matrix and return if necessary*/ - if(IsFloating() || !IsOnBed()) return NULL; - - /*Build a tria element using the 3 nodes of the base of the penta. Then use - * the tria functionality to build a friction stiffness matrix on these 3 - * nodes: */ - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - ElementMatrix* Ke=tria->CreateKMatrixStressbalanceSSAFriction(); - delete tria->material; delete tria; - - /*clean-up and return*/ - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixStressbalanceHO{{{*/ -ElementMatrix* Penta::CreateKMatrixStressbalanceHO(void){ - - /*compute all stiffness matrices for this element*/ - ElementMatrix* Ke1=CreateKMatrixStressbalanceHOViscous(); - ElementMatrix* Ke2=CreateKMatrixStressbalanceHOFriction(); - ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); - - /*clean-up and return*/ - delete Ke1; - delete Ke2; - return Ke; - -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixStressbalanceHOViscous{{{*/ -ElementMatrix* Penta::CreateKMatrixStressbalanceHOViscous(void){ - - /*Intermediaries */ - int approximation; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble Jdet; - IssmDouble viscosity,oldviscosity,newviscosity,viscosity_overshoot; //viscosity - IssmDouble epsilon[5],oldepsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ - IssmDouble D_scalar; - GaussPenta *gauss=NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - int numdof = numnodes*NDOF2; - - /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters,HOApproximationEnum); - IssmDouble* B = xNew(5*numdof); - IssmDouble* Bprime = xNew(5*numdof); - IssmDouble* D = xNewZeroInit(5*5); - - /*Retrieve all inputs and parameters*/ - inputs->GetInputValue(&approximation,ApproximationEnum); - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&viscosity_overshoot,StressbalanceViscosityOvershootEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vxold_input=inputs->GetInput(VxPicardEnum); _assert_(vxold_input); - Input* vyold_input=inputs->GetInput(VyPicardEnum); _assert_(vyold_input); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(5,5); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetBHO(&B[0], &xyz_list[0][0], gauss); - GetBprimeHO(&Bprime[0], &xyz_list[0][0], gauss); - - this->GetStrainRate3dHO(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); - this->GetStrainRate3dHO(&oldepsilon[0],&xyz_list[0][0],gauss,vxold_input,vyold_input); - material->GetViscosity3d(&viscosity, &epsilon[0]); - material->GetViscosity3d(&oldviscosity, &oldepsilon[0]); - newviscosity=viscosity+viscosity_overshoot*(viscosity-oldviscosity); - - D_scalar=2*newviscosity*gauss->weight*Jdet; - for(int i=0;i<5;i++) D[i*5+i]=D_scalar; - - TripleMultiply(B,5,numdof,1, - D,5,5,0, - Bprime,5,numdof,0, - &Ke->values[0],1); - } - - /*Transform Coordinate System*/ - TransformStiffnessMatrixCoord(Ke,nodes,numnodes,XYEnum); - - /*Clean up and return*/ - delete gauss; - xDelete(D); - xDelete(Bprime); - xDelete(B); - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixStressbalanceHOFriction{{{*/ -ElementMatrix* Penta::CreateKMatrixStressbalanceHOFriction(void){ - - /*Intermediaries */ - bool mainlyfloating; - int i,j; - int analysis_type,migration_style; - int point1; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble alpha2,Jdet; - IssmDouble fraction1,fraction2; - IssmDouble gllevelset; - IssmDouble phi=1.0; - IssmDouble DL_scalar; - Friction *friction = NULL; - GaussPenta *gauss = NULL; - - /*Initialize Element matrix and return if necessary*/ - if(IsFloating() || !IsOnBed()) return NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - int numdof = numnodes*NDOF2; - - /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters,HOApproximationEnum); - IssmDouble* B = xNew(2*numdof); - IssmDouble* D = xNewZeroInit(2*2); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - for(i=0;iFindParam(&migration_style,GroundinglineMigrationEnum); - parameters->FindParam(&analysis_type,AnalysisTypeEnum); - Input* surface_input=inputs->GetInput(SurfaceEnum); _assert_(surface_input); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - Input* gllevelset_input=NULL; - - /*build friction object, used later on: */ - friction=new Friction("2d",inputs,matpar,analysis_type); - - /*Recover portion of element that is grounded*/ - if(migration_style==SubelementMigrationEnum) phi=this->GetGroundedPortion(&xyz_list_tria[0][0]); - if(migration_style==SubelementMigration2Enum){ - gllevelset_input=inputs->GetInput(MaskGroundediceLevelsetEnum); _assert_(gllevelset_input); - this->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating); - //gauss=new GaussPenta(point1,fraction1,fraction2,mainlyfloating,2); - gauss=new GaussPenta(0,1,2,2); - } - else{ - gauss=new GaussPenta(0,1,2,2); - } - - /* Start looping on the number of gaussian points: */ - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetTriaJacobianDeterminant(&Jdet,&xyz_list_tria[0][0],gauss); - GetBHOFriction(&B[0],gauss); - - friction->GetAlpha2(&alpha2, gauss,VxEnum,VyEnum,VzEnum); - if(migration_style==SubelementMigrationEnum) alpha2=phi*alpha2; - if(migration_style==SubelementMigration2Enum){ - gllevelset_input->GetInputValue(&gllevelset, gauss); - if(gllevelset<0) alpha2=0; - } - - DL_scalar=alpha2*gauss->weight*Jdet; - for (i=0;i<2;i++) D[i*2+i]=DL_scalar; - - TripleMultiply(B,2,numdof,1, - D,2,2,0, - B,2,numdof,0, - &Ke->values[0],1); - } - - /*Transform Coordinate System*/ - TransformStiffnessMatrixCoord(Ke,nodes,numnodes,XYEnum); - - /*Clean up and return*/ - delete gauss; - xDelete(D); - xDelete(B); - delete friction; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixStressbalanceHOFS{{{*/ -ElementMatrix* Penta::CreateKMatrixStressbalanceHOFS(void){ - - /*compute all stiffness matrices for this element*/ - ElementMatrix* Ke1=CreateKMatrixStressbalanceFS(); - int indices[3]={18,19,20}; - Ke1->StaticCondensation(3,&indices[0]); - int init = this->element_type; - this->element_type=P1Enum; //P1 needed for HO - ElementMatrix* Ke2=CreateKMatrixStressbalanceHO(); - this->element_type=init; - ElementMatrix* Ke3=CreateKMatrixCouplingHOFS(); - ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2,Ke3); - - /*clean-up and return*/ - delete Ke1; - delete Ke2; - delete Ke3; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixStressbalanceFS{{{*/ -ElementMatrix* Penta::CreateKMatrixStressbalanceFS(void){ - - ElementMatrix* Ke1 = NULL; - ElementMatrix* Ke2 = NULL; - ElementMatrix* Ke = NULL; - - /*compute all stiffness matrices for this element*/ - Ke1=CreateKMatrixStressbalanceFSViscous(); - Ke2=CreateKMatrixStressbalanceFSFriction(); - Ke =new ElementMatrix(Ke1,Ke2); - - /*clean-up and return*/ - delete Ke1; - delete Ke2; - return Ke; - -} -/*}}}*/ -/*FUNCTION Penta::KMatrixGLSstabilization{{{*/ -void Penta::KMatrixGLSstabilization(ElementMatrix* Ke){ - - int numdof = NUMVERTICES*NDOF4; - - /*Intermediaries */ - int i,j; - IssmDouble Jdet,viscosity,FSreconditioning,diameter,rigidity; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ - GaussPenta *gauss=NULL; - - /*Stabilization*/ - IssmDouble D_scalar; - IssmDouble dbasis[3][6]; - IssmDouble dmu[3]; - IssmDouble mu; - IssmDouble dnodalbasis[6][6][3]; - IssmDouble SU[6][4][4]; - IssmDouble SW[6][4][4]; - int p,q,ii; - int c=3; //index of pressure - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - parameters->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - - /*Find minimal length and B*/ - rigidity=material->GetB(); - diameter=MinEdgeLength(xyz_list); - - gauss=new GaussPenta(); - for(int iv=0;iv<6;iv++){ - gauss->GaussVertex(iv); - GetNodalFunctionsP1Derivatives(&dbasis[0][0],&xyz_list[0][0],gauss); - for(i=0;i<6;i++){ - for(j=0;j<3;j++){ - dnodalbasis[i][iv][j] = dbasis[j][i]; - } - } - } - delete gauss; - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(5,5); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - - this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); - material->GetViscosity3dFS(&viscosity,&epsilon[0]); - - D_scalar=gauss->weight*Jdet; - - /*Add stabilization*/ - GetNodalFunctionsP1Derivatives(&dbasis[0][0],&xyz_list[0][0],gauss); - dmu[0]=0.; dmu[1]=0.; dmu[2]=0.; - mu = 2.*viscosity; - for(p=0;p<6;p++) for(i=0;i<4;i++) for(j=0;j<4;j++){ - SU[p][i][j]=0.; - SW[p][i][j]=0.; - } - for(p=0;p<6;p++){ - for(i=0;i<3;i++){ - SU[p][i][c] += dbasis[i][p]; - SW[p][c][i] += dbasis[i][p]; - for(j=0;j<3;j++){ - SU[p][i][i] += -dmu[j]*dbasis[j][p]; - SU[p][i][j] += -dmu[i]*dbasis[i][p]; - for(ii=0;ii<6;ii++){ - SU[p][i][i] += -mu*dnodalbasis[p][ii][j]*dbasis[j][ii]; - SU[p][i][j] += -mu*dnodalbasis[p][ii][i]*dbasis[j][ii]; - } - SW[p][i][i] += -dmu[j]*dbasis[j][p]; - SW[p][j][i] += -dmu[j]*dbasis[i][p]; - for(ii=0;ii<6;ii++){ - SW[p][i][i] += -mu*dnodalbasis[p][ii][j]*dbasis[j][ii]; - SW[p][j][i] += -mu*dnodalbasis[p][ii][i]*dbasis[j][ii]; - } - } - } - } - IssmDouble tau = 1./3.*pow(diameter,2)/(8.*2.*viscosity); - for(p=0;p<6;p++){ - for(q=0;q<6;q++){ - for(i=0;i<4;i++){ - for(j=0;j<4;j++){ - Ke->values[(p*4+i)*numdof+q*4+j] += gauss->weight*Jdet*tau*SW[p][i][0]*SU[q][0][j]; - Ke->values[(p*4+i)*numdof+q*4+j] += gauss->weight*Jdet*tau*SW[p][i][1]*SU[q][1][j]; - Ke->values[(p*4+i)*numdof+q*4+j] += gauss->weight*Jdet*tau*SW[p][i][2]*SU[q][2][j]; - } - } - } - } - } - - /*Clean up*/ - delete gauss; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixStressbalanceFSViscous {{{*/ -ElementMatrix* Penta::CreateKMatrixStressbalanceFSViscous(void){ - - /*Intermediaries */ - int i,approximation; - IssmDouble Jdet,viscosity,FSreconditioning,D_scalar; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ - GaussPenta *gauss=NULL; - - /*If on water or not FS, skip stiffness: */ - inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation!=FSApproximationEnum && approximation!=SSAFSApproximationEnum && approximation!=HOFSApproximationEnum) return NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - int numdof = vnumnodes*NDOF3 + pnumnodes*NDOF1; - - /*Prepare coordinate system list*/ - int* cs_list = xNew(vnumnodes+pnumnodes); - for(i=0;iparameters,FSvelocityEnum); - IssmDouble* B = xNew(8*numdof); - IssmDouble* Bprime = xNew(8*numdof); - IssmDouble* D = xNewZeroInit(8*8); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - parameters->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(5,5); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetBFS(B,&xyz_list[0][0],gauss); - GetBprimeFS(Bprime,&xyz_list[0][0],gauss); - - this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); - material->GetViscosity3dFS(&viscosity,&epsilon[0]); - - D_scalar=gauss->weight*Jdet; - for(i=0;i<6;i++) D[i*8+i] = +D_scalar*2.*viscosity; - for(i=6;i<8;i++) D[i*8+i] = -D_scalar*FSreconditioning; - - TripleMultiply(B,8,numdof,1, - D,8,8,0, - Bprime,8,numdof,0, - Ke->values,1); - } - - /*Transform Coordinate System*/ - TransformStiffnessMatrixCoord(Ke,nodes,(vnumnodes+pnumnodes),cs_list); - - /*Clean up and return*/ - delete gauss; - xDelete(cs_list); - xDelete(B); - xDelete(Bprime); - xDelete(D); - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixStressbalanceFSFriction{{{*/ -ElementMatrix* Penta::CreateKMatrixStressbalanceFSFriction(void){ - - /*Intermediaries */ - int i,j; - int analysis_type,approximation; - IssmDouble alpha2,Jdet2d; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - Friction *friction = NULL; - GaussPenta *gauss = NULL; - - /*Initialize Element matrix and return if necessary*/ - if(IsFloating() || !IsOnBed()) return NULL; - - /*If on water or not FS, skip stiffness: */ - inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation!=FSApproximationEnum && approximation!=SSAFSApproximationEnum && approximation!=HOFSApproximationEnum) return NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - int numdof = vnumnodes*NDOF3 + pnumnodes*NDOF1; - - /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,vnumnodes+pnumnodes,this->parameters,FSvelocityEnum); - IssmDouble* BFriction = xNew(2*numdof); - IssmDouble* D = xNewZeroInit(2*2); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - parameters->FindParam(&analysis_type,AnalysisTypeEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - for(i=0;ibegin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetTriaJacobianDeterminant(&Jdet2d, &xyz_list_tria[0][0],gauss); - GetLFS(BFriction,gauss); - - friction->GetAlpha2(&alpha2,gauss,VxEnum,VyEnum,VzEnum); - - D[0*2+0] = +alpha2*gauss->weight*Jdet2d; //taub_x = -alpha2 vx - D[1*2+1] = +alpha2*gauss->weight*Jdet2d; //taub_y = -alpha2 vy - - TripleMultiply(BFriction,2,numdof,1, - D,2,2,0, - BFriction,2,numdof,0, - Ke->values,1); - } - - /*DO NOT Transform Coordinate System: this stiffness matrix is already expressed in tangential coordinates*/ - //TransformStiffnessMatrixCoord(Ke,nodes,NUMVERTICES,XYZEnum); - - /*Clean up and return*/ - delete gauss; - delete friction; - xDelete(BFriction); - xDelete(D); - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixStressbalanceVert {{{*/ -ElementMatrix* Penta::CreateKMatrixStressbalanceVert(void){ - - /*compute all stiffness matrices for this element*/ - ElementMatrix* Ke1=CreateKMatrixStressbalanceVertVolume(); - ElementMatrix* Ke2=CreateKMatrixStressbalanceVertSurface(); - ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); - - /*clean-up and return*/ - delete Ke1; - delete Ke2; - return Ke; - -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixStressbalanceVertVolume {{{*/ -ElementMatrix* Penta::CreateKMatrixStressbalanceVertVolume(void){ - - /*Intermediaries */ - IssmDouble Jdet; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble B[NDOF1][NUMVERTICES]; - IssmDouble Bprime[NDOF1][NUMVERTICES]; - IssmDouble DL_scalar; - GaussPenta *gauss=NULL; - - /*Initialize Element matrix*/ - ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(2,2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetBVert(&B[0][0], &xyz_list[0][0], gauss); - GetBprimeVert(&Bprime[0][0], &xyz_list[0][0], gauss); - - DL_scalar=gauss->weight*Jdet; - - TripleMultiply( &B[0][0],1,NUMVERTICES,1, - &DL_scalar,1,1,0, - &Bprime[0][0],1,NUMVERTICES,0, - &Ke->values[0],1); - } - - /*Clean up and return*/ - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixStressbalanceVertSurface {{{*/ -ElementMatrix* Penta::CreateKMatrixStressbalanceVertSurface(void){ - - if (!IsOnSurface()) return NULL; - - /*Constants*/ - const int numdof=NDOF1*NUMVERTICES; - - /*Intermediaries */ - int i,j; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble surface_normal[3]; - IssmDouble Jdet2d,DL_scalar; - IssmDouble basis[NUMVERTICES]; - GaussPenta *gauss=NULL; - - /*Initialize Element matrix*/ - ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - for(i=0;ibegin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetTriaJacobianDeterminant(&Jdet2d, &xyz_list_tria[0][0],gauss); - GetNodalFunctionsP1(&basis[0], gauss); - - DL_scalar= - gauss->weight*Jdet2d*surface_normal[2]; - - TripleMultiply( basis,1,numdof,1, - &DL_scalar,1,1,0, - basis,1,numdof,0, - &Ke->values[0],1); - } - - /*Clean up and return*/ - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorCouplingSSAFS {{{*/ -ElementVector* Penta::CreatePVectorCouplingSSAFS(void){ - - /*compute all load vectors for this element*/ - ElementVector* pe1=CreatePVectorCouplingSSAFSViscous(); - ElementVector* pe2=CreatePVectorCouplingSSAFSFriction(); - ElementVector* pe =new ElementVector(pe1,pe2); - - /*clean-up and return*/ - delete pe1; - delete pe2; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorCouplingSSAFSViscous {{{*/ -ElementVector* Penta::CreatePVectorCouplingSSAFSViscous(void){ - - /*Intermediaries */ - int i,approximation; - IssmDouble viscosity,Jdet; - IssmDouble FSreconditioning; - IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ - IssmDouble dw[3]; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble basis[6]; //for the six nodes of the penta - IssmDouble dbasis[3][6]; //for the six nodes of the penta - GaussPenta *gauss=NULL; - - /*Initialize Element vector and return if necessary*/ - inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation!=SSAFSApproximationEnum) return NULL; - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - - /*Prepare coordinate system list*/ - int* cs_list = xNew(vnumnodes+pnumnodes); - for(i=0;iparameters,FSvelocityEnum); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - Input* vzSSA_input=inputs->GetInput(VzSSAEnum); _assert_(vzSSA_input); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(5,5); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctionsP1(&basis[0], gauss); - GetNodalFunctionsP1Derivatives(&dbasis[0][0],&xyz_list[0][0], gauss); - - vzSSA_input->GetInputDerivativeValue(&dw[0],&xyz_list[0][0],gauss); - - this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); - material->GetViscosity3dFS(&viscosity,&epsilon[0]); - - for(i=0;ivalues[i*NDOF3+0]+=-Jdet*gauss->weight*viscosity*dw[0]*dbasis[2][i]; - pe->values[i*NDOF3+1]+=-Jdet*gauss->weight*viscosity*dw[1]*dbasis[2][i]; - pe->values[i*NDOF3+2]+=-Jdet*gauss->weight*viscosity*(dw[0]*dbasis[0][i]+dw[1]*dbasis[1][i]+2*dw[2]*dbasis[2][i]); - pe->values[NDOF3*vnumnodes+i]+=Jdet*gauss->weight*FSreconditioning*dw[2]*basis[i]; - } - } - - /*Transform coordinate system*/ - TransformLoadVectorCoord(pe,nodes,vnumnodes+pnumnodes,cs_list); - - /*Clean up and return*/ - xDelete(cs_list); - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorCouplingSSAFSFriction{{{*/ -ElementVector* Penta::CreatePVectorCouplingSSAFSFriction(void){ - - /*Intermediaries*/ - int i,j; - int approximation,analysis_type; - IssmDouble Jdet,Jdet2d; - IssmDouble FSreconditioning; - IssmDouble bed_normal[3]; - IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ - IssmDouble viscosity, w, alpha2_gauss; - IssmDouble dw[3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble basis[6]; //for the six nodes of the penta - Friction* friction=NULL; - GaussPenta *gauss=NULL; - - /*Initialize Element vector and return if necessary*/ - if(!IsOnBed() || IsFloating()) return NULL; - inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation!=SSAFSApproximationEnum) return NULL; - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - - /*Prepare coordinate system list*/ - int* cs_list = xNew(vnumnodes+pnumnodes); - for(i=0;iparameters,FSvelocityEnum); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - parameters->FindParam(&analysis_type,AnalysisTypeEnum); - this->parameters->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - Input* vzSSA_input=inputs->GetInput(VzSSAEnum); _assert_(vzSSA_input); - - for(i=0;ibegin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetTriaJacobianDeterminant(&Jdet2d, &xyz_list_tria[0][0], gauss); - GetNodalFunctionsP1(basis, gauss); - - vzSSA_input->GetInputValue(&w, gauss); - vzSSA_input->GetInputDerivativeValue(&dw[0],&xyz_list[0][0],gauss); - - BedNormal(&bed_normal[0],xyz_list_tria); - this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); - material->GetViscosity3dFS(&viscosity,&epsilon[0]); - friction->GetAlpha2(&alpha2_gauss, gauss,VxEnum,VyEnum,VzEnum); - - for(i=0;ivalues[i*NDOF3+0]+=Jdet2d*gauss->weight*(alpha2_gauss*w*bed_normal[0]*bed_normal[2]+2*viscosity*dw[2]*bed_normal[0])*basis[i]; - pe->values[i*NDOF3+1]+=Jdet2d*gauss->weight*(alpha2_gauss*w*bed_normal[1]*bed_normal[2]+2*viscosity*dw[2]*bed_normal[1])*basis[i]; - pe->values[i*NDOF3+2]+=Jdet2d*gauss->weight*2*viscosity*(dw[0]*bed_normal[0]+dw[1]*bed_normal[1]+dw[2]*bed_normal[2])*basis[i]; - } - } - - /*Transform coordinate system*/ - TransformLoadVectorCoord(pe,nodes,(vnumnodes+pnumnodes),cs_list); - - /*Clean up and return*/ - xDelete(cs_list); - delete gauss; - delete friction; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorCouplingHOFS {{{*/ -ElementVector* Penta::CreatePVectorCouplingHOFS(void){ - - /*compute all load vectors for this element*/ - ElementVector* pe1=CreatePVectorCouplingHOFSViscous(); - ElementVector* pe2=CreatePVectorCouplingHOFSFriction(); - ElementVector* pe =new ElementVector(pe1,pe2); - - /*clean-up and return*/ - delete pe1; - delete pe2; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorCouplingHOFSViscous {{{*/ -ElementVector* Penta::CreatePVectorCouplingHOFSViscous(void){ - - /*Intermediaries */ - int i; - int approximation; - IssmDouble viscosity,Jdet; - IssmDouble FSreconditioning; - IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ - IssmDouble dw[3]; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble basis[6]; //for the six nodes of the penta - IssmDouble dbasis[3][6]; //for the six nodes of the penta - GaussPenta *gauss=NULL; - - /*Initialize Element vector and return if necessary*/ - inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation!=HOFSApproximationEnum) return NULL; - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - - /*Prepare coordinate system list*/ - int* cs_list = xNew(vnumnodes+pnumnodes); - for(i=0;iparameters,FSvelocityEnum); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - Input* vzHO_input=inputs->GetInput(VzHOEnum); _assert_(vzHO_input); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(5,5); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctionsP1(&basis[0], gauss); - GetNodalFunctionsP1Derivatives(&dbasis[0][0],&xyz_list[0][0], gauss); - - vzHO_input->GetInputDerivativeValue(&dw[0],&xyz_list[0][0],gauss); - - this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); - material->GetViscosity3dFS(&viscosity,&epsilon[0]); - - for(i=0;ivalues[i*NDOF3+0]+=-Jdet*gauss->weight*viscosity*dw[0]*dbasis[2][i]; - pe->values[i*NDOF3+1]+=-Jdet*gauss->weight*viscosity*dw[1]*dbasis[2][i]; - pe->values[i*NDOF3+2]+=-Jdet*gauss->weight*viscosity*(dw[0]*dbasis[0][i]+dw[1]*dbasis[1][i]+2*dw[2]*dbasis[2][i]); - pe->values[NDOF3*vnumnodes+i]+=Jdet*gauss->weight*FSreconditioning*dw[2]*basis[i]; - } - } - - /*Transform coordinate system*/ - TransformLoadVectorCoord(pe,nodes,vnumnodes+pnumnodes,cs_list); - - /*Clean up and return*/ - xDelete(cs_list); - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorCouplingHOFSFriction{{{*/ -ElementVector* Penta::CreatePVectorCouplingHOFSFriction(void){ - - /*Intermediaries*/ - int i,j; - int approximation,analysis_type; - IssmDouble Jdet,Jdet2d; - IssmDouble FSreconditioning; - IssmDouble bed_normal[3]; - IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ - IssmDouble viscosity, w, alpha2_gauss; - IssmDouble dw[3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble basis[6]; //for the six nodes of the penta - Friction* friction=NULL; - GaussPenta *gauss=NULL; - - /*Initialize Element vector and return if necessary*/ - if(!IsOnBed() || IsFloating()) return NULL; - inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation!=HOFSApproximationEnum) return NULL; - - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - int numnodes = vnumnodes+pnumnodes; - - /*Prepare coordinate system list*/ - int* cs_list = xNew(vnumnodes+pnumnodes); - for(i=0;iparameters,FSvelocityEnum); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - parameters->FindParam(&analysis_type,AnalysisTypeEnum); - this->parameters->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - Input* vzHO_input=inputs->GetInput(VzHOEnum); _assert_(vzHO_input); - - for(i=0;ibegin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetTriaJacobianDeterminant(&Jdet2d, &xyz_list_tria[0][0], gauss); - GetNodalFunctionsP1(basis, gauss); - - vzHO_input->GetInputValue(&w, gauss); - vzHO_input->GetInputDerivativeValue(&dw[0],&xyz_list[0][0],gauss); - - BedNormal(&bed_normal[0],xyz_list_tria); - this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); - material->GetViscosity3dFS(&viscosity,&epsilon[0]); - friction->GetAlpha2(&alpha2_gauss, gauss,VxEnum,VyEnum,VzEnum); - - for(i=0;ivalues[i*NDOF3+0]+=Jdet2d*gauss->weight*(alpha2_gauss*w*bed_normal[0]*bed_normal[2]+2*viscosity*dw[2]*bed_normal[0])*basis[i]; - pe->values[i*NDOF3+1]+=Jdet2d*gauss->weight*(alpha2_gauss*w*bed_normal[1]*bed_normal[2]+2*viscosity*dw[2]*bed_normal[1])*basis[i]; - pe->values[i*NDOF3+2]+=Jdet2d*gauss->weight*2*viscosity*(dw[0]*bed_normal[0]+dw[1]*bed_normal[1]+dw[2]*bed_normal[2])*basis[i]; - } - } - - /*Transform coordinate system*/ - TransformLoadVectorCoord(pe,nodes,vnumnodes+pnumnodes,cs_list); - - /*Clean up and return*/ - xDelete(cs_list); - delete gauss; - delete friction; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorStressbalanceHoriz{{{*/ -ElementVector* Penta::CreatePVectorStressbalanceHoriz(void){ - - int approximation; - inputs->GetInputValue(&approximation,ApproximationEnum); - - switch(approximation){ - case SSAApproximationEnum: - return CreatePVectorStressbalanceSSA(); - case HOApproximationEnum: - return CreatePVectorStressbalanceHO(); - case L1L2ApproximationEnum: - return CreatePVectorStressbalanceL1L2(); - case SIAApproximationEnum: - return NULL; - case NoneApproximationEnum: - return NULL; - case FSApproximationEnum: - return CreatePVectorStressbalanceFS(); - case SSAHOApproximationEnum: - return CreatePVectorStressbalanceSSAHO(); - case SSAFSApproximationEnum: - return CreatePVectorStressbalanceSSAFS(); - case HOFSApproximationEnum: - return CreatePVectorStressbalanceHOFS(); - default: - _error_("Approximation " << EnumToStringx(approximation) << " not supported yet"); - } -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorStressbalanceSSAHO{{{*/ -ElementVector* Penta::CreatePVectorStressbalanceSSAHO(void){ - - /*compute all load vectors for this element*/ - ElementVector* pe1=CreatePVectorStressbalanceSSA(); - ElementVector* pe2=CreatePVectorStressbalanceHO(); - ElementVector* pe =new ElementVector(pe1,pe2); - - /*clean-up and return*/ - delete pe1; - delete pe2; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorStressbalanceSSAFS{{{*/ -ElementVector* Penta::CreatePVectorStressbalanceSSAFS(void){ - - /*compute all load vectors for this element*/ - int init = this->element_type; - this->element_type=P1Enum; - ElementVector* pe1=CreatePVectorStressbalanceSSA(); - this->element_type=init; - ElementVector* pe2=CreatePVectorStressbalanceFS(); - int indices[3]={18,19,20}; - this->element_type=MINIcondensedEnum; - ElementMatrix* Ke = CreateKMatrixStressbalanceFS(); - this->element_type=init; - pe2->StaticCondensation(Ke,3,&indices[0]); - delete Ke; - ElementVector* pe3=CreatePVectorCouplingSSAFS(); - ElementVector* pe =new ElementVector(pe1,pe2,pe3); - - /*clean-up and return*/ - delete pe1; - delete pe2; - delete pe3; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorStressbalanceHOFS{{{*/ -ElementVector* Penta::CreatePVectorStressbalanceHOFS(void){ - - /*compute all load vectors for this element*/ - int init = this->element_type; - this->element_type=P1Enum; - ElementVector* pe1=CreatePVectorStressbalanceHO(); - this->element_type=init; - ElementVector* pe2=CreatePVectorStressbalanceFS(); - int indices[3]={18,19,20}; - this->element_type=MINIcondensedEnum; - ElementMatrix* Ke = CreateKMatrixStressbalanceFS(); - this->element_type=init; - pe2->StaticCondensation(Ke,3,&indices[0]); - delete Ke; - ElementVector* pe3=CreatePVectorCouplingHOFS(); - ElementVector* pe =new ElementVector(pe1,pe2,pe3); - - /*clean-up and return*/ - delete pe1; - delete pe2; - delete pe3; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorStressbalanceSIA{{{*/ -ElementVector* Penta::CreatePVectorStressbalanceSIA(void){ - - /*Intermediaries*/ - int i,j; - int node0,node1; - IssmDouble connectivity[2]; - IssmDouble Jdet; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_segment[2][3]; - IssmDouble z_list[NUMVERTICES]; - IssmDouble slope[2]; - IssmDouble slope2,constant_part; - IssmDouble rho_ice,gravity,n,B; - IssmDouble ub,vb,z_g,surface,thickness; - GaussPenta* gauss=NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); _assert_(numnodes==6); - - /*Initialize Element vector*/ - ElementVector* pe=new ElementVector(nodes,numnodes,this->parameters); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - rho_ice=matpar->GetRhoIce(); - gravity=matpar->GetG(); - n=material->GetN(); - B=material->GetB(); - Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input); - Input* surface_input=inputs->GetInput(SurfaceEnum); _assert_(surface_input); - Input* slopex_input=inputs->GetInput(SurfaceSlopeXEnum); _assert_(slopex_input); - Input* slopey_input=inputs->GetInput(SurfaceSlopeYEnum); _assert_(slopey_input); - for(i=0;iConnectivity(); - connectivity[1]=(IssmDouble)vertices[node1]->Connectivity(); - - /*Loop on the Gauss points: */ - gauss=new GaussPenta(node0,node1,3); - for(int ig=gauss->begin();igend();ig++){ - gauss->GaussPoint(ig); - - slopex_input->GetInputValue(&slope[0],gauss); - slopey_input->GetInputValue(&slope[1],gauss); - surface_input->GetInputValue(&surface,gauss); - thickness_input->GetInputValue(&thickness,gauss); - - slope2=pow(slope[0],2)+pow(slope[1],2); - constant_part=-2.*pow(rho_ice*gravity,n)*pow(slope2,((n-1.)/2.)); - - PentaRef::GetInputValue(&z_g,&z_list[0],gauss); - GetSegmentJacobianDeterminant(&Jdet,&xyz_list_segment[0][0],gauss); - - if(IsOnSurface()){ - pe->values[2*node1+0]+=constant_part*pow((surface-z_g)/B,n)*slope[0]*Jdet*gauss->weight/connectivity[1]; - pe->values[2*node1+1]+=constant_part*pow((surface-z_g)/B,n)*slope[1]*Jdet*gauss->weight/connectivity[1]; - } - else{/*connectivity is too large, should take only half on it*/ - pe->values[2*node1+0]+=constant_part*pow((surface-z_g)/B,n)*slope[0]*Jdet*gauss->weight*2./connectivity[1]; - pe->values[2*node1+1]+=constant_part*pow((surface-z_g)/B,n)*slope[1]*Jdet*gauss->weight*2./connectivity[1]; - } - } - delete gauss; - - /*Deal with lower surface*/ - if(IsOnBed()){ - constant_part=-1.58*1.e-10*rho_ice*gravity*thickness; - ub=constant_part*slope[0]; - vb=constant_part*slope[1]; - - pe->values[2*node0+0]+=ub/connectivity[0]; - pe->values[2*node0+1]+=vb/connectivity[0]; - } - } - - /*Clean up and return*/ - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorStressbalanceSSA{{{*/ -ElementVector* Penta::CreatePVectorStressbalanceSSA(void){ - - if (!IsOnBed()) return NULL; - - /*Call Tria function*/ - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - ElementVector* pe=tria->CreatePVectorStressbalanceSSA(); - delete tria->material; delete tria; - - /*Clean up and return*/ - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorStressbalanceL1L2{{{*/ -ElementVector* Penta::CreatePVectorStressbalanceL1L2(void){ - - if (!IsOnBed()) return NULL; - - /*Call Tria function*/ - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - ElementVector* pe=tria->CreatePVectorStressbalanceSSA(); - delete tria->material; delete tria; - - /*Clean up and return*/ - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorStressbalanceHO{{{*/ -ElementVector* Penta::CreatePVectorStressbalanceHO(void){ - - /*compute all load vectors for this element*/ - ElementVector* pe1=CreatePVectorStressbalanceHODrivingStress(); - ElementVector* pe2=CreatePVectorStressbalanceHOFront(); - ElementVector* pe =new ElementVector(pe1,pe2); - - /*clean-up and return*/ - delete pe1; - delete pe2; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorStressbalanceHODrivingStress{{{*/ -ElementVector* Penta::CreatePVectorStressbalanceHODrivingStress(void){ - - /*Intermediaries*/ - IssmDouble Jdet; - IssmDouble slope[3]; //do not put 2! this goes into GetInputDerivativeValue, which addresses slope[3] also! - IssmDouble driving_stress_baseline,thickness; - IssmDouble xyz_list[NUMVERTICES][3]; - GaussPenta *gauss=NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize vector*/ - ElementVector* pe = new ElementVector(nodes,numnodes,this->parameters,HOApproximationEnum); - IssmDouble* basis = xNewZeroInit(numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input); - Input* surface_input=inputs->GetInput(SurfaceEnum); _assert_(surface_input); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(2,3); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - - thickness_input->GetInputValue(&thickness, gauss); - surface_input->GetInputDerivativeValue(&slope[0],&xyz_list[0][0],gauss); - - driving_stress_baseline=matpar->GetRhoIce()*matpar->GetG(); - - for(int i=0;ivalues[i*NDOF2+0]+= -driving_stress_baseline*slope[0]*Jdet*gauss->weight*basis[i]; - pe->values[i*NDOF2+1]+= -driving_stress_baseline*slope[1]*Jdet*gauss->weight*basis[i]; - } - } - - /*Transform coordinate system*/ - TransformLoadVectorCoord(pe,nodes,numnodes,XYEnum); - - /*Clean up and return*/ - xDelete(basis); - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorStressbalanceHOFront{{{*/ -ElementVector* Penta::CreatePVectorStressbalanceHOFront(void){ - - /*Intermediaries */ - IssmDouble ls[NUMVERTICES]; - IssmDouble xyz_list[NUMVERTICES][3]; - bool isfront; - - /*Retrieve all inputs and parameters*/ - GetInputListOnVertices(&ls[0],MaskIceLevelsetEnum); - - /*If the level set is awlays <=0, there is no ice front here*/ - isfront = false; - if(ls[0]>0. || ls[1]>0. || ls[2]>0.){ - if(ls[0]*ls[1]<0. || ls[0]*ls[2]<0. || (ls[0]*ls[1]+ls[0]*ls[2]+ls[1]*ls[2]==0.)){ - isfront = true; - } - } - - /*If no front, return NULL*/ - if(!isfront) return NULL; - - /*Intermediaries*/ - IssmDouble rho_ice,rho_water,gravity; - IssmDouble Jdet,surface,z_g,water_pressure,ice_pressure,air_pressure; - IssmDouble surface_under_water,base_under_water,pressure; - IssmDouble xyz_list_front[4][3]; - IssmDouble area_coordinates[4][3]; - IssmDouble normal[3]; - GaussPenta* gauss; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector and other vectors*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - ElementVector* pe = new ElementVector(nodes,numnodes,this->parameters,HOApproximationEnum); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - Input* surface_input=inputs->GetInput(SurfaceEnum); _assert_(surface_input); - rho_water=matpar->GetRhoWater(); - rho_ice =matpar->GetRhoIce(); - gravity =matpar->GetG(); - GetZeroLevelsetCoordinates(&xyz_list_front[0][0],xyz_list,MaskIceLevelsetEnum); - GetAreaCoordinates(&area_coordinates[0][0],xyz_list_front,xyz_list,4); - GetQuadNormal(&normal[0],xyz_list_front); - - /*Initialize gauss points*/ - IssmDouble zmax=xyz_list[0][2]; for(int i=1;i<6;i++) if(xyz_list[i][2]>zmax) zmax=xyz_list[i][2]; - IssmDouble zmin=xyz_list[0][2]; for(int i=1;i<6;i++) if(xyz_list[i][2]0 && zmin<0) gauss=new GaussPenta(area_coordinates,3,10); //refined in vertical because of the sea level discontinuity - else gauss=new GaussPenta(area_coordinates,3,3); - - /* Start looping on the number of gaussian points: */ - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - surface_input->GetInputValue(&surface,gauss); - z_g=GetZcoord(gauss); - GetNodalFunctions(basis,gauss); - GetQuadJacobianDeterminant(&Jdet,xyz_list_front,gauss); - - water_pressure = rho_water*gravity*min(0.,z_g);//0 if the gaussian point is above water level - ice_pressure = rho_ice*gravity*(surface-z_g); - air_pressure = 0; - pressure = ice_pressure + water_pressure + air_pressure; - - for (int i=0;ivalues[2*i+0]+= pressure*Jdet*gauss->weight*normal[0]*basis[i]; - pe->values[2*i+1]+= pressure*Jdet*gauss->weight*normal[1]*basis[i]; - } - } - - /*Transform coordinate system*/ - TransformLoadVectorCoord(pe,nodes,numnodes,XYEnum); - - /*Clean up and return*/ - xDelete(basis); - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorStressbalanceFS {{{*/ -ElementVector* Penta::CreatePVectorStressbalanceFS(void){ - - ElementVector* pe1; - ElementVector* pe2; - ElementVector* pe3; - ElementVector* pe; - - /*compute all stiffness matrices for this element*/ - pe1=CreatePVectorStressbalanceFSViscous(); - pe2=CreatePVectorStressbalanceFSShelf(); - pe3=CreatePVectorStressbalanceFSFront(); - pe =new ElementVector(pe1,pe2,pe3); - - /*clean-up and return*/ - delete pe1; - delete pe2; - delete pe3; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorStressbalanceFSFront{{{*/ -ElementVector* Penta::CreatePVectorStressbalanceFSFront(void){ - - /*Intermediaries */ - int i; - IssmDouble ls[NUMVERTICES]; - IssmDouble xyz_list[NUMVERTICES][3]; - bool isfront; - - /*Retrieve all inputs and parameters*/ - GetInputListOnVertices(&ls[0],MaskIceLevelsetEnum); - - /*If the level set is awlays <=0, there is no ice front here*/ - isfront = false; - if(ls[0]>0. || ls[1]>0. || ls[2]>0.){ - if(ls[0]*ls[1]<0. || ls[0]*ls[2]<0. || (ls[0]*ls[1]+ls[0]*ls[2]+ls[1]*ls[2]==0.)){ - isfront = true; - } - } - - /*If no front, return NULL*/ - if(!isfront) return NULL; - - /*Fetch number of nodes and dof for this finite element*/ - IssmDouble rho_ice,rho_water,gravity; - IssmDouble Jdet,z_g,water_pressure,air_pressure; - IssmDouble surface_under_water,base_under_water,pressure; - IssmDouble xyz_list_front[4][3]; - IssmDouble area_coordinates[4][3]; - IssmDouble normal[3]; - GaussPenta* gauss; - - /*Fetch number of nodes and dof for this finite element*/ - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - - /*Prepare coordinate system list*/ - int* cs_list = xNew(vnumnodes+pnumnodes); - for(i=0;iparameters,FSvelocityEnum); - IssmDouble* vbasis = xNew(vnumnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - rho_water=matpar->GetRhoWater(); - rho_ice =matpar->GetRhoIce(); - gravity =matpar->GetG(); - GetZeroLevelsetCoordinates(&xyz_list_front[0][0],xyz_list,MaskIceLevelsetEnum); - GetAreaCoordinates(&area_coordinates[0][0],xyz_list_front,xyz_list,4); - GetQuadNormal(&normal[0],xyz_list_front); - - /*Start looping on Gaussian points*/ - IssmDouble zmax=xyz_list[0][2]; for(int i=1;i<6;i++) if(xyz_list[i][2]>zmax) zmax=xyz_list[i][2]; - IssmDouble zmin=xyz_list[0][2]; for(int i=1;i<6;i++) if(xyz_list[i][2]0 && zmin<0) gauss=new GaussPenta(area_coordinates,3,30); //refined in vertical because of the sea level discontinuity - else gauss=new GaussPenta(area_coordinates,3,3); - - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - z_g=GetZcoord(gauss); - GetNodalFunctionsVelocity(vbasis,gauss); - GetQuadJacobianDeterminant(&Jdet,xyz_list_front,gauss); - - water_pressure=rho_water*gravity*min(0.,z_g);//0 if the gaussian point is above water level - air_pressure=0; - pressure = water_pressure + air_pressure; - - for(i=0;ivalues[3*i+0]+= pressure*Jdet*gauss->weight*normal[0]*vbasis[i]; - pe->values[3*i+1]+= pressure*Jdet*gauss->weight*normal[1]*vbasis[i]; - pe->values[3*i+2]+= pressure*Jdet*gauss->weight*normal[2]*vbasis[i]; - } - } - - /*Transform coordinate system*/ - TransformLoadVectorCoord(pe,nodes,(vnumnodes+pnumnodes),cs_list); - - /*Clean up and return*/ - xDelete(cs_list); - xDelete(vbasis); - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::PVectorGLSstabilization{{{*/ -void Penta::PVectorGLSstabilization(ElementVector* pe){ - - /*Intermediaries*/ - int i,j; - IssmDouble Jdet,gravity,rho_ice,B,D_scalar_stab,viscosity; - IssmDouble forcex,forcey,forcez,diameter,FSreconditioning; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ - GaussPenta *gauss=NULL; - - /*Stabilization*/ - IssmDouble dbasis[3][6]; - IssmDouble dmu[3]; - IssmDouble mu; - IssmDouble dnodalbasis[6][6][3]; - IssmDouble SW[6][4][4]; - int p,ii; - int c=3; //index of pressure - - /*Retrieve all inputs and parameters*/ - rho_ice=matpar->GetRhoIce(); - gravity=matpar->GetG(); - B=material->GetB(); - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - - /*Find minimal length*/ - diameter=MinEdgeLength(xyz_list); - - gauss=new GaussPenta(); - for(int iv=0;iv<6;iv++){ - gauss->GaussVertex(iv); - GetNodalFunctionsP1Derivatives(&dbasis[0][0],&xyz_list[0][0],gauss); - for(i=0;i<6;i++){ - for(j=0;j<3;j++){ - dnodalbasis[i][iv][j] = dbasis[j][i]; - } - } - } - delete gauss; - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(5,5); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); - material->GetViscosity3dFS(&viscosity,&epsilon[0]); - - GetNodalFunctionsP1Derivatives(&dbasis[0][0],&xyz_list[0][0],gauss); - dmu[0]=0.; dmu[1]=0.; dmu[2]=0.; - mu = 2.*viscosity; - for(p=0;p<6;p++) for(i=0;i<4;i++) for(j=0;j<4;j++){ - SW[p][i][j]=0.; - } - for(p=0;p<6;p++){ - for(i=0;i<3;i++){ - SW[p][c][i] += dbasis[i][p]; - for(j=0;j<3;j++){ - SW[p][i][i] += -dmu[j]*dbasis[j][p]; - SW[p][j][i] += -dmu[j]*dbasis[i][p]; - for(ii=0;ii<6;ii++){ - SW[p][i][i] += -mu*dnodalbasis[p][ii][j]*dbasis[j][ii]; - SW[p][j][i] += -mu*dnodalbasis[p][ii][i]*dbasis[j][ii]; - } - } - } - } - IssmDouble tau = 1./3.*pow(diameter,2)/(8.*2.*viscosity); - for(p=0;p<6;p++){ - for(j=0;j<4;j++){ - pe->values[p*4+j] += gauss->weight*Jdet*tau*rho_ice*forcex*SW[p][j][0]; - pe->values[p*4+j] += gauss->weight*Jdet*tau*rho_ice*forcey*SW[p][j][1]; - pe->values[p*4+j] += gauss->weight*Jdet*tau*rho_ice*(forcez-gravity)*SW[p][j][2]; - } - } - } - - /*Clean up*/ - delete gauss; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorStressbalanceFSViscous {{{*/ -ElementVector* Penta::CreatePVectorStressbalanceFSViscous(void){ - - /*Intermediaries*/ - int i; - int approximation; - IssmDouble Jdet,gravity,rho_ice; - IssmDouble forcex,forcey,forcez; - IssmDouble xyz_list[NUMVERTICES][3]; - GaussPenta *gauss=NULL; - - /*Initialize Element vector and return if necessary*/ - inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation!=FSApproximationEnum && approximation!=SSAFSApproximationEnum && approximation!=HOFSApproximationEnum) return NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - - /*Prepare coordinate system list*/ - int* cs_list = xNew(vnumnodes+pnumnodes); - for(i=0;iparameters,FSvelocityEnum); - IssmDouble* vbasis = xNew(vnumnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* loadingforcex_input=inputs->GetInput(LoadingforceXEnum); _assert_(loadingforcex_input); - Input* loadingforcey_input=inputs->GetInput(LoadingforceYEnum); _assert_(loadingforcey_input); - Input* loadingforcez_input=inputs->GetInput(LoadingforceZEnum); _assert_(loadingforcez_input); - rho_ice = matpar->GetRhoIce(); - gravity = matpar->GetG(); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(5,5); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctionsVelocity(vbasis, gauss); - - loadingforcex_input->GetInputValue(&forcex,gauss); - loadingforcey_input->GetInputValue(&forcey,gauss); - loadingforcez_input->GetInputValue(&forcez,gauss); - - for(i=0;ivalues[i*NDOF3+2] += -rho_ice*gravity*Jdet*gauss->weight*vbasis[i]; - pe->values[i*NDOF3+0] += +rho_ice*forcex *Jdet*gauss->weight*vbasis[i]; - pe->values[i*NDOF3+1] += +rho_ice*forcey *Jdet*gauss->weight*vbasis[i]; - pe->values[i*NDOF3+2] += +rho_ice*forcez *Jdet*gauss->weight*vbasis[i]; - } - } - - /*Transform coordinate system*/ - TransformLoadVectorCoord(pe,nodes,vnumnodes+pnumnodes,cs_list); - - /*Clean up and return*/ - delete gauss; - xDelete(cs_list); - xDelete(vbasis); - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorStressbalanceFSShelf{{{*/ -ElementVector* Penta::CreatePVectorStressbalanceFSShelf(void){ - - /*Intermediaries*/ - int i,j; - int approximation,shelf_dampening; - IssmDouble gravity,rho_water,bed,water_pressure; - IssmDouble damper,normal_vel,vx,vy,vz,dt; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble bed_normal[3]; - IssmDouble dz[3]; - IssmDouble Jdet2d; - GaussPenta *gauss=NULL; - - /*Initialize Element vector and return if necessary*/ - if(!IsOnBed() || !IsFloating()) return NULL; - inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation!=FSApproximationEnum && approximation!=SSAFSApproximationEnum && approximation!=HOFSApproximationEnum) return NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - - /*Prepare coordinate system list*/ - int* cs_list = xNew(vnumnodes+pnumnodes); - for(i=0;iparameters,FSvelocityEnum); - IssmDouble* vbasis = xNew(vnumnodes); - - /*Retrieve all inputs and parameters*/ - this->parameters->FindParam(&shelf_dampening,StressbalanceShelfDampeningEnum); - rho_water=matpar->GetRhoWater(); - gravity=matpar->GetG(); - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* bed_input=inputs->GetInput(BedEnum); _assert_(bed_input); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - - for(i=0;ibegin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetTriaJacobianDeterminant(&Jdet2d, &xyz_list_tria[0][0], gauss); - GetNodalFunctionsVelocity(vbasis, gauss); - - BedNormal(&bed_normal[0],xyz_list_tria); - bed_input->GetInputValue(&bed, gauss); - if(shelf_dampening){ //add dampening to avoid too high vertical velocities when not in hydrostatic equilibrium - bed_input->GetInputDerivativeValue(&dz[0],&xyz_list[0][0],gauss); - vx_input->GetInputValue(&vx, gauss); - vy_input->GetInputValue(&vy, gauss); - vz_input->GetInputValue(&vz, gauss); - dt=0.; - normal_vel=bed_normal[0]*vx+bed_normal[1]*vy+bed_normal[2]*vz; - damper=gravity*rho_water*pow(1+pow(dz[0],2)+pow(dz[1],2),0.5)*normal_vel*dt; - } - else damper=0.; - water_pressure=gravity*rho_water*bed; - - for(i=0;ivalues[3*i+0]+=(water_pressure+damper)*gauss->weight*Jdet2d*vbasis[i]*bed_normal[0]; - pe->values[3*i+1]+=(water_pressure+damper)*gauss->weight*Jdet2d*vbasis[i]*bed_normal[1]; - pe->values[3*i+2]+=(water_pressure+damper)*gauss->weight*Jdet2d*vbasis[i]*bed_normal[2]; - } - } - - /*Transform coordinate system*/ - TransformLoadVectorCoord(pe,nodes,(vnumnodes+pnumnodes),cs_list); - - /*Clean up and return*/ - delete gauss; - xDelete(cs_list); - xDelete(vbasis); - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorStressbalanceVert {{{*/ -ElementVector* Penta::CreatePVectorStressbalanceVert(void){ - - /*compute all load vectors for this element*/ - ElementVector* pe1=CreatePVectorStressbalanceVertVolume(); - ElementVector* pe2=CreatePVectorStressbalanceVertBase(); - ElementVector* pe =new ElementVector(pe1,pe2); - - /*clean-up and return*/ - delete pe1; - delete pe2; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorStressbalanceVertVolume {{{*/ -ElementVector* Penta::CreatePVectorStressbalanceVertVolume(void){ - - /*Constants*/ - const int numdof=NDOF1*NUMVERTICES; - - /*Intermediaries*/ - int approximation; - IssmDouble Jdet; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble dudx,dvdy,dwdz; - IssmDouble du[3],dv[3],dw[3]; - IssmDouble basis[6]; - GaussPenta *gauss=NULL; - - /*Initialize Element vector*/ - ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - inputs->GetInputValue(&approximation,ApproximationEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vzFS_input=NULL; - if(approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){ - vzFS_input=inputs->GetInput(VzFSEnum); _assert_(vzFS_input); - } - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(2,2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctionsP1(basis, gauss); - - vx_input->GetInputDerivativeValue(&du[0],&xyz_list[0][0],gauss); - vy_input->GetInputDerivativeValue(&dv[0],&xyz_list[0][0],gauss); - if(approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){ - vzFS_input->GetInputDerivativeValue(&dw[0],&xyz_list[0][0],gauss); - dwdz=dw[2]; - } - else dwdz=0; - dudx=du[0]; - dvdy=dv[1]; - - for(int i=0;ivalues[i] += (dudx+dvdy+dwdz)*Jdet*gauss->weight*basis[i]; - } - - /*Clean up and return*/ - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorStressbalanceVertBase {{{*/ -ElementVector* Penta::CreatePVectorStressbalanceVertBase(void){ - - /*Constants*/ - const int numdof=NDOF1*NUMVERTICES; - - /*Intermediaries */ - int i,j; - int approximation; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble Jdet2d; - IssmDouble vx,vy,vz,dbdx,dbdy,basalmeltingvalue; - IssmDouble slope[3]; - IssmDouble basis[NUMVERTICES]; - GaussPenta* gauss=NULL; - - if (!IsOnBed()) return NULL; - - /*Initialize Element vector*/ - ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - for(i=0;iGetInputValue(&approximation,ApproximationEnum); - Input* bed_input=inputs->GetInput(BedEnum); _assert_(bed_input); - Input* basal_melting_input=inputs->GetInput(BasalforcingsMeltingRateEnum); _assert_(basal_melting_input); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vzFS_input=NULL; - if(approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){ - vzFS_input=inputs->GetInput(VzFSEnum); _assert_(vzFS_input); - } - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(0,1,2,2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - basal_melting_input->GetInputValue(&basalmeltingvalue, gauss); - bed_input->GetInputDerivativeValue(&slope[0],&xyz_list[0][0],gauss); - vx_input->GetInputValue(&vx, gauss); - vy_input->GetInputValue(&vy, gauss); - if(approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){ - vzFS_input->GetInputValue(&vz, gauss); - } - else vz=0; - - dbdx=slope[0]; - dbdy=slope[1]; - - GetTriaJacobianDeterminant(&Jdet2d, &xyz_list_tria[0][0],gauss); - GetNodalFunctionsP1(&basis[0], gauss); - - for(i=0;ivalues[i]+=-Jdet2d*gauss->weight*(vx*dbdx+vy*dbdy-vz-basalmeltingvalue)*basis[i]; - } - - /*Clean up and return*/ - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreateJacobianStressbalanceHoriz{{{*/ -ElementMatrix* Penta::CreateJacobianStressbalanceHoriz(void){ - - int approximation; - inputs->GetInputValue(&approximation,ApproximationEnum); - - switch(approximation){ - case SSAApproximationEnum: - return CreateJacobianStressbalanceSSA2d(); - case HOApproximationEnum: - return CreateJacobianStressbalanceHO(); - case FSApproximationEnum: - return CreateJacobianStressbalanceFS(); - case NoneApproximationEnum: - return NULL; - default: - _error_("Approximation " << EnumToStringx(approximation) << " not supported yet"); - } -} -/*}}}*/ -/*FUNCTION Penta::CreateJacobianStressbalanceSSA2d{{{*/ -ElementMatrix* Penta::CreateJacobianStressbalanceSSA2d(void){ - - /*Figure out if this penta is collapsed. If so, then bailout, except if it is at the - bedrock, in which case we spawn a tria element using the 3 first nodes, and use it to build - the stiffness matrix. */ - if (!IsOnBed()) return NULL; - - /*Depth average some fields*/ - switch(this->material->ObjectEnum()){ - case MaticeEnum: - this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum,MaterialsEnum); - this->InputDepthAverageAtBase(DamageDEnum,DamageDbarEnum,MaterialsEnum); - break; - default: - _error_("material "<material->ObjectEnum())<<" not supported"); - } - - /*Call Tria function*/ - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - ElementMatrix* Ke=tria->CreateJacobianStressbalanceSSA(); - delete tria->material; delete tria; - - /*Delete averaged inputs*/ - this->material->inputs->DeleteInput(MaterialsRheologyBbarEnum); - this->material->inputs->DeleteInput(DamageDbarEnum); - - /*clean up and return*/ - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateJacobianStressbalanceHO{{{*/ -ElementMatrix* Penta::CreateJacobianStressbalanceHO(void){ - - /*Intermediaries */ - int i,j; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble Jdet; - IssmDouble eps1dotdphii,eps1dotdphij; - IssmDouble eps2dotdphii,eps2dotdphij; - IssmDouble mu_prime; - IssmDouble epsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ - IssmDouble eps1[3],eps2[3]; - IssmDouble dphi[3][NUMVERTICES]; - GaussPenta *gauss=NULL; - - /*Initialize Jacobian with regular HO (first part of the Gateau derivative)*/ - ElementMatrix* Ke=CreateKMatrixStressbalanceHO(); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(5,5); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctionsP1Derivatives(&dphi[0][0],&xyz_list[0][0],gauss); - - this->GetStrainRate3dHO(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); - material->GetViscosityDerivativeEpsSquare(&mu_prime,&epsilon[0]); - eps1[0]=2*epsilon[0]+epsilon[1]; eps2[0]=epsilon[2]; - eps1[1]=epsilon[2]; eps2[1]=epsilon[0]+2*epsilon[1]; - eps1[2]=epsilon[3]; eps2[2]=epsilon[4]; - - for(i=0;i<6;i++){ - for(j=0;j<6;j++){ - eps1dotdphii=eps1[0]*dphi[0][i]+eps1[1]*dphi[1][i]+eps1[2]*dphi[2][i]; - eps1dotdphij=eps1[0]*dphi[0][j]+eps1[1]*dphi[1][j]+eps1[2]*dphi[2][j]; - eps2dotdphii=eps2[0]*dphi[0][i]+eps2[1]*dphi[1][i]+eps2[2]*dphi[2][i]; - eps2dotdphij=eps2[0]*dphi[0][j]+eps2[1]*dphi[1][j]+eps2[2]*dphi[2][j]; - - Ke->values[12*(2*i+0)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps1dotdphii; - Ke->values[12*(2*i+0)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps1dotdphii; - Ke->values[12*(2*i+1)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps2dotdphii; - Ke->values[12*(2*i+1)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps2dotdphii; - } - } - } - - /*Transform Coordinate System*/ - TransformStiffnessMatrixCoord(Ke,nodes,NUMVERTICES,XYEnum); - - /*Clean up and return*/ - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateJacobianStressbalanceFS{{{*/ -ElementMatrix* Penta::CreateJacobianStressbalanceFS(void){ - - /*Intermediaries */ - int i,j; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble Jdet; - IssmDouble eps1dotdphii,eps1dotdphij; - IssmDouble eps2dotdphii,eps2dotdphij; - IssmDouble eps3dotdphii,eps3dotdphij; - IssmDouble mu_prime; - IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ - IssmDouble eps1[3],eps2[3],eps3[3]; - GaussPenta *gauss=NULL; - - /*If on water or not FS, skip stiffness: */ - //inputs->GetInputValue(&approximation,ApproximationEnum); - //if(approximation!=FSApproximationEnum && approximation!=SSAFSApproximationEnum && approximation!=HOFSApproximationEnum) return NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - int numdof = vnumnodes*NDOF3 + pnumnodes*NDOF1; - - /*Prepare coordinate system list*/ - int* cs_list = xNew(vnumnodes+pnumnodes); - for(i=0;i(3*vnumnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussPenta(5,5); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet,&xyz_list[0][0],gauss); - GetNodalFunctionsDerivativesVelocity(dbasis,&xyz_list[0][0],gauss); - - //this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); - //material->GetViscosityDerivativeEpsSquareFS(&mu_prime,&epsilon[0]); - //eps1[0]=epsilon[0]; eps2[0]=epsilon[3]; eps3[0]=epsilon[4]; - //eps1[1]=epsilon[3]; eps2[1]=epsilon[1]; eps3[1]=epsilon[5]; - //eps1[2]=epsilon[4]; eps2[2]=epsilon[5]; eps3[2]=epsilon[2]; - this->GetStrainRate3dHO(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); - material->GetViscosityDerivativeEpsSquare(&mu_prime,&epsilon[0]); - eps1[0]=epsilon[0]; eps2[0]=epsilon[2]; eps3[0]=epsilon[3]; - eps1[1]=epsilon[2]; eps2[1]=epsilon[1]; eps3[1]=epsilon[4]; - eps1[2]=epsilon[3]; eps2[2]=epsilon[4]; eps3[2]= -epsilon[0] -epsilon[1]; - - for(i=0;ivalues[numdof*(3*i+0)+3*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps1dotdphii; - Ke->values[numdof*(3*i+0)+3*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps1dotdphii; - Ke->values[numdof*(3*i+0)+3*j+2]+=gauss->weight*Jdet*2*mu_prime*eps3dotdphij*eps1dotdphii; - - Ke->values[numdof*(3*i+1)+3*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps2dotdphii; - Ke->values[numdof*(3*i+1)+3*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps2dotdphii; - Ke->values[numdof*(3*i+1)+3*j+2]+=gauss->weight*Jdet*2*mu_prime*eps3dotdphij*eps2dotdphii; - - Ke->values[numdof*(3*i+2)+3*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps3dotdphii; - Ke->values[numdof*(3*i+2)+3*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps3dotdphii; - Ke->values[numdof*(3*i+2)+3*j+2]+=gauss->weight*Jdet*2*mu_prime*eps3dotdphij*eps3dotdphii; - } - } - } - - /*Transform Coordinate System*/ - TransformStiffnessMatrixCoord(Ke,nodes,(vnumnodes+pnumnodes),cs_list); - - /*Clean up and return*/ - xDelete(cs_list); - xDelete(dbasis); - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::GetSolutionFromInputsStressbalanceHoriz{{{*/ -void Penta::GetSolutionFromInputsStressbalanceHoriz(Vector* solution){ - - int approximation; - int *doflist = NULL; - IssmDouble vx,vy; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - int numdof = numnodes*NDOF2; - - /*Get approximation enum and dof list: */ - inputs->GetInputValue(&approximation,ApproximationEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - - /*Fetch dof list and allocate solution vectors*/ - GetDofList(&doflist,approximation,GsetEnum); - IssmDouble* values = xNew(numdof); - - /*Ok, we have vx and vy in values, fill in vx and vy arrays: */ - GaussPenta* gauss=new GaussPenta(); - for(int i=0;iGaussNode(this->element_type,i); - - /*Recover vx and vy*/ - vx_input->GetInputValue(&vx,gauss); - vy_input->GetInputValue(&vy,gauss); - values[i*NDOF2+0]=vx; - values[i*NDOF2+1]=vy; - } - - /*Add value to global vector*/ - solution->SetValues(numdof,doflist,values,INS_VAL); - - /*Free ressources:*/ - delete gauss; - xDelete(values); - xDelete(doflist); -} -/*}}}*/ -/*FUNCTION Penta::GetSolutionFromInputsStressbalanceSIA{{{*/ -void Penta::GetSolutionFromInputsStressbalanceSIA(Vector* solution){ - - const int numdof=NDOF2*NUMVERTICES; - - int i; - int* doflist=NULL; - IssmDouble vx,vy; - IssmDouble values[numdof]; - GaussPenta* gauss=NULL; - - /*Get dof list: */ - GetDofList(&doflist,NoneApproximationEnum,GsetEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - - /*Ok, we have vx and vy in values, fill in vx and vy arrays: */ - /*P1 element only for now*/ - gauss=new GaussPenta(); - for(i=0;iGaussVertex(i); - vx_input->GetInputValue(&vx,gauss); - vy_input->GetInputValue(&vy,gauss); - values[i*NDOF2+0]=vx; - values[i*NDOF2+1]=vy; - } - - /*Add value to global vector*/ - solution->SetValues(numdof,doflist,values,INS_VAL); - - /*Free ressources:*/ - delete gauss; - xDelete(doflist); -} -/*}}}*/ -/*FUNCTION Penta::GetSolutionFromInputsStressbalanceFS{{{*/ -void Penta::GetSolutionFromInputsStressbalanceFS(Vector* solution){ - - int* vdoflist=NULL; - int* pdoflist=NULL; - IssmDouble vx,vy,vz,p; - IssmDouble FSreconditioning; - GaussPenta *gauss; - - /*Fetch number of nodes and dof for this finite element*/ - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - int vnumdof = vnumnodes*NDOF3; - int pnumdof = pnumnodes*NDOF1; - - /*Initialize values*/ - IssmDouble* vvalues = xNew(vnumdof); - IssmDouble* pvalues = xNew(pnumdof); - - /*Get dof list: */ - GetDofListVelocity(&vdoflist,GsetEnum); - GetDofListPressure(&pdoflist,GsetEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - Input* p_input =inputs->GetInput(PressureEnum); _assert_(p_input); - - this->parameters->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); - - /*Ok, we have vx vy vz in values, fill in vx vy vz arrays: */ - gauss = new GaussPenta(); - for(int i=0;iGaussNode(this->VelocityInterpolation(),i); - vx_input->GetInputValue(&vx,gauss); - vy_input->GetInputValue(&vy,gauss); - vz_input->GetInputValue(&vz,gauss); - vvalues[i*NDOF3+0]=vx; - vvalues[i*NDOF3+1]=vy; - vvalues[i*NDOF3+2]=vz; - } - for(int i=0;iGaussNode(this->PressureInterpolation(),i); - p_input ->GetInputValue(&p ,gauss); - pvalues[i]=p/FSreconditioning; - } - - /*Add value to global vector*/ - solution->SetValues(vnumdof,vdoflist,vvalues,INS_VAL); - solution->SetValues(pnumdof,pdoflist,pvalues,INS_VAL); - - /*Free ressources:*/ - delete gauss; - xDelete(pdoflist); - xDelete(vdoflist); - xDelete(pvalues); - xDelete(vvalues); -} -/*}}}*/ -/*FUNCTION Penta::GetL1L2Viscosity{{{*/ -void Penta::GetL1L2Viscosity(IssmDouble* pviscosity,IssmDouble* xyz_list, GaussPenta* gauss, Input* vx_input, Input* vy_input,Input* surface_input){ - /*Compute the L1L2 viscosity - * - * 1 - * mu = - A^-1 (sigma'_e)^(1-n) - * 2 - * - * sigma'_e^2 = |sigma'_//|^2 + |sigma'_perp|^2 (see Perego 2012 eq. 17,18) - * - * L1L2 assumptions: - * - * (1) |eps_b|_// = A (|sigma'_//|^2 + |sigma'_perp|^2)^((n-1)/2) |sigma'_//| - * (2) |sigma'_perp|^2 = |rho g (s-z) grad(s)|^2 - * - * Assuming that n = 3, we have a polynom of degree 3 to solve (the only unkown is X=|sigma'_//|) - * - * A X^3 + A |rho g (s-z) grad(s)|^2 X - |eps_b|_// = 0 */ - - int i; - IssmDouble z,s,viscosity,p,q,delta; - IssmDouble tau_perp,tau_par,eps_b,A; - IssmDouble epsilonvx[5]; /*exx eyy exy exz eyz*/ - IssmDouble epsilonvy[5]; /*exx eyy exy exz eyz*/ - IssmDouble epsilon[5]; /*exx eyy exy exz eyz*/ - IssmDouble z_list[NUMVERTICES]; - IssmDouble slope[3]; - - /*Check that both inputs have been found*/ - if (!vx_input || !vy_input || !surface_input) _error_("Input missing"); - - /*Get tau_perp*/ - for(i=0;iGetInputValue(&s,gauss); - surface_input->GetInputDerivativeValue(&slope[0],xyz_list,gauss); - PentaRef::GetInputValue(&z,&z_list[0],gauss); - tau_perp = matpar->GetRhoIce() * matpar->GetG() * fabs(s-z)*sqrt(slope[0]*slope[0]+slope[1]*slope[1]); - - /* Get eps_b*/ - vx_input->GetVxStrainRate3dHO(epsilonvx,xyz_list,gauss); - vy_input->GetVyStrainRate3dHO(epsilonvy,xyz_list,gauss); - for(i=0;i<5;i++) epsilon[i]=epsilonvx[i]+epsilonvy[i]; - eps_b = sqrt(epsilon[0]*epsilon[0] + epsilon[1]*epsilon[1] + epsilon[0]*epsilon[1] + epsilon[2]*epsilon[2]); - if(eps_b==0.){ - *pviscosity = 2.5e+17; - return; - } - - /*Get A*/ - _assert_(material->GetN()==3.0); - A=material->GetA(); - - /*Solve for tau_perp (http://fr.wikipedia.org/wiki/MĆ©thode_de_Cardan)*/ - p = tau_perp *tau_perp; - q = - eps_b/A; - delta = q *q + p*p*p*4./27.; - _assert_(delta>0); - tau_par = pow(0.5*(-q+sqrt(delta)),1./3.) - pow(0.5*(q+sqrt(delta)),1./3.); - - /*Viscosity*/ - viscosity = 1./(2.*A*(tau_par*tau_par + tau_perp*tau_perp)); - _assert_(!xIsNan(viscosity)); - _assert_(viscosity > 0.); - - /*Assign output pointer*/ - *pviscosity = viscosity; - return; -} -/*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionStressbalanceHoriz {{{*/ -void Penta::InputUpdateFromSolutionStressbalanceHoriz(IssmDouble* solution){ - - int approximation; - - /*Recover inputs*/ - inputs->GetInputValue(&approximation,ApproximationEnum); - - /*SSA, everything is done by the element on bed*/ - if (approximation==SSAApproximationEnum){ - if (!IsOnBed()){ - /*Do nothing. Element on bed will take care of it*/ - return; - } - else{ - InputUpdateFromSolutionStressbalanceSSA(solution); - return; - } - } - if (approximation==L1L2ApproximationEnum){ - if (!IsOnBed()) return; - InputUpdateFromSolutionStressbalanceL1L2(solution); - return; - } - else if (approximation==HOApproximationEnum){ - InputUpdateFromSolutionStressbalanceHO(solution); - } - else if (approximation==HOFSApproximationEnum){ - InputUpdateFromSolutionStressbalanceHOFS(solution); - } - else if (approximation==SSAFSApproximationEnum){ - InputUpdateFromSolutionStressbalanceSSAFS(solution); - } - else if (approximation==FSApproximationEnum || approximation==NoneApproximationEnum){ - InputUpdateFromSolutionStressbalanceFS(solution); - } - else if (approximation==SSAHOApproximationEnum){ - InputUpdateFromSolutionStressbalanceSSAHO(solution); - } -} -/*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionStressbalanceSSA {{{*/ -void Penta::InputUpdateFromSolutionStressbalanceSSA(IssmDouble* solution){ - - int numnodes = this->NumberofNodes(); - int numdof = NDOF2*numnodes; - - int i; - IssmDouble rho_ice,g; - IssmDouble values[2*NUMVERTICES]; - IssmDouble vx[NUMVERTICES]; - IssmDouble vy[NUMVERTICES]; - IssmDouble vz[NUMVERTICES]; - IssmDouble vel[NUMVERTICES]; - IssmDouble pressure[NUMVERTICES]; - IssmDouble surface[NUMVERTICES]; - IssmDouble xyz_list[NUMVERTICES][3]; - int *doflist = NULL; - Penta *penta = NULL; - - /*Get dof list: */ - GetDofList(&doflist,SSAApproximationEnum,GsetEnum); - - /*Use the dof list to index into the solution vector: */ - for(i=0;i(vx[i])) _error_("NaN found in solution vector"); - if(xIsNan(vy[i])) _error_("NaN found in solution vector"); - } - - /*Get parameters fro pressure computation*/ - rho_ice=matpar->GetRhoIce(); - g=matpar->GetG(); - - /*Start looping over all elements above current element and update all inputs*/ - penta=this; - for(;;){ - - /*Get node data: */ - GetVerticesCoordinates(&xyz_list[0][0],penta->vertices,NUMVERTICES); - - /*Now Compute vel*/ - GetInputListOnVertices(&vz[0],VzEnum,0.0); //default is 0 - for(i=0;iinputs->ChangeEnum(VxEnum,VxPicardEnum); - penta->inputs->ChangeEnum(VyEnum,VyPicardEnum); - penta->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); - - /*Add vx and vy as inputs to the tria element: */ - penta->inputs->AddInput(new PentaInput(VxEnum,vx,P1Enum)); - penta->inputs->AddInput(new PentaInput(VyEnum,vy,P1Enum)); - penta->inputs->AddInput(new PentaInput(VelEnum,vel,P1Enum)); - penta->inputs->AddInput(new PentaInput(PressureEnum,pressure,P1Enum)); - - /*Stop if we have reached the surface*/ - if (penta->IsOnSurface()) break; - - /* get upper Penta*/ - penta=penta->GetUpperElement(); _assert_(penta->Id()!=this->id); - } - - /*Free ressources:*/ - xDelete(doflist); -} -/*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionStressbalanceSSAHO {{{*/ -void Penta::InputUpdateFromSolutionStressbalanceSSAHO(IssmDouble* solution){ - - const int numdof=NDOF2*NUMVERTICES; - const int numdof2d=NDOF2*NUMVERTICES2D; - - int i; - IssmDouble rho_ice,g; - IssmDouble SSA_values[numdof]; - IssmDouble HO_values[numdof]; - IssmDouble vx[NUMVERTICES]; - IssmDouble vy[NUMVERTICES]; - IssmDouble vz[NUMVERTICES]; - IssmDouble vel[NUMVERTICES]; - IssmDouble pressure[NUMVERTICES]; - IssmDouble surface[NUMVERTICES]; - IssmDouble xyz_list[NUMVERTICES][3]; - int* doflistp = NULL; - int* doflistm = NULL; - Penta *penta = NULL; - - /*OK, we have to add results of this element for HO - * and results from the penta at base for SSA. Now recover results*/ - penta=GetBasalElement(); - - /*Get dof listof this element (HO dofs) and of the penta at base (SSA dofs): */ - GetDofList(&doflistp,HOApproximationEnum,GsetEnum); - penta->GetDofList(&doflistm,SSAApproximationEnum,GsetEnum); - - /*Get node data: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - - /*Use the dof list to index into the solution vector: */ - for(i=0;inodes,NUMVERTICES,XYEnum); - TransformSolutionCoord(&HO_values[0], this->nodes,NUMVERTICES,XYEnum); - - /*Ok, we have vx and vy in values, fill in vx and vy arrays: */ - for(i=0;i(vx[i])) _error_("NaN found in solution vector"); - if(xIsNan(vy[i])) _error_("NaN found in solution vector"); - } - - /*Now Compute vel*/ - GetInputListOnVertices(&vz[0],VzEnum,0.0); //default is 0 - for(i=0;iGetRhoIce(); - g=matpar->GetG(); - GetInputListOnVertices(&surface[0],SurfaceEnum); - for(i=0;iinputs->ChangeEnum(VxEnum,VxPicardEnum); - this->inputs->ChangeEnum(VyEnum,VyPicardEnum); - this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); - - /*Add vx and vy as inputs to the tria element: */ - this->inputs->AddInput(new PentaInput(VxEnum,vx,P1Enum)); - this->inputs->AddInput(new PentaInput(VyEnum,vy,P1Enum)); - this->inputs->AddInput(new PentaInput(VelEnum,vel,P1Enum)); - this->inputs->AddInput(new PentaInput(PressureEnum,pressure,P1Enum)); - - /*Free ressources:*/ - xDelete(doflistp); - xDelete(doflistm); -} -/*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionStressbalanceSSAFS {{{*/ -void Penta::InputUpdateFromSolutionStressbalanceSSAFS(IssmDouble* solution){ - - const int numdofSSA = NDOF2*NUMVERTICES; - const int numdof2d = NDOF2*NUMVERTICES2D; - const int numdofFSv = NDOF3*NUMVERTICES; - const int numdofFSp = NDOF1*NUMVERTICES; - - int i; - IssmDouble FSreconditioning; - IssmDouble SSA_values[numdofSSA]; - IssmDouble FS_values[numdofFSv+numdofFSp]; - IssmDouble vx[NUMVERTICES]; - IssmDouble vy[NUMVERTICES]; - IssmDouble vz[NUMVERTICES]; - IssmDouble vzSSA[NUMVERTICES]; - IssmDouble vzFS[NUMVERTICES]; - IssmDouble vel[NUMVERTICES]; - IssmDouble pressure[NUMVERTICES]; - IssmDouble xyz_list[NUMVERTICES][3]; - int *doflistSSA = NULL; - int *doflistFSv = NULL; - int *doflistFSp = NULL; - Penta *penta = NULL; - - /*Prepare coordinate system list*/ - int* cs_list = xNew(2*NUMVERTICES); - for(i=0;iGetDofList(&doflistSSA,SSAApproximationEnum,GsetEnum); - GetDofList(&doflistFSv,FSvelocityEnum,GsetEnum); - GetDofListPressure(&doflistFSp,GsetEnum); - this->parameters->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); - - /*Get node data: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - - /*Use the dof list to index into the solution vector: */ - for(i=0;inodes,NUMVERTICES,XYEnum); - TransformSolutionCoord(&FS_values[0],this->nodes,2*NUMVERTICES,cs_list); - - /*Ok, we have vx and vy in values, fill in vx and vy arrays: */ - for(i=0;i(vx[i])) _error_("NaN found in solution vector"); - if(xIsNan(vy[i])) _error_("NaN found in solution vector"); - if(xIsNan(vzFS[i])) _error_("NaN found in solution vector"); - if(xIsNan(pressure[i])) _error_("NaN found in solution vector"); - } - - /*Get Vz*/ - Input* vzSSA_input=inputs->GetInput(VzSSAEnum); - if (vzSSA_input){ - if (vzSSA_input->ObjectEnum()!=PentaInputEnum){ - _error_("Cannot compute Vel as VzSSA is of type " << EnumToStringx(vzSSA_input->ObjectEnum())); - } - GetInputListOnVertices(&vzSSA[0],VzSSAEnum); - } - else{ - _error_("Cannot update solution as VzSSA is not present"); - } - - /*Now Compute vel*/ - for(i=0;iinputs->ChangeEnum(VxEnum,VxPicardEnum); - this->inputs->ChangeEnum(VyEnum,VyPicardEnum); - this->inputs->ChangeEnum(VzEnum,VzPicardEnum); - this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); - - /*Add vx and vy as inputs to the tria element: */ - this->inputs->AddInput(new PentaInput(VxEnum,vx,P1Enum)); - this->inputs->AddInput(new PentaInput(VyEnum,vy,P1Enum)); - this->inputs->AddInput(new PentaInput(VzEnum,vz,P1Enum)); - this->inputs->AddInput(new PentaInput(VzFSEnum,vzFS,P1Enum)); - this->inputs->AddInput(new PentaInput(VelEnum,vel,P1Enum)); - this->inputs->AddInput(new PentaInput(PressureEnum,pressure,P1Enum)); - - /*Free ressources:*/ - xDelete(doflistSSA); - xDelete(doflistFSv); - xDelete(doflistFSp); - xDelete(cs_list); -} -/*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionStressbalanceL1L2 {{{*/ -void Penta::InputUpdateFromSolutionStressbalanceL1L2(IssmDouble* solution){ - - const int numdof=NDOF2*NUMVERTICES; - - int i; - IssmDouble rho_ice,g; - IssmDouble values[numdof]; - IssmDouble vx[NUMVERTICES]; - IssmDouble vy[NUMVERTICES]; - IssmDouble vz[NUMVERTICES]; - IssmDouble vel[NUMVERTICES]; - IssmDouble pressure[NUMVERTICES]; - IssmDouble surface[NUMVERTICES]; - IssmDouble xyz_list[NUMVERTICES][3]; - int *doflist = NULL; - Penta *penta = NULL; - - /*Get dof list: */ - GetDofList(&doflist,L1L2ApproximationEnum,GsetEnum); - - /*Use the dof list to index into the solution vector: */ - for(i=0;i(vx[i])) _error_("NaN found in solution vector"); - if(xIsNan(vy[i])) _error_("NaN found in solution vector"); - } - - /*Get parameters fro pressure computation*/ - rho_ice=matpar->GetRhoIce(); - g=matpar->GetG(); - - /*Start looping over all elements above current element and update all inputs*/ - penta=this; - for(;;){ - - /*Get node data: */ - GetVerticesCoordinates(&xyz_list[0][0],penta->vertices,NUMVERTICES); - - /*Now Compute vel*/ - GetInputListOnVertices(&vz[0],VzEnum,0.0); //default is 0 - for(i=0;iinputs->ChangeEnum(VxEnum,VxPicardEnum); - penta->inputs->ChangeEnum(VyEnum,VyPicardEnum); - penta->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); - - /*Add vx and vy as inputs to the tria element: */ - penta->inputs->AddInput(new PentaInput(VxEnum,vx,P1Enum)); - penta->inputs->AddInput(new PentaInput(VyEnum,vy,P1Enum)); - penta->inputs->AddInput(new PentaInput(VelEnum,vel,P1Enum)); - penta->inputs->AddInput(new PentaInput(PressureEnum,pressure,P1Enum)); - - /*Stop if we have reached the surface*/ - if (penta->IsOnSurface()) break; - - /* get upper Penta*/ - penta=penta->GetUpperElement(); _assert_(penta->Id()!=this->id); - } - - /*Free ressources:*/ - xDelete(doflist); -} -/*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionStressbalanceHO {{{*/ -void Penta::InputUpdateFromSolutionStressbalanceHO(IssmDouble* solution){ - - int i; - IssmDouble rho_ice,g; - IssmDouble xyz_list[NUMVERTICES][3]; - int *doflist = NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - int numdof = numnodes*NDOF2; - - /*Fetch dof list and allocate solution vectors*/ - GetDofList(&doflist,HOApproximationEnum,GsetEnum); - IssmDouble* values = xNew(numdof); - IssmDouble* vx = xNew(numnodes); - IssmDouble* vy = xNew(numnodes); - IssmDouble* vz = xNew(numnodes); - IssmDouble* vel = xNew(numnodes); - IssmDouble* pressure = xNew(numnodes); - IssmDouble* surface = xNew(numnodes); - - /*Use the dof list to index into the solution vector: */ - for(i=0;i(vx[i])) _error_("NaN found in solution vector"); - if(xIsNan(vy[i])) _error_("NaN found in solution vector"); - } - - /*Get Vz and compute vel*/ - GetInputListOnNodes(&vz[0],VzEnum,0.); - for(i=0;iGetRhoIce(); - g=matpar->GetG(); - GetInputListOnVertices(&surface[0],SurfaceEnum); - for(i=0;iinputs->ChangeEnum(VxEnum,VxPicardEnum); - this->inputs->ChangeEnum(VyEnum,VyPicardEnum); - this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); - - /*Add vx and vy as inputs to the tria element: */ - this->inputs->AddInput(new PentaInput(VxEnum,vx,P1Enum)); - this->inputs->AddInput(new PentaInput(VyEnum,vy,P1Enum)); - this->inputs->AddInput(new PentaInput(VelEnum,vel,P1Enum)); - this->inputs->AddInput(new PentaInput(PressureEnum,pressure,P1Enum)); - - /*Free ressources:*/ - xDelete(surface); - xDelete(pressure); - xDelete(vel); - xDelete(vz); - xDelete(vy); - xDelete(vx); - xDelete(values); - xDelete(doflist); -} -/*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionStressbalanceHOFS {{{*/ -void Penta::InputUpdateFromSolutionStressbalanceHOFS(IssmDouble* solution){ - - const int numdofHO = NDOF2*NUMVERTICES; - const int numdofFSv = NDOF3*NUMVERTICES; - const int numdofFSp = NDOF1*NUMVERTICES; - - int i; - IssmDouble HO_values[numdofHO]; - IssmDouble FS_values[numdofFSv+numdofFSp]; - IssmDouble vx[NUMVERTICES]; - IssmDouble vy[NUMVERTICES]; - IssmDouble vz[NUMVERTICES]; - IssmDouble vzHO[NUMVERTICES]; - IssmDouble vzFS[NUMVERTICES]; - IssmDouble vel[NUMVERTICES]; - IssmDouble pressure[NUMVERTICES]; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble FSreconditioning; - int* doflistHO = NULL; - int* doflistFSv = NULL; - int* doflistFSp = NULL; - - /*Prepare coordinate system list*/ - int* cs_list = xNew(2*NUMVERTICES); - for(i=0;iparameters->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); - - /*Get node data: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - - /*Use the dof list to index into the solution vector: */ - for(i=0;inodes,NUMVERTICES,XYEnum); - TransformSolutionCoord(&FS_values[0],this->nodes,2*NUMVERTICES,cs_list); - - /*Ok, we have vx and vy in values, fill in vx and vy arrays: */ - for(i=0;i(vx[i])) _error_("NaN found in solution vector"); - if(xIsNan(vy[i])) _error_("NaN found in solution vector"); - if(xIsNan(vzFS[i])) _error_("NaN found in solution vector"); - if(xIsNan(pressure[i])) _error_("NaN found in solution vector"); - } - - /*Get Vz*/ - Input* vzHO_input=inputs->GetInput(VzHOEnum); - if (vzHO_input){ - if (vzHO_input->ObjectEnum()!=PentaInputEnum){ - _error_("Cannot compute Vel as VzHO is of type " << EnumToStringx(vzHO_input->ObjectEnum())); - } - GetInputListOnVertices(&vzHO[0],VzHOEnum); - } - else{ - _error_("Cannot update solution as VzHO is not present"); - } - - /*Now Compute vel*/ - for(i=0;iinputs->ChangeEnum(VxEnum,VxPicardEnum); - this->inputs->ChangeEnum(VyEnum,VyPicardEnum); - this->inputs->ChangeEnum(VzEnum,VzPicardEnum); - this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); - - /*Add vx and vy as inputs to the tria element: */ - this->inputs->AddInput(new PentaInput(VxEnum,vx,P1Enum)); - this->inputs->AddInput(new PentaInput(VyEnum,vy,P1Enum)); - this->inputs->AddInput(new PentaInput(VzEnum,vz,P1Enum)); - this->inputs->AddInput(new PentaInput(VzFSEnum,vzFS,P1Enum)); - this->inputs->AddInput(new PentaInput(VelEnum,vel,P1Enum)); - this->inputs->AddInput(new PentaInput(PressureEnum,pressure,P1Enum)); - - /*Free ressources:*/ - xDelete(doflistHO); - xDelete(doflistFSv); - xDelete(doflistFSp); - xDelete(cs_list); -} -/*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionStressbalanceSIA {{{*/ -void Penta::InputUpdateFromSolutionStressbalanceSIA(IssmDouble* solution){ - - int numnodes = this->NumberofNodes(); - int numdof=NDOF2*numnodes; - - int i; - IssmDouble rho_ice,g; - IssmDouble values[numdof]; - IssmDouble vx[NUMVERTICES]; - IssmDouble vy[NUMVERTICES]; - IssmDouble vz[NUMVERTICES]; - IssmDouble vel[NUMVERTICES]; - IssmDouble pressure[NUMVERTICES]; - IssmDouble surface[NUMVERTICES]; - IssmDouble xyz_list[NUMVERTICES][3]; - int* doflist = NULL; - - /*Get dof list: */ - GetDofList(&doflist,NoneApproximationEnum,GsetEnum); - - /*Get node data: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - - /*Use the dof list to index into the solution vector: */ - for(i=0;i(vx[i])) _error_("NaN found in solution vector"); - if(xIsNan(vy[i])) _error_("NaN found in solution vector"); - } - - /*Now Compute vel*/ - GetInputListOnVertices(&vz[0],VzEnum,0.0); //default is 0 - for(i=0;iGetRhoIce(); - g=matpar->GetG(); - GetInputListOnVertices(&surface[0],SurfaceEnum); - for(i=0;iinputs->ChangeEnum(VxEnum,VxPicardEnum); - this->inputs->ChangeEnum(VyEnum,VyPicardEnum); - this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); - - /*Add vx and vy as inputs to the tria element: */ - this->inputs->AddInput(new PentaInput(VxEnum,vx,P1Enum)); - this->inputs->AddInput(new PentaInput(VyEnum,vy,P1Enum)); - this->inputs->AddInput(new PentaInput(VelEnum,vel,P1Enum)); - this->inputs->AddInput(new PentaInput(PressureEnum,pressure,P1Enum)); - - /*Free ressources:*/ - xDelete(doflist); -} -/*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionStressbalanceVert {{{*/ -void Penta::InputUpdateFromSolutionStressbalanceVert(IssmDouble* solution){ - - int numnodes = this->NumberofNodes(); - int numdof=NDOF1*numnodes; - - int i; - int approximation; - IssmDouble rho_ice,g; - IssmDouble values[numdof]; - IssmDouble vx[NUMVERTICES]; - IssmDouble vy[NUMVERTICES]; - IssmDouble vz[NUMVERTICES]; - IssmDouble vzSSA[NUMVERTICES]; - IssmDouble vzHO[NUMVERTICES]; - IssmDouble vzFS[NUMVERTICES]; - IssmDouble vel[NUMVERTICES]; - IssmDouble pressure[NUMVERTICES]; - IssmDouble surface[NUMVERTICES]; - IssmDouble xyz_list[NUMVERTICES][3]; - int* doflist = NULL; - - /*Get the approximation and do nothing if the element in FS or None*/ - inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation==FSApproximationEnum || approximation==NoneApproximationEnum){ - return; - } - - /*Get dof list and vertices coordinates: */ - GetDofList(&doflist,NoneApproximationEnum,GsetEnum); - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - - /*Use the dof list to index into the solution vector vz: */ - for(i=0;i(vz[i])) _error_("NaN found in solution vector"); - } - - /*Get Vx and Vy*/ - GetInputListOnVertices(&vx[0],VxEnum,0.0); //default is 0 - GetInputListOnVertices(&vy[0],VyEnum,0.0); //default is 0 - - /*Do some modifications if we actually have a HOFS or SSAFS element*/ - if(approximation==HOFSApproximationEnum){ - Input* vzFS_input=inputs->GetInput(VzFSEnum); - if (vzFS_input){ - if (vzFS_input->ObjectEnum()!=PentaInputEnum) _error_("Cannot compute Vel as VzFS is of type " << EnumToStringx(vzFS_input->ObjectEnum())); - GetInputListOnVertices(&vzFS[0],VzFSEnum); - } - else _error_("Cannot compute Vz as VzFS in not present in HOFS element"); - for(i=0;iGetInput(VzFSEnum); - if (vzFS_input){ - if (vzFS_input->ObjectEnum()!=PentaInputEnum) _error_("Cannot compute Vel as VzFS is of type " << EnumToStringx(vzFS_input->ObjectEnum())); - GetInputListOnVertices(&vzFS[0],VzFSEnum); - } - else _error_("Cannot compute Vz as VzFS in not present in SSAFS element"); - for(i=0;iGetRhoIce(); - g=matpar->GetG(); - GetInputListOnVertices(&surface[0],SurfaceEnum); - for(i=0;iinputs->ChangeEnum(VzEnum,VzPicardEnum); - - if(approximation!=HOFSApproximationEnum && approximation!=SSAFSApproximationEnum){ - this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); - this->inputs->AddInput(new PentaInput(PressureEnum,pressure,P1Enum)); - } - else if(approximation==HOFSApproximationEnum){ - this->inputs->AddInput(new PentaInput(VzHOEnum,vzHO,P1Enum)); - } - else if(approximation==SSAFSApproximationEnum){ - this->inputs->AddInput(new PentaInput(VzSSAEnum,vzSSA,P1Enum)); - } - this->inputs->AddInput(new PentaInput(VzEnum,vz,P1Enum)); - this->inputs->AddInput(new PentaInput(VelEnum,vel,P1Enum)); - - /*Free ressources:*/ - xDelete(doflist); -} -/*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionStressbalanceFS {{{*/ -void Penta::InputUpdateFromSolutionStressbalanceFS(IssmDouble* solution){ - - int i; - int* vdoflist=NULL; - int* pdoflist=NULL; - IssmDouble FSreconditioning; - - /*Fetch number of nodes and dof for this finite element*/ - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - int vnumdof = vnumnodes*NDOF3; - int pnumdof = pnumnodes*NDOF1; - - /*Initialize values*/ - IssmDouble* values = xNew(vnumdof+pnumdof); - IssmDouble* vx = xNew(vnumnodes); - IssmDouble* vy = xNew(vnumnodes); - IssmDouble* vz = xNew(vnumnodes); - IssmDouble* vel = xNew(vnumnodes); - IssmDouble* pressure = xNew(pnumnodes); - - /*Prepare coordinate system list*/ - int* cs_list = xNew(vnumnodes+pnumnodes); - for(i=0;i(vx[i])) _error_("NaN found in solution vector"); - if(xIsNan(vy[i])) _error_("NaN found in solution vector"); - if(xIsNan(vz[i])) _error_("NaN found in solution vector"); - } - for(i=0;i(pressure[i])) _error_("NaN found in solution vector"); - } - - /*Recondition pressure and compute vel: */ - this->parameters->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); - for(i = 0;iinputs->ChangeEnum(VxEnum,VxPicardEnum); - this->inputs->ChangeEnum(VyEnum,VyPicardEnum); - this->inputs->ChangeEnum(VzEnum,VzPicardEnum); - this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); - - /*Add vx and vy as inputs to the tria element: */ - this->inputs->AddInput(new PentaInput(VxEnum,vx,P1Enum)); - this->inputs->AddInput(new PentaInput(VyEnum,vy,P1Enum)); - this->inputs->AddInput(new PentaInput(VzEnum,vz,P1Enum)); - this->inputs->AddInput(new PentaInput(VelEnum,vel,P1Enum)); - this->inputs->AddInput(new PentaInput(PressureEnum,pressure,P1Enum)); - - /*Free ressources:*/ - xDelete(pressure); - xDelete(vel); - xDelete(vz); - xDelete(vy); - xDelete(vx); - xDelete(values); - xDelete(vdoflist); - xDelete(pdoflist); - xDelete(cs_list); -} -/*}}}*/ -#endif - -#ifdef _HAVE_BALANCED_ -/*FUNCTION Penta::CreateKMatrixBalancethickness {{{*/ -ElementMatrix* Penta::CreateKMatrixBalancethickness(void){ - - /*Figure out if this penta is collapsed. If so, then bailout, except if it is at the - bedrock, in which case we spawn a tria element using the 3 first nodes, and use it to build - the stiffness matrix. */ - if (!IsOnBed()) return NULL; - - /*Depth Averaging Vx and Vy*/ - this->InputDepthAverageAtBase(VxEnum,VxAverageEnum); - this->InputDepthAverageAtBase(VyEnum,VyAverageEnum); - - /*Spawn Tria element from the base of the Penta: */ - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - ElementMatrix* Ke=tria->CreateKMatrixBalancethickness(); - delete tria->material; delete tria; - - /*Delete Vx and Vy averaged*/ - this->inputs->DeleteInput(VxAverageEnum); - this->inputs->DeleteInput(VyAverageEnum); - - /*clean up and return*/ - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorBalancethickness {{{*/ -ElementVector* Penta::CreatePVectorBalancethickness(void){ - - if (!IsOnBed()) return NULL; - - /*Depth Averaging Vx and Vy*/ - this->InputDepthAverageAtBase(VxEnum,VxAverageEnum); - this->InputDepthAverageAtBase(VyEnum,VyAverageEnum); - - /*Call Tria function*/ - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - ElementVector* pe=tria->CreatePVectorBalancethickness(); - delete tria->material; delete tria; - - /*Delete Vx and Vy averaged*/ - this->inputs->DeleteInput(VxAverageEnum); - this->inputs->DeleteInput(VyAverageEnum); - - /*Clean up and return*/ - return pe; -} -/*}}}*/ -#endif - -#ifdef _HAVE_HYDROLOGY_ -/*FUNCTION Penta::CreateKMatrixHydrologyDCInefficient {{{*/ -ElementMatrix* Penta::CreateKMatrixHydrologyDCInefficient(void){ - - if (!IsOnBed()) return NULL; - - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - ElementMatrix* Ke=tria->CreateKMatrixHydrologyDCInefficient(); - delete tria->material; delete tria; - - /*clean up and return*/ - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixHydrologyDCEfficient {{{*/ -ElementMatrix* Penta::CreateKMatrixHydrologyDCEfficient(void){ - - if (!IsOnBed()) return NULL; - - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - ElementMatrix* Ke=tria->CreateKMatrixHydrologyDCEfficient(); - delete tria->material; delete tria; - - /*clean up and return*/ - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorHydrologyDCInefficient {{{*/ -ElementVector* Penta::CreatePVectorHydrologyDCInefficient(void){ - - if (!IsOnBed()) return NULL; - - /*Call Tria function*/ - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - ElementVector* pe=tria->CreatePVectorHydrologyDCInefficient(); - delete tria->material; delete tria; - - /*Clean up and return*/ - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorHydrologyDCEfficient {{{*/ -ElementVector* Penta::CreatePVectorHydrologyDCEfficient(void){ - - if (!IsOnBed()) return NULL; - - /*Call Tria function*/ - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - ElementVector* pe=tria->CreatePVectorHydrologyDCEfficient(); - delete tria->material; delete tria; - - /*Clean up and return*/ - return pe; -} -/*}}}*/ -/*FUNCTION Penta::GetHydrologyDCInefficientHmax{{{*/ -void Penta::GetHydrologyDCInefficientHmax(IssmDouble* ph_max, Node* innode){ - - if (!IsOnBed()) return; - - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - tria->GetHydrologyDCInefficientHmax(ph_max,innode); - delete tria->material; delete tria; -} -/*}}}*/ -/*FUNCTION Penta::GetHydrologyTransfer{{{*/ -void Penta::GetHydrologyTransfer(Vector* transfer){ - - if (!IsOnBed()) return; - - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - tria->GetHydrologyTransfer(transfer); - delete tria->material; delete tria; -} -/*}}}*/ /*FUNCTION Penta::GetSolutionFromInputsOneDof {{{*/ void Penta::GetSolutionFromInputsOneDof(Vector* solution, int enum_type){ @@ -10823,98 +3981,4 @@ } /*}}}*/ -/*FUNCTION Penta::HydrologyEPLGetActive {{{*/ -void Penta::HydrologyEPLGetActive(Vector* active_vec){ - - if (!IsOnBed())return; - - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - tria->HydrologyEPLGetActive(active_vec); - delete tria->material; delete tria; - -} -/*}}}*/ -/*FUNCTION Penta::HydrologyEPLGetMask{{{*/ -void Penta::HydrologyEPLGetMask(Vector* vec_mask){ - - if (!IsOnBed())return; - - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - tria->HydrologyEPLGetMask(vec_mask); - delete tria->material; delete tria; - -} -/*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionHydrologyDCInefficient{{{*/ -void Penta::InputUpdateFromSolutionHydrologyDCInefficient(IssmDouble* solution){ - - const int numdof = NDOF1*NUMVERTICES; - const int numdof2d = NDOF1*NUMVERTICES2D; - int* doflist = NULL; - bool converged; - IssmDouble values[numdof]; - IssmDouble residual[numdof]; - IssmDouble penalty_factor; - IssmDouble kmax, kappa, h_max; - Penta *penta = NULL; - - /*If not on bed, return*/ - if (!IsOnBed()) return; - - /*Get dof list: */ - GetDofList(&doflist,NoneApproximationEnum,GsetEnum); - - /*Use the dof list to index into the solution vector and extrude it */ - for(int i=0;i(values[i])) _error_("NaN found in solution vector"); - } - - /*If converged keep the residual in mind*/ - this->inputs->GetInputValue(&converged,ConvergedEnum); - - /*Get inputs*/ - if(converged){ - this->parameters->FindParam(&kmax,HydrologySedimentKmaxEnum); - this->parameters->FindParam(&penalty_factor,HydrologydcPenaltyFactorEnum); - - kappa=kmax*pow(10.,penalty_factor); - - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - for(int i=0;iGetHydrologyDCInefficientHmax(&h_max,nodes[i]); - if(values[i]>h_max){ - residual[i]=kappa*(values[i]-h_max); - residual[i+numdof2d]=residual[i]; - } - else{ - residual[i]=0.0; - residual[i+numdof2d]=residual[i]; - } - } - delete tria->material; delete tria; - } - - /*Start looping over all elements above current element and update all inputs*/ - penta=this; - for(;;){ - /*Add input to the element: */ - penta->inputs->AddInput(new PentaInput(SedimentHeadEnum,values,P1Enum)); - penta->inputs->AddInput(new PentaInput(SedimentHeadResidualEnum,residual,P1Enum)); - - /*Stop if we have reached the surface*/ - if (penta->IsOnSurface()) break; - - /* get upper Penta*/ - penta=penta->GetUpperElement(); _assert_(penta->Id()!=this->id); - } - - /*Free ressources:*/ - xDelete(doflist); -} -/*}}}*/ -#endif - -#ifdef _HAVE_GROUNDINGLINE_ /*FUNCTION Penta::MigrateGroundingLine{{{*/ void Penta::MigrateGroundingLine(IssmDouble* phi_ungrounding){ @@ -10929,5 +3993,5 @@ IssmDouble melting[NUMVERTICES],phi[NUMVERTICES]; - if(!IsOnBed()) return; + if(!IsOnBase()) return; /*Recover info at the vertices: */ @@ -10937,6 +4001,6 @@ GetInputListOnVertices(&h[0],ThicknessEnum); GetInputListOnVertices(&s[0],SurfaceEnum); - GetInputListOnVertices(&b[0],BedEnum); - GetInputListOnVertices(&r[0],BathymetryEnum); + GetInputListOnVertices(&b[0],BaseEnum); + GetInputListOnVertices(&r[0],BedEnum); GetInputListOnVertices(&phi[0],MaskGroundediceLevelsetEnum); rho_water = matpar->GetRhoWater(); @@ -10986,5 +4050,5 @@ } this->inputs->AddInput(new PentaInput(MaskGroundediceLevelsetEnum,&phi[0],P1Enum)); - this->InputExtrude(MaskGroundediceLevelsetEnum,ElementEnum); + this->InputExtrude(MaskGroundediceLevelsetEnum); /*SubelementMigrationEnum: if one grounded, all grounded*/ @@ -11015,9 +4079,9 @@ /*Update inputs*/ this->inputs->AddInput(new PentaInput(SurfaceEnum,&s[0],P1Enum)); - this->inputs->AddInput(new PentaInput(BedEnum,&b[0],P1Enum)); + this->inputs->AddInput(new PentaInput(BaseEnum,&b[0],P1Enum)); /*Extrude inputs*/ - this->InputExtrude(SurfaceEnum,ElementEnum); - this->InputExtrude(BedEnum,ElementEnum); + this->InputExtrude(SurfaceEnum); + this->InputExtrude(BaseEnum); } /*}}}*/ @@ -11034,5 +4098,5 @@ density=rho_ice/rho_water; GetInputListOnVertices(&h[0],ThicknessEnum); - GetInputListOnVertices(&r[0],BathymetryEnum); + GetInputListOnVertices(&r[0],BedEnum); GetInputListOnVertices(&gl[0],MaskGroundediceLevelsetEnum); @@ -11070,3 +4134,2 @@ } /*}}}*/ -#endif Index: /issm/trunk/src/c/classes/Elements/Penta.h =================================================================== --- /issm/trunk/src/c/classes/Elements/Penta.h (revision 17805) +++ /issm/trunk/src/c/classes/Elements/Penta.h (revision 17806) @@ -23,5 +23,5 @@ class ElementMatrix; class ElementVector; - +class GaussPenta; #include "../../shared/Exceptions/exceptions.h" #include "../../shared/Enum/Enum.h" @@ -32,18 +32,8 @@ public: - int id; - int sid; - - Node **nodes; // set of nodes - Vertex **vertices; // 6 vertices - Material *material; // 1 material ice - Matpar *matpar; // 1 material parameter Penta **verticalneighbors; // 2 neighbors: first one under, second one above - Parameters *parameters; //pointer to solution parameters - Inputs *inputs; - /*Penta constructors and destructor: {{{*/ - Penta(); + Penta(){}; Penta(int penta_id,int penta_sid,int i, IoModel* iomodel,int nummodels); ~Penta(); @@ -51,14 +41,7 @@ /*Object virtual functions definitions: {{{*/ Object *copy(); - void DeepEcho(); - void Echo(); int ObjectEnum(); - int Id(); /*}}}*/ /*Update virtual functions definitions: {{{*/ - void InputUpdateFromConstant(bool constant, int name); - void InputUpdateFromConstant(IssmDouble constant, int name); - void InputUpdateFromConstant(int constant, int name); - void InputUpdateFromSolution(IssmDouble* solutiong); void InputUpdateFromVector(IssmDouble* vector, int name, int type); #ifdef _HAVE_DAKOTA_ @@ -70,41 +53,65 @@ /*Element virtual functions definitions: {{{*/ void BasalFrictionCreateInput(void); + IssmDouble CharacteristicLength(void){_error_("not implemented yet");}; void ComputeBasalStress(Vector* sigma_b); void ComputeStrainRate(Vector* eps); + void ComputeSigmaNN(){_error_("not implemented yet");}; void ComputeStressTensor(); + void ComputeDeviatoricStressTensor(); void Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters); + void ElementSizes(IssmDouble* hx,IssmDouble* hy,IssmDouble* hz); + int FiniteElement(void); + void FSContactMigration(Vector* vertexgrounded,Vector* vertexfloating); void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Materials* materials,Parameters* parameters); - void SetwiseNodeConnectivity(int* d_nz,int* o_nz,Node* node,bool* flags,int* flagsindices,int set1_enum,int set2_enum); - void CreateKMatrix(Matrix* Kff, Matrix* Kfs); - void CreateDVector(Vector* df); - void CreatePVector(Vector* pf); - void CreateJacobianMatrix(Matrix* Jff); void Delta18oParameterization(void); + Penta* GetUpperPenta(void); + Penta* GetLowerPenta(void); + Penta* GetSurfacePenta(void); + Penta* GetBasalPenta(void); + Element* GetUpperElement(void); + Element* GetLowerElement(void); + Element* GetSurfaceElement(void); + Element* GetBasalElement(void); + void GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating); + IssmDouble GetGroundedPortion(IssmDouble* xyz_list); int GetNodeIndex(Node* node); - void GetNodesSidList(int* sidlist); - void GetNodesLidList(int* lidlist); int GetNumberOfNodes(void); - void GetSolutionFromInputs(Vector* solution); - IssmDouble GetZcoord(GaussPenta* gauss); - void GetVectorFromInputs(Vector* vector,int name_enum); - - int Sid(); - void InputCreate(IssmDouble* vector,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code); - void InputDepthAverageAtBase(int enum_type,int average_enum_type,int object_enum=MeshElementsEnum); + int GetNumberOfVertices(void); + void GetSolutionFromInputsOneDof(Vector* solution,int enum_type); + IssmDouble GetXcoord(Gauss* gauss); + IssmDouble GetYcoord(Gauss* gauss); + IssmDouble GetZcoord(Gauss* gauss); + void GetVerticesCoordinatesBase(IssmDouble** pxyz_list); + void GetVerticesCoordinatesTop(IssmDouble** pxyz_list); + + void InputDepthAverageAtBase(int enum_type,int average_enum_type); void InputDuplicate(int original_enum,int new_enum); void InputScale(int enum_type,IssmDouble scale_factor); - - void ResultInterpolation(int* pinterpolation,int output_enum); - void ResultToVector(Vector* vector,int output_enum); + int NumberofNodesVelocity(void); + int NumberofNodesPressure(void); + int VelocityInterpolation(); + int PressureInterpolation(); + bool IsZeroLevelset(int levelset_enum); + bool IsIcefront(void); + void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum); + void GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum){_error_("not implemented yet");}; + void GetNormalFromLSF(IssmDouble *pnormal){_error_("not implemented yet");}; void PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm); - void ResetCoordinateSystem(void); + void ReduceMatrices(ElementMatrix* Ke,ElementVector* pe); + void ResetFSBasalBoundaryCondition(void); void SmbGradients(); + void SetTemporaryElementType(int element_type_in); + Element* SpawnBasalElement(void); + Element* SpawnTopElement(void); IssmDouble SurfaceArea(void); void Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finitelement); int NodalValue(IssmDouble* pvalue, int index, int natureofdataenum); IssmDouble TimeAdapt(); - void ViscousHeatingCreateInput(void); - - #ifdef _HAVE_RESPONSES_ + void ValueP1OnGauss(IssmDouble* pvalue,IssmDouble* values,Gauss* gauss); + void ValueP1DerivativesOnGauss(IssmDouble* dvalue,IssmDouble* values,IssmDouble* xyz_list,Gauss* gauss); + int VertexConnectivity(int vertexindex); + void VerticalSegmentIndices(int** pindices,int* pnumseg); + void ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input); + void AverageOntoPartition(Vector* partition_contributions,Vector* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part); IssmDouble IceVolume(void); @@ -125,5 +132,4 @@ void MaxVy(IssmDouble* pmaxvy); void MaxVz(IssmDouble* pmaxvz); - #endif #ifdef _HAVE_GIA_ @@ -131,5 +137,4 @@ #endif - #ifdef _HAVE_CONTROL_ IssmDouble DragCoefficientAbsGradient(void); void GradientIndexing(int* indexing,int control_index); @@ -159,200 +164,57 @@ IssmDouble BalancethicknessMisfit(void){_error_("not supported");}; void InputControlUpdate(IssmDouble scalar,bool save_parameter); - #endif - - #ifdef _HAVE_GROUNDINGLINE_ + IssmDouble Misfit(int modelenum,int observationenum,int weightsenum){_error_("not implemented yet");}; + IssmDouble MisfitArea(int weightsenum){_error_("not implemented yet");}; + void MigrateGroundingLine(IssmDouble* sheet_ungrounding); void PotentialUngrounding(Vector* potential_sheet_ungrounding); int UpdatePotentialUngrounding(IssmDouble* potential_sheet_ungrounding,Vector* vec_nodes_on_iceshelf,IssmDouble* nodes_on_iceshelf); - #endif - /*}}}*/ /*Penta specific routines:{{{*/ - void BedNormal(IssmDouble* bed_normal, IssmDouble xyz_list[3][3]); + void AddBasalInput(int input_enum, IssmDouble* values, int interpolation_enum); + void AddInput(int input_enum, IssmDouble* values, int interpolation_enum); + void NormalBase(IssmDouble* bed_normal, IssmDouble* xyz_list); + void NormalSection(IssmDouble* normal,IssmDouble* xyz_list); + void NormalTop(IssmDouble* bed_normal, IssmDouble* xyz_list); ElementMatrix* CreateBasalMassMatrix(void); - ElementMatrix* CreateKMatrix(void); - ElementMatrix* CreateKMatrixMasstransport(void); - ElementMatrix* CreateKMatrixFreeSurfaceTop(void); - ElementMatrix* CreateKMatrixFreeSurfaceBase(void); - ElementVector* CreatePVector(void); - ElementVector* CreatePVectorMasstransport(void); - ElementVector* CreatePVectorFreeSurfaceTop(void); - ElementVector* CreatePVectorFreeSurfaceBase(void); - ElementVector* CreatePVectorL2ProjectionBase(void); - void GetAreaCoordinates(IssmDouble *area_coordinates,IssmDouble xyz_zero[3][3],IssmDouble xyz_list[6][3],int numpoints); - void GetDofList(int** pdoflist,int approximation_enum,int setenum); - void GetDofListVelocity(int** pdoflist,int setenum); - void GetDofListPressure(int** pdoflist,int setenum); - void GetVertexPidList(int* doflist); - void GetVertexSidList(int* sidlist); - void GetConnectivityList(int* connectivity); - void GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating); - IssmDouble GetGroundedPortion(IssmDouble* xyz_list); + void GetAreaCoordinates(IssmDouble *area_coordinates,IssmDouble* xyz_zero,IssmDouble* xyz_list,int numpoints); int GetElementType(void); - void GetElementSizes(IssmDouble* hx,IssmDouble* hy,IssmDouble* hz); - void GetInputListOnVertices(IssmDouble* pvalue,int enumtype); - void GetInputListOnVertices(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue); - void GetInputListOnNodes(IssmDouble* pvalue,int enumtype); - void GetInputListOnNodes(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue); void GetInputValue(IssmDouble* pvalue,Node* node,int enumtype); - void GetMaterialInputValue(IssmDouble* pvalue,Node* node,int enumtype); - void GetPhi(IssmDouble* phi, IssmDouble* epsilon, IssmDouble viscosity); - void GetQuadNormal(IssmDouble* normal,IssmDouble xyz_list[4][3]); - IssmDouble GetStabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa); - void GetStrainRate3dHO(IssmDouble* epsilon,IssmDouble* xyz_list, GaussPenta* gauss, Input* vx_input, Input* vy_input); - void GetStrainRate3d(IssmDouble* epsilon,IssmDouble* xyz_list, GaussPenta* gauss, Input* vx_input, Input* vy_input, Input* vz_input); - Penta* GetUpperElement(void); - void GetZeroLevelsetCoordinates(IssmDouble* xyz_zero,IssmDouble xyz_list[6][3],int levelsetenum); - Penta* GetLowerElement(void); - Penta* GetBasalElement(void); - void InputExtrude(int enum_type,int object_type); - void InputUpdateFromSolutionMasstransport(IssmDouble* solutiong); - void InputUpdateFromSolutionFreeSurfaceTop(IssmDouble* solutiong); - void InputUpdateFromSolutionFreeSurfaceBase(IssmDouble* solutiong); + Node* GetNode(int node_number); + void InputExtrude(int enum_type); void InputUpdateFromSolutionOneDof(IssmDouble* solutiong,int enum_type); void InputUpdateFromSolutionOneDofCollapsed(IssmDouble* solutiong,int enum_type); - bool IsInput(int name); bool IsOnSurface(void); - bool IsOnBed(void); - bool IsFloating(void); + bool IsOnBase(void); bool IsNodeOnShelfFromFlags(IssmDouble* flags); - bool NoIceInElement(void); - IssmDouble MinEdgeLength(IssmDouble xyz_list[6][3]); + void JacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss); + void JacobianDeterminantLine(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss); + void JacobianDeterminantSurface(IssmDouble* pJdet, IssmDouble* xyz_list,Gauss* gauss); + void JacobianDeterminantBase(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss); + void JacobianDeterminantTop(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss); + Gauss* NewGauss(void); + Gauss* NewGauss(int order); + Gauss* NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order){_error_("not implemented yet");}; + Gauss* NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert); + Gauss* NewGauss(int point1,IssmDouble fraction1,IssmDouble fraction2,bool mainlyfloating,int order){_error_("not implemented yet");}; + Gauss* NewGaussBase(int order); + Gauss* NewGaussLine(int vertex1,int vertex2,int order); + Gauss* NewGaussTop(int order); + void NodalFunctions(IssmDouble* basis,Gauss* gauss); + void NodalFunctionsP1(IssmDouble* basis,Gauss* gauss); + void NodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss); + void NodalFunctionsP1Derivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss); + void NodalFunctionsMINIDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss); + void NodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss); + void NodalFunctionsVelocity(IssmDouble* basis,Gauss* gauss); + void NodalFunctionsPressure(IssmDouble* basis,Gauss* gauss); + void NodalFunctionsTensor(IssmDouble* basis,Gauss* gauss); + IssmDouble MinEdgeLength(IssmDouble* xyz_list); void SetClone(int* minranks); - Tria* SpawnTria(int location); - void SurfaceNormal(IssmDouble* surface_normal, IssmDouble xyz_list[3][3]); - - #ifdef _HAVE_STRESSBALANCE_ - ElementMatrix* CreateKMatrixCouplingSSAHO(void); - ElementMatrix* CreateKMatrixCouplingSSAHOViscous(void); - ElementMatrix* CreateKMatrixCouplingSSAHOFriction(void); - ElementMatrix* CreateKMatrixCouplingSSAFS(void); - ElementMatrix* CreateKMatrixCouplingSSAFSViscous(void); - ElementMatrix* CreateKMatrixCouplingSSAFSFriction(void); - ElementMatrix* CreateKMatrixCouplingHOFS(void); - ElementMatrix* CreateKMatrixStressbalanceHoriz(void); - ElementMatrix* CreateKMatrixAdjointHoriz(void); - ElementVector* CreateDVectorStressbalanceHoriz(void); - ElementVector* CreateDVectorStressbalanceFS(void); - ElementMatrix* CreateKMatrixStressbalanceSIA(void); - ElementMatrix* CreateKMatrixStressbalanceSSA2d(void); - ElementMatrix* CreateKMatrixStressbalanceSSA3d(void); - ElementMatrix* CreateKMatrixStressbalanceSSA3dViscous(void); - ElementMatrix* CreateKMatrixStressbalanceSSA3dFriction(void); - ElementMatrix* CreateKMatrixStressbalanceSSAHO(void); - ElementMatrix* CreateKMatrixStressbalanceSSAFS(void); - ElementMatrix* CreateKMatrixStressbalanceL1L2(void); - ElementMatrix* CreateKMatrixStressbalanceL1L2Viscous(void); - ElementMatrix* CreateKMatrixStressbalanceL1L2Friction(void); - ElementMatrix* CreateKMatrixStressbalanceHO(void); - ElementMatrix* CreateKMatrixStressbalanceHOViscous(void); - ElementMatrix* CreateKMatrixStressbalanceHOFriction(void); - ElementMatrix* CreateKMatrixStressbalanceHOFS(void); - ElementMatrix* CreateKMatrixStressbalanceFS(void); - ElementMatrix* CreateKMatrixStressbalanceFSViscous(void); - void KMatrixGLSstabilization(ElementMatrix* Ke); - ElementMatrix* CreateKMatrixStressbalanceFSFriction(void); - ElementMatrix* CreateKMatrixStressbalanceVert(void); - ElementMatrix* CreateKMatrixStressbalanceVertVolume(void); - ElementMatrix* CreateKMatrixStressbalanceVertSurface(void); - ElementMatrix* CreateJacobianStressbalanceHoriz(void); - ElementMatrix* CreateJacobianStressbalanceSSA2d(void); - ElementMatrix* CreateJacobianStressbalanceHO(void); - ElementMatrix* CreateJacobianStressbalanceFS(void); - void InputUpdateFromSolutionStressbalanceHoriz( IssmDouble* solutiong); - void InputUpdateFromSolutionStressbalanceSSA( IssmDouble* solutiong); - void InputUpdateFromSolutionStressbalanceSSAHO( IssmDouble* solutiong); - void InputUpdateFromSolutionStressbalanceSSAFS( IssmDouble* solutiong); - void InputUpdateFromSolutionStressbalanceL1L2( IssmDouble* solutiong); - void InputUpdateFromSolutionStressbalanceHO( IssmDouble* solutiong); - void InputUpdateFromSolutionStressbalanceHOFS( IssmDouble* solutiong); - void InputUpdateFromSolutionStressbalanceSIA( IssmDouble* solutiong); - void InputUpdateFromSolutionStressbalanceVert( IssmDouble* solutiong); - void InputUpdateFromSolutionStressbalanceFS( IssmDouble* solutiong); - void GetSolutionFromInputsStressbalanceHoriz(Vector* solutiong); - void GetSolutionFromInputsStressbalanceSIA(Vector* solutiong); - void GetSolutionFromInputsStressbalanceFS(Vector* solutiong); - ElementVector* CreatePVectorCouplingSSAFS(void); - ElementVector* CreatePVectorCouplingSSAFSViscous(void); - ElementVector* CreatePVectorCouplingSSAFSFriction(void); - ElementVector* CreatePVectorCouplingHOFS(void); - ElementVector* CreatePVectorCouplingHOFSViscous(void); - ElementVector* CreatePVectorCouplingHOFSFriction(void); - ElementVector* CreatePVectorStressbalanceHoriz(void); - ElementVector* CreatePVectorStressbalanceSIA(void); - ElementVector* CreatePVectorStressbalanceSSA(void); - ElementVector* CreatePVectorStressbalanceSSAHO(void); - ElementVector* CreatePVectorStressbalanceSSAFS(void); - ElementVector* CreatePVectorStressbalanceL1L2(void); - ElementVector* CreatePVectorStressbalanceHO(void); - ElementVector* CreatePVectorStressbalanceHODrivingStress(void); - ElementVector* CreatePVectorStressbalanceHOFront(void); - ElementVector* CreatePVectorStressbalanceHOFS(void); - ElementVector* CreatePVectorStressbalanceFS(void); - ElementVector* CreatePVectorStressbalanceFSFront(void); - ElementVector* CreatePVectorStressbalanceFSViscous(void); - void PVectorGLSstabilization(ElementVector* pe); - ElementVector* CreatePVectorStressbalanceFSShelf(void); - ElementVector* CreatePVectorStressbalanceVert(void); - ElementVector* CreatePVectorStressbalanceVertVolume(void); - ElementVector* CreatePVectorStressbalanceVertBase(void); - void GetL1L2Viscosity(IssmDouble*, IssmDouble*, GaussPenta*, Input*, Input*, Input*); - #endif - - #ifdef _HAVE_CONTROL_ - ElementVector* CreatePVectorAdjointHoriz(void); - ElementMatrix* CreateKMatrixAdjointSSA2d(void); - ElementMatrix* CreateKMatrixAdjointHO(void); - ElementMatrix* CreateKMatrixAdjointFS(void); - ElementVector* CreatePVectorAdjointSSA(void); - ElementVector* CreatePVectorAdjointHO(void); - ElementVector* CreatePVectorAdjointFS(void); - void InputUpdateFromSolutionAdjointHoriz( IssmDouble* solutiong); - void InputUpdateFromSolutionAdjointFS( IssmDouble* solutiong); - #endif - - #ifdef _HAVE_HYDROLOGY_ - ElementMatrix* CreateKMatrixHydrologyDCInefficient(void); - ElementMatrix* CreateKMatrixHydrologyDCEfficient(void); - ElementVector* CreatePVectorHydrologyDCInefficient(void); - ElementVector* CreatePVectorHydrologyDCEfficient(void); - void GetHydrologyDCInefficientHmax(IssmDouble* ph_max, Node* innode); - void GetHydrologyTransfer(Vector* transfer); - void GetSolutionFromInputsOneDof(Vector* solution, int enum_type); - void HydrologyEPLGetActive(Vector* active_vec); - void HydrologyEPLGetMask(Vector* vec_mask); - void InputUpdateFromSolutionHydrologyDCInefficient(IssmDouble* solution); - #endif - - void UpdateConstraintsExtrudeFromBase(void){_error_("not implemented yet");}; - void UpdateConstraintsExtrudeFromTop(void){_error_("not implemented yet");}; - #ifdef _HAVE_THERMAL_ - ElementMatrix* CreateKMatrixEnthalpy(void); - ElementMatrix* CreateKMatrixEnthalpyVolume(void); - ElementMatrix* CreateKMatrixEnthalpyShelf(void); - ElementMatrix* CreateKMatrixThermal(void); - ElementMatrix* CreateKMatrixMelting(void); - ElementMatrix* CreateKMatrixThermalVolume(void); - ElementMatrix* CreateKMatrixThermalShelf(void); - ElementVector* CreatePVectorEnthalpy(void); - ElementVector* CreatePVectorEnthalpyVolume(void); - ElementVector* CreatePVectorEnthalpyShelf(void); - ElementVector* CreatePVectorEnthalpySheet(void); - ElementVector* CreatePVectorMelting(void); - ElementVector* CreatePVectorThermal(void); - ElementVector* CreatePVectorThermalVolume(void); - ElementVector* CreatePVectorThermalShelf(void); - ElementVector* CreatePVectorThermalSheet(void); - void InputUpdateFromSolutionThermal(IssmDouble* solutiong); - void InputUpdateFromSolutionEnthalpy(IssmDouble* solutiong); - void UpdateBasalConstraintsEnthalpy(void); - void ComputeBasalMeltingrate(void); - void DrainWaterfraction(void); - #endif - - #ifdef _HAVE_BALANCED_ - ElementMatrix* CreateKMatrixBalancethickness(void); - ElementVector* CreatePVectorBalancethickness(void); - #endif + Tria* SpawnTria(int index1,int index2,int index3); + IssmDouble StabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa); + + void UpdateConstraintsExtrudeFromBase(void); + void UpdateConstraintsExtrudeFromTop(void); /*}}}*/ }; Index: /issm/trunk/src/c/classes/Elements/PentaRef.cpp =================================================================== --- /issm/trunk/src/c/classes/Elements/PentaRef.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Elements/PentaRef.cpp (revision 17806) @@ -16,12 +16,13 @@ /*Element macros*/ +#define NUMNODESP0 1 #define NUMNODESP1 6 #define NUMNODESP1_2d 3 #define NUMNODESP1b 7 #define NUMNODESP1xP2 9 +#define NUMNODESP1xP3 12 #define NUMNODESP2xP1 12 -#define NUMNODESP2 15 +#define NUMNODESP2 18 #define NUMNODESP2xP4 30 -#define NUMNODESP1xP3 12 /*Object constructors and destructor*/ @@ -55,1092 +56,6 @@ /*Reference Element numerics*/ -/*FUNCTION PentaRef::GetBSSAHO {{{*/ -void PentaRef::GetBSSAHO(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss){ - /*Compute B matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF2. - * For node i, Bi can be expressed in the actual coordinate system - * by: - * Bi=[ dh/dx 0 ] - * [ 0 dh/dy ] - * [ 1/2*dh/dy 1/2*dh/dx ] - * where h is the interpolation function for node i. - * - * We assume B has been allocated already, of size: 5x(NDOF2*NUMNODESP1) - */ - - IssmDouble dbasis[3][NUMNODESP1]; - - /*Get dbasis in actual coordinate system: */ - GetNodalFunctionsP1Derivatives(&dbasis[0][0],xyz_list, gauss); - - /*Build B: */ - for(int i=0;iNumberofNodes(); - - /*Get nodal functions derivatives*/ - IssmDouble* dbasis=xNew(3*numnodes); - GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - - /*Build B: */ - for(int i=0;i(dbasis); -} -/*}}}*/ -/*FUNCTION PentaRef::GetBprimeHO {{{*/ -void PentaRef::GetBprimeHO(IssmDouble* B,IssmDouble* xyz_list,GaussPenta* gauss){ - /*Compute B prime matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF2. - * For node i, Bi can be expressed in the actual coordinate system - * by: - * Bi=[ 2*dh/dx dh/dy ] - * [ dh/dx 2*dh/dy ] - * [ dh/dy dh/dx ] - * [ dh/dz 0 ] - * [ 0 dh/dz ] - * where h is the interpolation function for node i. - * - * We assume B has been allocated already, of size: 5x(NDOF2*numnodes) - */ - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Get nodal functions derivatives*/ - IssmDouble* dbasis=xNew(3*numnodes); - GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - - /*Build BPrime: */ - for(int i=0;i(dbasis); -} -/*}}}*/ -/*FUNCTION PentaRef::GetBprimeSSAFS{{{*/ -void PentaRef::GetBprimeSSAFS(IssmDouble* Bprime, IssmDouble* xyz_list, GaussPenta* gauss){ - /*Compute Bprime matrix. Bprime=[Bprime1 Bprime2 Bprime3 Bprime4 Bprime5 Bprime6] where Bprimei is of size 5*NDOF2. - * For node i, Bprimei can be expressed in the actual coordinate system - * by: - * Bprimei=[ 2*dh/dx dh/dy 0 0 ] - * [ dh/dx 2*dh/dy 0 0 ] - * [ dh/dy dh/dx 0 0 ] - * where h is the interpolation function for node i. - * - * We assume Bprime has been allocated already, of size: 5x(NDOF2*NUMNODESP1) - */ - - int i; - IssmDouble dbasismini[3][NUMNODESP1b]; - - /*Get dbasis in actual coordinate system: */ - GetNodalFunctionsMINIDerivatives(&dbasismini[0][0],xyz_list, gauss); - - /*Build Bprime: */ - for(i=0;iNumberofNodes(); - - /*Get nodal functions derivatives*/ - IssmDouble* dbasis=xNew(3*numnodes); - GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - - /*Build B: */ - for(int i=0;i(dbasis); -} -/*}}}*/ -/*FUNCTION PentaRef::GetBFS {{{*/ -void PentaRef::GetBFS(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss){ - - /*Compute B matrix. B=[Bv1 Bv2 ... Bp1 Bp2 ...] where Bvi is of size 3*NDOF3. - * For node i, Bvi can be expressed in the actual coordinate system - * by: Bvi=[ dh/dx 0 0 ] - * [ 0 dh/dy 0 ] - * [ 0 0 dh/dz ] - * [ 1/2*dh/dy 1/2*dh/dx 0 ] - * [ 1/2*dh/dz 0 1/2*dh/dx ] - * [ 0 1/2*dh/dz 1/2*dh/dy ] - * [ 0 0 0 ] - * [ dh/dx dh/dy dh/dz ] - * - * by: Bpi=[ 0 ] - * [ 0 ] - * [ 0 ] - * [ 0 ] - * [ 0 ] - * [ 0 ] - * [ h ] - * [ 0 ] - * where h is the interpolation function for node i. - * Same thing for Bb except the last column that does not exist. - */ - - /*Fetch number of nodes for this finite element*/ - int pnumnodes = this->NumberofNodesPressure(); - int vnumnodes = this->NumberofNodesVelocity(); - - /*Get nodal functions derivatives*/ - IssmDouble* vdbasis=xNew(3*vnumnodes); - IssmDouble* pbasis =xNew(pnumnodes); - GetNodalFunctionsDerivativesVelocity(vdbasis,xyz_list,gauss); - GetNodalFunctionsPressure(pbasis,gauss); - - /*Build B: */ - for(int i=0;i(vdbasis); - xDelete(pbasis); -} -/*}}}*/ -/*FUNCTION PentaRef::GetBFSGLS {{{*/ -void PentaRef::GetBFSGLS(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss){ - - /*Compute B matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 3*NDOF4. - * For node i, Bi can be expressed in the actual coordinate system - * by: Bi=[ dh/dx 0 0 0 ] - * [ 0 dh/dy 0 0 ] - * [ 0 0 dh/dy 0 ] - * [ 1/2*dh/dy 1/2*dh/dx 0 0 ] - * [ 1/2*dh/dz 0 1/2*dh/dx 0 ] - * [ 0 1/2*dh/dz 1/2*dh/dy 0 ] - * [ 0 0 0 h ] - * [ dh/dx dh/dy dh/dz 0 ] - * where h is the interpolation function for node i. - * Same thing for Bb except the last column that does not exist. - */ - - int i; - IssmDouble dbasis[3][NUMNODESP1]; - IssmDouble basis[NUMNODESP1]; - - /*Get dbasismini in actual coordinate system: */ - GetNodalFunctionsP1Derivatives(&dbasis[0][0],xyz_list, gauss); - GetNodalFunctionsP1(&basis[0], gauss); - - /*Build B: */ - for(i=0;iNumberofNodesPressure(); - int vnumnodes = this->NumberofNodesVelocity(); - - /*Get nodal functions derivatives*/ - IssmDouble* vdbasis=xNew(3*vnumnodes); - IssmDouble* pbasis =xNew(pnumnodes); - GetNodalFunctionsDerivativesVelocity(vdbasis,xyz_list,gauss); - GetNodalFunctionsPressure(pbasis,gauss); - - /*Build B_prime: */ - for(int i=0;i(vdbasis); - xDelete(pbasis); -} -/*}}}*/ -/*FUNCTION PentaRef::GetBprimeFSGLS {{{*/ -void PentaRef::GetBprimeFSGLS(IssmDouble* B_prime, IssmDouble* xyz_list, GaussPenta* gauss){ - /* Compute B' matrix. B'=[B1' B2' B3' B4' B5' B6' Bb'] where Bi' is of size 3*NDOF2. - * For node i, Bi' can be expressed in the actual coordinate system - * by: - * Bi'=[ dh/dx 0 0 0] - * [ 0 dh/dy 0 0] - * [ 0 0 dh/dz 0] - * [ dh/dy dh/dx 0 0] - * [ dh/dz 0 dh/dx 0] - * [ 0 dh/dz dh/dy 0] - * [ dh/dx dh/dy dh/dz 0] - * [ 0 0 0 h] - * where h is the interpolation function for node i. - * - * Same thing for the bubble fonction except that there is no fourth column - */ - - int i; - IssmDouble dbasis[3][NUMNODESP1]; - IssmDouble basis[NUMNODESP1]; - - /*Get dbasismini in actual coordinate system: */ - GetNodalFunctionsP1Derivatives(&dbasis[0][0],xyz_list, gauss); - GetNodalFunctionsP1(basis, gauss); - - /*B_primeuild B_prime: */ - for(i=0;iNumberofNodes(); - - /*Get nodal functions derivatives*/ - IssmDouble* basis=xNew(numnodes); - GetNodalFunctions(basis,gauss); - - /*Build B: */ - for(int i=0;i(basis); -} -/*}}}*/ -/*FUNCTION PentaRef::GetBConduct{{{*/ -void PentaRef::GetBConduct(IssmDouble* B_conduct, IssmDouble* xyz_list, GaussPenta* gauss){ - /*Compute B matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF1. - * For node i, Bi' can be expressed in the actual coordinate system - * by: - * Bi_conduct=[ dh/dx ] - * [ dh/dy ] - * [ dh/dz ] - * where h is the interpolation function for node i. - * - * We assume B has been allocated already, of size: 3x(NDOF1*numnodes) - */ - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Get nodal functions derivatives*/ - IssmDouble* dbasis=xNew(3*numnodes); - GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - - /*Build B: */ - for(int i=0;i(dbasis); -} -/*}}}*/ -/*FUNCTION PentaRef::GetBVert{{{*/ -void PentaRef::GetBVert(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss){ - /* Compute B matrix. B=[dh1/dz dh2/dz dh3/dz dh4/dz dh5/dz dh6/dz]; - where hi is the interpolation function for node i.*/ - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Get nodal functions derivatives*/ - IssmDouble* dbasis=xNew(3*numnodes); - GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - - /*Build B: */ - for(int i=0;i(dbasis); -} -/*}}}*/ -/*FUNCTION PentaRef::GetBprimeAdvec{{{*/ -void PentaRef::GetBprimeAdvec(IssmDouble* Bprime_advec, IssmDouble* xyz_list, GaussPenta* gauss){ - /*Compute B matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF1. - * For node i, Bi' can be expressed in the actual coordinate system - * by: - * Biprime_advec=[ dh/dx ] - * [ dh/dy ] - * [ dh/dz ] - * where h is the interpolation function for node i. - * - * We assume B has been allocated already, of size: 3x(NDOF1*numnodes) - */ - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Get nodal functions derivatives*/ - IssmDouble* dbasis=xNew(3*numnodes); - GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - - /*Build B': */ - for(int i=0;i(dbasis); -} -/*}}}*/ -/*FUNCTION PentaRef::GetBprimeVert{{{*/ -void PentaRef::GetBprimeVert(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss){ - - GetNodalFunctions(B,gauss); - -} -/*}}}*/ -/*FUNCTION PentaRef::GetBHOFriction{{{*/ -void PentaRef::GetBHOFriction(IssmDouble* B, GaussPenta* gauss){ - /*Compute B matrix. B=[B1 B2 B3] where Bi is square and of size 2x2. - ** For node i, Bi can be expressed in the actual coordinate system - ** by: - ** Bi=[ N 0 ] - ** [ 0 N ] - ** where N is the interpolation function for node i. - ** - ** We assume B has been allocated already, of size: 2 (2 x numnodes) - **/ - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Get nodal functions derivatives*/ - IssmDouble* basis=xNew(numnodes); - GetNodalFunctions(basis,gauss); - - for(int i=0;i(basis); -} -/*}}}*/ -/*FUNCTION PentaRef::GetLFS{{{*/ -void PentaRef::GetLFS(IssmDouble* LFS, GaussPenta* gauss){ - /* Compute L matrix. L=[L1 L2 L3] where Li is square and of size numdof. - * For node i, Li can be expressed in the actual coordinate system - * by: - * Li=[ h 0 0 0 ] - * [ 0 h 0 0 ] - * where h is the interpolation function for node i. - */ - - /*Fetch number of nodes for this finite element*/ - int pnumnodes = this->NumberofNodesPressure(); - int vnumnodes = this->NumberofNodesVelocity(); - int pnumdof = pnumnodes; - int vnumdof = vnumnodes*NDOF3; - - /*Get nodal functions derivatives*/ - IssmDouble* vbasis=xNew(vnumnodes); - GetNodalFunctionsVelocity(vbasis,gauss); - - /*Build LFS: */ - for(int i=0;i(vbasis); -} -/*}}}*/ -/*FUNCTION PentaRef::GetLprimeFS {{{*/ -void PentaRef::GetLprimeFS(IssmDouble* LprimeFS, IssmDouble* xyz_list, GaussPenta* gauss){ - /* Compute Lprime matrix. Lprime=[Lp1 Lp2 Lp3] where Lpi is square and of size numdof. - * For node i, Lpi can be expressed in the actual coordinate system - * by: - * Lpi=[ h 0 0 0]1 - * [ 0 h 0 0]2 - * [ h 0 0 0]3 - * [ 0 h 0 0]4 - * [ 0 0 h 0]5 - * [ 0 0 h 0]6 - * [ 0 0 dh/dz 0]7 - * [ 0 0 dh/dz 0]8 - * [ 0 0 dh/dz 0]9 - * [dh/dz 0 dh/dx 0]0 - * [ 0 dh/dz dh/dy 0]1 - * [ 0 0 0 h]2 - * [ 0 0 0 h]3 - * [ 0 0 0 h]4 - * - * Li=[ h 0 0 0]1 - * [ 0 h 0 0]2 - * [ 0 0 h 0]3 - * [ 0 0 h 0]4 - * [ h 0 0 0]5 - * [ 0 h 0 0]6 - * [ h 0 0 0]7 - * [ 0 h 0 0]8 - * [ 0 0 h 0]9 - * [ 0 0 h 0]0 - * [ 0 0 h 0]1 - * [ h 0 0 0]2 - * [ 0 h 0 0]3 - * [ 0 0 h 0]4 - * where h is the interpolation function for node i. - */ - - int num_dof=4; - IssmDouble L1L2l3[NUMNODESP1_2d]; - IssmDouble dbasis[3][NUMNODESP1]; - - /*Get L1L2l3 in actual coordinate system: */ - L1L2l3[0]=gauss->coord1*(1-gauss->coord4)/2.0; - L1L2l3[1]=gauss->coord2*(1-gauss->coord4)/2.0; - L1L2l3[2]=gauss->coord3*(1-gauss->coord4)/2.0; - - GetNodalFunctionsP1Derivatives(&dbasis[0][0],xyz_list,gauss); - - /*Build LprimeFS: */ - for(int i=0;i<3;i++){ - LprimeFS[num_dof*NUMNODESP1_2d*0+num_dof*i+0] = L1L2l3[i]; - LprimeFS[num_dof*NUMNODESP1_2d*0+num_dof*i+1] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*0+num_dof*i+2] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*0+num_dof*i+3] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*1+num_dof*i+0] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*1+num_dof*i+1] = L1L2l3[i]; - LprimeFS[num_dof*NUMNODESP1_2d*1+num_dof*i+2] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*1+num_dof*i+3] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*2+num_dof*i+0] = L1L2l3[i]; - LprimeFS[num_dof*NUMNODESP1_2d*2+num_dof*i+1] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*2+num_dof*i+2] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*2+num_dof*i+3] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*3+num_dof*i+0] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*3+num_dof*i+1] = L1L2l3[i]; - LprimeFS[num_dof*NUMNODESP1_2d*3+num_dof*i+2] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*3+num_dof*i+3] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*4+num_dof*i+0] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*4+num_dof*i+1] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*4+num_dof*i+2] = L1L2l3[i]; - LprimeFS[num_dof*NUMNODESP1_2d*4+num_dof*i+3] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*5+num_dof*i+0] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*5+num_dof*i+1] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*5+num_dof*i+2] = L1L2l3[i]; - LprimeFS[num_dof*NUMNODESP1_2d*5+num_dof*i+3] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*6+num_dof*i+0] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*6+num_dof*i+1] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*6+num_dof*i+2] = dbasis[2][i]; - LprimeFS[num_dof*NUMNODESP1_2d*6+num_dof*i+3] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*7+num_dof*i+0] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*7+num_dof*i+1] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*7+num_dof*i+2] = dbasis[2][i]; - LprimeFS[num_dof*NUMNODESP1_2d*7+num_dof*i+3] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*8+num_dof*i+0] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*8+num_dof*i+1] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*8+num_dof*i+2] = dbasis[2][i]; - LprimeFS[num_dof*NUMNODESP1_2d*8+num_dof*i+3] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*9+num_dof*i+0] = dbasis[2][i]; - LprimeFS[num_dof*NUMNODESP1_2d*9+num_dof*i+1] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*9+num_dof*i+2] = dbasis[0][i]; - LprimeFS[num_dof*NUMNODESP1_2d*9+num_dof*i+3] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*10+num_dof*i+0] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*10+num_dof*i+1] = dbasis[2][i]; - LprimeFS[num_dof*NUMNODESP1_2d*10+num_dof*i+2] = dbasis[1][i]; - LprimeFS[num_dof*NUMNODESP1_2d*10+num_dof*i+3] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*11+num_dof*i+0] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*11+num_dof*i+1] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*11+num_dof*i+2] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*11+num_dof*i+3] = L1L2l3[i]; - LprimeFS[num_dof*NUMNODESP1_2d*12+num_dof*i+0] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*12+num_dof*i+1] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*12+num_dof*i+2] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*12+num_dof*i+3] = L1L2l3[i]; - LprimeFS[num_dof*NUMNODESP1_2d*13+num_dof*i+0] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*13+num_dof*i+1] = 0; - LprimeFS[num_dof*NUMNODESP1_2d*13+num_dof*i+2] = 0; - LprimeFS[num_dof*NUMNODESP1_2d*13+num_dof*i+3] = L1L2l3[i]; - } -} -/*}}}*/ -/*FUNCTION PentaRef::GetLSSAFS {{{*/ -void PentaRef::GetLSSAFS(IssmDouble* LFS, GaussPenta* gauss){ - /* - * Compute L matrix. L=[L1 L2 L3] where Li is square and of size numdof. - * For node i, Li can be expressed in the actual coordinate system - * by: - * Li=[ h 0 ] - * [ 0 h ] - * [ h 0 ] - * [ 0 h ] - * [ h 0 ] - * [ 0 h ] - * [ h 0 ] - * [ 0 h ] - * where h is the interpolation function for node i. - */ - - int num_dof=2; - IssmDouble L1L2l3[NUMNODESP1_2d]; - - /*Get L1L2l3 in actual coordinate system: */ - L1L2l3[0]=gauss->coord1*(1-gauss->coord4)/2.0; - L1L2l3[1]=gauss->coord2*(1-gauss->coord4)/2.0; - L1L2l3[2]=gauss->coord3*(1-gauss->coord4)/2.0; - - /*Build LFS: */ - for(int i=0;i<3;i++){ - LFS[num_dof*NUMNODESP1_2d*0+num_dof*i+0] = L1L2l3[i]; - LFS[num_dof*NUMNODESP1_2d*0+num_dof*i+1] = 0; - LFS[num_dof*NUMNODESP1_2d*1+num_dof*i+0] = 0; - LFS[num_dof*NUMNODESP1_2d*1+num_dof*i+1] = L1L2l3[i]; - LFS[num_dof*NUMNODESP1_2d*2+num_dof*i+0] = L1L2l3[i]; - LFS[num_dof*NUMNODESP1_2d*2+num_dof*i+1] = 0; - LFS[num_dof*NUMNODESP1_2d*3+num_dof*i+0] = 0; - LFS[num_dof*NUMNODESP1_2d*3+num_dof*i+1] = L1L2l3[i]; - LFS[num_dof*NUMNODESP1_2d*4+num_dof*i+0] = L1L2l3[i]; - LFS[num_dof*NUMNODESP1_2d*4+num_dof*i+1] = 0; - LFS[num_dof*NUMNODESP1_2d*5+num_dof*i+0] = 0; - LFS[num_dof*NUMNODESP1_2d*5+num_dof*i+1] = L1L2l3[i]; - LFS[num_dof*NUMNODESP1_2d*6+num_dof*i+0] = L1L2l3[i]; - LFS[num_dof*NUMNODESP1_2d*6+num_dof*i+1] = 0; - LFS[num_dof*NUMNODESP1_2d*7+num_dof*i+0] = 0; - LFS[num_dof*NUMNODESP1_2d*7+num_dof*i+1] = L1L2l3[i]; - } -} -/*}}}*/ -/*FUNCTION PentaRef::GetLprimeSSAFS {{{*/ -void PentaRef::GetLprimeSSAFS(IssmDouble* LprimeFS, IssmDouble* xyz_list, GaussPenta* gauss){ - /* Compute Lprime matrix. Lprime=[Lp1 Lp2 Lp3] where Lpi is square and of size numdof. - * For node i, Lpi can be expressed in the actual coordinate system - * by: - * Lpi=[ h 0 0 0] - * [ 0 h 0 0] - * [ 0 0 h 0] - * [ 0 0 h 0] - * [ 0 0 dh/dz 0] - * [ 0 0 dh/dz 0] - * [ 0 0 0 h] - * [ 0 0 0 h] - * where h is the interpolation function for node i. - */ - int num_dof=3; - int num_dof_vel=3*NUMNODESP1b; - int num_dof_total=3*NUMNODESP1b+1*NUMNODESP1; - IssmDouble L1L2l3[NUMNODESP1_2d]; - IssmDouble dbasis[3][NUMNODESP1]; - - /*Get L1L2l3 in actual coordinate system: */ - L1L2l3[0]=gauss->coord1*(1-gauss->coord4)/2.0; - L1L2l3[1]=gauss->coord2*(1-gauss->coord4)/2.0; - L1L2l3[2]=gauss->coord3*(1-gauss->coord4)/2.0; - - GetNodalFunctionsP1Derivatives(&dbasis[0][0],xyz_list,gauss); - - /*Build LprimeFS: */ - for(int i=0;i<3;i++){ - LprimeFS[num_dof_total*0+num_dof*i+0] = L1L2l3[i]; - LprimeFS[num_dof_total*0+num_dof*i+1] = 0.; - LprimeFS[num_dof_total*0+num_dof*i+2] = 0.; - LprimeFS[num_dof_total*1+num_dof*i+0] = 0.; - LprimeFS[num_dof_total*1+num_dof*i+1] = L1L2l3[i]; - LprimeFS[num_dof_total*1+num_dof*i+2] = 0.; - LprimeFS[num_dof_total*2+num_dof*i+0] = 0.; - LprimeFS[num_dof_total*2+num_dof*i+1] = 0.; - LprimeFS[num_dof_total*2+num_dof*i+2] = L1L2l3[i]; - LprimeFS[num_dof_total*3+num_dof*i+0] = 0.; - LprimeFS[num_dof_total*3+num_dof*i+1] = 0.; - LprimeFS[num_dof_total*3+num_dof*i+2] = L1L2l3[i]; - LprimeFS[num_dof_total*4+num_dof*i+0] = 0.; - LprimeFS[num_dof_total*4+num_dof*i+1] = 0.; - LprimeFS[num_dof_total*4+num_dof*i+2] = dbasis[2][i]; - LprimeFS[num_dof_total*5+num_dof*i+0] = 0.; - LprimeFS[num_dof_total*5+num_dof*i+1] = 0.; - LprimeFS[num_dof_total*5+num_dof*i+2] = dbasis[2][i]; - LprimeFS[num_dof_total*6+num_dof*i+0] = 0.; - LprimeFS[num_dof_total*6+num_dof*i+1] = 0.; - LprimeFS[num_dof_total*6+num_dof*i+2] = 0.; - LprimeFS[num_dof_total*7+num_dof*i+0] = 0.; - LprimeFS[num_dof_total*7+num_dof*i+1] = 0.; - LprimeFS[num_dof_total*7+num_dof*i+2] = 0.; - } - for(int i=3;i<7;i++){ - LprimeFS[num_dof_total*0+num_dof*i+0] = 0.; - LprimeFS[num_dof_total*0+num_dof*i+1] = 0.; - LprimeFS[num_dof_total*0+num_dof*i+2] = 0.; - LprimeFS[num_dof_total*1+num_dof*i+0] = 0.; - LprimeFS[num_dof_total*1+num_dof*i+1] = 0.; - LprimeFS[num_dof_total*1+num_dof*i+2] = 0.; - LprimeFS[num_dof_total*2+num_dof*i+0] = 0.; - LprimeFS[num_dof_total*2+num_dof*i+1] = 0.; - LprimeFS[num_dof_total*2+num_dof*i+2] = 0.; - LprimeFS[num_dof_total*3+num_dof*i+0] = 0.; - LprimeFS[num_dof_total*3+num_dof*i+1] = 0.; - LprimeFS[num_dof_total*3+num_dof*i+2] = 0.; - LprimeFS[num_dof_total*4+num_dof*i+0] = 0.; - LprimeFS[num_dof_total*4+num_dof*i+1] = 0.; - LprimeFS[num_dof_total*4+num_dof*i+2] = 0.; - LprimeFS[num_dof_total*5+num_dof*i+0] = 0.; - LprimeFS[num_dof_total*5+num_dof*i+1] = 0.; - LprimeFS[num_dof_total*5+num_dof*i+2] = 0.; - LprimeFS[num_dof_total*6+num_dof*i+0] = 0.; - LprimeFS[num_dof_total*6+num_dof*i+1] = 0.; - LprimeFS[num_dof_total*6+num_dof*i+2] = 0.; - LprimeFS[num_dof_total*7+num_dof*i+0] = 0.; - LprimeFS[num_dof_total*7+num_dof*i+1] = 0.; - LprimeFS[num_dof_total*7+num_dof*i+2] = 0.; - } - for(int i=0;i<3;i++){ - LprimeFS[num_dof_total*0+num_dof_vel+i] = 0.; - LprimeFS[num_dof_total*1+num_dof_vel+i] = 0.; - LprimeFS[num_dof_total*2+num_dof_vel+i] = 0.; - LprimeFS[num_dof_total*3+num_dof_vel+i] = 0.; - LprimeFS[num_dof_total*4+num_dof_vel+i] = 0.; - LprimeFS[num_dof_total*5+num_dof_vel+i] = 0.; - LprimeFS[num_dof_total*6+num_dof_vel+i] = L1L2l3[i]; - LprimeFS[num_dof_total*7+num_dof_vel+i] = L1L2l3[i]; - } - for(int i=3;i<6;i++){ - LprimeFS[num_dof_total*0+num_dof_vel+i] = 0.; - LprimeFS[num_dof_total*1+num_dof_vel+i] = 0.; - LprimeFS[num_dof_total*2+num_dof_vel+i] = 0.; - LprimeFS[num_dof_total*3+num_dof_vel+i] = 0.; - LprimeFS[num_dof_total*4+num_dof_vel+i] = 0.; - LprimeFS[num_dof_total*5+num_dof_vel+i] = 0.; - LprimeFS[num_dof_total*6+num_dof_vel+i] = 0.; - LprimeFS[num_dof_total*7+num_dof_vel+i] = 0.; - } -} -/*}}}*/ -/*FUNCTION PentaRef::GetLFSSSA {{{*/ -void PentaRef::GetLFSSSA(IssmDouble* LFS, GaussPenta* gauss){ - /* Compute L matrix. L=[L1 L2 L3] where Li is square and of size numdof. - * For node i, Li can be expressed in the actual coordinate system - * by: - * Li=[ h 0 0 ] - * [ 0 h 0 ] - * [ 0 0 h ] - * [ 0 0 h ] - * where h is the interpolation function for node i. - */ - - int num_dof=3; - IssmDouble L1L2l3[NUMNODESP1_2d]; - - /*Get L1L2l3 in actual coordinate system: */ - L1L2l3[0]=gauss->coord1*(1-gauss->coord4)/2.0; - L1L2l3[1]=gauss->coord2*(1-gauss->coord4)/2.0; - L1L2l3[2]=gauss->coord3*(1-gauss->coord4)/2.0; - - /*Build LFS: */ - for(int i=0;i<3;i++){ - LFS[num_dof*NUMNODESP1_2d*0+num_dof*i+0] = L1L2l3[i]; - LFS[num_dof*NUMNODESP1_2d*0+num_dof*i+1] = 0.; - LFS[num_dof*NUMNODESP1_2d*0+num_dof*i+2] = 0.; - LFS[num_dof*NUMNODESP1_2d*1+num_dof*i+0] = 0.; - LFS[num_dof*NUMNODESP1_2d*1+num_dof*i+1] = L1L2l3[i]; - LFS[num_dof*NUMNODESP1_2d*1+num_dof*i+2] = 0.; - LFS[num_dof*NUMNODESP1_2d*2+num_dof*i+0] = 0.; - LFS[num_dof*NUMNODESP1_2d*2+num_dof*i+1] = 0.; - LFS[num_dof*NUMNODESP1_2d*2+num_dof*i+2] = L1L2l3[i]; - LFS[num_dof*NUMNODESP1_2d*3+num_dof*i+0] = 0.; - LFS[num_dof*NUMNODESP1_2d*3+num_dof*i+1] = 0.; - LFS[num_dof*NUMNODESP1_2d*3+num_dof*i+2] = L1L2l3[i]; - } -} -/*}}}*/ -/*FUNCTION PentaRef::GetLprimeFSSSA {{{*/ -void PentaRef::GetLprimeFSSSA(IssmDouble* LprimeFS, IssmDouble* xyz_list, GaussPenta* gauss){ - /* Compute Lprime matrix. Lprime=[Lp1 Lp2 Lp3] where Lpi is square and of size numdof. - * For node i, Lpi can be expressed in the actual coordinate system - * by: - * Lpi=[ h 0 ] - * [ 0 h ] - * [ h 0 ] - * [ 0 h ] - * where h is the interpolation function for node i. - */ - int num_dof=2; - IssmDouble L1L2l3[NUMNODESP1_2d]; - IssmDouble dbasis[3][NUMNODESP1]; - - /*Get L1L2l3 in actual coordinate system: */ - L1L2l3[0]=gauss->coord1*(1-gauss->coord4)/2.0; - L1L2l3[1]=gauss->coord2*(1-gauss->coord4)/2.0; - L1L2l3[2]=gauss->coord3*(1-gauss->coord4)/2.0; - GetNodalFunctionsP1Derivatives(&dbasis[0][0],xyz_list,gauss); - - /*Build LprimeFS: */ - for(int i=0;i<3;i++){ - LprimeFS[num_dof*NUMNODESP1_2d*0+num_dof*i+0] = L1L2l3[i]; - LprimeFS[num_dof*NUMNODESP1_2d*0+num_dof*i+1] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*1+num_dof*i+0] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*1+num_dof*i+1] = L1L2l3[i]; - LprimeFS[num_dof*NUMNODESP1_2d*2+num_dof*i+0] = L1L2l3[i]; - LprimeFS[num_dof*NUMNODESP1_2d*2+num_dof*i+1] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*3+num_dof*i+0] = 0.; - LprimeFS[num_dof*NUMNODESP1_2d*3+num_dof*i+1] = L1L2l3[i]; - } -} -/*}}}*/ /*FUNCTION PentaRef::GetJacobian {{{*/ -void PentaRef::GetJacobian(IssmDouble* J, IssmDouble* xyz_list,GaussPenta* gauss){ +void PentaRef::GetJacobian(IssmDouble* J, IssmDouble* xyz_list,Gauss* gauss_in){ /*The Jacobian is constant over the element, discard the gaussian points. * J is assumed to have been allocated of size NDOF2xNDOF2.*/ @@ -1151,4 +66,8 @@ IssmDouble y1,y2,y3,y4,y5,y6; IssmDouble z1,z2,z3,z4,z5,z6; + + /*Cast gauss to GaussPenta*/ + _assert_(gauss_in->Enum()==GaussPentaEnum); + GaussPenta* gauss = dynamic_cast(gauss_in); /*Figure out xi,eta and zi (parametric coordinates), for this gaussian point: */ @@ -1195,5 +114,5 @@ /*}}}*/ /*FUNCTION PentaRef::GetJacobianDeterminant {{{*/ -void PentaRef::GetJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,GaussPenta* gauss){ +void PentaRef::GetJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss){ /*On a penta, Jacobian varies according to coordinates. We need to get the Jacobian, and take * the determinant of it: */ @@ -1210,5 +129,5 @@ /*}}}*/ /*FUNCTION PentaRef::GetTriaJacobianDeterminant{{{*/ -void PentaRef::GetTriaJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,GaussPenta* gauss){ +void PentaRef::GetTriaJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss){ /*The Jacobian determinant is constant over the element, discard the gaussian points. * J is assumed to have been allocated of size NDOF2xNDOF2.*/ @@ -1230,5 +149,5 @@ /*}}}*/ /*FUNCTION PentaRef::GetSegmentJacobianDeterminant{{{*/ -void PentaRef::GetSegmentJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,GaussPenta* gauss){ +void PentaRef::GetSegmentJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss){ /*The Jacobian determinant is constant over the element, discard the gaussian points. * J is assumed to have been allocated of size NDOF2xNDOF2.*/ @@ -1247,5 +166,5 @@ /*}}}*/ /*FUNCTION PentaRef::GetJacobianInvert {{{*/ -void PentaRef::GetJacobianInvert(IssmDouble* Jinv, IssmDouble* xyz_list,GaussPenta* gauss){ +void PentaRef::GetJacobianInvert(IssmDouble* Jinv, IssmDouble* xyz_list,Gauss* gauss){ /*Jacobian*/ @@ -1259,14 +178,30 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetNodalFunctions{{{*/ -void PentaRef::GetNodalFunctions(IssmDouble* basis,GaussPenta* gauss){ +/*FUNCTION PentaRef::GetNodalFunctions(IssmDouble* basis,Gauss* gauss){{{*/ +void PentaRef::GetNodalFunctions(IssmDouble* basis,Gauss* gauss){ /*This routine returns the values of the nodal functions at the gaussian point.*/ _assert_(basis); + GetNodalFunctions(basis,gauss,this->element_type); + +} +/*}}}*/ +/*FUNCTION PentaRef::GetNodalFunctions(IssmDouble* basis,Gauss* gauss_in,int finiteelement){{{*/ +void PentaRef::GetNodalFunctions(IssmDouble* basis,Gauss* gauss_in,int finiteelement){ + /*This routine returns the values of the nodal functions at the gaussian point.*/ + + _assert_(basis); + + /*Cast gauss to GaussPenta*/ + _assert_(gauss_in->Enum()==GaussPentaEnum); + GaussPenta* gauss = dynamic_cast(gauss_in); /*Get current coordinates in reference element*/ IssmDouble zeta=gauss->coord4; - switch(this->element_type){ + switch(finiteelement){ + case P0Enum: + basis[0]=1.; + return; case P1Enum: case P1DGEnum: basis[0]=gauss->coord1*(1.-zeta)/2.; @@ -1324,62 +259,56 @@ basis[ 5]=gauss->coord3*(2.*gauss->coord3-1.)*zeta*(zeta+1.)/2.; /*mid-sides of quads*/ - basis[ 6]=gauss->coord1*(1.-zeta*zeta); - basis[ 7]=gauss->coord2*(1.-zeta*zeta); - basis[ 8]=gauss->coord3*(1.-zeta*zeta); + basis[ 6]=gauss->coord1*(2.*gauss->coord1-1.)*(1.-zeta*zeta); + basis[ 7]=gauss->coord2*(2.*gauss->coord2-1.)*(1.-zeta*zeta); + basis[ 8]=gauss->coord3*(2.*gauss->coord3-1.)*(1.-zeta*zeta); /*mid-sides of triangles*/ - basis[ 9]=2.*gauss->coord3*gauss->coord2*zeta*(zeta-1.); - basis[10]=2.*gauss->coord3*gauss->coord1*zeta*(zeta-1.); - basis[11]=2.*gauss->coord1*gauss->coord2*zeta*(zeta-1.); - basis[12]=2.*gauss->coord3*gauss->coord2*zeta*(zeta+1.); - basis[13]=2.*gauss->coord3*gauss->coord1*zeta*(zeta+1.); - basis[14]=2.*gauss->coord1*gauss->coord2*zeta*(zeta+1.); - return; - - /* - MODIFICATION - */ + basis[ 9]=4.*gauss->coord3*gauss->coord2*zeta*(zeta-1.)/2.; + basis[10]=4.*gauss->coord3*gauss->coord1*zeta*(zeta-1.)/2.; + basis[11]=4.*gauss->coord1*gauss->coord2*zeta*(zeta-1.)/2.; + basis[12]=4.*gauss->coord3*gauss->coord2*zeta*(zeta+1.)/2.; + basis[13]=4.*gauss->coord3*gauss->coord1*zeta*(zeta+1.)/2.; + basis[14]=4.*gauss->coord1*gauss->coord2*zeta*(zeta+1.)/2.; + /*quad faces*/ + basis[15]=4.*gauss->coord3*gauss->coord2*(1.-zeta*zeta); + basis[16]=4.*gauss->coord3*gauss->coord1*(1.-zeta*zeta); + basis[17]=4.*gauss->coord1*gauss->coord2*(1.-zeta*zeta); + return; case P2xP4Enum : /*Corner nodes*/ - basis[ 0]=(2./3.)*gauss->coord1*(2.*gauss->coord1-1.)*(zeta-1.)*(zeta-0.5 )*(zeta)*(zeta+0.5); - basis[ 1]=(2./3.)*gauss->coord2*(2.*gauss->coord2-1.)*(zeta-1.)*(zeta-0.5 )*(zeta)*(zeta+0.5); - basis[ 2]=(2./3.)*gauss->coord3*(2.*gauss->coord3-1.)*(zeta-1.)*(zeta-0.5 )*(zeta)*(zeta+0.5); - basis[ 3]=(2./3.)*gauss->coord1*(2.*gauss->coord1-1.)*(zeta-0.5)*(zeta)*(zeta+0.5)*(zeta +1.); - basis[ 4]=(2./3.)*gauss->coord2*(2.*gauss->coord2-1.)*(zeta-0.5)*(zeta)*(zeta+0.5)*(zeta +1.); - basis[ 5]=(2./3.)*gauss->coord3*(2.*gauss->coord3-1.)*(zeta-0.5)*(zeta)*(zeta+0.5)*(zeta +1.); - + basis[ 0]=gauss->coord1*(2.*gauss->coord1-1.)*(2./3.)*(zeta-1.)*(zeta-0.5 )*(zeta)*(zeta+0.5); + basis[ 1]=gauss->coord2*(2.*gauss->coord2-1.)*(2./3.)*(zeta-1.)*(zeta-0.5 )*(zeta)*(zeta+0.5); + basis[ 2]=gauss->coord3*(2.*gauss->coord3-1.)*(2./3.)*(zeta-1.)*(zeta-0.5 )*(zeta)*(zeta+0.5); + basis[ 3]=gauss->coord1*(2.*gauss->coord1-1.)*(2./3.)*(zeta-0.5)*(zeta)*(zeta+0.5)*(zeta +1.); + basis[ 4]=gauss->coord2*(2.*gauss->coord2-1.)*(2./3.)*(zeta-0.5)*(zeta)*(zeta+0.5)*(zeta +1.); + basis[ 5]=gauss->coord3*(2.*gauss->coord3-1.)*(2./3.)*(zeta-0.5)*(zeta)*(zeta+0.5)*(zeta +1.); /*mid-sides of quads*/ - basis[ 6]=4.*gauss->coord1*(zeta-1.)*(zeta-0.5)*(zeta+0.5)*(zeta+1.); - basis[ 7]=4.*gauss->coord2*(zeta-1.)*(zeta-0.5)*(zeta+0.5)*(zeta+1.); - basis[ 8]=4.*gauss->coord3*(zeta-1.)*(zeta-0.5)*(zeta+0.5)*(zeta+1.); - + basis[ 6]=gauss->coord1*(2.*gauss->coord1-1)*4.*(zeta-1.)*(zeta-0.5)*(zeta+0.5)*(zeta+1.); + basis[ 7]=gauss->coord2*(2.*gauss->coord2-1)*4.*(zeta-1.)*(zeta-0.5)*(zeta+0.5)*(zeta+1.); + basis[ 8]=gauss->coord3*(2.*gauss->coord3-1)*4.*(zeta-1.)*(zeta-0.5)*(zeta+0.5)*(zeta+1.); /*mid-sides of triangles*/ - basis[ 9]=(2./3.)*gauss->coord2*gauss->coord3*(zeta-1.)*(zeta-0.5)*zeta*(zeta+0.5); - basis[10]=(2./3.)*gauss->coord1*gauss->coord3*(zeta-1.)*(zeta-0.5)*zeta*(zeta+0.5); - basis[11]=(2./3.)*gauss->coord1*gauss->coord2*(zeta-1.)*(zeta-0.5)*zeta*(zeta+0.5); - basis[12]=(2./3.)*gauss->coord2*gauss->coord3*(zeta-0.5)*zeta*(zeta+0.5)*(zeta+1.); - basis[13]=(2./3.)*gauss->coord1*gauss->coord3*(zeta-0.5)*zeta*(zeta+0.5)*(zeta+1.); - basis[14]=(2./3.)*gauss->coord1*gauss->coord2*(zeta-0.5)*zeta*(zeta+0.5)*(zeta+1.); - + basis[ 9]=4.*gauss->coord2*gauss->coord3*(2./3.)*(zeta-1.)*(zeta-0.5)*zeta*(zeta+0.5); + basis[10]=4.*gauss->coord1*gauss->coord3*(2./3.)*(zeta-1.)*(zeta-0.5)*zeta*(zeta+0.5); + basis[11]=4.*gauss->coord1*gauss->coord2*(2./3.)*(zeta-1.)*(zeta-0.5)*zeta*(zeta+0.5); + basis[12]=4.*gauss->coord2*gauss->coord3*(2./3.)*(zeta-0.5)*zeta*(zeta+0.5)*(zeta+1.); + basis[13]=4.*gauss->coord1*gauss->coord3*(2./3.)*(zeta-0.5)*zeta*(zeta+0.5)*(zeta+1.); + basis[14]=4.*gauss->coord1*gauss->coord2*(2./3.)*(zeta-0.5)*zeta*(zeta+0.5)*(zeta+1.); /*quarter-sides of quads*/ - basis[15]=-(2./3.)*gauss->coord1*(zeta-1.0)*(zeta-0.5)*zeta*(zeta+1.); - basis[16]=-(2./3.)*gauss->coord2*(zeta-1.0)*(zeta-0.5)*zeta*(zeta+1.); - basis[17]=-(2./3.)*gauss->coord3*(zeta-1.0)*(zeta-0.5)*zeta*(zeta+1.); - basis[18]=-(2./3.)*gauss->coord1*(zeta-1.0)*zeta*(zeta+0.5)*(zeta+1.); - basis[19]=-(2./3.)*gauss->coord2*(zeta-1.0)*zeta*(zeta+0.5)*(zeta+1.); - basis[20]=-(2./3.)*gauss->coord3*(zeta-1.0)*zeta*(zeta+0.5)*(zeta+1.); - + basis[15]=gauss->coord1*(2.*gauss->coord1-1.)*(-8./3.)*(zeta-1.0)*(zeta-0.5)*zeta*(zeta+1.); + basis[16]=gauss->coord2*(2.*gauss->coord2-1.)*(-8./3.)*(zeta-1.0)*(zeta-0.5)*zeta*(zeta+1.); + basis[17]=gauss->coord3*(2.*gauss->coord3-1.)*(-8./3.)*(zeta-1.0)*(zeta-0.5)*zeta*(zeta+1.); + basis[18]=gauss->coord1*(2.*gauss->coord1-1.)*(-8./3.)*(zeta-1.0)*zeta*(zeta+0.5)*(zeta+1.); + basis[19]=gauss->coord2*(2.*gauss->coord2-1.)*(-8./3.)*(zeta-1.0)*zeta*(zeta+0.5)*(zeta+1.); + basis[20]=gauss->coord3*(2.*gauss->coord3-1.)*(-8./3.)*(zeta-1.0)*zeta*(zeta+0.5)*(zeta+1.); /* mid-sides of interior triangles*/ - basis[21]=-(8./3.)*gauss->coord2*gauss->coord3*(zeta-1.0)*(zeta-0.5)*zeta*(zeta+1.); - basis[22]=-(8./3.)*gauss->coord1*gauss->coord3*(zeta-1.0)*(zeta-0.5)*zeta*(zeta+1.); - basis[23]=-(8./3.)*gauss->coord1*gauss->coord2*(zeta-1.0)*(zeta-0.5)*zeta*(zeta+1.); - basis[24]=16.*gauss->coord2*gauss->coord3*(zeta-1.0)*(zeta-0.5)*(zeta+0.5)*(zeta+1.); - basis[25]=16.*gauss->coord1*gauss->coord3*(zeta-1.0)*(zeta-0.5)*(zeta+0.5)*(zeta+1.); - basis[26]=16.*gauss->coord1*gauss->coord2*(zeta-1.0)*(zeta-0.5)*(zeta+0.5)*(zeta+1.); - basis[27]=-(8./3.)*gauss->coord2*gauss->coord3*(zeta-1.0)*zeta*(zeta+0.5)*(zeta+1.); - basis[28]=-(8./3.)*gauss->coord1*gauss->coord3*(zeta-1.0)*zeta*(zeta+0.5)*(zeta+1.); - basis[29]=-(8./3.)*gauss->coord1*gauss->coord2*(zeta-1.0)*zeta*(zeta+0.5)*(zeta+1.); - return; - - + basis[21]=4.*gauss->coord2*gauss->coord3*(-8./3.)*(zeta-1.0)*(zeta-0.5)*zeta*(zeta+1.); + basis[22]=4.*gauss->coord1*gauss->coord3*(-8./3.)*(zeta-1.0)*(zeta-0.5)*zeta*(zeta+1.); + basis[23]=4.*gauss->coord1*gauss->coord2*(-8./3.)*(zeta-1.0)*(zeta-0.5)*zeta*(zeta+1.); + basis[24]=4.*gauss->coord2*gauss->coord3*4.*(zeta-1.0)*(zeta-0.5)*(zeta+0.5)*(zeta+1.); + basis[25]=4.*gauss->coord1*gauss->coord3*4.*(zeta-1.0)*(zeta-0.5)*(zeta+0.5)*(zeta+1.); + basis[26]=4.*gauss->coord1*gauss->coord2*4.*(zeta-1.0)*(zeta-0.5)*(zeta+0.5)*(zeta+1.); + basis[27]=4.*gauss->coord2*gauss->coord3*(-8./3.)*(zeta-1.0)*zeta*(zeta+0.5)*(zeta+1.); + basis[28]=4.*gauss->coord1*gauss->coord3*(-8./3.)*(zeta-1.0)*zeta*(zeta+0.5)*(zeta+1.); + basis[29]=4.*gauss->coord1*gauss->coord2*(-8./3.)*(zeta-1.0)*zeta*(zeta+0.5)*(zeta+1.); + return; case P1xP3Enum : /*Corner nodes*/ @@ -1390,5 +319,4 @@ basis[ 4]=(9.)/(16.)*gauss->coord2*(zeta-1./3.)*(zeta+1./3.)*(zeta+1.); basis[ 5]=(9.)/(16.)*gauss->coord3*(zeta-1./3.)*(zeta+1./3.)*(zeta+1.); - /*quarter-sides of quads*/ basis[ 6]=(27.)/(16.)*gauss->coord1*(zeta-1)*(zeta-1./3.)*(zeta+1.); @@ -1399,5 +327,4 @@ basis[11]=-(27.)/(16.)*gauss->coord3*(zeta-1)*(zeta+1./3.)*(zeta+1.); return; - default: _error_("Element type "<element_type)<<" not supported yet"); @@ -1406,75 +333,38 @@ /*}}}*/ /*FUNCTION PentaRef::GetNodalFunctionsVelocity{{{*/ -void PentaRef::GetNodalFunctionsVelocity(IssmDouble* basis,GaussPenta* gauss){ +void PentaRef::GetNodalFunctionsVelocity(IssmDouble* basis,Gauss* gauss){ /*This routine returns the values of the nodal functions at the gaussian point.*/ - switch(this->element_type){ - case P1P1Enum: - this->element_type = P1Enum; - this->GetNodalFunctions(basis,gauss); - this->element_type = P1P1Enum; - return; - case P1P1GLSEnum: - this->element_type = P1Enum; - this->GetNodalFunctions(basis,gauss); - this->element_type = P1P1GLSEnum; - return; - case MINIcondensedEnum: - this->element_type = P1bubbleEnum; - this->GetNodalFunctions(basis,gauss); - this->element_type = MINIcondensedEnum; - return; - case MINIEnum: - this->element_type = P1bubbleEnum; - this->GetNodalFunctions(basis,gauss); - this->element_type = MINIEnum; - return; - case TaylorHoodEnum: - this->element_type = P2Enum; - this->GetNodalFunctions(basis,gauss); - this->element_type = TaylorHoodEnum; - return; - default: - _error_("Element type "<element_type)<<" not supported yet"); - } + int save = this->element_type; + this->element_type = VelocityInterpolation(); + this->GetNodalFunctions(basis,gauss); + this->element_type = save; + } /*}}}*/ /*FUNCTION PentaRef::GetNodalFunctionsPressure{{{*/ -void PentaRef::GetNodalFunctionsPressure(IssmDouble* basis,GaussPenta* gauss){ +void PentaRef::GetNodalFunctionsPressure(IssmDouble* basis,Gauss* gauss){ /*This routine returns the values of the nodal functions at the gaussian point.*/ - switch(this->element_type){ - case P1P1Enum: - this->element_type = P1Enum; - this->GetNodalFunctions(basis,gauss); - this->element_type = P1P1Enum; - return; - case P1P1GLSEnum: - this->element_type = P1Enum; - this->GetNodalFunctions(basis,gauss); - this->element_type = P1P1GLSEnum; - return; - case MINIcondensedEnum: - this->element_type = P1Enum; - this->GetNodalFunctions(basis,gauss); - this->element_type = MINIcondensedEnum; - return; - case MINIEnum: - this->element_type = P1Enum; - this->GetNodalFunctions(basis,gauss); - this->element_type = MINIEnum; - return; - case TaylorHoodEnum: - this->element_type = P1Enum; - this->GetNodalFunctions(basis,gauss); - this->element_type = TaylorHoodEnum; - return; - default: - _error_("Element type "<element_type)<<" not supported yet"); - } + int save = this->element_type; + this->element_type = PressureInterpolation(); + this->GetNodalFunctions(basis,gauss); + this->element_type = save; + +} +/*}}}*/ +/*FUNCTION PentaRef::GetNodalFunctionsTensor{{{*/ +void PentaRef::GetNodalFunctionsTensor(IssmDouble* basis,Gauss* gauss){ + /*This routine returns the values of the nodal functions at the gaussian point.*/ + + int save = this->element_type; + this->element_type = TensorInterpolation(); + this->GetNodalFunctions(basis,gauss); + this->element_type = save; + } /*}}}*/ /*FUNCTION PentaRef::GetNodalFunctionsDerivatives{{{*/ -void PentaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussPenta* gauss){ +void PentaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss){ /*This routine returns the values of the nodal functions derivatives (with respect to the @@ -1511,76 +401,33 @@ /*}}}*/ /*FUNCTION PentaRef::GetNodalFunctionsDerivativesVelocity{{{*/ -void PentaRef::GetNodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list, GaussPenta* gauss){ - switch(this->element_type){ - case P1P1Enum: - this->element_type = P1Enum; - this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - this->element_type = P1P1Enum; - return; - case P1P1GLSEnum: - this->element_type = P1Enum; - this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - this->element_type = P1P1GLSEnum; - return; - case MINIcondensedEnum: - this->element_type = P1bubbleEnum; - this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - this->element_type = MINIcondensedEnum; - return; - case MINIEnum: - this->element_type = P1bubbleEnum; - this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - this->element_type = MINIEnum; - return; - case TaylorHoodEnum: - this->element_type = P2Enum; - this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - this->element_type = TaylorHoodEnum; - return; - default: - _error_("Element type "<element_type)<<" not supported yet"); - } +void PentaRef::GetNodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss){ + + int save = this->element_type; + this->element_type = VelocityInterpolation(); + this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); + this->element_type = save; + } /*}}}*/ /*FUNCTION PentaRef::GetNodalFunctionsDerivativesPressure{{{*/ -void PentaRef::GetNodalFunctionsDerivativesPressure(IssmDouble* dbasis,IssmDouble* xyz_list, GaussPenta* gauss){ - switch(this->element_type){ - case P1P1Enum: - this->element_type = P1Enum; - this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - this->element_type = P1P1Enum; - return; - case P1P1GLSEnum: - this->element_type = P1Enum; - this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - this->element_type = P1P1GLSEnum; - return; - case MINIcondensedEnum: - this->element_type = P1Enum; - this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - this->element_type = MINIcondensedEnum; - return; - case MINIEnum: - this->element_type = P1Enum; - this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - this->element_type = MINIEnum; - return; - case TaylorHoodEnum: - this->element_type = P1Enum; - this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - this->element_type = TaylorHoodEnum; - return; - default: - _error_("Element type "<element_type)<<" not supported yet"); - } +void PentaRef::GetNodalFunctionsDerivativesPressure(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss){ + + int save = this->element_type; + this->element_type = PressureInterpolation(); + this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); + this->element_type = save; } /*}}}*/ /*FUNCTION PentaRef::GetNodalFunctionsDerivativesReference{{{*/ -void PentaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussPenta* gauss){ +void PentaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss_in){ /*This routine returns the values of the nodal functions derivatives (with respect to the * natural coordinate system) at the gaussian point. */ - _assert_(dbasis && gauss); + _assert_(dbasis && gauss_in); + + /*Cast gauss to GaussPenta*/ + _assert_(gauss_in->Enum()==GaussPentaEnum); + GaussPenta* gauss = dynamic_cast(gauss_in); /*Get current coordinates in reference element*/ @@ -1588,4 +435,10 @@ switch(this->element_type){ + case P0Enum: + /*Zero derivative*/ + dbasis[NUMNODESP0*0+0] = 0.; + dbasis[NUMNODESP0*1+0] = 0.; + dbasis[NUMNODESP0*2+0] = 0.; + return; case P1Enum: case P1DGEnum: /*Nodal function 1*/ @@ -1761,15 +614,15 @@ /*Nodal function 7*/ - dbasis[NUMNODESP2*0+6 ] = -0.5*(1.-zeta*zeta); - dbasis[NUMNODESP2*1+6 ] = -SQRT3/6.*(1.-zeta*zeta); - dbasis[NUMNODESP2*2+6 ] = -2.*zeta*gauss->coord1; + dbasis[NUMNODESP2*0+6 ] = (-2.*gauss->coord1 + 0.5)*(1.-zeta*zeta); + dbasis[NUMNODESP2*1+6 ] = (-2.*SQRT3/3.*gauss->coord1 + SQRT3/6.)*(1.-zeta*zeta); + dbasis[NUMNODESP2*2+6 ] = -2.*zeta*gauss->coord1*(2.*gauss->coord1-1.); /*Nodal function 8*/ - dbasis[NUMNODESP2*0+7 ] = 0.5*(1.-zeta*zeta); - dbasis[NUMNODESP2*1+7 ] = -SQRT3/6.*(1.-zeta*zeta); - dbasis[NUMNODESP2*2+7 ] = -2.*zeta*gauss->coord2; + dbasis[NUMNODESP2*0+7 ] = (+2.*gauss->coord2 - 0.5)*(1.-zeta*zeta); + dbasis[NUMNODESP2*1+7 ] = (-2.*SQRT3/3.*gauss->coord2 + SQRT3/6.)*(1.-zeta*zeta); + dbasis[NUMNODESP2*2+7 ] = -2.*zeta*gauss->coord2*(2.*gauss->coord2-1.); /*Nodal function 9*/ dbasis[NUMNODESP2*0+8 ] = 0.; - dbasis[NUMNODESP2*1+8 ] = SQRT3/3.*(1.-zeta*zeta); - dbasis[NUMNODESP2*2+8 ] = -2.*zeta*gauss->coord3; + dbasis[NUMNODESP2*1+8 ] = (+4.*SQRT3/3.*gauss->coord3 - SQRT3/3.)*(1.-zeta*zeta); + dbasis[NUMNODESP2*2+8 ] = -2.*zeta*gauss->coord3*(2.*gauss->coord3-1.); /*Nodal function 10*/ @@ -1797,183 +650,190 @@ dbasis[NUMNODESP2*1+14] = .5*zeta*(zeta+1.)*(-2.*SQRT3/3.*(gauss->coord1+gauss->coord2)); dbasis[NUMNODESP2*2+14] = 2.*gauss->coord1*gauss->coord2*(2.*zeta+1.); - return; - - /* - Modification - */ + + /*Nodal function 16*/ + dbasis[NUMNODESP2*0+15] = 2.*gauss->coord3*(1.-zeta*zeta); + dbasis[NUMNODESP2*1+15] = (1.-zeta*zeta)*(+4.*SQRT3/3.*gauss->coord2 - 2.*SQRT3/3.*gauss->coord3); + dbasis[NUMNODESP2*2+15] = -2.*zeta*4.*gauss->coord3*gauss->coord2; + /*Nodal function 17*/ + dbasis[NUMNODESP2*0+16] = -2.*gauss->coord3*(1.-zeta*zeta); + dbasis[NUMNODESP2*1+16] = (1.-zeta*zeta)*(+4.*SQRT3/3.*gauss->coord1 - 2.*SQRT3/3.*gauss->coord3); + dbasis[NUMNODESP2*2+16] = -2.*zeta*4.*gauss->coord3*gauss->coord1; + /*Nodal function 18*/ + dbasis[NUMNODESP2*0+17] = 2.*(gauss->coord1-gauss->coord2)*(1.-zeta*zeta); + dbasis[NUMNODESP2*1+17] = (1.-zeta*zeta)*(-2.*SQRT3/3.*(gauss->coord1+gauss->coord2)); + dbasis[NUMNODESP2*2+17] = -2.*zeta*4.*gauss->coord1*gauss->coord2; + return; case P2xP4Enum : /*Nodal function 1*/ dbasis[NUMNODESP2xP4*0+0 ] = (-2* gauss->coord1 + 0.5 ) *(2./3.) *(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta+0.5) ; dbasis[NUMNODESP2xP4*1+0 ] = (-((2.*SQRT3)/(3.))*gauss->coord1 + (SQRT3/6.) )*(2./3.)*(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta+0.5) ; - dbasis[NUMNODESP2xP4*2+0 ] = (2./3.)* gauss->coord1 *(2.* gauss->coord1 -1)*( (2.*zeta-1)*(zeta -0.5)*(zeta +0.5) + 2.* zeta *zeta *(zeta -1.)); - /*Nodal function 2*/ + dbasis[NUMNODESP2xP4*2+0 ] = gauss->coord1 *(2.* gauss->coord1 -1)* 2./3.*( (2.*zeta-1)*(zeta -0.5)*(zeta +0.5) + 2.* zeta *zeta *(zeta -1.)); + /*Nodal function 2*/ dbasis[NUMNODESP2xP4*0+1 ] = (2.*gauss->coord2 - 0.5 ) *(2./3.) *(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta+0.5) ; dbasis[NUMNODESP2xP4*1+1 ] = (-((2.*SQRT3)/(3.))*gauss->coord2 + (SQRT3/6.) )*(2./3.)*(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta+0.5) ; - dbasis[NUMNODESP2xP4*2+1 ] = (2./3.)*gauss->coord2*(2.*gauss->coord2 -1.)*((2.*zeta-1.)*(zeta -0.5)*(zeta +0.5) + 2. * zeta *zeta*(zeta -1.)); - /*Nodal function 3*/ + dbasis[NUMNODESP2xP4*2+1 ] = gauss->coord2*(2.*gauss->coord2 -1.)* 2./3.* ((2.*zeta-1.)*(zeta -0.5)*(zeta +0.5) + 2. * zeta *zeta*(zeta -1.)); + /*Nodal function 3*/ dbasis[NUMNODESP2xP4*0+2 ] = 0. ; dbasis[NUMNODESP2xP4*1+2 ] = (((4.*SQRT3)/(3.))*gauss->coord3 - (SQRT3)/(3.))*(2./3.)*(zeta -1.)*(zeta-0.5)*(zeta)*(zeta+0.5); - dbasis[NUMNODESP2xP4*2+2 ] = (2./3.)*gauss->coord3*(2.* gauss->coord3 -1.)*( (2.*zeta-1.)*(zeta -0.5)*(zeta +0.5) + 2.*zeta *zeta*(zeta -1.)); - /*Nodal function 4*/ + dbasis[NUMNODESP2xP4*2+2 ] = gauss->coord3*(2.* gauss->coord3 -1.)* 2./3.*( (2.*zeta-1.)*(zeta -0.5)*(zeta +0.5) + 2.*zeta *zeta*(zeta -1.)); + /*Nodal function 4*/ dbasis[NUMNODESP2xP4*0+3 ] = (-2.* gauss->coord1 + 0.5 ) *(2./3.) *(zeta - 0.5)*(zeta)*(zeta+0.5)*(zeta +1. ); dbasis[NUMNODESP2xP4*1+3 ] = (-((2.*SQRT3)/(3.)) *gauss->coord1 + (SQRT3)/(6.) ) *(2./3.) *(zeta - 0.5)*(zeta)*(zeta+0.5)*(zeta +1. ); - dbasis[NUMNODESP2xP4*2+3 ] = (2./3.)*gauss->coord1*(2.*gauss->coord1 -1.)*( (2.*zeta+1.)*(zeta -0.5)*(zeta +0.5) + 2.*zeta *zeta*(zeta +1.)); - /*Nodal function 5*/ + dbasis[NUMNODESP2xP4*2+3 ] = gauss->coord1*(2.*gauss->coord1 -1.)* 2./3.*( (2.*zeta+1.)*(zeta -0.5)*(zeta +0.5) + 2.*zeta *zeta*(zeta +1.)); + /*Nodal function 5*/ dbasis[NUMNODESP2xP4*0+4 ] = (2*gauss->coord2 - 0.5 ) *(2./3.) *(zeta - 0.5)*(zeta)*(zeta+0.5)*(zeta +1. ); - dbasis[NUMNODESP2xP4*1+4 ] = -((2.*SQRT3)/(3.)) *gauss->coord2 + (SQRT3/(6.))*(2./3.)*(zeta - 0.5)*(zeta)*(zeta+0.5)*(zeta +1. ); - dbasis[NUMNODESP2xP4*2+4 ] = (2./3.)*gauss->coord2 *(2.*gauss->coord2 -1.)*( (2.*zeta+1.)*(zeta -0.5)*(zeta +0.5) + 2.*zeta *zeta*(zeta +1.)); - /*Nodal function 6*/ + dbasis[NUMNODESP2xP4*1+4 ] = (-((2.*SQRT3)/(3.)) *gauss->coord2 + (SQRT3/6.))*(2./3.)*(zeta - 0.5)*(zeta)*(zeta+0.5)*(zeta +1. ); + dbasis[NUMNODESP2xP4*2+4 ] = gauss->coord2 *(2.*gauss->coord2 -1.)* 2./3.*( (2.*zeta+1.)*(zeta -0.5)*(zeta +0.5) + 2.*zeta *zeta*(zeta +1.)); + /*Nodal function 6*/ dbasis[NUMNODESP2xP4*0+5 ] = 0. ; dbasis[NUMNODESP2xP4*1+5 ] = (((4.*SQRT3)/(3.))*gauss->coord3 - SQRT3/3. ) *(2./3.) *(zeta - 0.5)*(zeta)*(zeta+0.5)*(zeta +1. ); - dbasis[NUMNODESP2xP4*2+5 ] = (2./3.)*gauss->coord3 *(2.*gauss->coord3 -1.)*( (2.*zeta+1.)*(zeta -0.5)*(zeta +0.5) + 2.*zeta *zeta*(zeta +1)); - /*Nodal function 7*/ - dbasis[NUMNODESP2xP4*0+6 ] = -2. *(zeta - 1.)*(zeta - 0.5)*(zeta+0.5)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*1+6 ] = (-4.*SQRT3)/(6.) *(zeta - 1.)*(zeta - 0.5)*(zeta+0.5)*(zeta +1.) ; - dbasis[NUMNODESP2xP4*2+6 ] = 4.*gauss->coord1*( 4.*zeta *zeta*zeta - (5./2.)*zeta ); - /*Nodal function 8*/ - dbasis[NUMNODESP2xP4*0+7 ] = 2.*(zeta - 1.)*(zeta - 0.5)*(zeta+0.5)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*1+7 ] = ((-4.*SQRT3)/(6.)) *(zeta - 1.)*(zeta - 0.5)*(zeta+0.5)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*2+7 ] = 4.* gauss->coord2*( 4.*zeta *zeta*zeta - (5./2.)*zeta ); - /*Nodal function 9*/ + dbasis[NUMNODESP2xP4*2+5 ] = gauss->coord3 *(2.*gauss->coord3 -1.)* 2./3.*( (2.*zeta+1.)*(zeta -0.5)*(zeta +0.5) + 2.*zeta *zeta*(zeta +1)); + /*Nodal function 7*/ + dbasis[NUMNODESP2xP4*0+6 ] = (-2.* gauss->coord1 + 0.5 ) * 4.*(zeta - 1.)*(zeta - 0.5)*(zeta+0.5)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*1+6 ] = (-((2.*SQRT3)/(3.)) *gauss->coord1 + (SQRT3)/(6.) )* 4.*(zeta - 1.)*(zeta - 0.5)*(zeta+0.5)*(zeta +1.) ; + dbasis[NUMNODESP2xP4*2+6 ] = gauss->coord1*(2.*gauss->coord1-1)* 4.*( 4.*zeta *zeta*zeta - (5./2.)*zeta ); + /*Nodal function 8*/ + dbasis[NUMNODESP2xP4*0+7 ] = (2*gauss->coord2 - 0.5 )* 4.*(zeta - 1.)*(zeta - 0.5)*(zeta+0.5)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*1+7 ] = (-((2.*SQRT3)/(3.)) *gauss->coord2 + (SQRT3)/(6.)) * 4.*(zeta - 1.)*(zeta - 0.5)*(zeta+0.5)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*2+7 ] = gauss->coord2*(2.*gauss->coord2-1)* 4.*( 4.*zeta *zeta*zeta - (5./2.)*zeta ); + /*Nodal function 9*/ dbasis[NUMNODESP2xP4*0+8 ] = 0. ; - dbasis[NUMNODESP2xP4*1+8 ] = ((4.*SQRT3)/(3.)) *(zeta - 1.)*(zeta - 0.5)*(zeta+0.5)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*2+8 ] = 4.*gauss->coord3*( 4.*zeta *zeta*zeta - (5./2.)*zeta ); - /*Nodal function 10*/ - dbasis[NUMNODESP2xP4*0+9 ] = (4./3.)*(gauss->coord3 )*(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta+0.5) ; - dbasis[NUMNODESP2xP4*1+9 ] = 4.* (((- SQRT3)/6.)* gauss->coord3+ (SQRT3/3.) *gauss->coord2) *(2./3.) *(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta+0.5); + dbasis[NUMNODESP2xP4*1+8 ] = (((4.*SQRT3)/(3.))*gauss->coord3 - SQRT3/3. ) * 4.*(zeta - 1.)*(zeta - 0.5)*(zeta+0.5)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*2+8 ] = gauss->coord3*(2.*gauss->coord3-1)* 4.*( 4.*zeta *zeta*zeta - (5./2.)*zeta ); + /*Nodal function 10*/ + dbasis[NUMNODESP2xP4*0+9 ] = 2.*gauss->coord3 * 2./3.*(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta+0.5) ; + dbasis[NUMNODESP2xP4*1+9 ] = (4.* SQRT3/3.* gauss->coord2- 2.*SQRT3/3. *gauss->coord3) *(2./3.) *(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta+0.5); dbasis[NUMNODESP2xP4*2+9 ] = 4.* gauss->coord2 * gauss->coord3 *(2./3.)*((2.*zeta-1.)*(zeta -0.5)*(zeta +0.5) + 2.* zeta*zeta*(zeta -1.)); - /*Nodal function 11*/ - dbasis[NUMNODESP2xP4*0+10] = -(4./3.)* gauss->coord3*(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta+0.5) ; - dbasis[NUMNODESP2xP4*1+10] = 4.* ((SQRT3/3.)*gauss->coord1- (SQRT3/6.)*gauss->coord3) *(2./3.) *(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta+0.5); + /*Nodal function 11*/ + dbasis[NUMNODESP2xP4*0+10] = -2.* gauss->coord3* 2./3.*(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta+0.5) ; + dbasis[NUMNODESP2xP4*1+10] = (4.*SQRT3/3.*gauss->coord1 - 2.*SQRT3/3.*gauss->coord3) * (2./3.) *(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta+0.5); dbasis[NUMNODESP2xP4*2+10] = 4.* gauss->coord3*gauss->coord1 *(2./3.)*( (2*zeta-1.)*(zeta -0.5)*(zeta +0.5) + 2* zeta * zeta*(zeta -1)); - /*Nodal function 12*/ - dbasis[NUMNODESP2xP4*0+11] = 4.* (gauss->coord1*0.5- gauss->coord2 *0.5 )*(2./3.) *(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta+0.5) ; - dbasis[NUMNODESP2xP4*1+11] = 4.* (- (SQRT3/6.) *gauss->coord2 - (SQRT3/6.) *gauss->coord1) *(2./3.) *(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta+0.5); + /*Nodal function 12*/ + dbasis[NUMNODESP2xP4*0+11] = 2.* (gauss->coord1- gauss->coord2)* (2./3.) *(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta+0.5) ; + dbasis[NUMNODESP2xP4*1+11] = -2.* SQRT3/3.*(gauss->coord2 +gauss->coord1) *(2./3.) *(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta+0.5); dbasis[NUMNODESP2xP4*2+11] = 4.* gauss->coord1*gauss->coord2 *(2./3.) *( (2.*zeta-1)*(zeta -0.5)*(zeta +0.5) + 2* zeta* zeta*(zeta -1)); - /*Nodal function 13*/ - dbasis[NUMNODESP2xP4*0+12] = (4./3.) * gauss->coord3 *(zeta - 0.5)*(zeta)*(zeta+0.5)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*1+12] = 4.* ( (- SQRT3/6. ) * gauss->coord3 + (SQRT3/3.) *gauss->coord2) *(2./3.) *(zeta - 0.5)*(zeta)*(zeta+0.5)*(zeta +1. ); - dbasis[NUMNODESP2xP4*2+12] = 4.* gauss->coord2*gauss->coord3 *(2./3.)*( (2.*zeta+1.)*(zeta -0.5)*(zeta +0.5) + 2*zeta*zeta*(zeta +1.)); - /*Nodal function 14*/ - dbasis[NUMNODESP2xP4*0+13] = (- 4./3.) *gauss->coord3*(zeta - 0.5)*(zeta)*(zeta+0.5)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*1+13] = 4.* ((SQRT3/3.)*gauss->coord1- (SQRT3/6.)*gauss->coord3) *(2./3.) *(zeta - 0.5)*(zeta)*(zeta+0.5)*(zeta +1. ); - dbasis[NUMNODESP2xP4*2+13] = 4.* gauss->coord3*gauss->coord1 *(2./3.)*( (2.*zeta+1.)*(zeta -0.5)*(zeta +0.5) + 2.*zeta *zeta*(zeta +1.)); - /*Nodal function 15*/ - dbasis[NUMNODESP2xP4*0+14] = 4.* ( gauss->coord1*0.5- gauss->coord2*0.5) *(2./3.) *(zeta - 0.5)*(zeta)*(zeta+0.5)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*1+14] = 4.* (- (SQRT3/6.)*gauss->coord2 - (SQRT3/6.)*gauss->coord1) *(2./3.) *(zeta - 0.5)*(zeta)*(zeta+0.5)*(zeta +1. ); - dbasis[NUMNODESP2xP4*2+14] = 4.* gauss->coord1*gauss->coord2 *(2./3.)*( (2.*zeta+1.)*(zeta -0.5)*(zeta +0.5) + 2* zeta *zeta*(zeta +1.)); - /*Nodal function 16*/ - dbasis[NUMNODESP2xP4*0+15] = (8./6.) *(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*1+15] = (8./3.) *(SQRT3/6.) *(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*2+15] = -(8./3.) *gauss->coord1 *((2.*zeta -1. )*(zeta-0.5)*(zeta +1.) + zeta*(zeta -1.)*( 2.*zeta + 0.5)); - /*Nodal function 17*/ - dbasis[NUMNODESP2xP4*0+16] = - (8./6.) *(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*1+16] = (8./3.) * (SQRT3/6.) *(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*2+16] = -(8./3.)*gauss->coord2 *((2.*zeta -1. )*(zeta-0.5)*(zeta +1.) + zeta *(zeta -1.)*( 2.*zeta + 0.5)); - /*Nodal function 18*/ + /*Nodal function 13*/ + dbasis[NUMNODESP2xP4*0+12] = 2.* gauss->coord3 * 2./3.*(zeta - 0.5)*(zeta)*(zeta+0.5)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*1+12] = (4.*SQRT3/3.* gauss->coord2 - 2.*SQRT3/3. *gauss->coord3) *(2./3.) *(zeta - 0.5)*(zeta)*(zeta+0.5)*(zeta +1. ); + dbasis[NUMNODESP2xP4*2+12] = 4.*gauss->coord2*gauss->coord3 *(2./3.)*( (2.*zeta+1.)*(zeta -0.5)*(zeta +0.5) + 2*zeta*zeta*(zeta +1.)); + /*Nodal function 14*/ + dbasis[NUMNODESP2xP4*0+13] = - 2.*gauss->coord3* 2./3.*(zeta - 0.5)*(zeta)*(zeta+0.5)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*1+13] = (4.*SQRT3/3.*gauss->coord1- 2.*SQRT3/3.*gauss->coord3) * (2./3.) *(zeta - 0.5)*(zeta)*(zeta+0.5)*(zeta +1. ); + dbasis[NUMNODESP2xP4*2+13] = 4.*gauss->coord3*gauss->coord1 *(2./3.)*( (2.*zeta+1.)*(zeta -0.5)*(zeta +0.5) + 2.*zeta *zeta*(zeta +1.)); + /*Nodal function 15*/ + dbasis[NUMNODESP2xP4*0+14] = 2.* (gauss->coord1- gauss->coord2)* (2./3.) *(zeta - 0.5)*(zeta)*(zeta+0.5)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*1+14] = -2.* SQRT3/3.*(gauss->coord2 +gauss->coord1) *(2./3.) *(zeta - 0.5)*(zeta)*(zeta+0.5)*(zeta +1. ); + dbasis[NUMNODESP2xP4*2+14] = 4.*gauss->coord1*gauss->coord2 *(2./3.)*( (2.*zeta+1.)*(zeta -0.5)*(zeta +0.5) + 2* zeta *zeta*(zeta +1.)); + /*Nodal function 16*/ + dbasis[NUMNODESP2xP4*0+15] = (-2.* gauss->coord1 + 0.5 )* (-8./3.)*(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*1+15] = (-2.*SQRT3/3. *gauss->coord1 + SQRT3/6.) * (-8./3.)*(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*2+15] = gauss->coord1*(2.*gauss->coord1-1) * (-8./3.)*((2.*zeta -1.)*(zeta-0.5)*(zeta +1.) +zeta*(zeta -1.)*( 2.*zeta + 0.5)); + /*Nodal function 17*/ + dbasis[NUMNODESP2xP4*0+16] = (2*gauss->coord2 - 0.5 )* (-8./3.)*(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*1+16] = (-2.*SQRT3/3. *gauss->coord2 + SQRT3/6.)* (-8./3.)*(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*2+16] = gauss->coord2*(2.*gauss->coord2-1) * (-8./3.)*((2.*zeta -1.)*(zeta-0.5)*(zeta +1.) +zeta *(zeta -1.)*( 2.*zeta + 0.5)); + /*Nodal function 18*/ dbasis[NUMNODESP2xP4*0+17] = 0. ; - dbasis[NUMNODESP2xP4*1+17] = (8./3.) *(SQRT3/3.) *(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*2+17] = -(8./3.)*gauss->coord3 *((2.* zeta -1. ) *(zeta-0.5)* (zeta +1.) + zeta *(zeta -1.)*( 2.*zeta + 0.5)); - /*Nodal function 19*/ - dbasis[NUMNODESP2xP4*0+18] = (4./3.) *(zeta - 1.)*(zeta)*(zeta+0.5)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*1+18] = (8./3.)* (SQRT3/6.)*(zeta - 1.)*(zeta)*(zeta+0.5)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*2+18] = -(8./3.)*gauss->coord1*((2.*zeta -1. ) *(zeta+0.5)* (zeta +1.) + zeta* (zeta -1.)*( 2.*zeta + 3./2.)); - /*Nodal function 20*/ - dbasis[NUMNODESP2xP4*0+19] = (8./6.) *(zeta - 1.)*(zeta)*(zeta+0.5)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*1+19] = (8./3.)*(SQRT3/6) *(zeta - 1.)*(zeta)*(zeta+0.5)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*2+19] = -(8./3.)*gauss->coord2*((2.*zeta -1. )*(zeta+0.5)*(zeta +1.) + zeta*(zeta -1.)*( 2.*zeta + 3./2.)); - /*Nodal function 21*/ + dbasis[NUMNODESP2xP4*1+17] = (4.*SQRT3/3.*gauss->coord3 - SQRT3/3. )* (-8./3.)*(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*2+17] = gauss->coord3*(2*gauss->coord3-1) * (-8./3.)*((2.*zeta-1.)*(zeta-0.5)*(zeta +1.) +zeta *(zeta -1.)*( 2.*zeta + 0.5)); + /*Nodal function 19*/ + dbasis[NUMNODESP2xP4*0+18] = (-2.* gauss->coord1 + 0.5 ) * (-8./3.)*(zeta - 1.)*(zeta)*(zeta+0.5)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*1+18] = (-2.*SQRT3/3. *gauss->coord1 + SQRT3/6. )* (-8./3.)*(zeta - 1.)*(zeta)*(zeta+0.5)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*2+18] = gauss->coord1*(2.*gauss->coord1-1) * (-8./3.)*((2.*zeta -1. ) *(zeta+0.5)* (zeta +1.) + zeta* (zeta -1.)*( 2.*zeta + 3./2.)); + /*Nodal function 20*/ + dbasis[NUMNODESP2xP4*0+19] = (2*gauss->coord2 - 0.5 )* (-8./3.)*(zeta - 1.)*(zeta)*(zeta+0.5)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*1+19] = (-2.*SQRT3/3.*gauss->coord2 + SQRT3/6.) * (-8./3.)*(zeta - 1.)*(zeta)*(zeta+0.5)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*2+19] = gauss->coord2*(2.*gauss->coord2-1)* (-8./3.)*((2.*zeta -1. )*(zeta+0.5)*(zeta +1.) + zeta*(zeta -1.)*( 2.*zeta + 3./2.)); + /*Nodal function 21*/ dbasis[NUMNODESP2xP4*0+20] = 0 ; - dbasis[NUMNODESP2xP4*1+20] = -(8./3.)* (SQRT3/3) *(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*2+20] = -(8./3.)*gauss->coord3 *(2. *zeta -1. )*(zeta+0.5)*(zeta +1.) + zeta*(zeta -1.)*( 2.*zeta + 3./2.); - /*Nodal function 22*/ - dbasis[NUMNODESP2xP4*0+21] = -(32./6.) *gauss->coord3 *(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta +1. ); - dbasis[NUMNODESP2xP4*1+21] = -(32./3.)*(- (SQRT3/6.)*gauss->coord3+ (SQRT3/3.)*gauss->coord2 ) *(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*2+21] = -(32./3.)*gauss->coord2 *gauss->coord3*((2.*zeta -1. )*(zeta-0.5)*(zeta +1.) + zeta*(zeta -1.)*( 2.*zeta + 0.5)); - /*Nodal function 23*/ - dbasis[NUMNODESP2xP4*0+22] = (32./6.) *gauss->coord3 *(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta +1. ); - dbasis[NUMNODESP2xP4*1+22] = -(32./3.)*( (SQRT3/3.)*gauss->coord1- (SQRT3/6.)*gauss->coord3 )*(zeta -1.)*(zeta - 0.5)*(zeta)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*2+22] = -(32./3.) *gauss->coord1*gauss->coord3*((2.*zeta -1. )*(zeta-0.5)*(zeta +1.) + zeta*(zeta -1.)*( 2.*zeta + 0.5)); - /*Nodal function 24*/ - dbasis[NUMNODESP2xP4*0+23] = -(32./3.)*( gauss->coord1*0.5- gauss->coord2*0.5) *(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta +1. ); - dbasis[NUMNODESP2xP4*1+23] = -(32./3.)*(- (SQRT3/6.)*gauss->coord2- (SQRT3/6.)*gauss->coord1 ) *(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*2+23] = -(32./3.)*gauss->coord1*gauss->coord2*((2.*zeta -1. )* (zeta-0.5) *(zeta +1.) + zeta* (zeta -1.)*( 2.*zeta + 0.5)); - /*Nodal function 25*/ - dbasis[NUMNODESP2xP4*0+24] = 8. *gauss->coord3 *(zeta - 1.)*(zeta - 0.5)*(zeta+0.5)*(zeta +1. ); - dbasis[NUMNODESP2xP4*1+24] = 16.*(- (SQRT3/6.)*gauss->coord3 + (SQRT3/3.) *gauss->coord2) *(zeta - 1.)*(zeta - 0.5)*(zeta+0.5)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*2+24] = 16.* gauss->coord2 * gauss->coord3* ( 4.* zeta*zeta*zeta - (5./2.) *zeta ); - /*Nodal function 26*/ - dbasis[NUMNODESP2xP4*0+25] = 8. *gauss->coord3*(zeta - 1.)*(zeta - 0.5)*(zeta+0.5)*(zeta +1. ); - dbasis[NUMNODESP2xP4*1+25] = -16.*((SQRT3/3.)*gauss->coord1- (SQRT3/6.)*gauss->coord3 )*(zeta - 1.)*(zeta - 0.5)*(zeta+0.5)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*2+25] = 16. * gauss->coord1 * gauss->coord3 *( 4. *zeta*zeta*zeta - (5./2.)* zeta ); - /*Nodal function 27*/ - dbasis[NUMNODESP2xP4*0+26] = 16.*( gauss->coord1*0.5-gauss->coord2*0.5) *(zeta - 1.)*(zeta - 0.5)*(zeta+0.5)*(zeta +1. ); - dbasis[NUMNODESP2xP4*1+26] = 16.*(- (SQRT3/6.)*gauss->coord2- (SQRT3/6.)*gauss->coord1 )*(zeta - 1.)*(zeta - 0.5)*(zeta+0.5)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*2+26] = 16. *gauss->coord1 *gauss->coord2 *( 4.* zeta*zeta*zeta - (5./2.)*zeta ); - /*Nodal function 28*/ - dbasis[NUMNODESP2xP4*0+27] = -(32./6.)* gauss->coord3*(zeta - 1.)*(zeta)*(zeta+0.5)*(zeta +1. ); - dbasis[NUMNODESP2xP4*1+27] = -(32./3.)*(- (SQRT3/6.)*gauss->coord3+ (SQRT3/3.)*gauss->coord2 ) *(zeta - 1.)*(zeta)*(zeta+0.5)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*2+27] = -(32./3.)* gauss->coord2*gauss->coord3* ((2.*zeta -1. )*(zeta+0.5)*(zeta +1.) + zeta*(zeta -1.)*( 2.*zeta + (3./2.))); - /*Nodal function 29*/ - dbasis[NUMNODESP2xP4*0+28] = (32./6.) *gauss->coord3 *(zeta - 1.)*(zeta)*(zeta+0.5)*(zeta +1. ); - dbasis[NUMNODESP2xP4*1+28] = -(32./3.)*((SQRT3/3.)*gauss->coord1- (SQRT3/6.)*gauss->coord3 ) *(zeta - 1.)*(zeta)*(zeta+0.5)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*2+28] = -(32./3.)* gauss->coord1*gauss->coord3* ((2.*zeta -1. )*(zeta+0.5)*(zeta +1.) + zeta*(zeta -1.)*( 2.*zeta + (3./2.))); - /*Nodal function 30*/ - dbasis[NUMNODESP2xP4*0+29] = -(32./3.)*( gauss->coord1*0.5- gauss->coord2*0.5)*(zeta - 1.)*(zeta)*(zeta+0.5)*(zeta +1. ); - dbasis[NUMNODESP2xP4*1+29] = -(32./3.)*(- (SQRT3/6.)*gauss->coord2- (SQRT3/6.)*gauss->coord1 ) *(zeta - 1.)*(zeta)*(zeta+0.5)*(zeta +1. ) ; - dbasis[NUMNODESP2xP4*2+29] = -(32./3.)* gauss->coord1*gauss->coord2 *((2.*zeta -1. )*(zeta+0.5)*(zeta +1) + zeta*(zeta -1.)*( 2.*zeta + (3./2.))); - return; - + dbasis[NUMNODESP2xP4*1+20] = (4.*SQRT3/3.*gauss->coord3 - SQRT3/3.)* (-8./3.)*(zeta - 1.)*(zeta + 0.5)*(zeta)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*2+20] = gauss->coord3*(2*gauss->coord3-1) * (-8./3.)*((2. *zeta -1. )*(zeta+0.5)*(zeta +1.) + zeta*(zeta -1.)*( 2.*zeta + 3./2.)); + /*Nodal function 22*/ + dbasis[NUMNODESP2xP4*0+21] = 2. *gauss->coord3 * (-8./3.)*(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta +1. ); + dbasis[NUMNODESP2xP4*1+21] = (4.* SQRT3/3.*gauss->coord2- 2.*SQRT3/3.*gauss->coord3) * (-8./3.)*(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*2+21] = 4.*gauss->coord2 *gauss->coord3* (-8./3.)*((2.*zeta -1. )*(zeta-0.5)*(zeta +1.) + zeta*(zeta -1.)*( 2.*zeta + 0.5)); + /*Nodal function 23*/ + dbasis[NUMNODESP2xP4*0+22] = -2. *gauss->coord3 *( -8./3.)*(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta +1. ); + dbasis[NUMNODESP2xP4*1+22] = (4.* SQRT3/3.*gauss->coord1- 2.*SQRT3/3.*gauss->coord3 )*(-8./3.)*(zeta -1.)*(zeta - 0.5)*(zeta)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*2+22] = 4.*gauss->coord1*gauss->coord3* (-8./3.)*((2.*zeta -1. )*(zeta-0.5)*(zeta +1.) + zeta*(zeta -1.)*( 2.*zeta + 0.5)); + /*Nodal function 24*/ + dbasis[NUMNODESP2xP4*0+23] = 2.*(gauss->coord1- gauss->coord2) * (-8./3.)*(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta +1. ); + dbasis[NUMNODESP2xP4*1+23] = -2.*SQRT3/3.*(gauss->coord2+ gauss->coord1) * (-8./3.)*(zeta - 1.)*(zeta - 0.5)*(zeta)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*2+23] = 4.*gauss->coord1*gauss->coord2* (-8./3.)*((2.*zeta -1. )* (zeta-0.5) *(zeta +1.) + zeta* (zeta -1.)*( 2.*zeta + 0.5)); + /*Nodal function 25*/ + dbasis[NUMNODESP2xP4*0+24] = 2. *gauss->coord3 *4.*(zeta - 1.)*(zeta - 0.5)*(zeta+0.5)*(zeta +1. ); + dbasis[NUMNODESP2xP4*1+24] = (4.*SQRT3/3.*gauss->coord2 - 2.* SQRT3/3. *gauss->coord3) *4.*(zeta - 1.)*(zeta - 0.5)*(zeta+0.5)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*2+24] = 4.* gauss->coord2 * gauss->coord3* 4.*( 4.* zeta*zeta*zeta - 5./2. *zeta ); + /*Nodal function 26*/ + dbasis[NUMNODESP2xP4*0+25] = -2. *gauss->coord3*4.*(zeta - 1.)*(zeta - 0.5)*(zeta+0.5)*(zeta +1. ); + dbasis[NUMNODESP2xP4*1+25] = (4.*SQRT3/3.*gauss->coord1- 2.*SQRT3/3.*gauss->coord3 )*4.*(zeta - 1.)*(zeta - 0.5)*(zeta+0.5)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*2+25] = 4. * gauss->coord1 * gauss->coord3 *4.*( 4. *zeta*zeta*zeta - 5./2.* zeta ); + /*Nodal function 27*/ + dbasis[NUMNODESP2xP4*0+26] = 2.*( gauss->coord1-gauss->coord2) * 4.*(zeta - 1.)*(zeta - 0.5)*(zeta+0.5)*(zeta +1. ); + dbasis[NUMNODESP2xP4*1+26] = -2.* SQRT3/3.*(gauss->coord1+ gauss->coord2 )*4.*(zeta - 1.)*(zeta - 0.5)*(zeta+0.5)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*2+26] = 4. *gauss->coord1 *gauss->coord2 *4.*( 4.* zeta*zeta*zeta - 5./2.*zeta ); + /*Nodal function 28*/ + dbasis[NUMNODESP2xP4*0+27] = 2.* gauss->coord3* (-8./3.)*(zeta - 1.)*(zeta)*(zeta+0.5)*(zeta +1. ); + dbasis[NUMNODESP2xP4*1+27] = (4.*SQRT3/3.*gauss->coord2- 2.*SQRT3/3.*gauss->coord3) * (-8./3.)*(zeta - 1.)*(zeta)*(zeta+0.5)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*2+27] = 4.* gauss->coord2*gauss->coord3* (-8./3.)*((2.*zeta -1. )*(zeta+0.5)*(zeta +1.) +zeta*(zeta -1.)*( 2.*zeta + 3./2.)); + /*Nodal function 29*/ + dbasis[NUMNODESP2xP4*0+28] = -2.*gauss->coord3 *(-8./3.)*(zeta - 1.)*(zeta)*(zeta+0.5)*(zeta +1. ); + dbasis[NUMNODESP2xP4*1+28] = (4.*SQRT3/3.*gauss->coord1- 2.*SQRT3/3.*gauss->coord3) * (-8./3.)*(zeta - 1.)*(zeta)*(zeta+0.5)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*2+28] = 4.* gauss->coord1*gauss->coord3* (-8./3.)*((2.*zeta -1. )*(zeta+0.5)*(zeta +1.) +zeta*(zeta -1.)*( 2.*zeta + 3./2.)); + /*Nodal function 30*/ + dbasis[NUMNODESP2xP4*0+29] = 2.*(gauss->coord1-gauss->coord2)* (-8./3.)*(zeta - 1.)*(zeta)*(zeta+0.5)*(zeta +1. ); + dbasis[NUMNODESP2xP4*1+29] = -2.*SQRT3/3.*(gauss->coord1+gauss->coord2) * (-8./3.)*(zeta - 1.)*(zeta)*(zeta+0.5)*(zeta +1. ) ; + dbasis[NUMNODESP2xP4*2+29] = 4.* gauss->coord1*gauss->coord2 * (-8./3.)*((2.*zeta -1. )*(zeta+0.5)*(zeta +1) +zeta*(zeta -1.)*( 2.*zeta + 3./2.)); + return; case P1xP3Enum : /*Nodal function 1*/ - dbasis[NUMNODESP1xP3*0+0 ] = (9./32.)*(zeta-1)*(zeta-1./3.)*(zeta+1./3.); - dbasis[NUMNODESP1xP3*1+0 ] = ((3.*SQRT3)/32.)*(zeta-1)*(zeta-1./3.)*(zeta+1./3.); - dbasis[NUMNODESP1xP3*2+0 ] =- (9./16.)* gauss->coord1 *( 2. *zeta *( zeta -1. ) + ( zeta - (1./3.) )*( zeta + (1./3.) )); + dbasis[NUMNODESP1xP3*0+0 ] = (9./32.)*(zeta-1)*(zeta-1./3.)*(zeta+1./3.); + dbasis[NUMNODESP1xP3*1+0 ] = ((3.*SQRT3)/32.)*(zeta-1)*(zeta-1./3.)*(zeta+1./3.); + dbasis[NUMNODESP1xP3*2+0 ] =- (9./16.)* gauss->coord1 *( 2. *zeta *( zeta -1. ) + ( zeta - (1./3.) )*( zeta + (1./3.) )); /*Nodal function 2*/ - dbasis[NUMNODESP1xP3*0+1 ] = - (9./32.)*(zeta-1)*(zeta-1./3.)*(zeta+1./3.); - dbasis[NUMNODESP1xP3*1+1 ] = ((3.*SQRT3)/32.) *(zeta-1)*(zeta-1./3.)*(zeta+1./3.); - dbasis[NUMNODESP1xP3*2+1 ] =- (9./16.)*gauss->coord2 *( 2.* zeta* ( zeta -1. ) + ( zeta - (1./3.) )*( zeta + (1./3.) )); - /*Nodal function 3*/ - dbasis[NUMNODESP1xP3*0+2 ] = 0.; - dbasis[NUMNODESP1xP3*1+2 ] = - ((3.*SQRT3)/32.)*(zeta-1)*(zeta-1./3.)*(zeta+1./3.); - dbasis[NUMNODESP1xP3*2+2 ] = - (9./16.)* gauss->coord3* ( 2. *zeta *( zeta -1. ) + ( zeta - (1./3.) )*( zeta + (1./3.) )); + dbasis[NUMNODESP1xP3*0+1 ] = - (9./32.)*(zeta-1)*(zeta-1./3.)*(zeta+1./3.); + dbasis[NUMNODESP1xP3*1+1 ] = ((3.*SQRT3)/32.) *(zeta-1)*(zeta-1./3.)*(zeta+1./3.); + dbasis[NUMNODESP1xP3*2+1 ] =- (9./16.)*gauss->coord2 *( 2.* zeta* ( zeta -1. ) + ( zeta - (1./3.) )*( zeta + (1./3.) )); + /*Nodal function 3*/ + dbasis[NUMNODESP1xP3*0+2 ] = 0.; + dbasis[NUMNODESP1xP3*1+2 ] = - ((3.*SQRT3)/16.)*(zeta-1)*(zeta-1./3.)*(zeta+1./3.); + dbasis[NUMNODESP1xP3*2+2 ] = - (9./16.)* gauss->coord3* ( 2. *zeta *( zeta -1. ) + ( zeta - (1./3.) )*( zeta + (1./3.) )); /*Nodal function 4*/ - dbasis[NUMNODESP1xP3*0+3 ] = - (9./32.)*(zeta-1./3.)*(zeta+1./3.)*(zeta+1.); - dbasis[NUMNODESP1xP3*1+3 ] = -((3.*SQRT3)/32.) *(zeta-1./3.)*(zeta+1./3.)*(zeta+1.); - dbasis[NUMNODESP1xP3*2+3 ] = (9./16.)* gauss->coord1*( 2.* zeta *( zeta +1. ) + ( zeta - (1./3.) )*( zeta + (1./3.) )); + dbasis[NUMNODESP1xP3*0+3 ] = - (9./32.)*(zeta-1./3.)*(zeta+1./3.)*(zeta+1.); + dbasis[NUMNODESP1xP3*1+3 ] = -((3.*SQRT3)/32.) *(zeta-1./3.)*(zeta+1./3.)*(zeta+1.); + dbasis[NUMNODESP1xP3*2+3 ] = (9./16.)* gauss->coord1*( 2.* zeta *( zeta +1. ) + ( zeta - (1./3.) )*( zeta + (1./3.) )); /*Nodal function 5*/ - dbasis[NUMNODESP1xP3*0+4 ] = (9./32.)* (zeta-1./3.)*(zeta+1./3.)*(zeta+1.); - dbasis[NUMNODESP1xP3*1+4 ] = - ((3.*SQRT3)/32.) *(zeta-1./3.)*(zeta+1./3.)*(zeta+1.); - dbasis[NUMNODESP1xP3*2+4 ] = (9./16.)* gauss->coord2* ( 2.* zeta *( zeta +1. ) + ( zeta - (1./3.) )*( zeta + (1./3.) )); + dbasis[NUMNODESP1xP3*0+4 ] = (9./32.)* (zeta-1./3.)*(zeta+1./3.)*(zeta+1.); + dbasis[NUMNODESP1xP3*1+4 ] = - ((3.*SQRT3)/32.) *(zeta-1./3.)*(zeta+1./3.)*(zeta+1.); + dbasis[NUMNODESP1xP3*2+4 ] = (9./16.)* gauss->coord2* ( 2.* zeta *( zeta +1. ) + ( zeta - (1./3.) )*( zeta + (1./3.) )); /*Nodal function 6*/ - dbasis[NUMNODESP1xP3*0+5 ] = 0.; - dbasis[NUMNODESP1xP3*1+5 ] = ((3.*SQRT3)/16.) *(zeta-1./3.)*(zeta+1./3.)*(zeta+1.); - dbasis[NUMNODESP1xP3*2+5 ] = (9./16.)* gauss->coord3 *( 2.* zeta * ( zeta + 1. ) + ( zeta - (1./3.) )*( zeta + (1./3.) )); + dbasis[NUMNODESP1xP3*0+5 ] = 0.; + dbasis[NUMNODESP1xP3*1+5 ] = ((3.*SQRT3)/16.) *(zeta-1./3.)*(zeta+1./3.)*(zeta+1.); + dbasis[NUMNODESP1xP3*2+5 ] = (9./16.)* gauss->coord3 *( 2.* zeta * ( zeta + 1. ) + ( zeta - (1./3.) )*( zeta + (1./3.) )); /*Nodal function 7*/ - dbasis[NUMNODESP1xP3*0+6 ] = - (27./32.) *(zeta-1)*(zeta-1./3.)*(zeta+1.); - dbasis[NUMNODESP1xP3*1+6 ] = - (27./32.) *(zeta-1)*(zeta-1./3.)*(zeta+1.); - dbasis[NUMNODESP1xP3*2+6 ] = gauss->coord1*(27./16.)*( 2.* zeta *( zeta - (1./3.)) + ( zeta - 1. )*( zeta + 1. )); + dbasis[NUMNODESP1xP3*0+6 ] = - (27./32.) *(zeta-1)*(zeta-1./3.)*(zeta+1.); + dbasis[NUMNODESP1xP3*1+6 ] = - (9.*SQRT3/32.) *(zeta-1)*(zeta-1./3.)*(zeta+1.); + dbasis[NUMNODESP1xP3*2+6 ] = gauss->coord1*(27./16.)*( 2.* zeta *( zeta - (1./3.)) + ( zeta - 1. )*( zeta + 1. )); /*Nodal function 8*/ - dbasis[NUMNODESP1xP3*0+7 ] = (27./32.) *(zeta-1)*(zeta-1./3.)*(zeta+1.); - dbasis[NUMNODESP1xP3*1+7 ] = -(27./32.) *(zeta-1)*(zeta-1./3.)*(zeta+1.); - dbasis[NUMNODESP1xP3*2+7 ] = gauss->coord2*(27./16.)*( 2.* zeta *( zeta - (1./3.)) + ( zeta - 1. )*( zeta + 1. )); + dbasis[NUMNODESP1xP3*0+7 ] = (27./32.) *(zeta-1)*(zeta-1./3.)*(zeta+1.); + dbasis[NUMNODESP1xP3*1+7 ] = -((9.*SQRT3)/32.) *(zeta-1)*(zeta-1./3.)*(zeta+1.); + dbasis[NUMNODESP1xP3*2+7 ] = gauss->coord2*(27./16.)*( 2.* zeta *( zeta - (1./3.)) + ( zeta - 1. )*( zeta + 1. )); /*Nodal function 9*/ - dbasis[NUMNODESP1xP3*0+8 ] = 0.; - dbasis[NUMNODESP1xP3*1+8 ] = ((9.*SQRT3)/16.) *(zeta-1.)*(zeta-1./3.)*(zeta+1.); - dbasis[NUMNODESP1xP3*2+8 ] = gauss->coord3*(27./16.)*( 2. *zeta *( zeta - (1./3.)) + ( zeta - 1. )*( zeta + 1. )); + dbasis[NUMNODESP1xP3*0+8 ] = 0.; + dbasis[NUMNODESP1xP3*1+8 ] = ((9.*SQRT3)/16.) *(zeta-1.)*(zeta-1./3.)*(zeta+1.); + dbasis[NUMNODESP1xP3*2+8 ] = gauss->coord3*(27./16.)*( 2. *zeta *( zeta - (1./3.)) + ( zeta - 1. )*( zeta + 1. )); /*Nodal function 10*/ - dbasis[NUMNODESP1xP3*0+9 ] = - (27./32.) *(zeta-1.)*(zeta+1./3.)*(zeta+1.); - dbasis[NUMNODESP1xP3*1+9 ] = - ((9.*SQRT3)/32.) *(zeta-1.)*(zeta+1./3.)*(zeta+1.); - dbasis[NUMNODESP1xP3*2+9 ] = gauss->coord1 *(27./16.)*( 2* zeta *( zeta + (1./3.)) + ( zeta - 1. )*( zeta + 1. )); + dbasis[NUMNODESP1xP3*0+9 ] = (27./32.) *(zeta-1.)*(zeta+1./3.)*(zeta+1.); + dbasis[NUMNODESP1xP3*1+9 ] = ((9.*SQRT3)/32.) *(zeta-1.)*(zeta+1./3.)*(zeta+1.); + dbasis[NUMNODESP1xP3*2+9 ] = -gauss->coord1 *(27./16.)*( 2* zeta *( zeta + (1./3.)) + ( zeta - 1. )*( zeta + 1. )); /*Nodal function 11*/ - dbasis[NUMNODESP1xP3*0+10] = (27./32.) *(zeta-1)*(zeta+1./3.)*(zeta+1); - dbasis[NUMNODESP1xP3*1+10] = - ((9.*SQRT3)/32.) *(zeta-1.)*(zeta+1./3.)*(zeta+1); - dbasis[NUMNODESP1xP3*2+10] = gauss->coord2 *(27./16.) * 2.* zeta *( zeta + (1./3.) + ( zeta - 1. )*( zeta + 1. )); + dbasis[NUMNODESP1xP3*0+10] = - (27./32.) *(zeta-1)*(zeta+1./3.)*(zeta+1); + dbasis[NUMNODESP1xP3*1+10] = ((9.*SQRT3)/32.) *(zeta-1.)*(zeta+1./3.)*(zeta+1); + dbasis[NUMNODESP1xP3*2+10] = -gauss->coord2 *(27./16.) *( 2.* zeta *( zeta + (1./3.)) + ( zeta - 1. )*( zeta + 1. )); /*Nodal function 12*/ - dbasis[NUMNODESP1xP3*0+11] = 0.; - dbasis[NUMNODESP1xP3*1+11] = ((9.*SQRT3)/16.) *(zeta-1.)*(zeta+1./3.)*(zeta+1); - dbasis[NUMNODESP1xP3*2+11] = gauss->coord3 *(27./16.)* 2.* zeta *( zeta + (1./3.) + ( zeta - 1. )*( zeta + 1. )); - return; - + dbasis[NUMNODESP1xP3*0+11] = 0.; + dbasis[NUMNODESP1xP3*1+11] = -((9.*SQRT3)/16.) *(zeta-1.)*(zeta+1./3.)*(zeta+1); + dbasis[NUMNODESP1xP3*2+11] = -gauss->coord3 *(27./16.)*( 2.* zeta *( zeta + (1./3.)) + ( zeta - 1. )*( zeta + 1. )); + return; default: _error_("Element type "<element_type)<<" not supported yet"); @@ -1983,6 +843,10 @@ /*}}}*/ /*FUNCTION PentaRef::GetNodalFunctionsMINI{{{*/ -void PentaRef::GetNodalFunctionsMINI(IssmDouble* l1l7, GaussPenta* gauss){ +void PentaRef::GetNodalFunctionsMINI(IssmDouble* l1l7, Gauss* gauss_in){ /*This routine returns the values of the nodal functions at the gaussian point.*/ + + /*Cast gauss to GaussPenta*/ + _assert_(gauss_in->Enum()==GaussPentaEnum); + GaussPenta* gauss = dynamic_cast(gauss_in); l1l7[0]=gauss->coord1*(1.0-gauss->coord4)/2.0; @@ -1997,5 +861,5 @@ /*}}}*/ /*FUNCTION PentaRef::GetNodalFunctionsMINIDerivatives{{{*/ -void PentaRef::GetNodalFunctionsMINIDerivatives(IssmDouble* dbasismini,IssmDouble* xyz_list, GaussPenta* gauss){ +void PentaRef::GetNodalFunctionsMINIDerivatives(IssmDouble* dbasismini,IssmDouble* xyz_list, Gauss* gauss){ /*This routine returns the values of the nodal functions derivatives (with respect to the @@ -2027,8 +891,13 @@ /*}}}*/ /*FUNCTION PentaRef::GetNodalFunctionsMINIDerivativesReference{{{*/ -void PentaRef::GetNodalFunctionsMINIDerivativesReference(IssmDouble* dbasis,GaussPenta* gauss){ - +void PentaRef::GetNodalFunctionsMINIDerivativesReference(IssmDouble* dbasis,Gauss* gauss_in){ /*This routine returns the values of the nodal functions derivatives (with respect to the * natural coordinate system) at the gaussian point. */ + + /*Cast gauss to GaussPenta*/ + _assert_(gauss_in->Enum()==GaussPentaEnum); + GaussPenta* gauss = dynamic_cast(gauss_in); + + IssmDouble zeta=gauss->coord4; @@ -2064,6 +933,10 @@ /*}}}*/ /*FUNCTION PentaRef::GetNodalFunctionsP1 {{{*/ -void PentaRef::GetNodalFunctionsP1(IssmDouble* basis, GaussPenta* gauss){ +void PentaRef::GetNodalFunctionsP1(IssmDouble* basis, Gauss* gauss_in){ /*This routine returns the values of the nodal functions at the gaussian point.*/ + + /*Cast gauss to GaussPenta*/ + _assert_(gauss_in->Enum()==GaussPentaEnum); + GaussPenta* gauss = dynamic_cast(gauss_in); basis[0]=gauss->coord1*(1-gauss->coord4)/2.0; @@ -2077,5 +950,5 @@ /*}}}*/ /*FUNCTION PentaRef::GetNodalFunctionsP1Derivatives {{{*/ -void PentaRef::GetNodalFunctionsP1Derivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussPenta* gauss){ +void PentaRef::GetNodalFunctionsP1Derivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss){ /*This routine returns the values of the nodal functions derivatives (with respect to the @@ -2106,8 +979,12 @@ /*}}}*/ /*FUNCTION PentaRef::GetNodalFunctionsP1DerivativesReference {{{*/ -void PentaRef::GetNodalFunctionsP1DerivativesReference(IssmDouble* dbasis,GaussPenta* gauss){ +void PentaRef::GetNodalFunctionsP1DerivativesReference(IssmDouble* dbasis,Gauss* gauss_in){ /*This routine returns the values of the nodal functions derivatives (with respect to the * natural coordinate system) at the gaussian point. Those values vary along xi,eta,z */ + + /*Cast gauss to GaussPenta*/ + _assert_(gauss_in->Enum()==GaussPentaEnum); + GaussPenta* gauss = dynamic_cast(gauss_in); IssmDouble zeta=gauss->coord4; @@ -2140,21 +1017,21 @@ /*}}}*/ /*FUNCTION PentaRef::GetQuadJacobianDeterminant{{{*/ -void PentaRef::GetQuadJacobianDeterminant(IssmDouble* Jdet,IssmDouble xyz_list[4][3],GaussPenta* gauss){ +void PentaRef::GetQuadJacobianDeterminant(IssmDouble* Jdet,IssmDouble* xyz_list,Gauss* gauss){ /*This routine returns the values of the nodal functions at the gaussian point.*/ IssmDouble x1,x2,x3,x4,y1,y2,y3,y4,z1,z2,z3,z4; - x1=xyz_list[0][0]; - y1=xyz_list[0][1]; - z1=xyz_list[0][2]; - x2=xyz_list[1][0]; - y2=xyz_list[1][1]; - z2=xyz_list[1][2]; - x3=xyz_list[2][0]; - y3=xyz_list[2][1]; - z3=xyz_list[2][2]; - x4=xyz_list[3][0]; - y4=xyz_list[3][1]; - z4=xyz_list[3][2]; + x1=xyz_list[0*3+0]; + y1=xyz_list[0*3+1]; + z1=xyz_list[0*3+2]; + x2=xyz_list[1*3+0]; + y2=xyz_list[1*3+1]; + z2=xyz_list[1*3+2]; + x3=xyz_list[2*3+0]; + y3=xyz_list[2*3+1]; + z3=xyz_list[2*3+2]; + x4=xyz_list[3*3+0]; + y4=xyz_list[3*3+1]; + z4=xyz_list[3*3+2]; /*Jdet = (Area of the trapezoid)/(Area trapezoid ref) with AreaRef = 4*/ @@ -2165,21 +1042,35 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetInputValue{{{*/ -void PentaRef::GetInputValue(IssmDouble* pvalue,IssmDouble* plist,GaussPenta* gauss){ - /*P1 interpolation on Gauss point*/ - - /*intermediary*/ - IssmDouble basis[6]; - - /*nodal functions: */ - GetNodalFunctionsP1(&basis[0],gauss); - - /*Assign output pointers:*/ - *pvalue=basis[0]*plist[0]+basis[1]*plist[1]+basis[2]*plist[2]+basis[3]*plist[3]+basis[4]*plist[4]+basis[5]*plist[5]; +/*FUNCTION PentaRef::GetInputValue(IssmDouble* pvalue,IssmDouble* plist,Gauss* gauss){{{*/ +void PentaRef::GetInputValue(IssmDouble* pvalue,IssmDouble* plist,Gauss* gauss){ + + GetInputValue(pvalue,plist,gauss,this->element_type); + +} +/*}}}*/ +/*FUNCTION PentaRef::GetInputValue(IssmDouble* pvalue,IssmDouble* plist,Gauss* gauss,int finiteelement){{{*/ +void PentaRef::GetInputValue(IssmDouble* pvalue,IssmDouble* plist,Gauss* gauss,int finiteelement){ + + /*Output*/ + IssmDouble value =0.; + + /*Fetch number of nodes for this finite element*/ + int numnodes = this->NumberofNodes(finiteelement); + + /*Get nodal functions*/ + IssmDouble* basis=xNew(numnodes); + GetNodalFunctions(basis, gauss,finiteelement); + + /*Calculate parameter for this Gauss point*/ + for(int i=0;i(basis); + *pvalue = value; } /*}}}*/ /*FUNCTION PentaRef::GetInputDerivativeValue{{{*/ -void PentaRef::GetInputDerivativeValue(IssmDouble* p, IssmDouble* plist,IssmDouble* xyz_list, GaussPenta* gauss){ +void PentaRef::GetInputDerivativeValue(IssmDouble* p, IssmDouble* plist,IssmDouble* xyz_list, Gauss* gauss){ /*From node values of parameter p (p_list[0], p_list[1], p_list[2], * p_list[3], p_list[4] and p_list[4]), return parameter derivative value at @@ -2191,20 +1082,41 @@ * p is a vector of size 3x1 already allocated. */ - IssmDouble dbasis[3][NUMNODESP1]; - - /*Get nodal funnctions derivatives in actual coordinate system: */ - GetNodalFunctionsP1Derivatives(&dbasis[0][0],xyz_list, gauss); - - /*Assign output*/ - p[0]=plist[0]*dbasis[0][0]+plist[1]*dbasis[0][1]+plist[2]*dbasis[0][2]+plist[3]*dbasis[0][3]+plist[4]*dbasis[0][4]+plist[5]*dbasis[0][5]; - p[1]=plist[0]*dbasis[1][0]+plist[1]*dbasis[1][1]+plist[2]*dbasis[1][2]+plist[3]*dbasis[1][3]+plist[4]*dbasis[1][4]+plist[5]*dbasis[1][5]; - p[2]=plist[0]*dbasis[2][0]+plist[1]*dbasis[2][1]+plist[2]*dbasis[2][2]+plist[3]*dbasis[2][3]+plist[4]*dbasis[2][4]+plist[5]*dbasis[2][5]; - -} -/*}}}*/ -/*FUNCTION PentaRef::NumberofNodes{{{*/ + + /*Output*/ + IssmDouble dpx=0.; + IssmDouble dpy=0.; + IssmDouble dpz=0.; + + /*Fetch number of nodes for this finite element*/ + int numnodes = this->NumberofNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(3*numnodes); + GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Calculate parameter for this Gauss point*/ + for(int i=0;i(dbasis); + p[0]=dpx; + p[1]=dpy; + p[2]=dpz; + +} +/*}}}*/ +/*FUNCTION PentaRef::NumberofNodes(){{{*/ int PentaRef::NumberofNodes(void){ - switch(this->element_type){ + return this->NumberofNodes(this->element_type); +} +/*}}}*/ +/*FUNCTION PentaRef::NumberofNodes(int finiteelement){{{*/ +int PentaRef::NumberofNodes(int finiteelement){ + + switch(finiteelement){ + case P0Enum: return NUMNODESP0; case P1Enum: return NUMNODESP1; case P1bubbleEnum: return NUMNODESP1b; @@ -2218,6 +1130,7 @@ case MINIEnum: return NUMNODESP1b+NUMNODESP1; case TaylorHoodEnum: return NUMNODESP2+NUMNODESP1; - case P2xP4Enum: return NUMNODESP2xP4; - case P1xP3Enum: return NUMNODESP1xP3; + case OneLayerP4zEnum: return NUMNODESP2xP4+NUMNODESP1; + case P2xP4Enum: return NUMNODESP2xP4; + case P1xP3Enum: return NUMNODESP1xP3; default: _error_("Element type "<element_type)<<" not supported yet"); } @@ -2235,4 +1148,5 @@ case MINIEnum: return NUMNODESP1; case TaylorHoodEnum: return NUMNODESP1; + case OneLayerP4zEnum: return NUMNODESP1; default: _error_("Element type "<element_type)<<" not supported yet"); } @@ -2250,4 +1164,5 @@ case MINIEnum: return NUMNODESP1b; case TaylorHoodEnum: return NUMNODESP2; + case OneLayerP4zEnum: return NUMNODESP2xP4; default: _error_("Element type "<element_type)<<" not supported yet"); } @@ -2265,4 +1180,5 @@ case MINIEnum: return P1bubbleEnum; case TaylorHoodEnum: return P2Enum; + case OneLayerP4zEnum: return P2xP4Enum; default: _error_("Element type "<element_type)<<" not supported yet"); } @@ -2280,5 +1196,17 @@ case MINIEnum: return P1Enum; case TaylorHoodEnum: return P1Enum; + case OneLayerP4zEnum: return P1Enum; default: _error_("Element type "<element_type)<<" not supported yet"); + } + + return -1; +} +/*}}}*/ +/*FUNCTION PentaRef::TensorInterpolation{{{*/ +int PentaRef::TensorInterpolation(void){ + + switch(this->element_type){ + case XTaylorHoodEnum: return P1DGEnum; + default: _error_("Element type "<element_type)<<" not supported yet"); } @@ -2324,6 +1252,23 @@ indices[1] = 1; indices[2] = 2; - return; + break; + case P1xP3Enum: + numindices = 3; + indices = xNew(numindices); + indices[0] = 0; + indices[1] = 1; + indices[2] = 2; + break; case P2Enum: + numindices = 6; + indices = xNew(numindices); + indices[0] = 0; + indices[1] = 1; + indices[2] = 2; + indices[3] = 9; + indices[4] = 10; + indices[5] = 11; + break; + case P2xP4Enum: numindices = 6; indices = xNew(numindices); Index: /issm/trunk/src/c/classes/Elements/PentaRef.h =================================================================== --- /issm/trunk/src/c/classes/Elements/PentaRef.h (revision 17805) +++ /issm/trunk/src/c/classes/Elements/PentaRef.h (revision 17806) @@ -7,5 +7,5 @@ #define _PENTAREF_H_ -class GaussPenta; +class Gauss; class PentaRef{ @@ -22,57 +22,39 @@ /*Numerics*/ - void GetNodalFunctions(IssmDouble* basis, GaussPenta* gauss); - void GetNodalFunctionsVelocity(IssmDouble* basis, GaussPenta* gauss); - void GetNodalFunctionsPressure(IssmDouble* basis, GaussPenta* gauss); - void GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,GaussPenta* gauss); - void GetNodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,GaussPenta* gauss); - void GetNodalFunctionsDerivativesPressure(IssmDouble* dbasis,IssmDouble* xyz_list,GaussPenta* gauss); - void GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussPenta* gauss); - void GetNodalFunctionsP1(IssmDouble* l1l6, GaussPenta* gauss); - void GetNodalFunctionsMINI(IssmDouble* l1l7, GaussPenta* gauss); - void GetNodalFunctionsP1Derivatives(IssmDouble* dh1dh6,IssmDouble* xyz_list, GaussPenta* gauss); - void GetNodalFunctionsMINIDerivatives(IssmDouble* dh1dh7,IssmDouble* xyz_list, GaussPenta* gauss); - void GetNodalFunctionsP1DerivativesReference(IssmDouble* dl1dl6,GaussPenta* gauss); - void GetNodalFunctionsMINIDerivativesReference(IssmDouble* dl1dl7,GaussPenta* gauss); - void GetQuadJacobianDeterminant(IssmDouble* Jdet, IssmDouble xyz_list[4][3],GaussPenta* gauss); - void GetJacobian(IssmDouble* J, IssmDouble* xyz_list,GaussPenta* gauss); - void GetJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,GaussPenta* gauss); - void GetTriaJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,GaussPenta* gauss); - void GetSegmentJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,GaussPenta* gauss); - void GetJacobianInvert(IssmDouble* Jinv, IssmDouble* xyz_list,GaussPenta* gauss); - void GetBSSAHO(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss); - void GetBSSAFS(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss); - void GetBHO(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss); - void GetBFSstrainrate(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss); - void GetBFS(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss); - void GetBFSGLS(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss); - void GetBprimeSSAFS(IssmDouble* Bprime, IssmDouble* xyz_list, GaussPenta* gauss); - void GetBprimeHO(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss); - void GetBprimeFS(IssmDouble* B_prime, IssmDouble* xyz_list, GaussPenta* gauss); - void GetBprimeFSGLS(IssmDouble* B_prime, IssmDouble* xyz_list, GaussPenta* gauss); - void GetBprimeVert(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss); - void GetBAdvec(IssmDouble* B_advec, IssmDouble* xyz_list, GaussPenta* gauss); - void GetBConduct(IssmDouble* B_conduct, IssmDouble* xyz_list, GaussPenta* gauss); - void GetBVert(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss); - void GetBprimeAdvec(IssmDouble* Bprime_advec, IssmDouble* xyz_list, GaussPenta* gauss); - void GetBHOFriction(IssmDouble* L, GaussPenta* gauss); - void GetLFS(IssmDouble* LFS, GaussPenta* gauss); - void GetLprimeFS(IssmDouble* LprimeFS, IssmDouble* xyz_list, GaussPenta* gauss); - void GetLSSAFS(IssmDouble* LSSAFS, GaussPenta* gauss); - void GetLprimeSSAFS(IssmDouble* LprimeSSAFS, IssmDouble* xyz_list, GaussPenta* gauss); - void GetLFSSSA(IssmDouble* LFSSSA, GaussPenta* gauss); - void GetLprimeFSSSA(IssmDouble* LprimeFSSSA, IssmDouble* xyz_list, GaussPenta* gauss); - void GetInputValue(IssmDouble* pvalue,IssmDouble* plist, GaussPenta* gauss); - void GetInputValue(IssmDouble* pvalue,IssmDouble* plist,GaussTria* gauss){_error_("only PentaGauss are supported");}; - void GetInputDerivativeValue(IssmDouble* pvalues, IssmDouble* plist,IssmDouble* xyz_list, GaussPenta* gauss); - void GetInputDerivativeValue(IssmDouble* pvalues, IssmDouble* plist,IssmDouble* xyz_list, GaussTria* gauss){_error_("only PentaGauss are supported");}; + void GetNodalFunctions(IssmDouble* basis, Gauss* gauss); + void GetNodalFunctions(IssmDouble* basis, Gauss* gauss,int finiteelement); + void GetNodalFunctionsVelocity(IssmDouble* basis, Gauss* gauss); + void GetNodalFunctionsPressure(IssmDouble* basis, Gauss* gauss); + void GetNodalFunctionsTensor(IssmDouble* basis, Gauss* gauss); + void GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss); + void GetNodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss); + void GetNodalFunctionsDerivativesPressure(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss); + void GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss); + void GetNodalFunctionsP1(IssmDouble* l1l6, Gauss* gauss); + void GetNodalFunctionsMINI(IssmDouble* l1l7, Gauss* gauss); + void GetNodalFunctionsP1Derivatives(IssmDouble* dh1dh6,IssmDouble* xyz_list, Gauss* gauss); + void GetNodalFunctionsMINIDerivatives(IssmDouble* dh1dh7,IssmDouble* xyz_list, Gauss* gauss); + void GetNodalFunctionsP1DerivativesReference(IssmDouble* dl1dl6,Gauss* gauss); + void GetNodalFunctionsMINIDerivativesReference(IssmDouble* dl1dl7,Gauss* gauss); + void GetQuadJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss); + void GetJacobian(IssmDouble* J, IssmDouble* xyz_list,Gauss* gauss); + void GetJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss); + void GetTriaJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss); + void GetSegmentJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss); + void GetJacobianInvert(IssmDouble* Jinv, IssmDouble* xyz_list,Gauss* gauss); + void GetLprimeFSSSA(IssmDouble* LprimeFSSSA, IssmDouble* xyz_list, Gauss* gauss); + void GetInputValue(IssmDouble* pvalue,IssmDouble* plist, Gauss* gauss); + void GetInputValue(IssmDouble* pvalue,IssmDouble* plist, Gauss* gauss,int finiteelement); + void GetInputDerivativeValue(IssmDouble* pvalues, IssmDouble* plist,IssmDouble* xyz_list, Gauss* gauss); void BasalNodeIndices(int* pnumindices,int** pindices,int finiteelement); void SurfaceNodeIndices(int* pnumindices,int** pindices,int finiteelement); int NumberofNodes(void); + int NumberofNodes(int finiteelement); int NumberofNodesVelocity(void); int NumberofNodesPressure(void); int VelocityInterpolation(void); int PressureInterpolation(void); + int TensorInterpolation(void); }; #endif Index: /issm/trunk/src/c/classes/Elements/Seg.cpp =================================================================== --- /issm/trunk/src/c/classes/Elements/Seg.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Elements/Seg.cpp (revision 17806) @@ -19,17 +19,7 @@ #define NUMVERTICES 2 /*Constructors/destructor/copy*/ -/*FUNCTION Seg::Seg(){{{*/ -Seg::Seg(){ - this->nodes = NULL; - this->vertices = NULL; - this->material = NULL; - this->matpar = NULL; - this->inputs = NULL; - this->parameters = NULL; -} -/*}}}*/ /*FUNCTION Seg::Seg(int id, int sid,int index, IoModel* iomodel,int nummodels){{{*/ Seg::Seg(int seg_id, int seg_sid, int index, IoModel* iomodel,int nummodels) - :SegRef(nummodels),ElementHook(nummodels,index+1,2,iomodel){ + :SegRef(nummodels),ElementHook(nummodels,index+1,NUMVERTICES,iomodel){ /*id: */ @@ -48,10 +38,8 @@ this->material = NULL; this->matpar = NULL; - } /*}}}*/ /*FUNCTION Seg::~Seg(){{{*/ Seg::~Seg(){ - delete inputs; this->parameters=NULL; } @@ -63,55 +51,21 @@ /*}}}*/ -/*FUNCTION Seg::Echo{{{*/ -void Seg::Echo(void){ - _printf_("Seg:\n"); - _printf_(" id: " << id << "\n"); - if(nodes){ - nodes[0]->Echo(); - nodes[1]->Echo(); - } - else _printf_("nodes = NULL\n"); - - if (material) material->Echo(); - else _printf_("material = NULL\n"); - - if (matpar) matpar->Echo(); - else _printf_("matpar = NULL\n"); - - _printf_(" parameters\n"); - if (parameters) parameters->Echo(); - else _printf_("parameters = NULL\n"); - - _printf_(" inputs\n"); - if (inputs) inputs->Echo(); - else _printf_("inputs=NULL\n"); -} -/*}}}*/ -/*FUNCTION Seg::DeepEcho{{{*/ -void Seg::DeepEcho(void){ - - _printf_("Seg:\n"); - _printf_(" id: " << id << "\n"); - if(nodes){ - nodes[0]->DeepEcho(); - nodes[1]->DeepEcho(); - } - else _printf_("nodes = NULL\n"); - - if (material) material->DeepEcho(); - else _printf_("material = NULL\n"); - - if (matpar) matpar->DeepEcho(); - else _printf_("matpar = NULL\n"); - - _printf_(" parameters\n"); - if (parameters) parameters->DeepEcho(); - else _printf_("parameters = NULL\n"); - - _printf_(" inputs\n"); - if (inputs) inputs->DeepEcho(); - else _printf_("inputs=NULL\n"); - - return; +/*FUNCTION Seg::CharacteristicLength{{{*/ +IssmDouble Seg::CharacteristicLength(void){ + + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble x1,y1,x2,y2; + + /*Get xyz list: */ + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + x1=xyz_list[0][0]; y1=xyz_list[0][1]; + x2=xyz_list[1][0]; y2=xyz_list[1][1]; + + return sqrt((x2-x1)*(x2-x1) + (y2-y1)*(y2-y1)); +} +/*}}}*/ +/*FUNCTION Seg::FiniteElement{{{*/ +int Seg::FiniteElement(void){ + return this->element_type; } /*}}}*/ @@ -123,368 +77,144 @@ } /*}}}*/ -/*FUNCTION Seg::Id {{{*/ -int Seg::Id(){ - - return id; - -} -/*}}}*/ - -/*FUNCTION Seg::GetSize{{{*/ -IssmDouble Seg::GetSize(void){ - - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble x1,y1,x2,y2; - - /*Get xyz list: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - x1=xyz_list[0][0]; y1=xyz_list[0][1]; - x2=xyz_list[1][0]; y2=xyz_list[1][1]; - - return sqrt((x2-x1)*(x2-x1) + (y2-y1)*(y2-y1)); -} -/*}}}*/ -/*FUNCTION Seg::CreateKMatrixFreeSurfaceTop {{{*/ -ElementMatrix* Seg::CreateKMatrixFreeSurfaceTop(void){ - - /*Intermediaries */ - int stabilization; - IssmDouble Jdet,D_scalar,dt,h; - IssmDouble vx,vel; - IssmDouble xyz_list[NUMVERTICES][3]; - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters,NoneApproximationEnum); - IssmDouble* basis = xNew(numnodes); - IssmDouble* B = xNew(1*numnodes); - IssmDouble* Bprime = xNew(1*numnodes); + +void Seg::GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum){/*{{{*/ + + /* Intermediaries */ + int nrfrontnodes,index; + IssmDouble levelset[NUMVERTICES]; + + /*Recover parameters and values*/ + GetInputListOnVertices(&levelset[0],levelsetenum); + /* Get nodes where there is no ice */ + nrfrontnodes=0; + for(int i=0;i=0.){ + index=i; + nrfrontnodes++; + } + } + + _assert_(nrfrontnodes==1); + + IssmDouble* xyz_front = xNew(3); + + /* Return nodes */ + for(int dir=0;dir<3;dir++){ + xyz_front[dir]=xyz_list[3*index+dir]; + } + + *pxyz_front=xyz_front; +}/*}}}*/ +/*FUNCTION Seg::GetNumberOfNodes;{{{*/ +int Seg::GetNumberOfNodes(void){ + return this->NumberofNodes(); +} +/*}}}*/ +/*FUNCTION Seg::GetNumberOfVertices;{{{*/ +int Seg::GetNumberOfVertices(void){ + return NUMVERTICES; +} +/*}}}*/ +/*FUNCTION Seg::GetVerticesCoordinates(IssmDouble** pxyz_list){{{*/ +void Seg::GetVerticesCoordinates(IssmDouble** pxyz_list){ + + IssmDouble* xyz_list = xNew(NUMVERTICES*3); + ::GetVerticesCoordinates(xyz_list,this->vertices,NUMVERTICES); + + /*Assign output pointer*/ + *pxyz_list = xyz_list; + +}/*}}}*/ +bool Seg::IsIcefront(void){/*{{{*/ + + bool isicefront; + int i,nrice; + IssmDouble ls[NUMVERTICES]; /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - this->parameters->FindParam(&stabilization,MasstransportStabilizationEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - h=this->GetSize(); - - /* Start looping on the number of gaussian points: */ - GaussSeg *gauss=new GaussSeg(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - - vx_input->GetInputValue(&vx,gauss); - - D_scalar=gauss->weight*Jdet; - - TripleMultiply(basis,1,numnodes,1, - &D_scalar,1,1,0, - basis,1,numnodes,0, - &Ke->values[0],1); - - GetNodalFunctions(B,gauss); - GetBprimeMasstransport(Bprime,&xyz_list[0][0],gauss); - - D_scalar=dt*gauss->weight*Jdet*vx; - TripleMultiply(B,1,numnodes,1, - &D_scalar,1,1,0, - Bprime,1,numnodes,0, - &Ke->values[0],1); - - if(stabilization==2){ - /*Streamline upwinding*/ - vel=fabs(vx)+1.e-8; - D_scalar=dt*gauss->weight*Jdet*h/(2.*vel)*vx; - } - else if(stabilization==1){ - /*SSA*/ - vx_input->GetInputAverage(&vx); - D_scalar=dt*gauss->weight*Jdet*h/2.*fabs(vx); - } - if(stabilization==1 || stabilization==2){ - TripleMultiply(Bprime,1,numnodes,1, - &D_scalar,1,1,0, - Bprime,1,numnodes,0, - &Ke->values[0],1); - } - } - - /*Clean up and return*/ - xDelete(basis); - xDelete(B); - xDelete(Bprime); - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Seg::CreateKMatrixFreeSurfaceBase {{{*/ -ElementMatrix* Seg::CreateKMatrixFreeSurfaceBase(void){ - - /*Intermediaries */ - int stabilization; - IssmDouble Jdet,D_scalar,dt,h; - IssmDouble vx,vel; - IssmDouble xyz_list[NUMVERTICES][3]; - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters,NoneApproximationEnum); - IssmDouble* basis = xNew(numnodes); - IssmDouble* B = xNew(1*numnodes); - IssmDouble* Bprime = xNew(1*numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - this->parameters->FindParam(&stabilization,MasstransportStabilizationEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - h=this->GetSize(); - - /* Start looping on the number of gaussian points: */ - GaussSeg *gauss=new GaussSeg(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - - vx_input->GetInputValue(&vx,gauss); - - D_scalar=gauss->weight*Jdet; - - TripleMultiply(basis,1,numnodes,1, - &D_scalar,1,1,0, - basis,1,numnodes,0, - &Ke->values[0],1); - - GetNodalFunctions(B,gauss); - GetBprimeMasstransport(Bprime,&xyz_list[0][0],gauss); - - D_scalar=dt*gauss->weight*Jdet*vx; - TripleMultiply(B,1,numnodes,1, - &D_scalar,1,1,0, - Bprime,1,numnodes,0, - &Ke->values[0],1); - - if(stabilization==2){ - /*Streamline upwinding*/ - vel=fabs(vx)+1.e-8; - D_scalar=dt*gauss->weight*Jdet*h/(2.*vel)*vx; - } - else if(stabilization==1){ - /*SSA*/ - vx_input->GetInputAverage(&vx); - D_scalar=dt*gauss->weight*Jdet*h/2.*fabs(vx); - } - if(stabilization==1 || stabilization==2){ - TripleMultiply(Bprime,1,numnodes,1, - &D_scalar,1,1,0, - Bprime,1,numnodes,0, - &Ke->values[0],1); - } - } - - /*Clean up and return*/ - xDelete(basis); - xDelete(B); - xDelete(Bprime); - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Seg::CreateMassMatrix {{{*/ -ElementMatrix* Seg::CreateMassMatrix(void){ - - /* Intermediaries */ - IssmDouble D,Jdet; - IssmDouble xyz_list[NUMVERTICES][3]; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters,NoneApproximationEnum); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - - /* Start looping on the number of gaussian points: */ - GaussSeg* gauss=new GaussSeg(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetNodalFunctions(basis,gauss); - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - D=gauss->weight*Jdet; - - TripleMultiply(basis,1,numnodes,1, - &D,1,1,0, - basis,1,numnodes,0, - &Ke->values[0],1); - } - - /*Clean up and return*/ - delete gauss; - xDelete(basis); - return Ke; -} -/*}}}*/ -/*FUNCTION Seg::CreatePVectorL2Projection {{{*/ -ElementVector* Seg::CreatePVectorL2Projection(void){ - - /*Intermediaries */ - int i,input_enum; - IssmDouble Jdet; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble value; - Input* input2 = NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector*/ - ElementVector* pe = new ElementVector(nodes,numnodes,this->parameters); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&input_enum,InputToL2ProjectEnum); - Input* input = inputs->GetInput(input_enum); - if(!input){ - switch(input_enum){ - case SurfaceSlopeXEnum: input2 = inputs->GetInput(SurfaceEnum); _assert_(input2); break; - case BedSlopeXEnum: input2 = inputs->GetInput(BedEnum); _assert_(input2); break; - default: _error_("input not found in element"); - } - } - - /* Start looping on the number of gaussian points: */ - GaussSeg* gauss=new GaussSeg(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - - if(input){ - input->GetInputValue(&value,gauss); - } - else{ - input2->GetInputDerivativeValue(&value,&xyz_list[0][0],gauss); - } - - for(i=0;ivalues[i]+=Jdet*gauss->weight*value*basis[i]; - } - - /*Clean up and return*/ - xDelete(basis); - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Seg::CreatePVectorFreeSurfaceTop {{{*/ -ElementVector* Seg::CreatePVectorFreeSurfaceTop(void){ - - /*Intermediaries */ - IssmDouble Jdet,dt; - IssmDouble ms,surface,vy; - IssmDouble xyz_list[NUMVERTICES][3]; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector and other vectors*/ - ElementVector* pe = new ElementVector(nodes,numnodes,this->parameters); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - Input* vy_input = inputs->GetInput(VyEnum); _assert_(vy_input); - Input* ms_input = inputs->GetInput(SurfaceforcingsMassBalanceEnum); _assert_(ms_input); - Input* surface_input= inputs->GetInput(SurfaceEnum); _assert_(surface_input); - - /*Initialize mb_correction to 0, do not forget!:*/ - /* Start looping on the number of gaussian points: */ - GaussSeg* gauss=new GaussSeg(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - - vy_input->GetInputValue(&vy,gauss); - ms_input->GetInputValue(&ms,gauss); - surface_input->GetInputValue(&surface,gauss); - - for(int i=0;ivalues[i]+=Jdet*gauss->weight*(surface + dt*ms + dt*vy)*basis[i]; - } - - /*Clean up and return*/ - xDelete(basis); - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Seg::CreatePVectorFreeSurfaceBase {{{*/ -ElementVector* Seg::CreatePVectorFreeSurfaceBase(void){ - - /*Intermediaries */ - IssmDouble Jdet,dt; - IssmDouble mb,mb_correction,bed,vy; - IssmDouble xyz_list[NUMVERTICES][3]; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector and other vectors*/ - ElementVector* pe = new ElementVector(nodes,numnodes,this->parameters); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - Input* vy_input = inputs->GetInput(VyEnum); _assert_(vy_input); - Input* mb_input = inputs->GetInput(BasalforcingsMeltingRateEnum); _assert_(mb_input); - Input* mb_correction_input = inputs->GetInput(BasalforcingsMeltingRateCorrectionEnum); - Input* bed_input = inputs->GetInput(BedEnum); _assert_(bed_input); - - /*Initialize mb_correction to 0, do not forget!:*/ - /* Start looping on the number of gaussian points: */ - GaussSeg* gauss=new GaussSeg(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - - vy_input->GetInputValue(&vy,gauss); - mb_input->GetInputValue(&mb,gauss); - bed_input->GetInputValue(&bed,gauss); - if(mb_correction_input) - mb_correction_input->GetInputValue(&mb_correction,gauss); - else - mb_correction=0.; - - for(int i=0;ivalues[i]+=Jdet*gauss->weight*(bed+dt*(mb-mb_correction) + dt*vy)*basis[i]; - } - - /*Clean up and return*/ - xDelete(basis); - delete gauss; - return pe; -} -/*}}}*/ + GetInputListOnVertices(&ls[0],MaskIceLevelsetEnum); + + /* If only one vertex has ice, there is an ice front here */ + isicefront=false; + if(IsIceInElement()){ + nrice=0; + for(i=0;iEnum()==GaussSegEnum); + this->GetJacobianDeterminant(pJdet,xyz_list,(GaussSeg*)gauss); + +} +/*}}}*/ +/*FUNCTION Seg::JacobianDeterminantSurface{{{*/ +void Seg::JacobianDeterminantSurface(IssmDouble* pJdet,IssmDouble* xyz_list,Gauss* gauss){ + + *pJdet = 1.; + +} +/*}}}*/ +/*FUNCTION Seg::NewGauss(){{{*/ +Gauss* Seg::NewGauss(void){ + return new GaussSeg(); +} +/*}}}*/ +/*FUNCTION Seg::NewGauss(int order){{{*/ +Gauss* Seg::NewGauss(int order){ + return new GaussSeg(order); +} +/*}}}*/ +/*FUNCTION Seg::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order){{{*/ +Gauss* Seg::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order){ + + /*Output*/ + Gauss* gauss = NULL; + + if(xyz_list_front[0] == xyz_list[0]){ + gauss = new GaussSeg(-1.); + } + else if(xyz_list_front[0] == xyz_list[3*1+0]){ + gauss = new GaussSeg(+1.); + } + else{ + _error_("front is not located on element edge"); + } + + return gauss; +} +/*}}}*/ +/*FUNCTION Seg::NodalFunctions{{{*/ +void Seg::NodalFunctions(IssmDouble* basis, Gauss* gauss){ + + _assert_(gauss->Enum()==GaussSegEnum); + this->GetNodalFunctions(basis,(GaussSeg*)gauss); + +} +/*}}}*/ +/*FUNCTION Seg::NodalFunctionsDerivatives{{{*/ +void Seg::NodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){ + + _assert_(gauss->Enum()==GaussSegEnum); + this->GetNodalFunctionsDerivatives(dbasis,xyz_list,(GaussSeg*)gauss); + +} +/*}}}*/ +/*FUNCTION Seg::NormalSection{{{*/ +void Seg::NormalSection(IssmDouble* normal,IssmDouble* xyz_list_front){ + + IssmDouble* xyz_list = xNew(NUMVERTICES*3); + ::GetVerticesCoordinates(xyz_list,this->vertices,NUMVERTICES); + + if(xyz_list_front[0]>xyz_list[0]) + normal[0]= + 1.; + else + normal[0]= - 1.; + + xDelete(xyz_list); +} +/*}}}*/ Index: /issm/trunk/src/c/classes/Elements/Seg.h =================================================================== --- /issm/trunk/src/c/classes/Elements/Seg.h (revision 17805) +++ /issm/trunk/src/c/classes/Elements/Seg.h (revision 17806) @@ -30,29 +30,16 @@ public: - int id; - int sid; - - Node **nodes; // nodes - Vertex **vertices; // 3 vertices - Material *material; // 1 material ice - Matpar *matpar; // 1 material parameter - - Parameters *parameters; //pointer to solution parameters - Inputs *inputs; - /*Seg constructors, destructors {{{*/ - Seg(); + Seg(){}; Seg(int seg_id,int seg_sid,int i, IoModel* iomodel,int nummodels); ~Seg(); /*}}}*/ /*Object virtual functions definitions:{{{ */ - void Echo(); - void DeepEcho(); - int Id(); int ObjectEnum(); Object *copy(); /*}}}*/ /*Update virtual functions resolution: {{{*/ - void InputUpdateFromSolution(IssmDouble* solutiong){_error_("not implemented yet");}; + void InputUpdateFromSolutionOneDofCollapsed(IssmDouble* solution,int inputenum){_error_("not implemented yet");}; + void InputUpdateFromSolutionOneDof(IssmDouble* solution,int inputenum){_error_("not implemented yet");}; void InputUpdateFromVector(IssmDouble* vector, int name, int type){_error_("not implemented yet");}; #ifdef _HAVE_DAKOTA_ @@ -60,50 +47,88 @@ void InputUpdateFromMatrixDakota(IssmDouble* matrix, int nows, int ncols, int name, int type){_error_("not implemented yet");}; #endif - void InputUpdateFromConstant(IssmDouble constant, int name){_error_("not implemented yet");}; - void InputUpdateFromConstant(int constant, int name){_error_("not implemented yet");}; - void InputUpdateFromConstant(bool constant, int name){_error_("not implemented yet");}; void InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");}; /*}}}*/ /*Element virtual functions definitions: {{{*/ + void AddBasalInput(int input_enum, IssmDouble* values, int interpolation_enum){_error_("not implemented yet");}; + void AddInput(int input_enum, IssmDouble* values, int interpolation_enum){_error_("not implemented yet");}; + IssmDouble CharacteristicLength(void); void ComputeBasalStress(Vector* sigma_b){_error_("not implemented yet");}; + void ComputeSigmaNN(){_error_("not implemented yet");}; void ComputeStrainRate(Vector* eps){_error_("not implemented yet");}; void ComputeStressTensor(){_error_("not implemented yet");}; + void ComputeDeviatoricStressTensor(){_error_("not implemented yet");}; void Configure(Elements* elements,Loads* loads,Nodes* nodesin,Vertices* verticesin,Materials* materials,Parameters* parameters){_error_("not implemented yet");}; void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Materials* materials,Parameters* parameters){_error_("not implemented yet");}; - void SetwiseNodeConnectivity(int* d_nz,int* o_nz,Node* node,bool* flags,int* flagsindices,int set1_enum,int set2_enum){_error_("not implemented yet");}; - void CreateKMatrix(Matrix* Kff, Matrix* Kfs){_error_("not implemented yet");}; - void CreateDVector(Vector* df){_error_("not implemented yet");}; - void CreatePVector(Vector* pf){_error_("not implemented yet");}; - ElementVector* CreatePVectorL2Projection(void); - void CreateJacobianMatrix(Matrix* Jff){_error_("not implemented yet");}; void Delta18oParameterization(void){_error_("not implemented yet");}; + void ElementSizes(IssmDouble* hx,IssmDouble* hy,IssmDouble* hz){_error_("not implemented yet");}; + void FSContactMigration(Vector* vertexgrounded,Vector* vertexfloating){_error_("not implemented yet");}; + int FiniteElement(void); + Element* GetUpperElement(void){_error_("not implemented yet");}; + Element* GetLowerElement(void){_error_("not implemented yet");}; + Element* GetSurfaceElement(void){_error_("not implemented yet");}; + Element* GetBasalElement(void){_error_("not implemented yet");}; int GetNodeIndex(Node* node){_error_("not implemented yet");}; - void GetNodesSidList(int* sidlist){_error_("not implemented yet");}; - void GetNodesLidList(int* lidlist){_error_("not implemented yet");}; - int GetNumberOfNodes(void){_error_("not implemented yet");}; - int Sid(){_error_("not implemented yet");}; - bool IsOnBed(){_error_("not implemented yet");}; - bool IsFloating(){_error_("not implemented yet");}; + int GetNumberOfNodes(void); + int GetNumberOfVertices(void); + void GetVerticesCoordinates(IssmDouble** pxyz_list); + void GetVerticesCoordinatesBase(IssmDouble** pxyz_list){_error_("not implemented yet");}; + void GetVerticesCoordinatesTop(IssmDouble** pxyz_list){_error_("not implemented yet");}; + bool IsOnBase(){_error_("not implemented yet");}; + bool IsOnSurface(){_error_("not implemented yet");}; bool IsNodeOnShelfFromFlags(IssmDouble* flags){_error_("not implemented yet");}; - bool NoIceInElement(){_error_("not implemented yet");}; - void GetInputListOnVertices(IssmDouble* pvalue,int enumtype){_error_("not implemented yet");}; - void GetInputListOnVertices(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,Node* node,int enumtype){_error_("not implemented yet");}; - void GetMaterialInputValue(IssmDouble* pvalue,Node* node,int enumtype){_error_("not implemented yet");}; - #ifdef _HAVE_THERMAL_ - void UpdateBasalConstraintsEnthalpy(void){_error_("not implemented yet");}; - void ComputeBasalMeltingrate(void){_error_("not implemented yet");}; - void DrainWaterfraction(void){_error_("not implemented yet");}; - #endif - #ifdef _HAVE_HYDROLOGY_ - void GetHydrologyDCInefficientHmax(IssmDouble* ph_max, Node* innode){_error_("not implemented yet");}; - void GetHydrologyTransfer(Vector* transfer){_error_("not implemented yet");}; - void HydrologyEPLGetActive(Vector* active_vec){_error_("not implemented yet");}; - void HydrologyEPLGetMask(Vector* vec_mask){_error_("not implemented yet");}; - #endif - void GetSolutionFromInputs(Vector* solution){_error_("not implemented yet");}; - void GetVectorFromInputs(Vector* vector, int name_enum){_error_("not implemented yet");}; - void InputCreate(IssmDouble* vector,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code){_error_("not implemented yet");}; - void InputDepthAverageAtBase(int enum_type,int average_enum_type,int object_enum=MeshElementsEnum){_error_("not implemented yet");}; + void JacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss); + void JacobianDeterminantLine(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss){_error_("not implemented yet");}; + void JacobianDeterminantSurface(IssmDouble* pJdet, IssmDouble* xyz_list,Gauss* gauss); + void JacobianDeterminantBase(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss){_error_("not implemented yet");}; + void JacobianDeterminantTop(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss){_error_("not implemented yet");}; + IssmDouble MinEdgeLength(IssmDouble* xyz_list){_error_("not implemented yet");}; + void NodalFunctions(IssmDouble* basis,Gauss* gauss); + void NodalFunctionsP1(IssmDouble* basis,Gauss* gauss){_error_("not implemented yet");}; + void NodalFunctionsVelocity(IssmDouble* basis,Gauss* gauss){_error_("not implemented yet");}; + void NodalFunctionsPressure(IssmDouble* basis,Gauss* gauss){_error_("not implemented yet");}; + void NodalFunctionsTensor(IssmDouble* basis,Gauss* gauss){_error_("not implemented yet");}; + void NodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss); + void NodalFunctionsP1Derivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){_error_("not implemented yet");}; + void NodalFunctionsMINIDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){_error_("not implemented yet");}; + void NodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){_error_("not implemented yet");}; + void NormalSection(IssmDouble* normal,IssmDouble* xyz_list); + void NormalTop(IssmDouble* normal,IssmDouble* xyz_list){_error_("not implemented yet");}; + void NormalBase(IssmDouble* normal,IssmDouble* xyz_list){_error_("not implemented yet");}; + int NumberofNodesVelocity(void){_error_("not implemented yet");}; + int NumberofNodesPressure(void){_error_("not implemented yet");}; + Element* SpawnBasalElement(void){_error_("not implemented yet");}; + Element* SpawnTopElement(void){_error_("not implemented yet");}; + IssmDouble StabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa){_error_("not implemented yet");}; + int PressureInterpolation(void){_error_("not implemented yet");}; + void ValueP1OnGauss(IssmDouble* pvalue,IssmDouble* values,Gauss* gauss){_error_("not implemented yet");}; + void ValueP1DerivativesOnGauss(IssmDouble* dvalue,IssmDouble* values,IssmDouble* xyz_list,Gauss* gauss){_error_("not implemented yet");}; + int VelocityInterpolation(void){_error_("not implemented yet");}; + void GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating){_error_("not implemented yet");}; + IssmDouble GetGroundedPortion(IssmDouble* xyz_list){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,Node* node,int enumtype){_error_("not implemented yet");}; + Node* GetNode(int node_number){_error_("Not implemented");}; + IssmDouble GetXcoord(Gauss* gauss){_error_("Not implemented");}; + IssmDouble GetYcoord(Gauss* gauss){_error_("Not implemented");}; + IssmDouble GetZcoord(Gauss* gauss){_error_("not implemented yet");}; + int GetElementType(void){_error_("not implemented yet");}; + Gauss* NewGauss(void); + Gauss* NewGauss(int order); + Gauss* NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order); + Gauss* NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert){_error_("not implemented yet");}; + Gauss* NewGauss(int point1,IssmDouble fraction1,IssmDouble fraction2,bool mainlyfloating,int order){_error_("not implemented yet");}; + Gauss* NewGaussBase(int order){_error_("not implemented yet");}; + Gauss* NewGaussLine(int vertex1,int vertex2,int order){_error_("not implemented yet");}; + Gauss* NewGaussTop(int order){_error_("not implemented yet");}; + int VertexConnectivity(int vertexindex){_error_("not implemented yet");}; + void VerticalSegmentIndices(int** pindices,int* pnumseg){_error_("not implemented yet");}; + void ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){_error_("not implemented yet");}; + bool IsZeroLevelset(int levelset_enum){_error_("not implemented");}; + bool IsIcefront(void); + void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum){_error_("not implemented");}; + void GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum); + void GetNormalFromLSF(IssmDouble *pnormal){_error_("not implemented yet");}; + + void GetSolutionFromInputsOneDof(Vector* solution,int enum_type){_error_("not implemented yet");}; + void InputDepthAverageAtBase(int enum_type,int average_enum_type){_error_("not implemented yet");}; void InputDuplicate(int original_enum,int new_enum){_error_("not implemented yet");}; void InputScale(int enum_type,IssmDouble scale_factor){_error_("not implemented yet");}; @@ -111,7 +136,7 @@ int NodalValue(IssmDouble* pvalue, int index, int natureofdataenum){_error_("not implemented yet");}; void PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm){_error_("not implemented yet");}; - void ResultInterpolation(int* pinterpolation,int output_enum){_error_("not implemented");}; - void ResultToVector(Vector* vector,int output_enum){_error_("not implemented");}; - void ResetCoordinateSystem(void){_error_("not implemented yet");}; + void ResetFSBasalBoundaryCondition(void){_error_("not implemented yet");}; + void ReduceMatrices(ElementMatrix* Ke,ElementVector* pe){_error_("not implemented yet");}; + void SetTemporaryElementType(int element_type_in){_error_("not implemented yet");}; void SmbGradients(){_error_("not implemented yet");}; IssmDouble SurfaceArea(void){_error_("not implemented yet");}; @@ -121,5 +146,4 @@ void UpdateConstraintsExtrudeFromTop(){_error_("not implemented");}; -#ifdef _HAVE_RESPONSES_ void AverageOntoPartition(Vector* partition_contributions,Vector* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part){_error_("not implemented yet");}; IssmDouble IceVolume(void){_error_("not implemented yet");}; @@ -140,5 +164,6 @@ void MaxVy(IssmDouble* pmaxvy){_error_("not implemented yet");}; void MaxVz(IssmDouble* pmaxvz){_error_("not implemented yet");}; -#endif + IssmDouble Misfit(int modelenum,int observationenum,int weightsenum){_error_("not implemented yet");}; + IssmDouble MisfitArea(int weightsenum){_error_("not implemented yet");}; #ifdef _HAVE_GIA_ @@ -146,5 +171,4 @@ #endif -#ifdef _HAVE_CONTROL_ IssmDouble DragCoefficientAbsGradient(void){_error_("not implemented yet");}; void GradientIndexing(int* indexing,int control_index){_error_("not implemented yet");}; @@ -179,19 +203,9 @@ IssmDouble SurfaceAverageVelMisfit(void){_error_("not implemented yet");}; void InputControlUpdate(IssmDouble scalar,bool save_parameter){_error_("not implemented yet");}; -#endif - -#ifdef _HAVE_GROUNDINGLINE_ + void PotentialUngrounding(Vector* potential_sheet_ungrounding){_error_("not implemented yet");}; void MigrateGroundingLine(IssmDouble* sheet_ungrounding){_error_("not implemented yet");}; int UpdatePotentialUngrounding(IssmDouble* vertices_potentially_ungrounding,Vector* vec_nodes_on_iceshelf,IssmDouble* nodes_on_iceshelf){_error_("not implemented yet");}; -#endif - /*}}}*/ - /*Seg specific routines:*/ - ElementMatrix* CreateMassMatrix(void); - ElementMatrix* CreateKMatrixFreeSurfaceTop(void); - ElementMatrix* CreateKMatrixFreeSurfaceBase(void); - ElementVector* CreatePVectorFreeSurfaceTop(void); - ElementVector* CreatePVectorFreeSurfaceBase(void); - IssmDouble GetSize(void); + /*}}}*/ }; #endif /* _SEG_H */ Index: /issm/trunk/src/c/classes/Elements/SegRef.cpp =================================================================== --- /issm/trunk/src/c/classes/Elements/SegRef.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Elements/SegRef.cpp (revision 17806) @@ -16,4 +16,5 @@ /*Element macros*/ +#define NUMNODESP0 1 #define NUMNODESP1 2 @@ -91,7 +92,15 @@ switch(element_type){ + case P0Enum: + basis[0]=1.; + return; case P1Enum: case P1DGEnum: basis[0]=(1.-gauss->coord1)/2.; basis[1]=(1.+gauss->coord1)/2.; + return; + case P2Enum: + basis[0]=(gauss->coord1-1.)*gauss->coord1/2.; + basis[1]=gauss->coord1*(1.+gauss->coord1)/2.; + basis[2]=(1.-gauss->coord1)*(1.+gauss->coord1); return; default: @@ -153,4 +162,8 @@ switch(finiteelement){ + case P0Enum: + /*Nodal function 1*/ + dbasis[0] = 0.; + break; case P1Enum: case P1DGEnum: /*Nodal function 1*/ @@ -158,4 +171,10 @@ /*Nodal function 2*/ dbasis[1] = 0.5; + return; + case P2Enum: + /*Nodal function 1*/ + dbasis[0] = (gauss->coord1-1.)/2. + gauss->coord1/2.; + dbasis[1] = (1.+gauss->coord1)/2. + gauss->coord1/2.; + dbasis[2] = -2.*gauss->coord1; return; default: @@ -227,11 +246,7 @@ IssmDouble x1=xyz_list[3*0+0]; - IssmDouble y1=xyz_list[3*0+1]; - IssmDouble z1=xyz_list[3*0+2]; IssmDouble x2=xyz_list[3*1+0]; - IssmDouble y2=xyz_list[3*1+1]; - IssmDouble z2=xyz_list[3*1+2]; - - *J=.5*sqrt(pow(x2-x1,2) + pow(y2-y1,2) + pow(z2-z1,2)); + + *J=.5*fabs(x2-x1); } /*}}}*/ @@ -270,4 +285,5 @@ switch(finiteelement){ + case P0Enum: return NUMNODESP0; case P1Enum: return NUMNODESP1; case P1DGEnum: return NUMNODESP1; Index: /issm/trunk/src/c/classes/Elements/Tetra.cpp =================================================================== --- /issm/trunk/src/c/classes/Elements/Tetra.cpp (revision 17806) +++ /issm/trunk/src/c/classes/Elements/Tetra.cpp (revision 17806) @@ -0,0 +1,999 @@ +/*!\file Tetra.cpp + * \brief: implementation of the Tetrament object + */ +/*Headers:*/ +/*{{{*/ +#ifdef HAVE_CONFIG_H +#include +#else +#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" +#endif + +#include +#include +#include "../classes.h" +#include "../../shared/shared.h" +/*}}}*/ + +/*Element macros*/ +#define NUMVERTICES 4 + +/*Constructors/destructor/copy*/ +/*FUNCTION Tetra::Tetra(int id, int sid,int index, IoModel* iomodel,int nummodels){{{*/ +Tetra::Tetra(int seg_id, int seg_sid, int index, IoModel* iomodel,int nummodels) + :TetraRef(nummodels),ElementHook(nummodels,index+1,NUMVERTICES,iomodel){ + + /*id: */ + this->id = seg_id; + this->sid = seg_sid; + + //this->parameters: we still can't point to it, it may not even exist. Configure will handle this. + this->parameters = NULL; + + /*intialize inputs: */ + this->inputs = new Inputs(); + + /*initialize pointers:*/ + this->nodes = NULL; + this->vertices = NULL; + this->material = NULL; + this->matpar = NULL; + } +/*}}}*/ +/*FUNCTION Tetra::~Tetra(){{{*/ +Tetra::~Tetra(){ + this->parameters=NULL; +} +/*}}}*/ +/*FUNCTION Tetra::copy {{{*/ +Object* Tetra::copy() { + _error_("not implemented yet"); +} +/*}}}*/ + +/*FUNCTION Tetra::FiniteElement{{{*/ +int Tetra::FiniteElement(void){ + return this->element_type; +} /*}}}*/ +/*FUNCTION Tetra::ObjectEnum{{{*/ +int Tetra::ObjectEnum(void){ + + return TetraEnum; + +}/*}}}*/ + +/*FUNCTION Tetra::AddInput{{{*/ +void Tetra::AddInput(int input_enum,IssmDouble* values, int interpolation_enum){ + + /*Call inputs method*/ + _assert_(this->inputs); + this->inputs->AddInput(new TetraInput(input_enum,values,interpolation_enum)); +} +/*}}}*/ +/*FUNCTION Tetra::Configure {{{*/ +void Tetra::Configure(Elements* elementsin, Loads* loadsin, Nodes* nodesin,Vertices* verticesin, Materials* materialsin, Parameters* parametersin){ + + int analysis_counter; + + /*go into parameters and get the analysis_counter: */ + parametersin->FindParam(&analysis_counter,AnalysisCounterEnum); + + /*Get Element type*/ + this->element_type=this->element_type_list[analysis_counter]; + + /*Take care of hooking up all objects for this element, ie links the objects in the hooks to their respective + * datasets, using internal ids and offsets hidden in hooks: */ + if (this->hnodes[analysis_counter]) this->hnodes[analysis_counter]->configure(nodesin); + this->hvertices->configure(verticesin); + this->hmaterial->configure(materialsin); + this->hmatpar->configure(materialsin); + + /*Now, go pick up the objects inside the hooks: */ + if (this->hnodes[analysis_counter]) this->nodes=(Node**)this->hnodes[analysis_counter]->deliverp(); + else this->nodes=NULL; + this->vertices = (Vertex**)this->hvertices->deliverp(); + this->material = (Material*)this->hmaterial->delivers(); + this->matpar = (Matpar*)this->hmatpar->delivers(); + + /*point parameters to real dataset: */ + this->parameters=parametersin; + + /*get inputs configured too: */ + this->inputs->Configure(parameters); +} +/*}}}*/ +/*FUNCTION Tetra::FaceOnBaseIndices{{{*/ +void Tetra::FaceOnBaseIndices(int* pindex1,int* pindex2,int* pindex3){ + + IssmDouble values[NUMVERTICES]; + int indices[4][3] = {{0,1,2},{0,3,1},{1,3,2},{0,2,3}}; + + /*Retrieve all inputs and parameters*/ + GetInputListOnVertices(&values[0],MeshVertexonbaseEnum); + + for(int i=0;i<4;i++){ + if(values[indices[i][0]] == 1. && values[indices[i][1]] == 1. && values[indices[i][2]] == 1.){ + *pindex1 = indices[i][0]; + *pindex2 = indices[i][1]; + *pindex3 = indices[i][2]; + return; + } + } + + _error_("Could not find 3 vertices on bed"); +} +/*}}}*/ +/*FUNCTION Tetra::FaceOnSurfaceIndices{{{*/ +void Tetra::FaceOnSurfaceIndices(int* pindex1,int* pindex2,int* pindex3){ + + IssmDouble values[NUMVERTICES]; + int indices[4][3] = {{0,1,2},{0,3,1},{1,3,2},{0,2,3}}; + + /*Retrieve all inputs and parameters*/ + GetInputListOnVertices(&values[0],MeshVertexonsurfaceEnum); + + for(int i=0;i<4;i++){ + if(values[indices[i][0]] == 1. && values[indices[i][1]] == 1. && values[indices[i][2]] == 1.){ + *pindex1 = indices[i][0]; + *pindex2 = indices[i][1]; + *pindex3 = indices[i][2]; + return; + } + } + + _error_("Could not find 3 vertices on bed"); +} +/*}}}*/ +/*FUNCTION Tetra::FaceOnFrontIndices{{{*/ +void Tetra::FaceOnFrontIndices(int* pindex1,int* pindex2,int* pindex3){ + + IssmDouble values[NUMVERTICES]; + int indices[4][3] = {{0,1,2},{0,3,1},{1,3,2},{0,2,3}}; + + /*Retrieve all inputs and parameters*/ + GetInputListOnVertices(&values[0],MaskIceLevelsetEnum); + + for(int i=0;i<4;i++){ + if(values[indices[i][0]] == 0. && values[indices[i][1]] == 0. && values[indices[i][2]] == 0.){ + *pindex1 = indices[i][0]; + *pindex2 = indices[i][1]; + *pindex3 = indices[i][2]; + return; + } + } + + _error_("Could not find 3 vertices on bed"); +} +/*}}}*/ +/*FUNCTION Tetra::GetElementType {{{*/ +int Tetra::GetElementType(){ + + /*return TetraRef field*/ + return this->element_type; +} +/*}}}*/ +/*FUNCTION Tetra::GetNumberOfNodes;{{{*/ +int Tetra::GetNumberOfNodes(void){ + return this->NumberofNodes(); +} +/*}}}*/ +/*FUNCTION Tetra::GetNumberOfVertices;{{{*/ +int Tetra::GetNumberOfVertices(void){ + return NUMVERTICES; +} +/*}}}*/ +/*FUNCTION Tetra::GetVerticesCoordinatesBase(IssmDouble** pxyz_list){{{*/ +void Tetra::GetVerticesCoordinatesBase(IssmDouble** pxyz_list){ + + int indices[3]; + IssmDouble xyz_list[NUMVERTICES][3]; + + /*Element XYZ list*/ + ::GetVerticesCoordinates(&xyz_list[0][0],this->vertices,NUMVERTICES); + + /*Allocate Output*/ + IssmDouble* xyz_list_edge = xNew(3*3); + this->FaceOnBaseIndices(&indices[0],&indices[1],&indices[2]); + for(int i=0;i<3;i++) for(int j=0;j<3;j++) xyz_list_edge[i*3+j]=xyz_list[indices[i]][j]; + + /*Assign output pointer*/ + *pxyz_list = xyz_list_edge; + +}/*}}}*/ +/*FUNCTION Tetra::GetVerticesCoordinatesTop(IssmDouble** pxyz_list){{{*/ +void Tetra::GetVerticesCoordinatesTop(IssmDouble** pxyz_list){ + + int indices[3]; + IssmDouble xyz_list[NUMVERTICES][3]; + + /*Element XYZ list*/ + ::GetVerticesCoordinates(&xyz_list[0][0],this->vertices,NUMVERTICES); + + /*Allocate Output*/ + IssmDouble* xyz_list_edge = xNew(3*3); + this->FaceOnSurfaceIndices(&indices[0],&indices[1],&indices[2]); + for(int i=0;i<3;i++) for(int j=0;j<3;j++) xyz_list_edge[i*3+j]=xyz_list[indices[i]][j]; + + /*Assign output pointer*/ + *pxyz_list = xyz_list_edge; + +}/*}}}*/ +/*FUNCTION Tetra::GetXcoord {{{*/ +IssmDouble Tetra::GetXcoord(Gauss* gauss){ + + int i; + IssmDouble z; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble z_list[NUMVERTICES]; + + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + for(i=0;iConstant(&yts,ConstantsYtsEnum); + iomodel->Constant(&control_analysis,InversionIscontrolEnum); + if(control_analysis) iomodel->Constant(&num_control_type,InversionNumControlParametersEnum); + if(control_analysis) iomodel->Constant(&num_responses,InversionNumCostFunctionsEnum); + + /*Recover vertices ids needed to initialize inputs*/ + _assert_(iomodel->elements); + for(i=0;ielements[NUMVERTICES*index+i]; //ids for vertices are in the elements array from Matlab + } + + /*Control Inputs*/ + if (control_analysis && iomodel->Data(InversionControlParametersEnum)){ + for(i=0;i(iomodel->Data(InversionControlParametersEnum)[i])){ + case BalancethicknessThickeningRateEnum: + if (iomodel->Data(BalancethicknessThickeningRateEnum)){ + for(j=0;jData(BalancethicknessThickeningRateEnum)[tetra_vertex_ids[j]-1]/yts; + for(j=0;jData(InversionMinParametersEnum)[(tetra_vertex_ids[j]-1)*num_control_type+i]/yts; + for(j=0;jData(InversionMaxParametersEnum)[(tetra_vertex_ids[j]-1)*num_control_type+i]/yts; + this->inputs->AddInput(new ControlInput(BalancethicknessThickeningRateEnum,TetraInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); + } + break; + case VxEnum: + if (iomodel->Data(VxEnum)){ + for(j=0;jData(VxEnum)[tetra_vertex_ids[j]-1]/yts; + for(j=0;jData(InversionMinParametersEnum)[(tetra_vertex_ids[j]-1)*num_control_type+i]/yts; + for(j=0;jData(InversionMaxParametersEnum)[(tetra_vertex_ids[j]-1)*num_control_type+i]/yts; + this->inputs->AddInput(new ControlInput(VxEnum,TetraInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); + } + break; + case VyEnum: + if (iomodel->Data(VyEnum)){ + for(j=0;jData(VyEnum)[tetra_vertex_ids[j]-1]/yts; + for(j=0;jData(InversionMinParametersEnum)[(tetra_vertex_ids[j]-1)*num_control_type+i]/yts; + for(j=0;jData(InversionMaxParametersEnum)[(tetra_vertex_ids[j]-1)*num_control_type+i]/yts; + this->inputs->AddInput(new ControlInput(VyEnum,TetraInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); + } + break; + case FrictionCoefficientEnum: + if (iomodel->Data(FrictionCoefficientEnum)){ + for(j=0;jData(FrictionCoefficientEnum)[tetra_vertex_ids[j]-1]; + for(j=0;jData(InversionMinParametersEnum)[(tetra_vertex_ids[j]-1)*num_control_type+i]; + for(j=0;jData(InversionMaxParametersEnum)[(tetra_vertex_ids[j]-1)*num_control_type+i]; + this->inputs->AddInput(new ControlInput(FrictionCoefficientEnum,TetraInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); + } + break; + case MaterialsRheologyBbarEnum: + if(iomodel->Data(MaterialsRheologyBEnum)){ + for(j=0;jData(MaterialsRheologyBEnum)[tetra_vertex_ids[j]-1]; + for(j=0;jData(InversionMinParametersEnum)[(tetra_vertex_ids[j]-1)*num_control_type+i]; + for(j=0;jData(InversionMaxParametersEnum)[(tetra_vertex_ids[j]-1)*num_control_type+i]; + this->inputs->AddInput(new ControlInput(MaterialsRheologyBEnum,TetraInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); + } + break; + case DamageDbarEnum: + if(iomodel->Data(DamageDEnum)){ + for(j=0;jData(DamageDEnum)[tetra_vertex_ids[j]-1]; + for(j=0;jData(InversionMinParametersEnum)[(tetra_vertex_ids[j]-1)*num_control_type+i]; + for(j=0;jData(InversionMaxParametersEnum)[(tetra_vertex_ids[j]-1)*num_control_type+i]; + this->inputs->AddInput(new ControlInput(DamageDEnum,TetraInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); + } + break; + default: + _error_("Control " << EnumToStringx(reCast(iomodel->Data(InversionControlParametersEnum)[i])) << " not implemented yet"); + } + } + } + + /*Need to know the type of approximation for this element*/ + if(iomodel->Data(FlowequationElementEquationEnum)){ + this->inputs->AddInput(new IntInput(ApproximationEnum,reCast(iomodel->Data(FlowequationElementEquationEnum)[index]))); + } + + /*DatasetInputs*/ + if (control_analysis && iomodel->Data(InversionCostFunctionsCoefficientsEnum)) { + + /*Create inputs and add to DataSetInput*/ + DatasetInput* datasetinput=new DatasetInput(InversionCostFunctionsCoefficientsEnum); + for(i=0;iData(InversionCostFunctionsCoefficientsEnum)[(tetra_vertex_ids[j]-1)*num_responses+i]; + datasetinput->AddInput(new TetraInput(InversionCostFunctionsCoefficientsEnum,nodeinputs,P1Enum),reCast(iomodel->Data(InversionCostFunctionsEnum)[i])); + } + + /*Add datasetinput to element inputs*/ + this->inputs->AddInput(datasetinput); + } +} +/*}}}*/ +/*FUNCTION Tetra::InputUpdateFromSolutionOneDof{{{*/ +void Tetra::InputUpdateFromSolutionOneDof(IssmDouble* solution,int enum_type){ + + /*Intermediary*/ + int* doflist = NULL; + + /*Fetch number of nodes for this finite element*/ + int numnodes = this->NumberofNodes(); + + /*Fetch dof list and allocate solution vector*/ + GetDofList(&doflist,NoneApproximationEnum,GsetEnum); + IssmDouble* values = xNew(numnodes); + + /*Use the dof list to index into the solution vector: */ + for(int i=0;i(values[i])) _error_("NaN found in solution vector"); + } + + /*Add input to the element: */ + this->inputs->AddInput(new TetraInput(enum_type,values,P1Enum)); + + /*Free ressources:*/ + xDelete(values); + xDelete(doflist); +} +/*}}}*/ +/*FUNCTION Tetra::IsOnBase {{{*/ +bool Tetra::IsOnBase(){ + return HasFaceOnBase(); +} +/*}}}*/ +/*FUNCTION Tetra::IsOnSurface {{{*/ +bool Tetra::IsOnSurface(){ + return HasFaceOnSurface(); +} +/*}}}*/ +bool Tetra::IsIcefront(void){/*{{{*/ + + /*Retrieve all inputs and parameters*/ + IssmDouble ls[NUMVERTICES]; + GetInputListOnVertices(&ls[0],MaskIceLevelsetEnum); + + /* If only one vertex has ice, there is an ice front here */ + if(IsIceInElement()){ + int nrice=0; + for(int i=0;iEnum()==GaussTetraEnum); + this->GetJacobianDeterminant(pJdet,xyz_list,(GaussTetra*)gauss); + +} +/*}}}*/ +/*FUNCTION Tetra::JacobianDeterminantSurface{{{*/ +void Tetra::JacobianDeterminantSurface(IssmDouble* pJdet,IssmDouble* xyz_list,Gauss* gauss){ + + _assert_(gauss->Enum()==GaussTetraEnum); + this->GetJacobianDeterminantFace(pJdet,xyz_list,(GaussTetra*)gauss); + +} +/*}}}*/ +/*FUNCTION Tetra::JacobianDeterminantBase{{{*/ +void Tetra::JacobianDeterminantBase(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss){ + + _assert_(gauss->Enum()==GaussTetraEnum); + this->GetJacobianDeterminantFace(pJdet,xyz_list_base,(GaussTetra*)gauss); + +} +/*}}}*/ +/*FUNCTION Tetra::JacobianDeterminantTop{{{*/ +void Tetra::JacobianDeterminantTop(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss){ + + _assert_(gauss->Enum()==GaussTetraEnum); + this->GetJacobianDeterminantFace(pJdet,xyz_list_base,(GaussTetra*)gauss); + +} +/*}}}*/ +/*FUNCTION Tetra::NewGauss(){{{*/ +Gauss* Tetra::NewGauss(void){ + return new GaussTetra(); +} +/*}}}*/ +/*FUNCTION Tetra::NewGauss(int order){{{*/ +Gauss* Tetra::NewGauss(int order){ + return new GaussTetra(order); +} +/*}}}*/ +/*FUNCTION Tetra::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert){{{*/ +Gauss* Tetra::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert){ + /*FIXME: this is messed up, should provide indices and not xyz_list!*/ + int indices[3]; + this->FaceOnFrontIndices(&indices[0],&indices[1],&indices[2]); + return new GaussTetra(indices[0],indices[1],indices[2],max(order_horiz,order_vert)); +} +/*}}}*/ +/*FUNCTION Tetra::NewGaussBase(int order){{{*/ +Gauss* Tetra::NewGaussBase(int order){ + + int indices[3]; + this->FaceOnBaseIndices(&indices[0],&indices[1],&indices[2]); + return new GaussTetra(indices[0],indices[1],indices[2],order); +} +/*}}}*/ +/*FUNCTION Tetra::NewGaussTop(int order){{{*/ +Gauss* Tetra::NewGaussTop(int order){ + + int indices[3]; + this->FaceOnSurfaceIndices(&indices[0],&indices[1],&indices[2]); + return new GaussTetra(indices[0],indices[1],indices[2],order); +} +/*}}}*/ +/*FUNCTION Tetra::NodalFunctions{{{*/ +void Tetra::NodalFunctions(IssmDouble* basis, Gauss* gauss){ + + _assert_(gauss->Enum()==GaussTetraEnum); + this->GetNodalFunctions(basis,(GaussTetra*)gauss); + +} +/*}}}*/ +/*FUNCTION Tetra::NodalFunctionsVelocity{{{*/ +void Tetra::NodalFunctionsVelocity(IssmDouble* basis, Gauss* gauss){ + + _assert_(gauss->Enum()==GaussTetraEnum); + this->GetNodalFunctionsVelocity(basis,(GaussTetra*)gauss); + +} +/*}}}*/ +/*FUNCTION Tetra::NodalFunctionsPressure{{{*/ +void Tetra::NodalFunctionsPressure(IssmDouble* basis, Gauss* gauss){ + + _assert_(gauss->Enum()==GaussTetraEnum); + this->GetNodalFunctionsPressure(basis,(GaussTetra*)gauss); + +} +/*}}}*/ +/*FUNCTION Tetra::NodalFunctionsTensor{{{*/ +void Tetra::NodalFunctionsTensor(IssmDouble* basis, Gauss* gauss){ + + _assert_(gauss->Enum()==GaussTetraEnum); + this->GetNodalFunctionsTensor(basis,(GaussTetra*)gauss); + +} +/*}}}*/ +/*FUNCTION Tetra::NodalFunctionsDerivatives{{{*/ +void Tetra::NodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){ + + _assert_(gauss->Enum()==GaussTetraEnum); + this->GetNodalFunctionsDerivatives(dbasis,xyz_list,(GaussTetra*)gauss); + +} +/*}}}*/ +/*FUNCTION Tetra::NodalFunctionsDerivativesVelocity{{{*/ +void Tetra::NodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){ + + _assert_(gauss->Enum()==GaussTetraEnum); + this->GetNodalFunctionsDerivativesVelocity(dbasis,xyz_list,(GaussTetra*)gauss); + +} +/*}}}*/ +/*FUNCTION Tetra::NormalSection{{{*/ +void Tetra::NormalSection(IssmDouble* normal,IssmDouble* xyz_list){ + + /*Build unit outward pointing vector*/ + IssmDouble AB[3]; + IssmDouble AC[3]; + IssmDouble norm; + + AB[0]=xyz_list[1*3+0] - xyz_list[0*3+0]; + AB[1]=xyz_list[1*3+1] - xyz_list[0*3+1]; + AB[2]=xyz_list[1*3+2] - xyz_list[0*3+2]; + AC[0]=xyz_list[2*3+0] - xyz_list[0*3+0]; + AC[1]=xyz_list[2*3+1] - xyz_list[0*3+1]; + AC[2]=xyz_list[2*3+2] - xyz_list[0*3+2]; + + cross(normal,AB,AC); + norm=sqrt(normal[0]*normal[0]+normal[1]*normal[1]+normal[2]*normal[2]); + + for(int i=0;i<3;i++) normal[i]=normal[i]/norm; +} +/*}}}*/ +/*FUNCTION Tetra::NormalBase (THIS ONE){{{*/ +void Tetra::NormalBase(IssmDouble* bed_normal,IssmDouble* xyz_list){ + + IssmDouble v13[3],v23[3]; + IssmDouble normal[3]; + IssmDouble normal_norm; + + for(int i=0;i<3;i++){ + v13[i]=xyz_list[0*3+i]-xyz_list[2*3+i]; + v23[i]=xyz_list[1*3+i]-xyz_list[2*3+i]; + } + + normal[0]=v13[1]*v23[2]-v13[2]*v23[1]; + normal[1]=v13[2]*v23[0]-v13[0]*v23[2]; + normal[2]=v13[0]*v23[1]-v13[1]*v23[0]; + normal_norm=sqrt(normal[0]*normal[0]+ normal[1]*normal[1]+ normal[2]*normal[2]); + + /*Bed normal is opposite to surface normal*/ + bed_normal[0]=-normal[0]/normal_norm; + bed_normal[1]=-normal[1]/normal_norm; + bed_normal[2]=-normal[2]/normal_norm; +} +/*}}}*/ +/*FUNCTION Tetra::NormalTop (THIS ONE){{{*/ +void Tetra::NormalTop(IssmDouble* top_normal,IssmDouble* xyz_list){ + + IssmDouble v13[3],v23[3]; + IssmDouble normal[3]; + IssmDouble normal_norm; + + for(int i=0;i<3;i++){ + v13[i]=xyz_list[0*3+i]-xyz_list[2*3+i]; + v23[i]=xyz_list[1*3+i]-xyz_list[2*3+i]; + } + + normal[0]=v13[1]*v23[2]-v13[2]*v23[1]; + normal[1]=v13[2]*v23[0]-v13[0]*v23[2]; + normal[2]=v13[0]*v23[1]-v13[1]*v23[0]; + normal_norm=sqrt(normal[0]*normal[0]+ normal[1]*normal[1]+ normal[2]*normal[2]); + + top_normal[0]=normal[0]/normal_norm; + top_normal[1]=normal[1]/normal_norm; + top_normal[2]=normal[2]/normal_norm; +} +/*}}}*/ +/*FUNCTION Tetra::NumberofNodesPressure{{{*/ +int Tetra::NumberofNodesPressure(void){ + return TetraRef::NumberofNodesPressure(); +} +/*}}}*/ +/*FUNCTION Tetra::NumberofNodesVelocity{{{*/ +int Tetra::NumberofNodesVelocity(void){ + return TetraRef::NumberofNodesVelocity(); +} +/*}}}*/ +/*FUNCTION Tetra::ReduceMatrices{{{*/ +void Tetra::ReduceMatrices(ElementMatrix* Ke,ElementVector* pe){ + + if(pe){ + if(this->element_type==MINIcondensedEnum){ + int indices[3]={12,13,14}; + pe->StaticCondensation(Ke,3,&indices[0]); + } + else if(this->element_type==P1bubblecondensedEnum){ + int size = nodes[4]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum); + int offset = 0; + for(int i=0;i<4;i++) offset+=nodes[i]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum); + int* indices=xNew(size); + for(int i=0;iStaticCondensation(Ke,size,indices); + xDelete(indices); + } + } + + if(Ke){ + if(this->element_type==MINIcondensedEnum){ + int indices[3]={12,13,14}; + Ke->StaticCondensation(3,&indices[0]); + } + else if(this->element_type==P1bubblecondensedEnum){ + int size = nodes[4]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum); + int offset = 0; + for(int i=0;i<4;i++) offset+=nodes[i]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum); + int* indices=xNew(size); + for(int i=0;iStaticCondensation(size,indices); + xDelete(indices); + } + } +} +/*}}}*/ +/*FUNCTION Tetra::ResetFSBasalBoundaryCondition {{{*/ +void Tetra::ResetFSBasalBoundaryCondition(void){ + + int numnodes = this->GetNumberOfNodes(); + + int approximation; + IssmDouble* vertexonbase= NULL; + IssmDouble slopex,slopey,groundedice; + IssmDouble xz_plane[6]; + + /*For FS only: we want the CS to be tangential to the bedrock*/ + inputs->GetInputValue(&approximation,ApproximationEnum); + if(IsFloating() || !HasNodeOnBase() || approximation!=FSApproximationEnum) return; + + //printf("element number %i \n",this->id); + /*Get inputs*/ + Input* slopex_input=inputs->GetInput(BedSlopeXEnum); _assert_(slopex_input); + Input* slopey_input=inputs->GetInput(BedSlopeYEnum); _assert_(slopey_input); + Input* groundedicelevelset_input=inputs->GetInput(MaskGroundediceLevelsetEnum); _assert_(groundedicelevelset_input); + vertexonbase = xNew(numnodes); + this->GetInputListOnNodesVelocity(&vertexonbase[0],MeshVertexonbaseEnum); + + /*Loop over basal nodes and update their CS*/ + GaussTetra* gauss = new GaussTetra(); + for(int i=0;iNumberofNodesVelocity();i++){ + + if(vertexonbase[i]==1){ + gauss->GaussNode(this->VelocityInterpolation(),i); + + slopex_input->GetInputValue(&slopex,gauss); + slopey_input->GetInputValue(&slopey,gauss); + groundedicelevelset_input->GetInputValue(&groundedice,gauss); + + /*New X axis New Z axis*/ + xz_plane[0]=1.; xz_plane[3]=-slopex; + xz_plane[1]=0.; xz_plane[4]=-slopey; + xz_plane[2]=slopex; xz_plane[5]=1.; + + if(groundedice>0){ + if(this->nodes[i]->GetApproximation()==FSvelocityEnum){ + this->nodes[i]->DofInSSet(2); //vz + } + else _error_("Flow equation approximation"<nodes[i]->GetApproximation())<<" not supported yet"); + } + else{ + if(this->nodes[i]->GetApproximation()==FSvelocityEnum){ + this->nodes[i]->DofInFSet(2); //vz + } + else _error_("Flow equation approximation"<nodes[i]->GetApproximation())<<" not supported yet"); + } + + XZvectorsToCoordinateSystem(&this->nodes[i]->coord_system[0][0],&xz_plane[0]); + } + } + + /*cleanup*/ + xDelete(vertexonbase); + delete gauss; +} +/*}}}*/ +/*FUNCTION Tetra::SetCurrentConfiguration {{{*/ +void Tetra::SetCurrentConfiguration(Elements* elementsin, Loads* loadsin, Nodes* nodesin, Materials* materialsin, Parameters* parametersin){ + + /*go into parameters and get the analysis_counter: */ + int analysis_counter; + parametersin->FindParam(&analysis_counter,AnalysisCounterEnum); + + /*Get Element type*/ + this->element_type=this->element_type_list[analysis_counter]; + + /*Pick up nodes*/ + if(this->hnodes[analysis_counter]) this->nodes=(Node**)this->hnodes[analysis_counter]->deliverp(); + else this->nodes=NULL; + +} +/*}}}*/ +/*FUNCTION Tetra::SpawnBasalElement{{{*/ +Element* Tetra::SpawnBasalElement(void){ + + _assert_(HasFaceOnBase()); + + int index1,index2,index3; + this->FaceOnBaseIndices(&index1,&index2,&index3); + return SpawnTria(index1,index2,index3); +}/*}}}*/ +/*FUNCTION Tetra::SpawnTopElement{{{*/ +Element* Tetra::SpawnTopElement(void){ + + _assert_(HasFaceOnSurface()); + + int index1,index2,index3; + this->FaceOnSurfaceIndices(&index1,&index2,&index3); + return SpawnTria(index1,index2,index3); +}/*}}}*/ +/*FUNCTION Tetra::SpawnTria{{{*/ +Tria* Tetra::SpawnTria(int index1,int index2,int index3){ + + int analysis_counter; + + /*go into parameters and get the analysis_counter: */ + this->parameters->FindParam(&analysis_counter,AnalysisCounterEnum); + + /*Create Tria*/ + Tria* tria=new Tria(); + tria->id=this->id; + tria->inputs=(Inputs*)this->inputs->SpawnTriaInputs(index1,index2,index3); + tria->parameters=this->parameters; + tria->element_type=P1Enum; //Only P1 CG for now (TO BE CHANGED) + this->SpawnTriaHook(dynamic_cast(tria),index1,index2,index3); + + /*Spawn material*/ + tria->material=(Material*)this->material->copy2(tria); + + /*recover nodes, material and matpar: */ + tria->nodes = (Node**)tria->hnodes[analysis_counter]->deliverp(); + tria->vertices = (Vertex**)tria->hvertices->deliverp(); + tria->matpar = (Matpar*)tria->hmatpar->delivers(); + + /*Return new Tria*/ + return tria; +} +/*}}}*/ +/*FUNCTION Tetra::Update {{{*/ +void Tetra::Update(int index,IoModel* iomodel,int analysis_counter,int analysis_type,int finiteelement_type){ + + /*Intermediaries*/ + int i; + int tetra_vertex_ids[6]; + IssmDouble nodeinputs[6]; + IssmDouble yts; + bool dakota_analysis; + bool isFS; + int numnodes; + int* tetra_node_ids = NULL; + + /*Fetch parameters: */ + iomodel->Constant(&yts,ConstantsYtsEnum); + iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum); + iomodel->Constant(&isFS,FlowequationIsFSEnum); + + /*Checks if debuging*/ + _assert_(iomodel->elements); + + /*Recover element type*/ + this->SetElementType(finiteelement_type,analysis_counter); + + /*Recover vertices ids needed to initialize inputs*/ + for(i=0;i<4;i++) tetra_vertex_ids[i]=iomodel->elements[4*index+i]; //ids for vertices are in the elements array from Matlab + + /*Recover nodes ids needed to initialize the node hook.*/ + switch(finiteelement_type){ + case P1Enum: + numnodes = 4; + tetra_node_ids = xNew(numnodes); + tetra_node_ids[0]=iomodel->nodecounter+iomodel->elements[4*index+0]; + tetra_node_ids[1]=iomodel->nodecounter+iomodel->elements[4*index+1]; + tetra_node_ids[2]=iomodel->nodecounter+iomodel->elements[4*index+2]; + tetra_node_ids[3]=iomodel->nodecounter+iomodel->elements[4*index+3]; + break; + case P1bubbleEnum: case P1bubblecondensedEnum: + numnodes = 5; + tetra_node_ids = xNew(numnodes); + tetra_node_ids[0]=iomodel->nodecounter+iomodel->elements[4*index+0]; + tetra_node_ids[1]=iomodel->nodecounter+iomodel->elements[4*index+1]; + tetra_node_ids[2]=iomodel->nodecounter+iomodel->elements[4*index+2]; + tetra_node_ids[3]=iomodel->nodecounter+iomodel->elements[4*index+3]; + tetra_node_ids[4]=iomodel->nodecounter+iomodel->numberofvertices+index+1; + break; + case P2Enum: + numnodes = 10; + tetra_node_ids = xNew(numnodes); + tetra_node_ids[0]=iomodel->nodecounter+iomodel->elements[4*index+0]; + tetra_node_ids[1]=iomodel->nodecounter+iomodel->elements[4*index+1]; + tetra_node_ids[2]=iomodel->nodecounter+iomodel->elements[4*index+2]; + tetra_node_ids[3]=iomodel->nodecounter+iomodel->elements[4*index+3]; + tetra_node_ids[4]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[6*index+0]+1; + tetra_node_ids[5]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[6*index+1]+1; + tetra_node_ids[6]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[6*index+2]+1; + tetra_node_ids[7]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[6*index+3]+1; + tetra_node_ids[8]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[6*index+4]+1; + tetra_node_ids[9]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[6*index+5]+1; + break; + case MINIEnum: case MINIcondensedEnum: + numnodes = 9; + tetra_node_ids = xNew(numnodes); + tetra_node_ids[0]=iomodel->nodecounter+iomodel->elements[4*index+0]; + tetra_node_ids[1]=iomodel->nodecounter+iomodel->elements[4*index+1]; + tetra_node_ids[2]=iomodel->nodecounter+iomodel->elements[4*index+2]; + tetra_node_ids[3]=iomodel->nodecounter+iomodel->elements[4*index+3]; + tetra_node_ids[4]=iomodel->nodecounter+iomodel->numberofvertices+index+1; + + tetra_node_ids[5]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofelements+iomodel->elements[4*index+0]; + tetra_node_ids[6]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofelements+iomodel->elements[4*index+1]; + tetra_node_ids[7]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofelements+iomodel->elements[4*index+2]; + tetra_node_ids[8]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofelements+iomodel->elements[4*index+3]; + break; + case TaylorHoodEnum: + numnodes = 14; + tetra_node_ids = xNew(numnodes); + tetra_node_ids[0]=iomodel->nodecounter+iomodel->elements[4*index+0]; + tetra_node_ids[1]=iomodel->nodecounter+iomodel->elements[4*index+1]; + tetra_node_ids[2]=iomodel->nodecounter+iomodel->elements[4*index+2]; + tetra_node_ids[3]=iomodel->nodecounter+iomodel->elements[4*index+3]; + tetra_node_ids[4]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[6*index+0]+1; + tetra_node_ids[5]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[6*index+1]+1; + tetra_node_ids[6]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[6*index+2]+1; + tetra_node_ids[7]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[6*index+3]+1; + tetra_node_ids[8]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[6*index+4]+1; + tetra_node_ids[9]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[6*index+5]+1; + + tetra_node_ids[10]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->elements[4*index+0]; + tetra_node_ids[11]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->elements[4*index+1]; + tetra_node_ids[12]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->elements[4*index+2]; + tetra_node_ids[13]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->elements[4*index+3]; + break; + default: + _error_("Finite element "<SetHookNodes(tetra_node_ids,numnodes,analysis_counter); this->nodes=NULL; + xDelete(tetra_node_ids); + + /*Fill with IoModel*/ + this->InputUpdateFromIoModel(index,iomodel); +} +/*}}}*/ +/*FUNCTION Tetra::VelocityInterpolation{{{*/ +int Tetra::VelocityInterpolation(void){ + return TetraRef::VelocityInterpolation(); +} +/*}}}*/ +/*FUNCTION Tetra::PressureInterpolation{{{*/ +int Tetra::PressureInterpolation(void){ + return TetraRef::PressureInterpolation(); +} +/*}}}*/ +/*FUNCTION Tetra::ZeroLevelsetCoordinates{{{*/ +void Tetra::ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum){ + /*Compute portion of the element that is grounded*/ + + IssmDouble levelset[NUMVERTICES]; + IssmDouble* xyz_zero = xNew(3*3); + + /*Recover parameters and values*/ + GetInputListOnVertices(&levelset[0],levelsetenum); + + if(levelset[0]==0. && levelset[1]==0. && levelset[2]==0.){ + xyz_zero[3*0+0]=xyz_list[0*3+0]; + xyz_zero[3*0+1]=xyz_list[0*3+1]; + xyz_zero[3*0+2]=xyz_list[0*3+2]; + + /*New point 2*/ + xyz_zero[3*1+0]=xyz_list[1*3+0]; + xyz_zero[3*1+1]=xyz_list[1*3+1]; + xyz_zero[3*1+2]=xyz_list[1*3+2]; + + /*New point 3*/ + xyz_zero[3*2+0]=xyz_list[2*3+0]; + xyz_zero[3*2+1]=xyz_list[2*3+1]; + xyz_zero[3*2+2]=xyz_list[2*3+2]; + } + else if(levelset[0]==0. && levelset[1]==0. && levelset[3]==0.){ + xyz_zero[3*0+0]=xyz_list[0*3+0]; + xyz_zero[3*0+1]=xyz_list[0*3+1]; + xyz_zero[3*0+2]=xyz_list[0*3+2]; + + /*New point 2*/ + xyz_zero[3*1+0]=xyz_list[1*3+0]; + xyz_zero[3*1+1]=xyz_list[1*3+1]; + xyz_zero[3*1+2]=xyz_list[1*3+2]; + + /*New point 3*/ + xyz_zero[3*2+0]=xyz_list[3*3+0]; + xyz_zero[3*2+1]=xyz_list[3*3+1]; + xyz_zero[3*2+2]=xyz_list[3*3+2]; + } + else if(levelset[1]==0. && levelset[2]==0. && levelset[3]==0.){ + xyz_zero[3*0+0]=xyz_list[1*3+0]; + xyz_zero[3*0+1]=xyz_list[1*3+1]; + xyz_zero[3*0+2]=xyz_list[1*3+2]; + + /*New point 2*/ + xyz_zero[3*1+0]=xyz_list[2*3+0]; + xyz_zero[3*1+1]=xyz_list[2*3+1]; + xyz_zero[3*1+2]=xyz_list[2*3+2]; + + /*New point 3*/ + xyz_zero[3*2+0]=xyz_list[3*3+0]; + xyz_zero[3*2+1]=xyz_list[3*3+1]; + xyz_zero[3*2+2]=xyz_list[3*3+2]; + } + else if(levelset[2]==0. && levelset[0]==0. && levelset[3]==0.){ + xyz_zero[3*0+0]=xyz_list[2*3+0]; + xyz_zero[3*0+1]=xyz_list[2*3+1]; + xyz_zero[3*0+2]=xyz_list[2*3+2]; + + /*New point 2*/ + xyz_zero[3*1+0]=xyz_list[0*3+0]; + xyz_zero[3*1+1]=xyz_list[0*3+1]; + xyz_zero[3*1+2]=xyz_list[0*3+2]; + + /*New point 3*/ + xyz_zero[3*2+0]=xyz_list[3*3+0]; + xyz_zero[3*2+1]=xyz_list[3*3+1]; + xyz_zero[3*2+2]=xyz_list[3*3+2]; + } + else _error_("Case not covered"); + + /*Assign output pointer*/ + *pxyz_zero= xyz_zero; +} +/*}}}*/ Index: /issm/trunk/src/c/classes/Elements/Tetra.h =================================================================== --- /issm/trunk/src/c/classes/Elements/Tetra.h (revision 17806) +++ /issm/trunk/src/c/classes/Elements/Tetra.h (revision 17806) @@ -0,0 +1,216 @@ +/*! \file Tetra.h + * \brief: header file for seg object + */ + +#ifndef _TETRA_H_ +#define _TETRA_H_ + +/*Headers:*/ +/*{{{*/ +#include "./Element.h" +#include "./ElementHook.h" +#include "./TetraRef.h" +class Parameters; +class Inputs; +class IoModel; +class Results; +class Node; +class Material; +class Matpar; +class ElementMatrix; +class ElementVector; +class Vertex; + +#include "../../shared/Exceptions/exceptions.h" +#include "../../shared/Enum/Enum.h" +/*}}}*/ + +class Tetra: public Element,public ElementHook,public TetraRef{ + + public: + + /*Tetra constructors, destructors {{{*/ + Tetra(){}; + Tetra(int seg_id,int seg_sid,int i, IoModel* iomodel,int nummodels); + ~Tetra(); + /*}}}*/ + /*Object virtual functions definitions:{{{ */ + int ObjectEnum(); + Object *copy(); + /*}}}*/ + /*Update virtual functions resolution: {{{*/ + void InputUpdateFromSolutionOneDofCollapsed(IssmDouble* solution,int inputenum){_error_("not implemented yet");}; + void InputUpdateFromSolutionOneDof(IssmDouble* solution,int inputenum); + void InputUpdateFromVector(IssmDouble* vector, int name, int type){_error_("not implemented yet");}; +#ifdef _HAVE_DAKOTA_ + void InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){_error_("not implemented yet");}; + void InputUpdateFromMatrixDakota(IssmDouble* matrix, int nows, int ncols, int name, int type){_error_("not implemented yet");}; +#endif + void InputUpdateFromIoModel(int index, IoModel* iomodel); + /*}}}*/ + /*Element virtual functions definitions: {{{*/ + void AddBasalInput(int input_enum, IssmDouble* values, int interpolation_enum){_error_("not implemented yet");}; + void AddInput(int input_enum, IssmDouble* values, int interpolation_enum); + IssmDouble CharacteristicLength(void){_error_("not implemented yet");}; + void ComputeBasalStress(Vector* sigma_b){_error_("not implemented yet");}; + void ComputeSigmaNN(){_error_("not implemented yet");}; + void ComputeStrainRate(Vector* eps){_error_("not implemented yet");}; + void ComputeStressTensor(){_error_("not implemented yet");}; + void ComputeDeviatoricStressTensor(){_error_("not implemented yet");}; + void Configure(Elements* elements,Loads* loads,Nodes* nodesin,Vertices* verticesin,Materials* materials,Parameters* parameters); + void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Materials* materials,Parameters* parameters); + void Delta18oParameterization(void){_error_("not implemented yet");}; + void ElementSizes(IssmDouble* hx,IssmDouble* hy,IssmDouble* hz){_error_("not implemented yet");}; + void FaceOnFrontIndices(int* pindex1,int* pindex2,int* pindex3); + void FaceOnBaseIndices(int* pindex1,int* pindex2,int* pindex3); + void FaceOnSurfaceIndices(int* pindex1,int* pindex2,int* pindex3); + void FSContactMigration(Vector* vertexgrounded,Vector* vertexfloating){_error_("not implemented yet");}; + int FiniteElement(void); + Element* GetUpperElement(void){_error_("not implemented yet");}; + Element* GetLowerElement(void){_error_("not implemented yet");}; + Element* GetSurfaceElement(void){_error_("not implemented yet");}; + Element* GetBasalElement(void){_error_("not implemented yet");}; + int GetNodeIndex(Node* node){_error_("not implemented yet");}; + int GetNumberOfNodes(void); + int GetNumberOfVertices(void); + void GetVerticesCoordinatesBase(IssmDouble** pxyz_list); + void GetVerticesCoordinatesTop(IssmDouble** pxyz_list); + bool HasFaceOnBase(); + bool HasFaceOnSurface(); + bool IsOnBase(); + bool IsOnSurface(); + bool IsNodeOnShelfFromFlags(IssmDouble* flags){_error_("not implemented yet");}; + void JacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss); + void JacobianDeterminantLine(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss){_error_("not implemented yet");}; + void JacobianDeterminantSurface(IssmDouble* pJdet, IssmDouble* xyz_list,Gauss* gauss); + void JacobianDeterminantBase(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss); + void JacobianDeterminantTop(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss); + IssmDouble MinEdgeLength(IssmDouble* xyz_list){_error_("not implemented yet");}; + void NodalFunctions(IssmDouble* basis,Gauss* gauss); + void NodalFunctionsP1(IssmDouble* basis,Gauss* gauss){_error_("not implemented yet");}; + void NodalFunctionsVelocity(IssmDouble* basis,Gauss* gauss); + void NodalFunctionsPressure(IssmDouble* basis,Gauss* gauss); + void NodalFunctionsTensor(IssmDouble* basis,Gauss* gauss); + void NodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss); + void NodalFunctionsP1Derivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){_error_("not implemented yet");}; + void NodalFunctionsMINIDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){_error_("not implemented yet");}; + void NodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss); + void NormalSection(IssmDouble* normal,IssmDouble* xyz_list); + void NormalTop(IssmDouble* normal,IssmDouble* xyz_list); + void NormalBase(IssmDouble* normal,IssmDouble* xyz_list); + int NumberofNodesVelocity(void); + int NumberofNodesPressure(void); + Element* SpawnBasalElement(void); + Element* SpawnTopElement(void); + Tria* SpawnTria(int index1,int index2,int index3); + IssmDouble StabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa){_error_("not implemented yet");}; + int PressureInterpolation(void); + void ValueP1OnGauss(IssmDouble* pvalue,IssmDouble* values,Gauss* gauss){_error_("not implemented yet");}; + void ValueP1DerivativesOnGauss(IssmDouble* dvalue,IssmDouble* values,IssmDouble* xyz_list,Gauss* gauss){_error_("not implemented yet");}; + int VelocityInterpolation(void); + void GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating){_error_("not implemented yet");}; + IssmDouble GetGroundedPortion(IssmDouble* xyz_list){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,Node* node,int enumtype){_error_("not implemented yet");}; + Node* GetNode(int node_number){_error_("Not implemented");}; + IssmDouble GetXcoord(Gauss* gauss); + IssmDouble GetYcoord(Gauss* gauss); + IssmDouble GetZcoord(Gauss* gauss); + int GetElementType(void); + Gauss* NewGauss(void); + Gauss* NewGauss(int order); + Gauss* NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order){_error_("not implemented yet");}; + Gauss* NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert); + Gauss* NewGauss(int point1,IssmDouble fraction1,IssmDouble fraction2,bool mainlyfloating,int order){_error_("not implemented yet");}; + Gauss* NewGaussBase(int order); + Gauss* NewGaussLine(int vertex1,int vertex2,int order){_error_("not implemented yet");}; + Gauss* NewGaussTop(int order); + int VertexConnectivity(int vertexindex){_error_("not implemented yet");}; + void VerticalSegmentIndices(int** pindices,int* pnumseg){_error_("not implemented yet");}; + void ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){_error_("not implemented yet");}; + bool IsZeroLevelset(int levelset_enum){_error_("not implemented");}; + bool IsIcefront(void); + void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum); + void GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum){_error_("not implemented yet");}; + void GetNormalFromLSF(IssmDouble *pnormal){_error_("not implemented yet");}; + + void GetSolutionFromInputsOneDof(Vector* solution,int enum_type){_error_("not implemented yet");}; + void InputDepthAverageAtBase(int enum_type,int average_enum_type){_error_("not implemented yet");}; + void InputDuplicate(int original_enum,int new_enum){_error_("not implemented yet");}; + void InputScale(int enum_type,IssmDouble scale_factor){_error_("not implemented yet");}; + void MaterialUpdateFromTemperature(void){_error_("not implemented yet");}; + int NodalValue(IssmDouble* pvalue, int index, int natureofdataenum){_error_("not implemented yet");}; + void PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm){_error_("not implemented yet");}; + void ResetFSBasalBoundaryCondition(void); + void ReduceMatrices(ElementMatrix* Ke,ElementVector* pe); + void SetTemporaryElementType(int element_type_in){_error_("not implemented yet");}; + void SmbGradients(){_error_("not implemented yet");}; + IssmDouble SurfaceArea(void){_error_("not implemented yet");}; + void Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finitelement); + IssmDouble TimeAdapt(){_error_("not implemented yet");}; + void UpdateConstraintsExtrudeFromBase(){_error_("not implemented");}; + void UpdateConstraintsExtrudeFromTop(){_error_("not implemented");}; + + void AverageOntoPartition(Vector* partition_contributions,Vector* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part){_error_("not implemented yet");}; + IssmDouble IceVolume(void){_error_("not implemented yet");}; + IssmDouble IceVolumeAboveFloatation(void){_error_("not implemented yet");}; + IssmDouble TotalSmb(void){_error_("not implemented yet");}; + void MinVel(IssmDouble* pminvel){_error_("not implemented yet");}; + void MinVx(IssmDouble* pminvx){_error_("not implemented yet");}; + void MinVy(IssmDouble* pminvy){_error_("not implemented yet");}; + void MinVz(IssmDouble* pminvz){_error_("not implemented yet");}; + IssmDouble MassFlux(IssmDouble* segment){_error_("not implemented yet");}; + IssmDouble MassFlux(IssmDouble x1,IssmDouble y1, IssmDouble x2, IssmDouble y2,int segment_id){_error_("not implemented yet");} + void MaxAbsVx(IssmDouble* pmaxabsvx){_error_("not implemented yet");}; + void MaxAbsVy(IssmDouble* pmaxabsvy){_error_("not implemented yet");}; + void MaxAbsVz(IssmDouble* pmaxabsvz){_error_("not implemented yet");}; + void ElementResponse(IssmDouble* presponse,int response_enum){_error_("not implemented yet");}; + void MaxVel(IssmDouble* pmaxvel){_error_("not implemented yet");}; + void MaxVx(IssmDouble* pmaxvx){_error_("not implemented yet");}; + void MaxVy(IssmDouble* pmaxvy){_error_("not implemented yet");}; + void MaxVz(IssmDouble* pmaxvz){_error_("not implemented yet");}; + IssmDouble Misfit(int modelenum,int observationenum,int weightsenum){_error_("not implemented yet");}; + IssmDouble MisfitArea(int weightsenum){_error_("not implemented yet");}; + +#ifdef _HAVE_GIA_ + void GiaDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x,IssmDouble* y){_error_("not implemented yet");}; +#endif + + IssmDouble DragCoefficientAbsGradient(void){_error_("not implemented yet");}; + void GradientIndexing(int* indexing,int control_index){_error_("not implemented yet");}; + void Gradj(Vector* gradient,int control_type,int control_index){_error_("not implemented yet");}; + void GradjBGradient(Vector* gradient,int control_index){_error_("not implemented yet");}; + void GradjDGradient(Vector* gradient,int control_index){_error_("not implemented yet");}; + void GradjBSSA(Vector* gradient,int control_index){_error_("not implemented yet");}; + void GradjDSSA(Vector* gradient,int control_index){_error_("not implemented yet");}; + void GradjDragSSA(Vector* gradient,int control_index){_error_("not implemented yet");}; + void GradjDragFS(Vector* gradient,int control_index){_error_("not implemented yet");}; + void GradjDragGradient(Vector* gradient,int control_index){_error_("not implemented yet");}; + void GradjDhDtBalancedthickness(Vector* gradient,int control_index){_error_("not implemented yet");}; + void GradjVxBalancedthickness(Vector* gradient,int control_index){_error_("not implemented yet");}; + void GradjVyBalancedthickness(Vector* gradient,int control_index){_error_("not implemented yet");}; + void GradjThicknessBalancethicknessSoft(Vector* gradient,int control_index){_error_("not implemented yet");}; + void GetVectorFromControlInputs(Vector* gradient,int control_enum,int control_index,const char* data){_error_("not implemented yet");}; + void SetControlInputsFromVector(IssmDouble* vector,int control_enum,int control_index){_error_("not implemented yet");}; + void ControlInputGetGradient(Vector* gradient,int enum_type,int control_index){_error_("not implemented yet");}; + void ControlInputScaleGradient(int enum_type,IssmDouble scale){_error_("not implemented yet");}; + void ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index){_error_("not implemented yet");}; + void ControlToVectors(Vector* vector_control, Vector* vector_gradient,int control_enum){_error_("not implemented yet");}; + IssmDouble RheologyBbarAbsGradient(void){_error_("not implemented yet");}; + IssmDouble ThicknessAbsMisfit(void){_error_("not implemented yet");}; + IssmDouble SurfaceAbsVelMisfit(void){_error_("not implemented yet");}; + IssmDouble ThicknessAbsGradient(void){_error_("not implemented yet");}; + IssmDouble ThicknessAlongGradient(void){_error_("not implemented yet");}; + IssmDouble ThicknessAcrossGradient(void){_error_("not implemented yet");}; + IssmDouble BalancethicknessMisfit(void){_error_("not implemented yet");}; + IssmDouble SurfaceRelVelMisfit(void){_error_("not implemented yet");}; + IssmDouble SurfaceLogVelMisfit(void){_error_("not implemented yet");}; + IssmDouble SurfaceLogVxVyMisfit(void){_error_("not implemented yet");}; + IssmDouble SurfaceAverageVelMisfit(void){_error_("not implemented yet");}; + void InputControlUpdate(IssmDouble scalar,bool save_parameter){_error_("not implemented yet");}; + + void PotentialUngrounding(Vector* potential_sheet_ungrounding){_error_("not implemented yet");}; + void MigrateGroundingLine(IssmDouble* sheet_ungrounding){_error_("not implemented yet");}; + int UpdatePotentialUngrounding(IssmDouble* vertices_potentially_ungrounding,Vector* vec_nodes_on_iceshelf,IssmDouble* nodes_on_iceshelf){_error_("not implemented yet");}; + /*}}}*/ +}; +#endif /* _TETRA_H_*/ Index: /issm/trunk/src/c/classes/Elements/TetraRef.cpp =================================================================== --- /issm/trunk/src/c/classes/Elements/TetraRef.cpp (revision 17806) +++ /issm/trunk/src/c/classes/Elements/TetraRef.cpp (revision 17806) @@ -0,0 +1,632 @@ +/*!\file TetraRef.c + * \brief: implementation of the TetraRef object + */ + +/*Headers:*/ +/*{{{*/ +#ifdef HAVE_CONFIG_H +#include +#else +#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" +#endif + +#include "../classes.h" +#include "../../shared/shared.h" +/*}}}*/ + +/*Element macros*/ +#define NUMNODESP0 1 +#define NUMNODESP1 4 +#define NUMNODESP1b 5 +#define NUMNODESP2 10 + +/*Object constructors and destructor*/ +/*FUNCTION TetraRef::TetraRef(){{{*/ +TetraRef::TetraRef(){ + this->element_type_list=NULL; +} +/*}}}*/ +/*FUNCTION TetraRef::TetraRef(int* types,int nummodels){{{*/ +TetraRef::TetraRef(const int nummodels){ + + /*Only allocate pointer*/ + element_type_list=xNew(nummodels); + +} +/*}}}*/ +/*FUNCTION TetraRef::~TetraRef(){{{*/ +TetraRef::~TetraRef(){ + xDelete(element_type_list); +} +/*}}}*/ + +/*Management*/ +/*FUNCTION TetraRef::SetElementType{{{*/ +void TetraRef::SetElementType(int type,int type_counter){ + + /*initialize element type*/ + this->element_type_list[type_counter]=type; +} +/*}}}*/ + +/*Reference Element numerics*/ +/*FUNCTION TetraRef::GetNodalFunctions(IssmDouble* basis,GaussTetra* gauss){{{*/ +void TetraRef::GetNodalFunctions(IssmDouble* basis,GaussTetra* gauss){ + /*This routine returns the values of the nodal functions at the gaussian point.*/ + _assert_(basis); + GetNodalFunctions(basis,gauss,this->element_type); +} +/*}}}*/ +/*FUNCTION TetraRef::GetNodalFunctions(IssmDouble* basis,GaussTetra* gauss,int finiteelement){{{*/ +void TetraRef::GetNodalFunctions(IssmDouble* basis,GaussTetra* gauss,int finiteelement){ + /*This routine returns the values of the nodal functions at the gaussian point.*/ + + _assert_(basis); + + switch(finiteelement){ + case P0Enum: + basis[0]=1.; + return; + case P1Enum: case P1DGEnum: + basis[0]=gauss->coord1; + basis[1]=gauss->coord2; + basis[2]=gauss->coord3; + basis[3]=gauss->coord4; + return; + case P1bubbleEnum: case P1bubblecondensedEnum: + /*Corner nodes*/ + basis[0]=gauss->coord1; + basis[1]=gauss->coord2; + basis[2]=gauss->coord3; + basis[3]=gauss->coord4; + /*bubble*/ + basis[4]=256.*gauss->coord1*gauss->coord2*gauss->coord3*gauss->coord4; + return; + case P2Enum: + /*Vertices*/ + basis[0]=gauss->coord1*(2.*gauss->coord1-1.); + basis[1]=gauss->coord2*(2.*gauss->coord2-1.); + basis[2]=gauss->coord3*(2.*gauss->coord3-1.); + basis[3]=gauss->coord4*(2.*gauss->coord4-1.); + /*Edges*/ + basis[4]=4.*gauss->coord2*gauss->coord3; + basis[5]=4.*gauss->coord1*gauss->coord3; + basis[6]=4.*gauss->coord1*gauss->coord2; + basis[7]=4.*gauss->coord2*gauss->coord4; + basis[8]=4.*gauss->coord3*gauss->coord4; + basis[9]=4.*gauss->coord1*gauss->coord4; + return; + default: + _error_("Element type "<element_type){ + case P1P1Enum: + this->element_type = P1Enum; + this->GetNodalFunctions(basis,gauss); + this->element_type = P1P1Enum; + return; + case P1P1GLSEnum: + this->element_type = P1Enum; + this->GetNodalFunctions(basis,gauss); + this->element_type = P1P1GLSEnum; + return; + case MINIcondensedEnum: + this->element_type = P1bubbleEnum; + this->GetNodalFunctions(basis,gauss); + this->element_type = MINIcondensedEnum; + return; + case MINIEnum: + this->element_type = P1bubbleEnum; + this->GetNodalFunctions(basis,gauss); + this->element_type = MINIEnum; + return; + case TaylorHoodEnum: + this->element_type = P2Enum; + this->GetNodalFunctions(basis,gauss); + this->element_type = TaylorHoodEnum; + return; + default: + _error_("Element type "<element_type)<<" not supported yet"); + } +} +/*}}}*/ +/*FUNCTION TetraRef::GetNodalFunctionsPressure{{{*/ +void TetraRef::GetNodalFunctionsPressure(IssmDouble* basis,GaussTetra* gauss){ + /*This routine returns the values of the nodal functions at the gaussian point.*/ + + switch(this->element_type){ + case P1P1Enum: + this->element_type = P1Enum; + this->GetNodalFunctions(basis,gauss); + this->element_type = P1P1Enum; + return; + case P1P1GLSEnum: + this->element_type = P1Enum; + this->GetNodalFunctions(basis,gauss); + this->element_type = P1P1GLSEnum; + return; + case MINIcondensedEnum: + this->element_type = P1Enum; + this->GetNodalFunctions(basis,gauss); + this->element_type = MINIcondensedEnum; + return; + case MINIEnum: + this->element_type = P1Enum; + this->GetNodalFunctions(basis,gauss); + this->element_type = MINIEnum; + return; + case TaylorHoodEnum: + this->element_type = P1Enum; + this->GetNodalFunctions(basis,gauss); + this->element_type = TaylorHoodEnum; + return; + default: + _error_("Element type "<element_type)<<" not supported yet"); + } +} +/*}}}*/ +/*FUNCTION TetraRef::GetNodalFunctionsTensor{{{*/ +void TetraRef::GetNodalFunctionsTensor(IssmDouble* basis,GaussTetra* gauss){ + /*This routine returns the values of the nodal functions at the gaussian point.*/ + + switch(this->element_type){ + case XTaylorHoodEnum: + this->element_type = P1DGEnum; + this->GetNodalFunctions(basis,gauss); + this->element_type = XTaylorHoodEnum; + return; + default: + _error_("Element type "<element_type)<<" not supported yet"); + } +} +/*}}}*/ +/*FUNCTION TetraRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTetra* gauss){{{*/ +void TetraRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTetra* gauss){ + GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss,this->element_type); +} +/*}}}*/ +/*FUNCTION TetraRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTetra* gauss,int finiteelement){{{*/ +void TetraRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTetra* gauss,int finiteelement){ + + /*This routine returns the values of the nodal functions derivatives (with respect to the + * actual coordinate system): */ + IssmDouble Jinv[3][3]; + + /*Fetch number of nodes for this finite element*/ + int numnodes = this->NumberofNodes(finiteelement); + + /*Get nodal functions derivatives in reference triangle*/ + IssmDouble* dbasis_ref=xNew(3*numnodes); + GetNodalFunctionsDerivativesReference(dbasis_ref,gauss,finiteelement); + + /*Get Jacobian invert: */ + GetJacobianInvert(&Jinv[0][0], xyz_list, gauss); + + /*Build dbasis: + * + * [dhi/dx]= Jinv'*[dhi/dr] + * [dhi/dy] [dhi/ds] + * [dhi/dz] [dhi/dzeta] + */ + + for(int i=0;i(dbasis_ref); +} +/*}}}*/ +/*FUNCTION TetraRef::GetNodalFunctionsDerivativesPressure (THIS ONE and following ones){{{*/ +void TetraRef::GetNodalFunctionsDerivativesPressure(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTetra* gauss){ + switch(this->element_type){ + case P1P1Enum: + this->element_type = P1Enum; + this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); + this->element_type = P1P1Enum; + return; + case P1P1GLSEnum: + this->element_type = P1Enum; + this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); + this->element_type = P1P1GLSEnum; + return; + case MINIcondensedEnum: + this->element_type = P1Enum; + this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); + this->element_type = MINIcondensedEnum; + return; + case MINIEnum: + this->element_type = P1Enum; + this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); + this->element_type = MINIEnum; + return; + case TaylorHoodEnum: + this->element_type = P1Enum; + this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); + this->element_type = TaylorHoodEnum; + return; + default: + _error_("Element type "<element_type)<<" not supported yet"); + } +} +/*}}}*/ +/*FUNCTION TetraRef::GetNodalFunctionsDerivativesVelocity{{{*/ +void TetraRef::GetNodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTetra* gauss){ + switch(this->element_type){ + case P1P1Enum: + this->element_type = P1Enum; + this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); + this->element_type = P1P1Enum; + return; + case P1P1GLSEnum: + this->element_type = P1Enum; + this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); + this->element_type = P1P1GLSEnum; + return; + case MINIcondensedEnum: + this->element_type = P1bubbleEnum; + this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); + this->element_type = MINIcondensedEnum; + return; + case MINIEnum: + this->element_type = P1bubbleEnum; + this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); + this->element_type = MINIEnum; + return; + case TaylorHoodEnum: + this->element_type = P2Enum; + this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); + this->element_type = TaylorHoodEnum; + return; + default: + _error_("Element type "<element_type)<<" not supported yet"); + } +} +/*}}}*/ +/*FUNCTION TetraRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussTetra* gauss){{{*/ +void TetraRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussTetra* gauss){ + /*This routine returns the values of the nodal functions derivatives (with respect to the + * natural coordinate system) at the gaussian point. */ + + GetNodalFunctionsDerivativesReference(dbasis,gauss,this->element_type); + +} +/*}}}*/ +/*FUNCTION TetraRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussTetra* gauss,int finiteelement){{{*/ +void TetraRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussTetra* gauss,int finiteelement){ + /*This routine returns the values of the nodal functions derivatives (with respect to the + * natural coordinate system) at the gaussian point. */ + + _assert_(dbasis && gauss); + + switch(finiteelement){ + case P0Enum: + /*Nodal function 1*/ + dbasis[NUMNODESP0*0+0] = 0.; + dbasis[NUMNODESP0*1+0] = 0.; + dbasis[NUMNODESP0*2+0] = 0.; + return; + case P1Enum: case P1DGEnum: + dbasis[NUMNODESP1*0+0] = -1.; + dbasis[NUMNODESP1*1+0] = -1.; + dbasis[NUMNODESP1*2+0] = -1.; + + dbasis[NUMNODESP1*0+1] = 1.; + dbasis[NUMNODESP1*1+1] = 0.; + dbasis[NUMNODESP1*2+1] = 0.; + + dbasis[NUMNODESP1*0+2] = 0.; + dbasis[NUMNODESP1*1+2] = 1.; + dbasis[NUMNODESP1*2+2] = 0.; + + dbasis[NUMNODESP1*0+3] = 0.; + dbasis[NUMNODESP1*1+3] = 0.; + dbasis[NUMNODESP1*2+3] = 1.; + return; + case P1bubbleEnum: case P1bubblecondensedEnum: + dbasis[NUMNODESP1b*0+0] = -1.; + dbasis[NUMNODESP1b*1+0] = -1.; + dbasis[NUMNODESP1b*2+0] = -1.; + + dbasis[NUMNODESP1b*0+1] = 1.; + dbasis[NUMNODESP1b*1+1] = 0.; + dbasis[NUMNODESP1b*2+1] = 0.; + + dbasis[NUMNODESP1b*0+2] = 0.; + dbasis[NUMNODESP1b*1+2] = 1.; + dbasis[NUMNODESP1b*2+2] = 0.; + + dbasis[NUMNODESP1b*0+3] = 0.; + dbasis[NUMNODESP1b*1+3] = 0.; + dbasis[NUMNODESP1b*2+3] = 1.; + + dbasis[NUMNODESP1b*0+4] = 256.*(-gauss->coord2*gauss->coord3*gauss->coord4+gauss->coord1*gauss->coord3*gauss->coord4); + dbasis[NUMNODESP1b*1+4] = 256.*(-gauss->coord2*gauss->coord3*gauss->coord4+gauss->coord1*gauss->coord2*gauss->coord4); + dbasis[NUMNODESP1b*2+4] = 256.*(-gauss->coord2*gauss->coord3*gauss->coord4+gauss->coord1*gauss->coord2*gauss->coord3); + return; + case P2Enum: + dbasis[NUMNODESP2*0+0] = -4.*gauss->coord1+1.; + dbasis[NUMNODESP2*1+0] = -4.*gauss->coord1+1.; + dbasis[NUMNODESP2*2+0] = -4.*gauss->coord1+1.; + + dbasis[NUMNODESP2*0+1] = 4.*gauss->coord2-1.; + dbasis[NUMNODESP2*1+1] = 0.; + dbasis[NUMNODESP2*2+1] = 0.; + + dbasis[NUMNODESP2*0+2] = 0.; + dbasis[NUMNODESP2*1+2] = 4.*gauss->coord3-1.; + dbasis[NUMNODESP2*2+2] = 0.; + + dbasis[NUMNODESP2*0+3] = 0.; + dbasis[NUMNODESP2*1+3] = 0.; + dbasis[NUMNODESP2*2+3] = 4.*gauss->coord4-1.; + + dbasis[NUMNODESP2*0+4] = 4.*gauss->coord3; + dbasis[NUMNODESP2*1+4] = 4.*gauss->coord2; + dbasis[NUMNODESP2*2+4] = 0.; + + dbasis[NUMNODESP2*0+5] = -4.*gauss->coord3; + dbasis[NUMNODESP2*1+5] = 4.*(gauss->coord1-gauss->coord3); + dbasis[NUMNODESP2*2+5] = -4.*gauss->coord3; + + dbasis[NUMNODESP2*0+6] = 4.*(gauss->coord1-gauss->coord2); + dbasis[NUMNODESP2*1+6] = -4.*gauss->coord2; + dbasis[NUMNODESP2*2+6] = -4.*gauss->coord2; + + dbasis[NUMNODESP2*0+7] = 4.*gauss->coord4; + dbasis[NUMNODESP2*1+7] = 0.; + dbasis[NUMNODESP2*2+7] = 4.*gauss->coord2; + + dbasis[NUMNODESP2*0+8] = 0.; + dbasis[NUMNODESP2*1+8] = 4.*gauss->coord4; + dbasis[NUMNODESP2*2+8] = 4.*gauss->coord3; + + dbasis[NUMNODESP2*0+9] = -4.*gauss->coord4; + dbasis[NUMNODESP2*1+9] = -4.*gauss->coord4; + dbasis[NUMNODESP2*2+9] = 4.*(gauss->coord1-gauss->coord4); + return; + default: + _error_("Element type "<element_type)<<" not supported yet"); + } + +} +/*}}}*/ +/*FUNCTION TetraRef::GetInputDerivativeValue{{{*/ +void TetraRef::GetInputDerivativeValue(IssmDouble* p, IssmDouble* plist,IssmDouble* xyz_list, GaussTetra* gauss){ + /*From node values of parameter p (p_list[0], p_list[1], p_list[2], + * p_list[3], p_list[4] and p_list[4]), return parameter derivative value at + * gaussian point specified by gauss_coord: + * dp/dx=p_list[0]*dh1/dx+p_list[1]*dh2/dx+p_list[2]*dh3/dx+p_list[3]*dh4/dx+p_list[4]*dh5/dx+p_list[5]*dh6/dx; + * dp/dy=p_list[0]*dh1/dy+p_list[1]*dh2/dy+p_list[2]*dh3/dy+p_list[3]*dh4/dy+p_list[4]*dh5/dy+p_list[5]*dh6/dy; + * dp/dz=p_list[0]*dh1/dz+p_list[1]*dh2/dz+p_list[2]*dh3/dz+p_list[3]*dh4/dz+p_list[4]*dh5/dz+p_list[5]*dh6/dz; + * + * p is a vector of size 3x1 already allocated. + */ + + /*Output*/ + IssmDouble dpx=0.; + IssmDouble dpy=0.; + IssmDouble dpz=0.; + + /*Fetch number of nodes for this finite element*/ + int numnodes = this->NumberofNodes(); + + /*Get nodal functions derivatives*/ + IssmDouble* dbasis=xNew(3*numnodes); + GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); + + /*Calculate parameter for this Gauss point*/ + for(int i=0;i(dbasis); + p[0]=dpx; + p[1]=dpy; + p[2]=dpz; +} +/*}}}*/ +/*FUNCTION TetraRef::GetInputValue(IssmDouble* p, IssmDouble* plist, GaussTetra* gauss){{{*/ +void TetraRef::GetInputValue(IssmDouble* p, IssmDouble* plist, GaussTetra* gauss){ + + GetInputValue(p,plist,gauss,this->element_type); +} +/*}}}*/ +/*FUNCTION TetraRef::GetInputValue(IssmDouble* p, IssmDouble* plist, GaussTetra* gauss,int finiteelement){{{*/ +void TetraRef::GetInputValue(IssmDouble* p, IssmDouble* plist, GaussTetra* gauss,int finiteelement){ + + /*Output*/ + IssmDouble value =0.; + + /*Fetch number of nodes for this finite element*/ + int numnodes = this->NumberofNodes(finiteelement); + + /*Get nodal functions*/ + IssmDouble* basis=xNew(numnodes); + GetNodalFunctions(basis, gauss,finiteelement); + + /*Calculate parameter for this Gauss point*/ + for(int i=0;i(basis); + *p = value; +} +/*}}}*/ +/*FUNCTION TetraRef::GetJacobian{{{*/ +void TetraRef::GetJacobian(IssmDouble* J, IssmDouble* xyz_list,GaussTetra* gauss){ + /*The Jacobian is constant over the element, discard the gaussian points. + * J is assumed to have been allocated of size 1*/ + + IssmDouble x1=xyz_list[3*0+0]; + IssmDouble x2=xyz_list[3*1+0]; + IssmDouble x3=xyz_list[3*2+0]; + IssmDouble x4=xyz_list[3*3+0]; + + IssmDouble y1=xyz_list[3*0+1]; + IssmDouble y2=xyz_list[3*1+1]; + IssmDouble y3=xyz_list[3*2+1]; + IssmDouble y4=xyz_list[3*3+1]; + + IssmDouble z1=xyz_list[3*0+2]; + IssmDouble z2=xyz_list[3*1+2]; + IssmDouble z3=xyz_list[3*2+2]; + IssmDouble z4=xyz_list[3*3+2]; + + J[NDOF3*0+0] = x2-x1; + J[NDOF3*0+1] = y2-y1; + J[NDOF3*0+2] = z2-z1; + + J[NDOF3*1+0] = x3-x1; + J[NDOF3*1+1] = y3-y1; + J[NDOF3*1+2] = z3-z1; + + J[NDOF3*2+0] = x4-x1; + J[NDOF3*2+1] = y4-y1; + J[NDOF3*2+2] = z4-z1; +} +/*}}}*/ +/*FUNCTION TetraRef::GetJacobianDeterminant{{{*/ +void TetraRef::GetJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,GaussTetra* gauss){ + /*The Jacobian determinant is constant over the element, discard the gaussian points. + * J is assumed to have been allocated of size NDOF2xNDOF2.*/ + IssmDouble J[3][3]; + + /*Call Jacobian routine to get the jacobian:*/ + GetJacobian(&J[0][0],xyz_list, gauss); + + /*Get Determinant*/ + Matrix3x3Determinant(Jdet,&J[0][0]); + if(*Jdet<0) _error_("negative jacobian determinant!"); + +} +/*}}}*/ +/*FUNCTION TetraRef::GetJacobianDeterminantFace{{{*/ +void TetraRef::GetJacobianDeterminantFace(IssmDouble* Jdet, IssmDouble* xyz_list,GaussTetra* gauss){ + /*The Jacobian determinant is constant over the element, discard the gaussian points. + * J is assumed to have been allocated of size NDOF2xNDOF2.*/ + + IssmDouble x1=xyz_list[3*0+0]; + IssmDouble y1=xyz_list[3*0+1]; + IssmDouble z1=xyz_list[3*0+2]; + IssmDouble x2=xyz_list[3*1+0]; + IssmDouble y2=xyz_list[3*1+1]; + IssmDouble z2=xyz_list[3*1+2]; + IssmDouble x3=xyz_list[3*2+0]; + IssmDouble y3=xyz_list[3*2+1]; + IssmDouble z3=xyz_list[3*2+2]; + + /*Jdet = norm( AB ^ AC ) / (2 * area of the reference triangle), with areaRef=sqrt(3) */ + *Jdet=SQRT3/6.*pow(pow(((y2-y1)*(z3-z1)-(z2-z1)*(y3-y1)),2)+pow(((z2-z1)*(x3-x1)-(x2-x1)*(z3-z1)),2)+pow(((x2-x1)*(y3-y1)-(y2-y1)*(x3-x1)),2),0.5); + if(*Jdet<0) _error_("negative jacobian determinant!"); +} +/*}}}*/ +/*FUNCTION TetraRef::GetJacobianInvert {{{*/ +void TetraRef::GetJacobianInvert(IssmDouble* Jinv, IssmDouble* xyz_list,GaussTetra* gauss){ + + /*Jacobian*/ + IssmDouble J[3][3]; + + /*Call Jacobian routine to get the jacobian:*/ + GetJacobian(&J[0][0], xyz_list, gauss); + + /*Invert Jacobian matrix: */ + Matrix3x3Invert(Jinv,&J[0][0]); +} +/*}}}*/ +/*FUNCTION TetraRef::NumberofNodes(){{{*/ +int TetraRef::NumberofNodes(void){ + + return this->NumberofNodes(this->element_type); +} +/*}}}*/ +/*FUNCTION TetraRef::NumberofNodes(int finiteelement){{{*/ +int TetraRef::NumberofNodes(int finiteelement){ + + switch(finiteelement){ + case P0Enum: return NUMNODESP0; + case P1Enum: return NUMNODESP1; + case P1DGEnum: return NUMNODESP1; + case P1bubbleEnum: return NUMNODESP1b; + case P1bubblecondensedEnum: return NUMNODESP1b; + case P2Enum: return NUMNODESP2; + case P1P1Enum: return NUMNODESP1*2; + case P1P1GLSEnum: return NUMNODESP1*2; + case MINIcondensedEnum: return NUMNODESP1b+NUMNODESP1; + case MINIEnum: return NUMNODESP1b+NUMNODESP1; + case TaylorHoodEnum: return NUMNODESP2+NUMNODESP1; + default: _error_("Element type "<element_type)<<" not supported yet"); + } + + return -1; +} +/*}}}*/ +/*FUNCTION TetraRef::NumberofNodesPressure{{{*/ +int TetraRef::NumberofNodesPressure(void){ + + switch(this->element_type){ + case P1P1Enum: return NUMNODESP1; + case P1P1GLSEnum: return NUMNODESP1; + case MINIcondensedEnum: return NUMNODESP1; + case MINIEnum: return NUMNODESP1; + case TaylorHoodEnum: return NUMNODESP1; + default: _error_("Element type "<element_type)<<" not supported yet"); + } + + return -1; +} +/*}}}*/ +/*FUNCTION TetraRef::NumberofNodesVelocity{{{*/ +int TetraRef::NumberofNodesVelocity(void){ + + switch(this->element_type){ + case P1P1Enum: return NUMNODESP1; + case P1P1GLSEnum: return NUMNODESP1; + case MINIcondensedEnum: return NUMNODESP1b; + case MINIEnum: return NUMNODESP1b; + case TaylorHoodEnum: return NUMNODESP2; + default: _error_("Element type "<element_type)<<" not supported yet"); + } + + return -1; +} +/*}}}*/ +/*FUNCTION TetraRef::VelocityInterpolation{{{*/ +int TetraRef::VelocityInterpolation(void){ + + switch(this->element_type){ + case P1P1Enum: return P1Enum; + case P1P1GLSEnum: return P1Enum; + case MINIcondensedEnum: return P1bubbleEnum; + case MINIEnum: return P1bubbleEnum; + case TaylorHoodEnum: return P2Enum; + default: _error_("Element type "<element_type)<<" not supported yet"); + } + + return -1; +} +/*}}}*/ +/*FUNCTION TetraRef::PressureInterpolation{{{*/ +int TetraRef::PressureInterpolation(void){ + + switch(this->element_type){ + case P1P1Enum: return P1Enum; + case P1P1GLSEnum: return P1Enum; + case MINIcondensedEnum: return P1Enum; + case MINIEnum: return P1Enum; + case TaylorHoodEnum: return P1Enum; + default: _error_("Element type "<element_type)<<" not supported yet"); + } + + return -1; +} +/*}}}*/ Index: /issm/trunk/src/c/classes/Elements/TetraRef.h =================================================================== --- /issm/trunk/src/c/classes/Elements/TetraRef.h (revision 17806) +++ /issm/trunk/src/c/classes/Elements/TetraRef.h (revision 17806) @@ -0,0 +1,51 @@ + +/*!\file: TetraRef.h + * \brief abstract class for handling Tetra oriented routines, like nodal functions, + * strain rate generation, etc ... + */ + +#ifndef _TETRAREF_H_ +#define _TETRAREF_H_ + +class GaussTetra; + +class TetraRef{ + + public: + int* element_type_list; + int element_type; + + TetraRef(); + TetraRef(const int nummodels); + ~TetraRef(); + + /*Management*/ + void SetElementType(int type,int type_counter); + void GetBprimeMasstransport(IssmDouble* Bprime, IssmDouble* xyz_list, GaussTetra* gauss); + void GetJacobian(IssmDouble* J, IssmDouble* xyz_list,GaussTetra* gauss); + void GetJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,GaussTetra* gauss); + void GetJacobianDeterminantFace(IssmDouble* Jdet, IssmDouble* xyz_list,GaussTetra* gauss); + void GetJacobianInvert(IssmDouble* Jinv, IssmDouble* xyz_list,GaussTetra* gauss); + void GetNodalFunctions(IssmDouble* basis,GaussTetra* gauss); + void GetNodalFunctions(IssmDouble* basis,GaussTetra* gauss,int finiteelement); + void GetNodalFunctionsVelocity(IssmDouble* basis, GaussTetra* gauss); + void GetNodalFunctionsPressure(IssmDouble* basis, GaussTetra* gauss); + void GetNodalFunctionsTensor(IssmDouble* basis, GaussTetra* gauss); + void GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTetra* gauss); + void GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTetra* gauss,int finiteelement); + void GetNodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,GaussTetra* gauss); + void GetNodalFunctionsDerivativesPressure(IssmDouble* dbasis,IssmDouble* xyz_list,GaussTetra* gauss); + void GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussTetra* gauss); + void GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussTetra* gauss,int finiteelement); + void GetInputDerivativeValue(IssmDouble* p, IssmDouble* plist,IssmDouble* xyz_list, GaussTetra* gauss); + void GetInputValue(IssmDouble* p, IssmDouble* plist, GaussTetra* gauss); + void GetInputValue(IssmDouble* p, IssmDouble* plist, GaussTetra* gauss,int finiteelement); + + int NumberofNodes(void); + int NumberofNodes(int finiteelement); + int NumberofNodesVelocity(void); + int NumberofNodesPressure(void); + int VelocityInterpolation(void); + int PressureInterpolation(void); +}; +#endif Index: /issm/trunk/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk/src/c/classes/Elements/Tria.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Elements/Tria.cpp (revision 17806) @@ -24,18 +24,7 @@ /*Constructors/destructor/copy*/ -/*FUNCTION Tria::Tria(){{{*/ -Tria::Tria(){ - this->nodes = NULL; - this->vertices = NULL; - this->material = NULL; - this->matpar = NULL; - this->inputs = NULL; - this->parameters = NULL; - -} -/*}}}*/ /*FUNCTION Tria::Tria(int id, int sid,int index, IoModel* iomodel,int nummodels){{{*/ Tria::Tria(int tria_id, int tria_sid, int index, IoModel* iomodel,int nummodels) - :TriaRef(nummodels),ElementHook(nummodels,index+1,3,iomodel){ + :TriaRef(nummodels),ElementHook(nummodels,index+1,NUMVERTICES,iomodel){ /*id: */ @@ -54,10 +43,8 @@ this->material = NULL; this->matpar = NULL; - } /*}}}*/ /*FUNCTION Tria::~Tria(){{{*/ Tria::~Tria(){ - delete inputs; this->parameters=NULL; } @@ -108,528 +95,49 @@ /*Other*/ -/*FUNCTION Tria::SetwiseNodeConnectivity{{{*/ -void Tria::SetwiseNodeConnectivity(int* pd_nz,int* po_nz,Node* node,bool* flags,int* flagsindices,int set1_enum,int set2_enum){ - - /*Intermediaries*/ - const int numnodes = this->NumberofNodes(); - - /*Output */ - int d_nz = 0; - int o_nz = 0; - - /*Loop over all nodes*/ - for(int i=0;inodes[i]->Lid()]){ - - /*flag current node so that no other element processes it*/ - flags[this->nodes[i]->Lid()]=true; - - int counter=0; - while(flagsindices[counter]>=0) counter++; - flagsindices[counter]=this->nodes[i]->Lid(); - - /*if node is clone, we have an off-diagonal non-zero, else it is a diagonal non-zero*/ - switch(set2_enum){ - case FsetEnum: - if(nodes[i]->indexing.fsize){ - if(this->nodes[i]->IsClone()) - o_nz += 1; - else - d_nz += 1; - } - break; - case GsetEnum: - if(nodes[i]->indexing.gsize){ - if(this->nodes[i]->IsClone()) - o_nz += 1; - else - d_nz += 1; - } - break; - case SsetEnum: - if(nodes[i]->indexing.ssize){ - if(this->nodes[i]->IsClone()) - o_nz += 1; - else - d_nz += 1; - } - break; - default: _error_("not supported"); +/*FUNCTION Tria::AddBasalInput{{{*/ +void Tria::AddBasalInput(int input_enum,IssmDouble* values, int interpolation_enum){ + + /*Call inputs method*/ + _assert_(this->inputs); + + int domaintype; + parameters->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + this->inputs->AddInput(new TriaInput(input_enum,values,interpolation_enum)); + break; + case Domain2DverticalEnum:{ + if(interpolation_enum==P1Enum){ + IssmDouble values2[NUMVERTICES]={0.}; + int numindices; + int *indices = NULL; + int index = this->EdgeOnBaseIndex(); + NodeOnEdgeIndices(&numindices,&indices,index,this->FiniteElement()); + for(int i=0;iinputs->AddInput(new TriaInput(input_enum,values2,interpolation_enum)); + xDelete(indices); } - } - } - - /*Assign output pointers: */ - *pd_nz=d_nz; - *po_nz=o_nz; -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrix(Matrix* Kff, Matrix* Kfs) {{{*/ -void Tria::CreateKMatrix(Matrix* Kff, Matrix* Kfs){ - - - /*Skip if water element*/ - if(NoIceInElement()) return; - - /*Create element stiffness matrix*/ - ElementMatrix* Ke=CreateKMatrix(); - - if(Ke){ - /*Static condensation if requested*/ - if(this->element_type==P1bubblecondensedEnum){ - int size = nodes[3]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum); - int offset = 0; - for(int i=0;i<3;i++) offset+=nodes[i]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum); - int* indices=xNew(size); - for(int i=0;iStaticCondensation(size,indices); - xDelete(indices); - } - - /*Add to global matrix*/ - Ke->AddToGlobal(Kff,Kfs); - delete Ke; - } -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrix(void) {{{*/ -ElementMatrix* Tria::CreateKMatrix(void){ - - /*retreive parameters: */ - int analysis_type; - int meshtype; - parameters->FindParam(&analysis_type,AnalysisTypeEnum); - - /*Checks in debugging mode{{{*/ - _assert_(this->nodes && this->material && this->matpar && this->parameters && this->inputs); - /*}}}*/ - - /*Skip if water element*/ - if(NoIceInElement()) return NULL; - - /*Just branch to the correct element stiffness matrix generator, according to the type of analysis we are carrying out: */ - switch(analysis_type){ - #ifdef _HAVE_STRESSBALANCE_ - case StressbalanceAnalysisEnum: - int approximation; - inputs->GetInputValue(&approximation,ApproximationEnum); - switch(approximation){ - case SSAApproximationEnum: - return CreateKMatrixStressbalanceSSA(); - case FSApproximationEnum: - return CreateKMatrixStressbalanceFS(); - case SIAApproximationEnum: - return NULL; - case NoneApproximationEnum: - return NULL; - default: - _error_("Approximation " << EnumToStringx(approximation) << " not supported yet"); + else _error_("not implemented yet"); } break; - case StressbalanceSIAAnalysisEnum: - return CreateKMatrixStressbalanceSIA(); - break; - #endif - #ifdef _HAVE_DAMAGE_ - case DamageEvolutionAnalysisEnum: - return CreateKMatrixDamageEvolution(); - break; - #endif - case L2ProjectionBaseAnalysisEnum: - parameters->FindParam(&meshtype,MeshTypeEnum); - if(meshtype==Mesh2DverticalEnum){ - return CreateBasalMassMatrix(); - } - else{ - return CreateMassMatrix(); - } - break; - #ifdef _HAVE_MASSTRANSPORT_ - case MasstransportAnalysisEnum: - return CreateKMatrixMasstransport(); - break; - case FreeSurfaceTopAnalysisEnum: - parameters->FindParam(&meshtype,MeshTypeEnum); - switch(meshtype){ - case Mesh2DverticalEnum: - return CreateKMatrixFreeSurfaceTop1D(); - case Mesh3DEnum: - return CreateKMatrixFreeSurfaceTop(); - default: - _error_("Mesh not supported yet"); - } - break; - case FreeSurfaceBaseAnalysisEnum: - parameters->FindParam(&meshtype,MeshTypeEnum); - switch(meshtype){ - case Mesh2DverticalEnum: - return CreateKMatrixFreeSurfaceBase1D(); - case Mesh3DEnum: - return CreateKMatrixFreeSurfaceBase(); - default: - _error_("Mesh not supported yet"); - } - break; - case ExtrudeFromBaseAnalysisEnum: case ExtrudeFromTopAnalysisEnum: - return CreateKMatrixExtrusion(); - #endif - #ifdef _HAVE_HYDROLOGY_ - case HydrologyShreveAnalysisEnum: - return CreateKMatrixHydrologyShreve(); - break; - case HydrologyDCInefficientAnalysisEnum: - return CreateKMatrixHydrologyDCInefficient(); - break; - case HydrologyDCEfficientAnalysisEnum: - return CreateKMatrixHydrologyDCEfficient(); - break; - #endif - #ifdef _HAVE_BALANCED_ - case BalancethicknessAnalysisEnum: - return CreateKMatrixBalancethickness(); - break; - case BalancevelocityAnalysisEnum: - return CreateKMatrixBalancevelocity(); - break; - case SmoothedSurfaceSlopeXAnalysisEnum: case SmoothedSurfaceSlopeYAnalysisEnum: - return CreateKMatrixSmoothedSlope(); - break; - #endif - #ifdef _HAVE_CONTROL_ - case AdjointBalancethicknessAnalysisEnum: - return CreateKMatrixAdjointBalancethickness(); - break; - case AdjointHorizAnalysisEnum: - return CreateKMatrixAdjointSSA(); - break; - #endif - default: - _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet"); - } - - /*Make compiler happy*/ - return NULL; -} -/*}}}*/ -/*FUNCTION Tria::CreateMassMatrix {{{*/ -ElementMatrix* Tria::CreateMassMatrix(void){ - - /* Intermediaries */ - IssmDouble D,Jdet; - IssmDouble xyz_list[NUMVERTICES][3]; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters,NoneApproximationEnum); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - - /* Start looping on the number of gaussian points: */ - GaussTria* gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetNodalFunctions(basis,gauss); - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - D=gauss->weight*Jdet; - - TripleMultiply(basis,1,numnodes,1, - &D,1,1,0, - basis,1,numnodes,0, - &Ke->values[0],1); - } - - /*Clean up and return*/ - delete gauss; - xDelete(basis); - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreateBasalMassMatrix{{{*/ -ElementMatrix* Tria::CreateBasalMassMatrix(void){ - - if(!HasEdgeOnBed()) return NULL; - - int index1,index2; - this->EdgeOnBedIndices(&index1,&index2); - - Seg* seg=(Seg*)SpawnSeg(index1,index2); - ElementMatrix* Ke=seg->CreateMassMatrix(); - delete seg->material; delete seg; - - /*clean up and return*/ - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreateDVector {{{*/ -void Tria::CreateDVector(Vector* df){ - - /*Nothing done yet*/ -} -/*}}}*/ -/*FUNCTION Tria::CreatePVector(Vector* pf) {{{*/ -void Tria::CreatePVector(Vector* pf){ - - /*Skip if water element*/ - if(NoIceInElement()) return; - - /*Create element load vector*/ - ElementVector* pe = CreatePVector(); - - /*Add to global Vector*/ - if(pe){ - /*Static condensation if requested*/ - if(this->element_type==P1bubblecondensedEnum){ - int size = nodes[3]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum); - int offset = 0; - for(int i=0;i<3;i++) offset+=nodes[i]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum); - int* indices=xNew(size); - for(int i=0;ielement_type=P1bubbleEnum; - ElementMatrix* Ke = CreateKMatrix(); - this->element_type=P1bubblecondensedEnum; - - pe->StaticCondensation(Ke,size,indices); - xDelete(indices); - delete Ke; - } - - pe->AddToGlobal(pf); - delete pe; - } -} -/*}}}*/ -/*FUNCTION Tria::CreatePVector(void){{{*/ -ElementVector* Tria::CreatePVector(void){ - - /*retrive parameters: */ - int meshtype; - int analysis_type; - parameters->FindParam(&analysis_type,AnalysisTypeEnum); - - /*asserts: {{{*/ - /*if debugging mode, check that all pointers exist*/ - _assert_(this->nodes && this->material && this->matpar && this->parameters && this->inputs); - /*}}}*/ - - /*Skip if water element*/ - if(NoIceInElement()) return NULL; - - /*Just branch to the correct load generator, according to the type of analysis we are carrying out: */ - switch(analysis_type){ - #ifdef _HAVE_STRESSBALANCE_ - case StressbalanceAnalysisEnum: - int approximation; - inputs->GetInputValue(&approximation,ApproximationEnum); - switch(approximation){ - case SSAApproximationEnum: - return CreatePVectorStressbalanceSSA(); - case FSApproximationEnum: - return CreatePVectorStressbalanceFS(); - case SIAApproximationEnum: - return NULL; - case NoneApproximationEnum: - return NULL; - default: - _error_("Approximation " << EnumToStringx(approximation) << " not supported yet"); - } - break; - case StressbalanceSIAAnalysisEnum: - return CreatePVectorStressbalanceSIA(); - break; - #endif - #ifdef _HAVE_DAMAGE_ - case DamageEvolutionAnalysisEnum: - return CreatePVectorDamageEvolution(); - break; - #endif - case L2ProjectionBaseAnalysisEnum: - parameters->FindParam(&meshtype,MeshTypeEnum); - if(meshtype==Mesh2DverticalEnum){ - return CreatePVectorL2ProjectionBase(); - } - else{ - return CreatePVectorL2Projection(); - } - break; - #ifdef _HAVE_MASSTRANSPORT_ - case MasstransportAnalysisEnum: - return CreatePVectorMasstransport(); - break; - case FreeSurfaceTopAnalysisEnum: - parameters->FindParam(&meshtype,MeshTypeEnum); - switch(meshtype){ - case Mesh2DverticalEnum: - return CreatePVectorFreeSurfaceTop1D(); - case Mesh3DEnum: - return CreatePVectorFreeSurfaceTop(); - default: - _error_("Mesh not supported yet"); - } - break; - case FreeSurfaceBaseAnalysisEnum: - parameters->FindParam(&meshtype,MeshTypeEnum); - switch(meshtype){ - case Mesh2DverticalEnum: - return CreatePVectorFreeSurfaceBase1D(); - case Mesh3DEnum: - return CreatePVectorFreeSurfaceBase(); - default: - _error_("Mesh not supported yet"); - } - break; - case ExtrudeFromBaseAnalysisEnum: case ExtrudeFromTopAnalysisEnum: - return NULL; - break; - #endif - #ifdef _HAVE_HYDROLOGY_ - case HydrologyShreveAnalysisEnum: - return CreatePVectorHydrologyShreve(); - break; - case HydrologyDCInefficientAnalysisEnum: - return CreatePVectorHydrologyDCInefficient(); - break; - case HydrologyDCEfficientAnalysisEnum: - return CreatePVectorHydrologyDCEfficient(); - break; - #endif - #ifdef _HAVE_BALANCED_ - case BalancethicknessAnalysisEnum: - return CreatePVectorBalancethickness(); - break; - case BalancevelocityAnalysisEnum: - return CreatePVectorBalancevelocity(); - break; - case SmoothedSurfaceSlopeXAnalysisEnum: - return CreatePVectorSmoothedSlopeX(); - break; - case SmoothedSurfaceSlopeYAnalysisEnum: - return CreatePVectorSmoothedSlopeY(); - break; - #endif - #ifdef _HAVE_CONTROL_ - case AdjointBalancethicknessAnalysisEnum: - return CreatePVectorAdjointBalancethickness(); - break; - case AdjointHorizAnalysisEnum: - return CreatePVectorAdjointHoriz(); - break; - #endif - default: - _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet"); - } - - /*make compiler happy*/ - return NULL; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorL2ProjectionBase{{{*/ -ElementVector* Tria::CreatePVectorL2ProjectionBase(void){ - - if(!HasEdgeOnBed()) return NULL; - - int index1,index2; - this->EdgeOnBedIndices(&index1,&index2); - - Seg* seg=(Seg*)SpawnSeg(index1,index2); - ElementVector* pe=seg->CreatePVectorL2Projection(); - delete seg->material; delete seg; - - /*clean up and return*/ - return pe; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorL2Projection {{{*/ -ElementVector* Tria::CreatePVectorL2Projection(void){ - - /*Intermediaries */ - int i,input_enum; - IssmDouble Jdet,value; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble slopes[2]; - Input* input = NULL; - Input* input2 = NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector*/ - ElementVector* pe = new ElementVector(nodes,numnodes,this->parameters); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&input_enum,InputToL2ProjectEnum); - switch(input_enum){ - case SurfaceSlopeXEnum: input2 = inputs->GetInput(SurfaceEnum); _assert_(input2); break; - case SurfaceSlopeYEnum: input2 = inputs->GetInput(SurfaceEnum); _assert_(input2); break; - case BedSlopeXEnum: input2 = inputs->GetInput(BedEnum); _assert_(input2); break; - case BedSlopeYEnum: input2 = inputs->GetInput(BedEnum); _assert_(input2); break; - default: input = inputs->GetInput(input_enum); - } - - /* Start looping on the number of gaussian points: */ - GaussTria* gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - - if(input2) input2->GetInputDerivativeValue(&slopes[0],&xyz_list[0][0],gauss); - switch(input_enum){ - case SurfaceSlopeXEnum: case BedSlopeXEnum: value = slopes[0]; break; - case SurfaceSlopeYEnum: case BedSlopeYEnum: value = slopes[1]; break; - default: input->GetInputValue(&value,gauss); - } - - for(i=0;ivalues[i]+=Jdet*gauss->weight*value*basis[i]; - } - - /*Clean up and return*/ - xDelete(basis); - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Tria::CreateJacobianMatrix{{{*/ -void Tria::CreateJacobianMatrix(Matrix* Jff){ - - /*retrieve parameters: */ - ElementMatrix* Ke=NULL; - int analysis_type; - parameters->FindParam(&analysis_type,AnalysisTypeEnum); - - /*Checks in debugging {{{*/ - _assert_(this->nodes && this->material && this->matpar && this->parameters && this->inputs); - /*}}}*/ - - /*Skip if water element*/ - if(NoIceInElement()) return; - - /*Just branch to the correct element stiffness matrix generator, according to the type of analysis we are carrying out: */ - switch(analysis_type){ -#ifdef _HAVE_STRESSBALANCE_ - case StressbalanceAnalysisEnum: - Ke=CreateJacobianStressbalanceSSA(); - break; -#endif - default: - _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet"); - } - - /*Add to global matrix*/ - if(Ke){ - Ke->AddToGlobal(Jff); - delete Ke; - } + default: _error_("mesh "<inputs); + this->inputs->AddInput(new TriaInput(input_enum,values,interpolation_enum)); +} +/*}}}*/ +/*FUNCTION Tria::CharacteristicLength{{{*/ +IssmDouble Tria::CharacteristicLength(void){ + + return sqrt(2*this->GetArea()); } /*}}}*/ @@ -639,4 +147,59 @@ } /*}}}*/ +/*FUNCTION Tria::ComputeSigmaNN {{{*/ +void Tria::ComputeSigmaNN(){ + + if(~IsOnBase()){ + IssmDouble sigma_nn=0; + this->inputs->AddInput(new TriaInput(SigmaNNEnum,&sigma_nn,P0Enum)); + return; + } + else{ + IssmDouble* xyz_list=NULL; + IssmDouble pressure,viscosity,sigma_nn; + IssmDouble sigma_xx,sigma_xy,sigma_yy; + IssmDouble epsilon[3]; /* epsilon=[exx,eyy,exy];*/ + IssmDouble base_normal[2]; + int domaintype,dim=2; + + /* Get node coordinates and dof list: */ + GetVerticesCoordinates(&xyz_list); + + /*Retrieve all inputs we will be needing: */ + this->FindParam(&domaintype,DomainTypeEnum); + if(domaintype==Domain2DhorizontalEnum) _error_("stress tensor calculation not supported for mesh of type " <GetInput(PressureEnum); _assert_(pressure_input); + Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); + + /* Start looping on the number of vertices: */ + Gauss* gauss=NewGaussBase(1); + gauss->GaussPoint(0); + + /*Compute strain rate viscosity and pressure: */ + this->StrainRateSSA(&epsilon[0],xyz_list,gauss,vx_input,vy_input); + this->ViscosityFS(&viscosity,dim,xyz_list,gauss,vx_input,vy_input,NULL); + pressure_input->GetInputValue(&pressure,gauss); + + /*Compute Stress*/ + sigma_xx=2*viscosity*epsilon[0]-pressure; // sigma = nu eps - pressure + sigma_yy=2*viscosity*epsilon[1]-pressure; + sigma_xy=2*viscosity*epsilon[2]; + + /*Get normal vector to the bed */ + NormalBase(&base_normal[0],xyz_list); + + /*Compute sigma_nn*/ + sigma_nn=sigma_xx*base_normal[0]*base_normal[0] + sigma_xy*base_normal[0]*base_normal[1] + sigma_yy*base_normal[1]*base_normal[1]; + + /*Add Stress tensor components into inputs*/ + this->inputs->AddInput(new TriaInput(SigmaNNEnum,&sigma_nn,P0Enum)); + + /*Clean up and return*/ + xDelete(xyz_list); + delete gauss; + } +} +/*}}}*/ /*FUNCTION Tria::ComputeStrainRate {{{*/ void Tria::ComputeStrainRate(Vector* eps){ @@ -647,19 +210,22 @@ void Tria::ComputeStressTensor(){ - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble pressure,viscosity; - IssmDouble epsilon[3]; /* epsilon=[exx,eyy,exy];*/ - IssmDouble sigma_xx[NUMVERTICES]; - IssmDouble sigma_yy[NUMVERTICES]; - IssmDouble sigma_zz[NUMVERTICES]={0,0,0}; - IssmDouble sigma_xy[NUMVERTICES]; - IssmDouble sigma_xz[NUMVERTICES]={0,0,0}; - IssmDouble sigma_yz[NUMVERTICES]={0,0,0}; - GaussTria* gauss=NULL; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble pressure,viscosity; + IssmDouble epsilon[3]; /* epsilon=[exx,eyy,exy];*/ + IssmDouble sigma_xx[NUMVERTICES]; + IssmDouble sigma_yy[NUMVERTICES]; + IssmDouble sigma_zz[NUMVERTICES]={0,0,0}; + IssmDouble sigma_xy[NUMVERTICES]; + IssmDouble sigma_xz[NUMVERTICES]={0,0,0}; + IssmDouble sigma_yz[NUMVERTICES]={0,0,0}; + GaussTria* gauss=NULL; + int domaintype,dim=2; /* Get node coordinates and dof list: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); /*Retrieve all inputs we will be needing: */ + this->FindParam(&domaintype,DomainTypeEnum); + if(domaintype==Domain2DhorizontalEnum) _error_("stress tensor calculation not supported for mesh of type " <GetInput(PressureEnum); _assert_(pressure_input); Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); @@ -672,6 +238,6 @@ /*Compute strain rate viscosity and pressure: */ - this->GetStrainRate2d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); - material->GetViscosity2d(&viscosity,&epsilon[0]); + this->StrainRateSSA(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); + this->ViscositySSA(&viscosity,dim,&xyz_list[0][0],gauss,vx_input,vy_input); pressure_input->GetInputValue(&pressure,gauss); @@ -694,4 +260,55 @@ } /*}}}*/ +/*FUNCTION Tria::ComputeDeviatoricStressTensor {{{*/ +void Tria::ComputeDeviatoricStressTensor(){ + + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble viscosity; + IssmDouble epsilon[3]; /* epsilon=[exx,eyy,exy];*/ + IssmDouble tau_xx[NUMVERTICES]; + IssmDouble tau_yy[NUMVERTICES]; + IssmDouble tau_zz[NUMVERTICES]={0,0,0}; + IssmDouble tau_xy[NUMVERTICES]; + IssmDouble tau_xz[NUMVERTICES]={0,0,0}; + IssmDouble tau_yz[NUMVERTICES]={0,0,0}; + GaussTria* gauss=NULL; + int domaintype,dim=2; + + /* Get node coordinates and dof list: */ + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + + /*Retrieve all inputs we will be needing: */ + this->FindParam(&domaintype,DomainTypeEnum); + if(domaintype!=Domain2DhorizontalEnum) _error_("deviatoric stress tensor calculation not implemented for mesh of type " <GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); + + /* Start looping on the number of vertices: */ + gauss=new GaussTria(); + for (int iv=0;ivGaussVertex(iv); + + /*Compute strain rate and viscosity: */ + this->StrainRateSSA(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); + this->ViscositySSA(&viscosity,dim,&xyz_list[0][0],gauss,vx_input,vy_input); + + /*Compute Stress*/ + tau_xx[iv]=2*viscosity*epsilon[0]; // tau = nu eps + tau_yy[iv]=2*viscosity*epsilon[1]; + tau_xy[iv]=2*viscosity*epsilon[2]; + } + + /*Add Stress tensor components into inputs*/ + this->inputs->AddInput(new TriaInput(DeviatoricStressxxEnum,&tau_xx[0],P1Enum)); + this->inputs->AddInput(new TriaInput(DeviatoricStressxyEnum,&tau_xy[0],P1Enum)); + this->inputs->AddInput(new TriaInput(DeviatoricStressxzEnum,&tau_xz[0],P1Enum)); + this->inputs->AddInput(new TriaInput(DeviatoricStressyyEnum,&tau_yy[0],P1Enum)); + this->inputs->AddInput(new TriaInput(DeviatoricStressyzEnum,&tau_yz[0],P1Enum)); + this->inputs->AddInput(new TriaInput(DeviatoricStresszzEnum,&tau_zz[0],P1Enum)); + + /*Clean up and return*/ + delete gauss; +} +/*}}}*/ /*FUNCTION Tria::Configure {{{*/ void Tria::Configure(Elements* elementsin, Loads* loadsin,Nodes* nodesin,Vertices *verticesin,Materials* materialsin, Parameters* parametersin){ @@ -724,33 +341,4 @@ this->inputs->Configure(parameters); -} -/*}}}*/ -/*FUNCTION Tria::DeepEcho{{{*/ -void Tria::DeepEcho(void){ - - _printf_("Tria:\n"); - _printf_(" id: " << id << "\n"); - if(nodes){ - nodes[0]->DeepEcho(); - nodes[1]->DeepEcho(); - nodes[2]->DeepEcho(); - } - else _printf_("nodes = NULL\n"); - - if (material) material->DeepEcho(); - else _printf_("material = NULL\n"); - - if (matpar) matpar->DeepEcho(); - else _printf_("matpar = NULL\n"); - - _printf_(" parameters\n"); - if (parameters) parameters->DeepEcho(); - else _printf_("parameters = NULL\n"); - - _printf_(" inputs\n"); - if (inputs) inputs->DeepEcho(); - else _printf_("inputs=NULL\n"); - - return; } /*}}}*/ @@ -826,28 +414,31 @@ } /*}}}*/ -/*FUNCTION Tria::Echo{{{*/ -void Tria::Echo(void){ - _printf_("Tria:\n"); - _printf_(" id: " << id << "\n"); - if(nodes){ - nodes[0]->Echo(); - nodes[1]->Echo(); - nodes[2]->Echo(); - } - else _printf_("nodes = NULL\n"); - - if (material) material->Echo(); - else _printf_("material = NULL\n"); - - if (matpar) matpar->Echo(); - else _printf_("matpar = NULL\n"); - - _printf_(" parameters\n"); - if (parameters) parameters->Echo(); - else _printf_("parameters = NULL\n"); - - _printf_(" inputs\n"); - if (inputs) inputs->Echo(); - else _printf_("inputs=NULL\n"); +/*FUNCTION Tria::ElementSizes{{{*/ +void Tria::ElementSizes(IssmDouble* hx,IssmDouble* hy,IssmDouble* hz){ + + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble xmin,ymin; + IssmDouble xmax,ymax; + + /*Get xyz list: */ + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + xmin=xyz_list[0][0]; xmax=xyz_list[0][0]; + ymin=xyz_list[0][1]; ymax=xyz_list[0][1]; + + for(int i=1;ixmax) xmax=xyz_list[i][0]; + if(xyz_list[i][1]ymax) ymax=xyz_list[i][1]; + } + + *hx=xmax-xmin; + *hy=ymax-ymin; + *hz=0.; +} +/*}}}*/ +/*FUNCTION Tria::FiniteElement{{{*/ +int Tria::FiniteElement(void){ + return this->element_type; } /*}}}*/ @@ -866,5 +457,5 @@ /*Get xyz list: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); x1=xyz_list[0][0]; y1=xyz_list[0][1]; x2=xyz_list[1][0]; y2=xyz_list[1][1]; @@ -876,5 +467,5 @@ /*}}}*/ /*FUNCTION Tria::GetAreaCoordinates{{{*/ -void Tria::GetAreaCoordinates(IssmDouble* area_coordinates,IssmDouble xyz_zero[3][3],IssmDouble xyz_list[3][3],int numpoints){ +void Tria::GetAreaCoordinates(IssmDouble* area_coordinates,IssmDouble* xyz_zero,IssmDouble* xyz_list,int numpoints){ /*Computeportion of the element that is grounded*/ @@ -888,5 +479,5 @@ for(j=0;j<3;j++){ for(k=0;k<3;k++){ - xyz_bis[j][k]=xyz_list[j][k]; + xyz_bis[j][k]=xyz_list[j*3+k]; } } @@ -895,5 +486,5 @@ for(k=0;k<3;k++){ /*Change appropriate line*/ - xyz_bis[j][k]=xyz_zero[i][k]; + xyz_bis[j][k]=xyz_zero[i*3+k]; } @@ -905,81 +496,8 @@ for(k=0;k<3;k++){ /*Reinitialize xyz_list with original coordinates*/ - xyz_bis[j][k]=xyz_list[j][k]; + xyz_bis[j][k]=xyz_list[j*3+k]; } } } -} -/*}}}*/ -/*FUNCTION Tria::GetDofList {{{*/ -void Tria::GetDofList(int** pdoflist, int approximation_enum,int setenum){ - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*First, figure out size of doflist and create it: */ - int numberofdofs=0; - for(int i=0;iGetNumberOfDofs(approximation_enum,setenum); - - /*Allocate output*/ - int* doflist=xNew(numberofdofs); - - /*Populate: */ - int count=0; - for(int i=0;iGetDofList(doflist+count,approximation_enum,setenum); - count+=nodes[i]->GetNumberOfDofs(approximation_enum,setenum); - } - - /*Assign output pointers:*/ - *pdoflist=doflist; -} -/*}}}*/ -/*FUNCTION Tria::GetDofListVelocity{{{*/ -void Tria::GetDofListVelocity(int** pdoflist,int setenum){ - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodesVelocity(); - - /*First, figure out size of doflist and create it: */ - int numberofdofs=0; - for(int i=0;iGetNumberOfDofs(FSvelocityEnum,setenum); - - /*Allocate output*/ - int* doflist=xNew(numberofdofs); - - /*Populate: */ - int count=0; - for(int i=0;iGetDofList(doflist+count,FSvelocityEnum,setenum); - count+=nodes[i]->GetNumberOfDofs(FSvelocityEnum,setenum); - } - - /*Assign output pointers:*/ - *pdoflist=doflist; -} -/*}}}*/ -/*FUNCTION Tria::GetDofListPressure{{{*/ -void Tria::GetDofListPressure(int** pdoflist,int setenum){ - - /*Fetch number of nodes and dof for this finite element*/ - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - - /*First, figure out size of doflist and create it: */ - int numberofdofs=0; - for(int i=vnumnodes;iGetNumberOfDofs(FSApproximationEnum,setenum); - - /*Allocate output*/ - int* doflist=xNew(numberofdofs); - - /*Populate: */ - int count=0; - for(int i=vnumnodes;iGetDofList(doflist+count,FSApproximationEnum,setenum); - count+=nodes[i]->GetNumberOfDofs(FSApproximationEnum,setenum); - } - - /*Assign output pointers:*/ - *pdoflist=doflist; } /*}}}*/ @@ -1051,10 +569,12 @@ bool mainlyfloating = true; + int domaintype,index1,index2; const IssmPDouble epsilon = 1.e-15; - IssmDouble phi,s1,s2,area_init,area_grounded; - IssmDouble gl[NUMVERTICES]; - IssmDouble xyz_bis[3][3]; + IssmDouble phi,s1,s2,area_init,area_grounded; + IssmDouble gl[NUMVERTICES]; + IssmDouble xyz_bis[3][3]; /*Recover parameters and values*/ + parameters->FindParam(&domaintype,DomainTypeEnum); GetInputListOnVertices(&gl[0],MaskGroundediceLevelsetEnum); @@ -1064,82 +584,97 @@ if(gl[2]==0.) gl[2]=gl[2]+epsilon; - /*Check that not all nodes are grounded or floating*/ - if(gl[0]>0 && gl[1]>0 && gl[2]>0){ // All grounded - phi=1; - } - else if(gl[0]<0 && gl[1]<0 && gl[2]<0){ //All floating - phi=0; - } - else{ - /*Figure out if two nodes are floating or grounded*/ - if(gl[0]*gl[1]*gl[2]>0) mainlyfloating=false; - - if(gl[0]*gl[1]>0){ //Nodes 0 and 1 are similar, so points must be found on segment 0-2 and 1-2 - /*Coordinates of point 2: same as initial point 2*/ - xyz_bis[2][0]=*(xyz_list+3*2+0); - xyz_bis[2][1]=*(xyz_list+3*2+1); - xyz_bis[2][2]=*(xyz_list+3*2+2); - - /*Portion of the segments*/ - s1=gl[2]/(gl[2]-gl[1]); - s2=gl[2]/(gl[2]-gl[0]); - - /*New point 1*/ - xyz_bis[1][0]=*(xyz_list+3*2+0)+s1*(*(xyz_list+3*1+0)-*(xyz_list+3*2+0)); - xyz_bis[1][1]=*(xyz_list+3*2+1)+s1*(*(xyz_list+3*1+1)-*(xyz_list+3*2+1)); - xyz_bis[1][2]=*(xyz_list+3*2+2)+s1*(*(xyz_list+3*1+2)-*(xyz_list+3*2+2)); - - /*New point 0*/ - xyz_bis[0][0]=*(xyz_list+3*2+0)+s2*(*(xyz_list+3*0+0)-*(xyz_list+3*2+0)); - xyz_bis[0][1]=*(xyz_list+3*2+1)+s2*(*(xyz_list+3*0+1)-*(xyz_list+3*2+1)); - xyz_bis[0][2]=*(xyz_list+3*2+2)+s2*(*(xyz_list+3*0+2)-*(xyz_list+3*2+2)); - } - else if(gl[1]*gl[2]>0){ //Nodes 1 and 2 are similar, so points must be found on segment 0-1 and 0-2 - /*Coordinates of point 0: same as initial point 2*/ - xyz_bis[0][0]=*(xyz_list+3*0+0); - xyz_bis[0][1]=*(xyz_list+3*0+1); - xyz_bis[0][2]=*(xyz_list+3*0+2); - - /*Portion of the segments*/ - s1=gl[0]/(gl[0]-gl[1]); - s2=gl[0]/(gl[0]-gl[2]); - - /*New point 1*/ - xyz_bis[1][0]=*(xyz_list+3*0+0)+s1*(*(xyz_list+3*1+0)-*(xyz_list+3*0+0)); - xyz_bis[1][1]=*(xyz_list+3*0+1)+s1*(*(xyz_list+3*1+1)-*(xyz_list+3*0+1)); - xyz_bis[1][2]=*(xyz_list+3*0+2)+s1*(*(xyz_list+3*1+2)-*(xyz_list+3*0+2)); - - /*New point 2*/ - xyz_bis[2][0]=*(xyz_list+3*0+0)+s2*(*(xyz_list+3*2+0)-*(xyz_list+3*0+0)); - xyz_bis[2][1]=*(xyz_list+3*0+1)+s2*(*(xyz_list+3*2+1)-*(xyz_list+3*0+1)); - xyz_bis[2][2]=*(xyz_list+3*0+2)+s2*(*(xyz_list+3*2+2)-*(xyz_list+3*0+2)); - } - else if(gl[0]*gl[2]>0){ //Nodes 0 and 2 are similar, so points must be found on segment 1-0 and 1-2 - /*Coordinates of point 1: same as initial point 2*/ - xyz_bis[1][0]=*(xyz_list+3*1+0); - xyz_bis[1][1]=*(xyz_list+3*1+1); - xyz_bis[1][2]=*(xyz_list+3*1+2); - - /*Portion of the segments*/ - s1=gl[1]/(gl[1]-gl[0]); - s2=gl[1]/(gl[1]-gl[2]); - - /*New point 0*/ - xyz_bis[0][0]=*(xyz_list+3*1+0)+s1*(*(xyz_list+3*0+0)-*(xyz_list+3*1+0)); - xyz_bis[0][1]=*(xyz_list+3*1+1)+s1*(*(xyz_list+3*0+1)-*(xyz_list+3*1+1)); - xyz_bis[0][2]=*(xyz_list+3*1+2)+s1*(*(xyz_list+3*0+2)-*(xyz_list+3*1+2)); - - /*New point 2*/ - xyz_bis[2][0]=*(xyz_list+3*1+0)+s2*(*(xyz_list+3*2+0)-*(xyz_list+3*1+0)); - xyz_bis[2][1]=*(xyz_list+3*1+1)+s2*(*(xyz_list+3*2+1)-*(xyz_list+3*1+1)); - xyz_bis[2][2]=*(xyz_list+3*1+2)+s2*(*(xyz_list+3*2+2)-*(xyz_list+3*1+2)); - } - - /*Compute fraction of grounded element*/ - GetJacobianDeterminant(&area_init, xyz_list,NULL); - GetJacobianDeterminant(&area_grounded, &xyz_bis[0][0],NULL); - if(mainlyfloating==true) area_grounded=area_init-area_grounded; - phi=area_grounded/area_init; - } + if(domaintype==Domain2DverticalEnum){ + this->EdgeOnBaseIndices(&index1,&index2); + if(gl[index1]>0 && gl[index2]>0) phi=1; // All grounded + else if(gl[index1]<0 && gl[index2]<0) phi=0; // All floating + else if(gl[index1]<0 && gl[index2]>0){ //index2 grounded + phi=1./(1.-gl[index1]/gl[index2]); + } + else if(gl[index2]<0 && gl[index1]>0){ //index1 grounded + phi=1./(1.-gl[index2]/gl[index1]); + } + + } + else if(domaintype==Domain2DhorizontalEnum || domaintype==Domain3DEnum){ + /*Check that not all nodes are grounded or floating*/ + if(gl[0]>0 && gl[1]>0 && gl[2]>0){ // All grounded + phi=1; + } + else if(gl[0]<0 && gl[1]<0 && gl[2]<0){ //All floating + phi=0; + } + else{ + /*Figure out if two nodes are floating or grounded*/ + if(gl[0]*gl[1]*gl[2]>0) mainlyfloating=false; + + if(gl[0]*gl[1]>0){ //Nodes 0 and 1 are similar, so points must be found on segment 0-2 and 1-2 + /*Coordinates of point 2: same as initial point 2*/ + xyz_bis[2][0]=*(xyz_list+3*2+0); + xyz_bis[2][1]=*(xyz_list+3*2+1); + xyz_bis[2][2]=*(xyz_list+3*2+2); + + /*Portion of the segments*/ + s1=gl[2]/(gl[2]-gl[1]); + s2=gl[2]/(gl[2]-gl[0]); + + /*New point 1*/ + xyz_bis[1][0]=*(xyz_list+3*2+0)+s1*(*(xyz_list+3*1+0)-*(xyz_list+3*2+0)); + xyz_bis[1][1]=*(xyz_list+3*2+1)+s1*(*(xyz_list+3*1+1)-*(xyz_list+3*2+1)); + xyz_bis[1][2]=*(xyz_list+3*2+2)+s1*(*(xyz_list+3*1+2)-*(xyz_list+3*2+2)); + + /*New point 0*/ + xyz_bis[0][0]=*(xyz_list+3*2+0)+s2*(*(xyz_list+3*0+0)-*(xyz_list+3*2+0)); + xyz_bis[0][1]=*(xyz_list+3*2+1)+s2*(*(xyz_list+3*0+1)-*(xyz_list+3*2+1)); + xyz_bis[0][2]=*(xyz_list+3*2+2)+s2*(*(xyz_list+3*0+2)-*(xyz_list+3*2+2)); + } + else if(gl[1]*gl[2]>0){ //Nodes 1 and 2 are similar, so points must be found on segment 0-1 and 0-2 + /*Coordinates of point 0: same as initial point 2*/ + xyz_bis[0][0]=*(xyz_list+3*0+0); + xyz_bis[0][1]=*(xyz_list+3*0+1); + xyz_bis[0][2]=*(xyz_list+3*0+2); + + /*Portion of the segments*/ + s1=gl[0]/(gl[0]-gl[1]); + s2=gl[0]/(gl[0]-gl[2]); + + /*New point 1*/ + xyz_bis[1][0]=*(xyz_list+3*0+0)+s1*(*(xyz_list+3*1+0)-*(xyz_list+3*0+0)); + xyz_bis[1][1]=*(xyz_list+3*0+1)+s1*(*(xyz_list+3*1+1)-*(xyz_list+3*0+1)); + xyz_bis[1][2]=*(xyz_list+3*0+2)+s1*(*(xyz_list+3*1+2)-*(xyz_list+3*0+2)); + + /*New point 2*/ + xyz_bis[2][0]=*(xyz_list+3*0+0)+s2*(*(xyz_list+3*2+0)-*(xyz_list+3*0+0)); + xyz_bis[2][1]=*(xyz_list+3*0+1)+s2*(*(xyz_list+3*2+1)-*(xyz_list+3*0+1)); + xyz_bis[2][2]=*(xyz_list+3*0+2)+s2*(*(xyz_list+3*2+2)-*(xyz_list+3*0+2)); + } + else if(gl[0]*gl[2]>0){ //Nodes 0 and 2 are similar, so points must be found on segment 1-0 and 1-2 + /*Coordinates of point 1: same as initial point 2*/ + xyz_bis[1][0]=*(xyz_list+3*1+0); + xyz_bis[1][1]=*(xyz_list+3*1+1); + xyz_bis[1][2]=*(xyz_list+3*1+2); + + /*Portion of the segments*/ + s1=gl[1]/(gl[1]-gl[0]); + s2=gl[1]/(gl[1]-gl[2]); + + /*New point 0*/ + xyz_bis[0][0]=*(xyz_list+3*1+0)+s1*(*(xyz_list+3*0+0)-*(xyz_list+3*1+0)); + xyz_bis[0][1]=*(xyz_list+3*1+1)+s1*(*(xyz_list+3*0+1)-*(xyz_list+3*1+1)); + xyz_bis[0][2]=*(xyz_list+3*1+2)+s1*(*(xyz_list+3*0+2)-*(xyz_list+3*1+2)); + + /*New point 2*/ + xyz_bis[2][0]=*(xyz_list+3*1+0)+s2*(*(xyz_list+3*2+0)-*(xyz_list+3*1+0)); + xyz_bis[2][1]=*(xyz_list+3*1+1)+s2*(*(xyz_list+3*2+1)-*(xyz_list+3*1+1)); + xyz_bis[2][2]=*(xyz_list+3*1+2)+s2*(*(xyz_list+3*2+2)-*(xyz_list+3*1+2)); + } + + /*Compute fraction of grounded element*/ + GetJacobianDeterminant(&area_init, xyz_list,NULL); + GetJacobianDeterminant(&area_grounded, &xyz_bis[0][0],NULL); + if(mainlyfloating==true) area_grounded=area_init-area_grounded; + phi=area_grounded/area_init; + } + } + else _error_("mesh type "<1 || phi<0) _error_("Error. Problem with portion of grounded element: value should be between 0 and 1"); @@ -1148,6 +683,42 @@ } /*}}}*/ -/*FUNCTION Tria::GetSegmentNormal {{{*/ -void Tria:: GetSegmentNormal(IssmDouble* normal,IssmDouble xyz_list[2][3]){ +/*FUNCTION Tria::GetVerticesCoordinatesBase(IssmDouble** pxyz_list){{{*/ +void Tria::GetVerticesCoordinatesBase(IssmDouble** pxyz_list){ + + int indices[2]; + IssmDouble xyz_list[NUMVERTICES][3]; + + /*Element XYZ list*/ + ::GetVerticesCoordinates(&xyz_list[0][0],this->vertices,NUMVERTICES); + + /*Allocate Output*/ + IssmDouble* xyz_list_edge = xNew(2*3); + this->EdgeOnBaseIndices(&indices[0],&indices[1]); + for(int i=0;i<2;i++) for(int j=0;j<2;j++) xyz_list_edge[i*3+j]=xyz_list[indices[i]][j]; + + /*Assign output pointer*/ + *pxyz_list = xyz_list_edge; + +}/*}}}*/ +/*FUNCTION Tria::GetVerticesCoordinatesTop(IssmDouble** pxyz_list){{{*/ +void Tria::GetVerticesCoordinatesTop(IssmDouble** pxyz_list){ + + int indices[2]; + IssmDouble xyz_list[NUMVERTICES][3]; + + /*Element XYZ list*/ + ::GetVerticesCoordinates(&xyz_list[0][0],this->vertices,NUMVERTICES); + + /*Allocate Output*/ + IssmDouble* xyz_list_edge = xNew(2*3); + this->EdgeOnSurfaceIndices(&indices[0],&indices[1]); + for(int i=0;i<2;i++) for(int j=0;j<2;j++) xyz_list_edge[i*3+j]=xyz_list[indices[i]][j]; + + /*Assign output pointer*/ + *pxyz_list = xyz_list_edge; + +}/*}}}*/ +/*FUNCTION Tria::NormalSection{{{*/ +void Tria::NormalSection(IssmDouble* normal,IssmDouble* xyz_list){ /*Build unit outward pointing vector*/ @@ -1155,6 +726,6 @@ IssmDouble norm; - vector[0]=xyz_list[1][0] - xyz_list[0][0]; - vector[1]=xyz_list[1][1] - xyz_list[0][1]; + vector[0]=xyz_list[1*3+0] - xyz_list[0*3+0]; + vector[1]=xyz_list[1*3+1] - xyz_list[0*3+1]; norm=sqrt(vector[0]*vector[0] + vector[1]*vector[1]); @@ -1164,7 +735,6 @@ } /*}}}*/ -/*FUNCTION Tria::GetZeroLevelsetCoordinates{{{*/ -void Tria::GetZeroLevelsetCoordinates(IssmDouble* xyz_zero,IssmDouble xyz_list[3][3],int levelsetenum){ - /*Computeportion of the element that is grounded*/ +/*FUNCTION Tria::ZeroLevelsetCoordinates{{{*/ +void Tria::ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum){ int normal_orientation=0; @@ -1173,4 +743,5 @@ /*Recover parameters and values*/ + IssmDouble* xyz_zero = xNew(2*3); GetInputListOnVertices(&levelset[0],levelsetenum); @@ -1180,14 +751,14 @@ s2=levelset[2]/(levelset[2]-levelset[0]); - if(levelset[2]>0.) normal_orientation=1; + if(levelset[2]<0.) normal_orientation=1; //orientation of quadrangle depending on distribution of levelsetfunction /*New point 1*/ - xyz_zero[3*normal_orientation+0]=xyz_list[2][0]+s1*(xyz_list[1][0]-xyz_list[2][0]); - xyz_zero[3*normal_orientation+1]=xyz_list[2][1]+s1*(xyz_list[1][1]-xyz_list[2][1]); - xyz_zero[3*normal_orientation+2]=xyz_list[2][2]+s1*(xyz_list[1][2]-xyz_list[2][2]); + xyz_zero[3*normal_orientation+0]=xyz_list[2*3+0]+s1*(xyz_list[1*3+0]-xyz_list[2*3+0]); + xyz_zero[3*normal_orientation+1]=xyz_list[2*3+1]+s1*(xyz_list[1*3+1]-xyz_list[2*3+1]); + xyz_zero[3*normal_orientation+2]=xyz_list[2*3+2]+s1*(xyz_list[1*3+2]-xyz_list[2*3+2]); /*New point 0*/ - xyz_zero[3*(1-normal_orientation)+0]=xyz_list[2][0]+s2*(xyz_list[0][0]-xyz_list[2][0]); - xyz_zero[3*(1-normal_orientation)+1]=xyz_list[2][1]+s2*(xyz_list[0][1]-xyz_list[2][1]); - xyz_zero[3*(1-normal_orientation)+2]=xyz_list[2][2]+s2*(xyz_list[0][2]-xyz_list[2][2]); + xyz_zero[3*(1-normal_orientation)+0]=xyz_list[2*3+0]+s2*(xyz_list[0*3+0]-xyz_list[2*3+0]); + xyz_zero[3*(1-normal_orientation)+1]=xyz_list[2*3+1]+s2*(xyz_list[0*3+1]-xyz_list[2*3+1]); + xyz_zero[3*(1-normal_orientation)+2]=xyz_list[2*3+2]+s2*(xyz_list[0*3+2]-xyz_list[2*3+2]); } else if(levelset[1]*levelset[2]>0.){ //Nodes 1 and 2 are similar, so points must be found on segment 0-1 and 0-2 @@ -1196,14 +767,14 @@ s2=levelset[0]/(levelset[0]-levelset[1]); - if(levelset[0]>0.) normal_orientation=1; + if(levelset[0]<0.) normal_orientation=1; /*New point 1*/ - xyz_zero[3*normal_orientation+0]=xyz_list[0][0]+s1*(xyz_list[2][0]-xyz_list[0][0]); - xyz_zero[3*normal_orientation+1]=xyz_list[0][1]+s1*(xyz_list[2][1]-xyz_list[0][1]); - xyz_zero[3*normal_orientation+2]=xyz_list[0][2]+s1*(xyz_list[2][2]-xyz_list[0][2]); + xyz_zero[3*normal_orientation+0]=xyz_list[0*3+0]+s1*(xyz_list[2*3+0]-xyz_list[0*3+0]); + xyz_zero[3*normal_orientation+1]=xyz_list[0*3+1]+s1*(xyz_list[2*3+1]-xyz_list[0*3+1]); + xyz_zero[3*normal_orientation+2]=xyz_list[0*3+2]+s1*(xyz_list[2*3+2]-xyz_list[0*3+2]); /*New point 2*/ - xyz_zero[3*(1-normal_orientation)+0]=xyz_list[0][0]+s2*(xyz_list[1][0]-xyz_list[0][0]); - xyz_zero[3*(1-normal_orientation)+1]=xyz_list[0][1]+s2*(xyz_list[1][1]-xyz_list[0][1]); - xyz_zero[3*(1-normal_orientation)+2]=xyz_list[0][2]+s2*(xyz_list[1][2]-xyz_list[0][2]); + xyz_zero[3*(1-normal_orientation)+0]=xyz_list[0*3+0]+s2*(xyz_list[1*3+0]-xyz_list[0*3+0]); + xyz_zero[3*(1-normal_orientation)+1]=xyz_list[0*3+1]+s2*(xyz_list[1*3+1]-xyz_list[0*3+1]); + xyz_zero[3*(1-normal_orientation)+2]=xyz_list[0*3+2]+s2*(xyz_list[1*3+2]-xyz_list[0*3+2]); } else if(levelset[0]*levelset[2]>0.){ //Nodes 0 and 2 are similar, so points must be found on segment 1-0 and 1-2 @@ -1212,48 +783,123 @@ s2=levelset[1]/(levelset[1]-levelset[2]); - if(levelset[1]>0.) normal_orientation=1; + if(levelset[1]<0.) normal_orientation=1; /*New point 0*/ - xyz_zero[3*normal_orientation+0]=xyz_list[1][0]+s1*(xyz_list[0][0]-xyz_list[1][0]); - xyz_zero[3*normal_orientation+1]=xyz_list[1][1]+s1*(xyz_list[0][1]-xyz_list[1][1]); - xyz_zero[3*normal_orientation+2]=xyz_list[1][2]+s1*(xyz_list[0][2]-xyz_list[1][2]); + xyz_zero[3*normal_orientation+0]=xyz_list[1*3+0]+s1*(xyz_list[0*3+0]-xyz_list[1*3+0]); + xyz_zero[3*normal_orientation+1]=xyz_list[1*3+1]+s1*(xyz_list[0*3+1]-xyz_list[1*3+1]); + xyz_zero[3*normal_orientation+2]=xyz_list[1*3+2]+s1*(xyz_list[0*3+2]-xyz_list[1*3+2]); /*New point 2*/ - xyz_zero[3*(1-normal_orientation)+0]=xyz_list[1][0]+s2*(xyz_list[2][0]-xyz_list[1][0]); - xyz_zero[3*(1-normal_orientation)+1]=xyz_list[1][1]+s2*(xyz_list[2][1]-xyz_list[1][1]); - xyz_zero[3*(1-normal_orientation)+2]=xyz_list[1][2]+s2*(xyz_list[2][2]-xyz_list[1][2]); + xyz_zero[3*(1-normal_orientation)+0]=xyz_list[1*3+0]+s2*(xyz_list[2*3+0]-xyz_list[1*3+0]); + xyz_zero[3*(1-normal_orientation)+1]=xyz_list[1*3+1]+s2*(xyz_list[2*3+1]-xyz_list[1*3+1]); + xyz_zero[3*(1-normal_orientation)+2]=xyz_list[1*3+2]+s2*(xyz_list[2*3+2]-xyz_list[1*3+2]); } else if(levelset[0]==0. && levelset[1]==0.){ //front is on point 0 and 1 - xyz_zero[3*0+0]=xyz_list[0][0]; - xyz_zero[3*0+1]=xyz_list[0][1]; - xyz_zero[3*0+2]=xyz_list[0][2]; + xyz_zero[3*0+0]=xyz_list[0*3+0]; + xyz_zero[3*0+1]=xyz_list[0*3+1]; + xyz_zero[3*0+2]=xyz_list[0*3+2]; /*New point 2*/ - xyz_zero[3*1+0]=xyz_list[1][0]; - xyz_zero[3*1+1]=xyz_list[1][1]; - xyz_zero[3*1+2]=xyz_list[1][2]; + xyz_zero[3*1+0]=xyz_list[1*3+0]; + xyz_zero[3*1+1]=xyz_list[1*3+1]; + xyz_zero[3*1+2]=xyz_list[1*3+2]; } else if(levelset[0]==0. && levelset[2]==0.){ //front is on point 0 and 1 - xyz_zero[3*0+0]=xyz_list[2][0]; - xyz_zero[3*0+1]=xyz_list[2][1]; - xyz_zero[3*0+2]=xyz_list[2][2]; + xyz_zero[3*0+0]=xyz_list[2*3+0]; + xyz_zero[3*0+1]=xyz_list[2*3+1]; + xyz_zero[3*0+2]=xyz_list[2*3+2]; /*New point 2*/ - xyz_zero[3*1+0]=xyz_list[0][0]; - xyz_zero[3*1+1]=xyz_list[0][1]; - xyz_zero[3*1+2]=xyz_list[0][2]; + xyz_zero[3*1+0]=xyz_list[0*3+0]; + xyz_zero[3*1+1]=xyz_list[0*3+1]; + xyz_zero[3*1+2]=xyz_list[0*3+2]; } else if(levelset[1]==0. && levelset[2]==0.){ //front is on point 0 and 1 - xyz_zero[3*0+0]=xyz_list[1][0]; - xyz_zero[3*0+1]=xyz_list[1][1]; - xyz_zero[3*0+2]=xyz_list[1][2]; + xyz_zero[3*0+0]=xyz_list[1*3+0]; + xyz_zero[3*0+1]=xyz_list[1*3+1]; + xyz_zero[3*0+2]=xyz_list[1*3+2]; /*New point 2*/ - xyz_zero[3*1+0]=xyz_list[2][0]; - xyz_zero[3*1+1]=xyz_list[2][1]; - xyz_zero[3*1+2]=xyz_list[2][2]; + xyz_zero[3*1+0]=xyz_list[2*3+0]; + xyz_zero[3*1+1]=xyz_list[2*3+1]; + xyz_zero[3*1+2]=xyz_list[2*3+2]; } else _error_("Case not covered"); -} -/*}}}*/ + + /*Assign output pointer*/ + *pxyz_zero= xyz_zero; +} +/*}}}*/ +void Tria::GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum){/*{{{*/ + + /* Intermediaries */ + int i, dir,nrfrontnodes; + IssmDouble levelset[NUMVERTICES]; + + /*Recover parameters and values*/ + GetInputListOnVertices(&levelset[0],levelsetenum); + + int* indicesfront = xNew(NUMVERTICES); + /* Get nodes where there is no ice */ + nrfrontnodes=0; + for(i=0;i=0.){ + indicesfront[nrfrontnodes]=i; + nrfrontnodes++; + } + } + + _assert_(nrfrontnodes==2); + + /* arrange order of frontnodes such that they are oriented counterclockwise */ + if((NUMVERTICES+indicesfront[0]-indicesfront[1])%NUMVERTICES!=NUMVERTICES-1){ + int index=indicesfront[0]; + indicesfront[0]=indicesfront[1]; + indicesfront[1]=index; + } + + IssmDouble* xyz_front = xNew(3*nrfrontnodes); + /* Return nodes */ + for(i=0;i(indicesfront); +}/*}}}*/ +void Tria::GetNormalFromLSF(IssmDouble *pnormal){/*{{{*/ + + /* Intermediaries */ + int i; + const int dim=2; + IssmDouble* xyz_list = NULL; + IssmDouble dlevelset[dim], norm_dlevelset; + IssmDouble normal[dim]={0.}; + + /*Retrieve all inputs and parameters*/ + Input* levelset_input=this->GetInput(MaskIceLevelsetEnum); _assert_(levelset_input); + this->GetVerticesCoordinates(&xyz_list); + + IssmDouble counter=0.; + Gauss* gauss = this->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + /* Get normal on node */ + levelset_input->GetInputDerivativeValue(&dlevelset[0],xyz_list,gauss); + norm_dlevelset=0.; + for(i=0;i0.); + for(i=0;i(xyz_list); +}/*}}}*/ /*FUNCTION Tria::GetNodeIndex {{{*/ int Tria::GetNodeIndex(Node* node){ @@ -1267,28 +913,4 @@ } /*}}}*/ -/*FUNCTION Tria::GetNodesSidList{{{*/ -void Tria::GetNodesSidList(int* sidlist){ - - _assert_(sidlist); - _assert_(nodes); - int numnodes = this->NumberofNodes(); - - for(int i=0;iSid(); - } -} -/*}}}*/ -/*FUNCTION Tria::GetNodesLidList{{{*/ -void Tria::GetNodesLidList(int* lidlist){ - - _assert_(lidlist); - _assert_(nodes); - int numnodes = this->NumberofNodes(); - - for(int i=0;iLid(); - } -} -/*}}}*/ /*FUNCTION Tria::GetNumberOfNodes;{{{*/ int Tria::GetNumberOfNodes(void){ @@ -1296,107 +918,7 @@ } /*}}}*/ -/*FUNCTION Tria::GetInputListOnVertices(IssmDouble* pvalue,int enumtype) {{{*/ -void Tria::GetInputListOnVertices(IssmDouble* pvalue,int enumtype){ - - /*Recover input*/ - Input* input=inputs->GetInput(enumtype); - if (!input) _error_("Input " << EnumToStringx(enumtype) << " not found in element"); - - /*Checks in debugging mode*/ - _assert_(pvalue); - - /* Start looping on the number of vertices: */ - GaussTria* gauss=new GaussTria(); - for (int iv=0;ivGaussVertex(iv); - input->GetInputValue(&pvalue[iv],gauss); - } - - /*clean-up*/ - delete gauss; -} -/*}}}*/ -/*FUNCTION Tria::GetInputListOnVertices(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue) {{{*/ -void Tria::GetInputListOnVertices(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue){ - - Input *input = inputs->GetInput(enumtype); - - /*Checks in debugging mode*/ - _assert_(pvalue); - - /* Start looping on the number of vertices: */ - if (input){ - GaussTria* gauss=new GaussTria(); - for (int iv=0;ivGaussVertex(iv); - input->GetInputValue(&pvalue[iv],gauss); - } - delete gauss; - } - else{ - for (int iv=0;ivGetInput(enumtype); - - /*Checks in debugging mode*/ - _assert_(pvalue); - - /* Start looping on the number of vertices: */ - if (input){ - GaussTria* gauss=new GaussTria(); - for (int iv=0;ivGaussVertex(iv); - input->GetInputValue(&pvalue[iv],gauss,index); - } - delete gauss; - } - else{ - for (int iv=0;ivGetInput(enumtype); - int numnodes = this->NumberofNodes(); - - /* Start looping on the number of vertices: */ - if(input){ - GaussTria* gauss=new GaussTria(); - for(int iv=0;ivNumberofNodes();iv++){ - gauss->GaussNode(this->element_type,iv); - input->GetInputValue(&pvalue[iv],gauss); - } - delete gauss; - } - else{ - for(int iv=0;ivGetInput(enumtype); - if(!input) _error_("Input " << EnumToStringx(enumtype) << " not found in element"); - - /* Start looping on the number of vertices: */ - GaussTria* gauss=new GaussTria(); - for (int iv=0;ivNumberofNodes();iv++){ - gauss->GaussNode(this->element_type,iv); - input->GetInputValue(&pvalue[iv],gauss); - } - delete gauss; +/*FUNCTION Tria::GetNumberOfVertices;{{{*/ +int Tria::GetNumberOfVertices(void){ + return NUMVERTICES; } /*}}}*/ @@ -1414,135 +936,40 @@ } /*}}}*/ -/*FUNCTION Tria::GetMaterialInputValue(IssmDouble* pvalue,Node* node,int enumtype) {{{*/ -void Tria::GetMaterialInputValue(IssmDouble* pvalue,Node* node,int enumtype){ - - Input* input=this->material->inputs->GetInput(enumtype); - if(!input) _error_("No input of type " << EnumToStringx(enumtype) << " found in tria"); - - GaussTria* gauss=new GaussTria(); - gauss->GaussVertex(this->GetNodeIndex(node)); - - input->GetInputValue(pvalue,gauss); - delete gauss; -} -/*}}}*/ -/*FUNCTION Tria::GetVertexPidList {{{*/ -void Tria::GetVertexPidList(int* doflist){ - - for(int i=0;i<3;i++) doflist[i]=vertices[i]->Pid(); - -} -/*}}}*/ -/*FUNCTION Tria::GetVertexSidList {{{*/ -void Tria::GetVertexSidList(int* sidlist){ - for(int i=0;iSid(); -} -/*}}}*/ -/*FUNCTION Tria::GetConnectivityList {{{*/ -void Tria::GetConnectivityList(int* connectivity){ - for(int i=0;iConnectivity(); -} -/*}}}*/ -/*FUNCTION Tria::GetSolutionFromInputs{{{*/ -void Tria::GetSolutionFromInputs(Vector* solution){ - - /*retrive parameters: */ - int analysis_type; - parameters->FindParam(&analysis_type,AnalysisTypeEnum); - - /*Just branch to the correct InputUpdateFromSolution generator, according to the type of analysis we are carrying out: */ - switch(analysis_type){ - #ifdef _HAVE_STRESSBALANCE_ - case StressbalanceAnalysisEnum: - int approximation; - inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation==FSApproximationEnum || approximation==NoneApproximationEnum){ - GetSolutionFromInputsStressbalanceFS(solution); - } - else if (approximation==SSAApproximationEnum || approximation==SIAApproximationEnum){ - GetSolutionFromInputsStressbalanceHoriz(solution); - } - else{ - _error_("approximation not supported yet"); - } - break; - case StressbalanceSIAAnalysisEnum: - GetSolutionFromInputsStressbalanceSIA(solution); - break; - #endif - #ifdef _HAVE_HYDROLOGY_ - case HydrologyShreveAnalysisEnum: - GetSolutionFromInputsOneDof(solution,WatercolumnEnum); - break; - case HydrologyDCInefficientAnalysisEnum: - GetSolutionFromInputsOneDof(solution,SedimentHeadEnum); - break; - case HydrologyDCEfficientAnalysisEnum: - GetSolutionFromInputsOneDof(solution,EplHeadEnum); - break; - #endif - default: - _error_("analysis: " << EnumToStringx(analysis_type) << " not supported yet"); - } - -} -/*}}}*/ -/*FUNCTION Tria::GetStrainRate2d(IssmDouble* epsilon,IssmDouble* xyz_list, GaussTria* gauss, Input* vx_input, Input* vy_input){{{*/ -void Tria::GetStrainRate2d(IssmDouble* epsilon,IssmDouble* xyz_list, GaussTria* gauss, Input* vx_input, Input* vy_input){ - /*Compute the 2d Strain Rate (3 components): - * epsilon=[exx eyy exy] */ - - int i; - IssmDouble epsilonvx[3]; - IssmDouble epsilonvy[3]; - - /*Check that both inputs have been found*/ - if (!vx_input || !vy_input){ - _error_("Input missing. Here are the input pointers we have for vx: " << vx_input << ", vy: " << vy_input << "\n"); - } - - /*Get strain rate assuming that epsilon has been allocated*/ - vx_input->GetVxStrainRate2d(epsilonvx,xyz_list,gauss); - vy_input->GetVyStrainRate2d(epsilonvy,xyz_list,gauss); - - /*Sum all contributions*/ - for(i=0;i<3;i++) epsilon[i]=epsilonvx[i]+epsilonvy[i]; -} -/*}}}*/ -/*FUNCTION Tria::GetVectorFromInputs{{{*/ -void Tria::GetVectorFromInputs(Vector* vector,int input_enum){ - - int vertexpidlist[NUMVERTICES]; - - /*Get out if this is not an element input*/ - if(!IsInput(input_enum)) return; - - /*Prepare index list*/ - this->GetVertexPidList(&vertexpidlist[0]); - - /*Get input (either in element or material)*/ - Input* input=inputs->GetInput(input_enum); - if(!input) _error_("Input " << EnumToStringx(input_enum) << " not found in element"); - - /*We found the enum. Use its values to fill into the vector, using the vertices ids: */ - input->GetVectorFromInputs(vector,&vertexpidlist[0]); -} -/*}}}*/ -/*FUNCTION Tria::Id {{{*/ -int Tria::Id(){ - - return id; - -} -/*}}}*/ -/*FUNCTION Tria::Sid {{{*/ -int Tria::Sid(){ - - return sid; - +Node* Tria::GetNode(int node_number){/*{{{*/ + _assert_(node_number>=0); + _assert_(node_numberNumberofNodes()); + return this->nodes[node_number]; + +}/*}}}*/ +/*FUNCTION Tria::GetXcoord {{{*/ +IssmDouble Tria::GetXcoord(Gauss* gauss){ + + IssmDouble x; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble x_list[NUMVERTICES]; + + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + for(int i=0;iinputs->GetInput(enum_type); - else if (object_enum==MaterialsEnum) - oldinput=(Input*)this->material->inputs->GetInput(enum_type); - else - _error_("object " << EnumToStringx(object_enum) << " not supported yet"); + oldinput=(Input*)this->inputs->GetInput(enum_type); if(!oldinput)_error_("could not find old input with enum: " << EnumToStringx(enum_type)); newinput=(Input*)oldinput->copy(); @@ -1564,10 +986,5 @@ /*Add new input to current element*/ - if (object_enum==MeshElementsEnum) - this->inputs->AddInput((Input*)newinput); - else if (object_enum==MaterialsEnum) - this->material->inputs->AddInput((Input*)newinput); - else - _error_("object " << EnumToStringx(object_enum) << " not supported yet"); + this->inputs->AddInput((Input*)newinput); } /*}}}*/ @@ -1576,6 +993,7 @@ /*Call inputs method*/ - if (IsInput(original_enum)) inputs->DuplicateInput(original_enum,new_enum); - + if (IsInput(original_enum)) { + inputs->DuplicateInput(original_enum,new_enum); + } } /*}}}*/ @@ -1591,34 +1009,4 @@ /*Scale: */ input->Scale(scale_factor); -} -/*}}}*/ -/*FUNCTION Tria::InputUpdateFromConstant(int value, int name);{{{*/ -void Tria::InputUpdateFromConstant(int constant, int name){ - - /*Check that name is an element input*/ - if(!IsInput(name)) return; - - /*update input*/ - this->inputs->AddInput(new IntInput(name,constant)); -} -/*}}}*/ -/*FUNCTION Tria::InputUpdateFromConstant(IssmDouble value, int name);{{{*/ -void Tria::InputUpdateFromConstant(IssmDouble constant, int name){ - - /*Check that name is an element input*/ - if(!IsInput(name)) return; - - /*update input*/ - this->inputs->AddInput(new DoubleInput(name,constant)); -} -/*}}}*/ -/*FUNCTION Tria::InputUpdateFromConstant(bool value, int name);{{{*/ -void Tria::InputUpdateFromConstant(bool constant, int name){ - - /*Check that name is an element input*/ - if(!IsInput(name)) return; - - /*update input*/ - this->inputs->AddInput(new BoolInput(name,constant)); } /*}}}*/ @@ -1654,5 +1042,4 @@ /*Control Inputs*/ - #ifdef _HAVE_CONTROL_ if (control_analysis && iomodel->Data(InversionControlParametersEnum)){ for(i=0;iData(MaterialsRheologyBEnum)){ + for(j=0;j<3;j++) nodeinputs[j]=iomodel->Data(MaterialsRheologyBEnum)[tria_vertex_ids[j]-1]; + for(j=0;j<3;j++)cmmininputs[j]=iomodel->Data(InversionMinParametersEnum)[(tria_vertex_ids[j]-1)*num_control_type+i]; + for(j=0;j<3;j++)cmmaxinputs[j]=iomodel->Data(InversionMaxParametersEnum)[(tria_vertex_ids[j]-1)*num_control_type+i]; + this->inputs->AddInput(new ControlInput(MaterialsRheologyBbarEnum,TriaInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); + } + break; + case DamageDbarEnum: + if(iomodel->Data(DamageDEnum)){ + for(j=0;j<3;j++) nodeinputs[j]=iomodel->Data(DamageDEnum)[tria_vertex_ids[j]-1]; + for(j=0;j<3;j++)cmmininputs[j]=iomodel->Data(InversionMinParametersEnum)[(tria_vertex_ids[j]-1)*num_control_type+i]; + for(j=0;j<3;j++)cmmaxinputs[j]=iomodel->Data(InversionMaxParametersEnum)[(tria_vertex_ids[j]-1)*num_control_type+i]; + this->inputs->AddInput(new ControlInput(DamageDbarEnum,TriaInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); + } + break; default: _error_("Control " << EnumToStringx(reCast(iomodel->Data(InversionControlParametersEnum)[i])) << " not implemented yet"); @@ -1706,5 +1106,4 @@ } } - #endif /*DatasetInputs*/ @@ -1723,91 +1122,4 @@ } /*}}}*/ -/*FUNCTION Tria::InputUpdateFromSolution {{{*/ -void Tria::InputUpdateFromSolution(IssmDouble* solution){ - - /*retrive parameters: */ - int analysis_type,extrusioninput; - parameters->FindParam(&analysis_type,AnalysisTypeEnum); - - /*Just branch to the correct InputUpdateFromSolution generator, according to the type of analysis we are carrying out: */ - switch(analysis_type){ - #ifdef _HAVE_STRESSBALANCE_ - case StressbalanceAnalysisEnum: - int approximation; - inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation==FSApproximationEnum || approximation==NoneApproximationEnum){ - InputUpdateFromSolutionStressbalanceFS(solution); - } - else if (approximation==SSAApproximationEnum || approximation==SIAApproximationEnum){ - InputUpdateFromSolutionStressbalanceHoriz(solution); - } - else{ - _error_("approximation not supported yet"); - } - break; - case StressbalanceSIAAnalysisEnum: - InputUpdateFromSolutionStressbalanceHoriz(solution); - break; - #endif - #ifdef _HAVE_CONTROL_ - case AdjointHorizAnalysisEnum: - InputUpdateFromSolutionAdjointHoriz(solution); - break; - case AdjointBalancethicknessAnalysisEnum: - InputUpdateFromSolutionOneDof(solution,AdjointEnum); - break; - #endif - #ifdef _HAVE_HYDROLOGY_ - case HydrologyShreveAnalysisEnum: - InputUpdateFromSolutionHydrologyShreve(solution); - break; - case HydrologyDCInefficientAnalysisEnum: - InputUpdateFromSolutionHydrologyDCInefficient(solution); - break; - case HydrologyDCEfficientAnalysisEnum: - InputUpdateFromSolutionOneDof(solution,EplHeadEnum); - break; - #endif - #ifdef _HAVE_DAMAGE_ - case DamageEvolutionAnalysisEnum: - InputUpdateFromSolutionDamageEvolution(solution); - break; - #endif - #ifdef _HAVE_BALANCED_ - case BalancethicknessAnalysisEnum: - InputUpdateFromSolutionOneDof(solution,ThicknessEnum); - break; - case BalancevelocityAnalysisEnum: - InputUpdateFromSolutionOneDof(solution,VelEnum); - break; - case SmoothedSurfaceSlopeXAnalysisEnum: - InputUpdateFromSolutionOneDof(solution,SurfaceSlopeXEnum); - break; - case SmoothedSurfaceSlopeYAnalysisEnum: - InputUpdateFromSolutionOneDof(solution,SurfaceSlopeYEnum); - break; - #endif - case L2ProjectionBaseAnalysisEnum: - this->parameters->FindParam(&extrusioninput,InputToL2ProjectEnum); - InputUpdateFromSolutionOneDof(solution,extrusioninput); - break; - case MasstransportAnalysisEnum: - InputUpdateFromSolutionMasstransport(solution); - break; - case FreeSurfaceTopAnalysisEnum: - InputUpdateFromSolutionOneDof(solution,SurfaceEnum); - break; - case FreeSurfaceBaseAnalysisEnum: - InputUpdateFromSolutionOneDof(solution,BedEnum); - break; - case ExtrudeFromBaseAnalysisEnum: case ExtrudeFromTopAnalysisEnum: - this->parameters->FindParam(&extrusioninput,InputToExtrudeEnum); - InputUpdateFromSolutionOneDof(solution,extrusioninput); - break; - default: - _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet"); - } -} -/*}}}*/ /*FUNCTION Tria::InputUpdateFromSolutionOneDof{{{*/ void Tria::InputUpdateFromSolutionOneDof(IssmDouble* solution,int enum_type){ @@ -1834,80 +1146,4 @@ /*Free ressources:*/ xDelete(values); - xDelete(doflist); -} -/*}}}*/ -/*FUNCTION Tria::InputUpdateFromSolutionMasstransport{{{*/ -void Tria::InputUpdateFromSolutionMasstransport(IssmDouble* solution){ - - /*Intermediaries*/ - int i,hydroadjustment; - int* doflist=NULL; - IssmDouble rho_ice,rho_water,minthickness; - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Fetch dof list and allocate solution vector*/ - GetDofList(&doflist,NoneApproximationEnum,GsetEnum); - IssmDouble* newthickness = xNew(numnodes); - IssmDouble* newbed = xNew(numnodes); - IssmDouble* newsurface = xNew(numnodes); - IssmDouble* oldthickness = xNew(numnodes); - IssmDouble* oldbed = xNew(numnodes); - IssmDouble* oldsurface = xNew(numnodes); - IssmDouble* phi = xNew(numnodes); - - /*Use the dof list to index into the solution vector: */ - this->parameters->FindParam(&minthickness,MasstransportMinThicknessEnum); - for(i=0;i(newthickness[i])) _error_("NaN found in solution vector"); - /*Constrain thickness to be at least 1m*/ - if(newthickness[i]parameters->FindParam(&hydroadjustment,MasstransportHydrostaticAdjustmentEnum); - rho_ice=matpar->GetRhoIce(); - rho_water=matpar->GetRhoWater(); - - for(i=0;i0.){ - newsurface[i] = oldbed[i]+newthickness[i]; //surface = oldbed + newthickness - newbed[i] = oldbed[i]; //same bed: do nothing - } - else{ //this is an ice shelf - if(hydroadjustment==AbsoluteEnum){ - newsurface[i] = newthickness[i]*(1-rho_ice/rho_water); - newbed[i] = newthickness[i]*(-rho_ice/rho_water); - } - else if(hydroadjustment==IncrementalEnum){ - newsurface[i] = oldsurface[i]+(1.0-rho_ice/rho_water)*(newthickness[i]-oldthickness[i]); //surface = oldsurface + (1-di) * dH - newbed[i] = oldbed[i]-rho_ice/rho_water*(newthickness[i]-oldthickness[i]); //bed = oldbed + di * dH - } - else _error_("Hydrostatic adjustment " << hydroadjustment << " (" << EnumToStringx(hydroadjustment) << ") not supported yet"); - } - } - - /*Add input to the element: */ - this->inputs->AddInput(new TriaInput(ThicknessEnum,newthickness,P1Enum)); - this->inputs->AddInput(new TriaInput(SurfaceEnum,newsurface,P1Enum)); - this->inputs->AddInput(new TriaInput(BedEnum,newbed,P1Enum)); - - /*Free ressources:*/ - xDelete(newthickness); - xDelete(newbed); - xDelete(newsurface); - xDelete(oldthickness); - xDelete(oldbed); - xDelete(oldsurface); - xDelete(phi); xDelete(doflist); } @@ -1930,10 +1166,5 @@ } /*update input*/ - if (name==MaterialsRheologyBbarEnum || name==MaterialsRheologyBEnum || name==DamageDEnum || name==DamageDbarEnum){ - material->inputs->AddInput(new TriaInput(name,values,P1Enum)); - } - else{ - this->inputs->AddInput(new TriaInput(name,values,P1Enum)); - } + this->inputs->AddInput(new TriaInput(name,values,P1Enum)); break; @@ -1944,10 +1175,5 @@ } /*update input*/ - if(name==MaterialsRheologyBbarEnum || name==MaterialsRheologyBEnum || name==DamageDEnum || name==DamageDbarEnum){ - material->inputs->AddInput(new TriaInput(name,values,P1Enum)); - } - else{ - this->inputs->AddInput(new TriaInput(name,values,P1Enum)); - } + this->inputs->AddInput(new TriaInput(name,values,P1Enum)); break; @@ -1989,141 +1215,66 @@ } /*}}}*/ -/*FUNCTION Tria::InputCreate(IssmDouble* vector,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code){{{*/ -void Tria::InputCreate(IssmDouble* vector,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code){ - - /*Intermediaries*/ - int i,t; - int tria_vertex_ids[3]; - int row; - IssmDouble nodeinputs[3]; - IssmDouble time; - TransientInput* transientinput=NULL; - - /*Branch on type of vector: nodal or elementary: */ - if(vector_type==1){ //nodal vector - - /*Recover vertices ids needed to initialize inputs*/ - for(i=0;i<3;i++){ - _assert_(iomodel->elements); - tria_vertex_ids[i]=reCast(iomodel->elements[3*this->sid+i]); //ids for vertices are in the elements array from Matlab - } - - /*Are we in transient or static? */ - if(M==iomodel->numberofvertices){ - - /*create input values: */ - for(i=0;i<3;i++)nodeinputs[i]=vector[tria_vertex_ids[i]-1]; - - /*create static input: */ - this->inputs->AddInput(new TriaInput(vector_enum,nodeinputs,P1Enum)); - } - else if(M==iomodel->numberofvertices+1){ - /*create transient input: */ - for(t=0;tAddTimeInput(new TriaInput(vector_enum,nodeinputs,P1Enum),time); - } - this->inputs->AddInput(transientinput); - } - else _error_("nodal vector is either numberofvertices or numberofvertices+1 long. Field provided (" << EnumToStringx(vector_enum) << ") is " << M << " long"); - } - else if(vector_type==2){ //element vector - /*Are we in transient or static? */ - if(M==iomodel->numberofelements){ - - /*static mode: create an input out of the element value: */ - - if (code==5){ //boolean - this->inputs->AddInput(new BoolInput(vector_enum,reCast(vector[this->sid]))); - } - else if (code==6){ //integer - this->inputs->AddInput(new IntInput(vector_enum,reCast(vector[this->sid]))); - } - else if (code==7){ //IssmDouble - this->inputs->AddInput(new DoubleInput(vector_enum,vector[this->sid])); - } - else _error_("could not recognize nature of vector from code " << code); - } - else { - _error_("transient element inputs not supported yet!"); - } - } - else{ - _error_("Cannot add input for vector type " << vector_type << " (not supported)"); - } - -} -/*}}}*/ -/*FUNCTION Tria::IsInput{{{*/ -bool Tria::IsInput(int name){ - if ( - name==ThicknessEnum || - name==SurfaceEnum || - name==BathymetryEnum || - name==BedEnum || - name==MaskGroundediceLevelsetEnum || - name==MaskIceLevelsetEnum || - name==SurfaceSlopeXEnum || - name==SurfaceSlopeYEnum || - name==BasalforcingsMeltingRateEnum || - name==WatercolumnEnum || - name==SurfaceforcingsMassBalanceEnum || - name==SurfaceAreaEnum|| - name==VxEnum || - name==VyEnum || - name==PressureEnum || - name==InversionVxObsEnum || - name==InversionVyObsEnum || - name==FrictionCoefficientEnum || - name==MaterialsRheologyBbarEnum || - name==DamageDbarEnum || - name==GradientEnum || - name==OldGradientEnum || - name==ConvergedEnum || - name==SedimentHeadOldEnum || - name==SedimentHeadEnum || - name==EplHeadOldEnum || - name==EplHeadEnum || - name==HydrologydcMaskEplactiveEnum || - name==MeshVertexonbedEnum || - name==WaterTransferEnum || - name==QmuVxEnum || - name==QmuVyEnum || - name==QmuPressureEnum || - name==QmuBedEnum || - name==QmuThicknessEnum || - name==QmuSurfaceEnum || - name==QmuTemperatureEnum || - name==QmuMeltingEnum || - name==QmuMaskGroundediceLevelsetEnum || - name==QmuMaskIceLevelsetEnum || - name==GiaWEnum || - name==GiadWdtEnum - ){ - return true; - } - else return false; -} -/*}}}*/ -/*FUNCTION Tria::IsOnBed {{{*/ -bool Tria::IsOnBed(){ - - bool onbed; - inputs->GetInputValue(&onbed,MeshElementonbedEnum); - return onbed; -} -/*}}}*/ -/*FUNCTION Tria::HasEdgeOnBed {{{*/ -bool Tria::HasEdgeOnBed(){ +/*FUNCTION Tria::IsOnBase {{{*/ +bool Tria::IsOnBase(){ + + int domaintype; + this->parameters->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DverticalEnum: + return HasEdgeOnBase(); + case Domain2DhorizontalEnum: + return true; + default: _error_("mesh "<parameters->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DverticalEnum: + return HasEdgeOnSurface(); + case Domain2DhorizontalEnum: + return true; + default: _error_("mesh "<Enum()==GaussTriaEnum); + this->GetJacobianDeterminant(pJdet,xyz_list,(GaussTria*)gauss); + +} +/*}}}*/ +/*FUNCTION Tria::JacobianDeterminantBase{{{*/ +void Tria::JacobianDeterminantBase(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss){ + + _assert_(gauss->Enum()==GaussTriaEnum); + this->GetSegmentJacobianDeterminant(pJdet,xyz_list_base,(GaussTria*)gauss); + +} +/*}}}*/ +/*FUNCTION Tria::JacobianDeterminantSurface{{{*/ +void Tria::JacobianDeterminantSurface(IssmDouble* pJdet,IssmDouble* xyz_list,Gauss* gauss){ + + _assert_(gauss->Enum()==GaussTriaEnum); + this->GetSegmentJacobianDeterminant(pJdet,xyz_list,(GaussTria*)gauss); + +} +/*}}}*/ +/*FUNCTION Tria::JacobianDeterminantTop{{{*/ +void Tria::JacobianDeterminantTop(IssmDouble* pJdet,IssmDouble* xyz_list_top,Gauss* gauss){ + + _assert_(gauss->Enum()==GaussTriaEnum); + this->GetSegmentJacobianDeterminant(pJdet,xyz_list_top,(GaussTria*)gauss); + +} +/*}}}*/ +/*FUNCTION Tria::HasEdgeOnBase {{{*/ +bool Tria::HasEdgeOnBase(){ IssmDouble values[NUMVERTICES]; @@ -2131,5 +1282,5 @@ /*Retrieve all inputs and parameters*/ - GetInputListOnVertices(&values[0],MeshVertexonbedEnum); + GetInputListOnVertices(&values[0],MeshVertexonbaseEnum); sum = values[0]+values[1]+values[2]; @@ -2168,6 +1319,6 @@ } /*}}}*/ -/*FUNCTION Tria::EdgeOnBedIndices{{{*/ -void Tria::EdgeOnBedIndices(int* pindex1,int* pindex2){ +/*FUNCTION Tria::EdgeOnBaseIndices{{{*/ +void Tria::EdgeOnBaseIndices(int* pindex1,int* pindex2){ IssmDouble values[NUMVERTICES]; @@ -2175,5 +1326,5 @@ /*Retrieve all inputs and parameters*/ - GetInputListOnVertices(&values[0],MeshVertexonbedEnum); + GetInputListOnVertices(&values[0],MeshVertexonbaseEnum); for(int i=0;i<3;i++){ @@ -2210,6 +1361,6 @@ } /*}}}*/ -/*FUNCTION Tria::EdgeOnBedIndex{{{*/ -int Tria::EdgeOnBedIndex(void){ +/*FUNCTION Tria::EdgeOnBaseIndex{{{*/ +int Tria::EdgeOnBaseIndex(void){ IssmDouble values[NUMVERTICES]; @@ -2217,5 +1368,5 @@ /*Retrieve all inputs and parameters*/ - GetInputListOnVertices(&values[0],MeshVertexonbedEnum); + GetInputListOnVertices(&values[0],MeshVertexonbaseEnum); for(int i=0;i<3;i++){ @@ -2248,22 +1399,79 @@ } /*}}}*/ -/*FUNCTION Tria::IsFloating {{{*/ -bool Tria::IsFloating(){ - - bool shelf; - int migration_style; - parameters->FindParam(&migration_style,GroundinglineMigrationEnum); - - if(migration_style==SubelementMigrationEnum || migration_style==SubelementMigration2Enum){ //Floating if all nodes are floating - if(this->inputs->Max(MaskGroundediceLevelsetEnum) <= 0.) shelf=true; - else shelf=false; - } - else if(migration_style==NoneEnum || migration_style==AgressiveMigrationEnum || migration_style==SoftMigrationEnum){ //Floating if all nodes are floating - if(this->inputs->Min(MaskGroundediceLevelsetEnum) > 0.) shelf=false; - else shelf=true; - } - else _error_("migration_style not implemented yet"); - - return shelf; +/*FUNCTION Tria::FSContactMigration{{{*/ +void Tria::FSContactMigration(Vector* vertexgrounded,Vector* vertexfloating){ + + if(!IsOnBase()) return; + + /*Intermediaries*/ + IssmDouble* xyz_list = NULL; + IssmDouble pressure,water_pressure,sigma_nn,viscosity,bed,base; + IssmDouble bed_normal[2]; + IssmDouble epsilon[3]; /* epsilon=[exx,eyy,exy];*/ + IssmDouble surface=0,value=0; + bool grounded; + + /* Get node coordinates and dof list: */ + GetVerticesCoordinates(&xyz_list); + + /*Retrieve all inputs we will be needing: */ + Input* pressure_input = inputs->GetInput(PressureEnum); _assert_(pressure_input); + Input* base_input = inputs->GetInput(BaseEnum); _assert_(base_input); + Input* bed_input = inputs->GetInput(BedEnum); _assert_(bed_input); + Input* vx_input = inputs->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input = inputs->GetInput(VyEnum); _assert_(vy_input); + + /*Create gauss point in the middle of the basal edge*/ + Gauss* gauss=NewGaussBase(1); + gauss->GaussPoint(0); + + if(!IsFloating()){ + /*Check for basal force only if grounded and touching GL*/ + if(this->inputs->Min(MaskGroundediceLevelsetEnum)==0.){ + this->StrainRateSSA(&epsilon[0],xyz_list,gauss,vx_input,vy_input); + this->ViscosityFS(&viscosity,2,xyz_list,gauss,vx_input,vy_input,NULL); + pressure_input->GetInputValue(&pressure, gauss); + base_input->GetInputValue(&base, gauss); _assert_(base<0.); + + /*Compute Stress*/ + IssmDouble sigma_xx=2.*viscosity*epsilon[0]-pressure; + IssmDouble sigma_yy=2.*viscosity*epsilon[1]-pressure; + IssmDouble sigma_xy=2.*viscosity*epsilon[2]; + + /*Get normal vector to the bed */ + NormalBase(&bed_normal[0],xyz_list); + + /*basalforce*/ + sigma_nn = sigma_xx*bed_normal[0]*bed_normal[0] + sigma_yy*bed_normal[1]*bed_normal[1] + 2.*sigma_xy*bed_normal[0]*bed_normal[1]; + + /*Compute water pressure*/ + IssmDouble rho_ice = matpar->GetRhoIce(); + IssmDouble rho_water = matpar->GetRhoWater(); + IssmDouble gravity = matpar->GetG(); + water_pressure=gravity*rho_water*base; + + /*Compare basal stress to water pressure and determine whether it should ground*/ + if (sigma_nnGetInputValue(&base, gauss); + bed_input->GetInputValue(&bed, gauss); + if (baseSetValue(vertices[i]->Pid(),+1.,INS_VAL); + else vertexfloating->SetValue(vertices[i]->Pid(),+1.,INS_VAL); + } + + /*clean up*/ + delete gauss; + xDelete(xyz_list); } /*}}}*/ @@ -2283,16 +1491,98 @@ } /*}}}*/ -/*FUNCTION Tria::NoIceInElement {{{*/ -bool Tria::NoIceInElement(){ - - /*Get levelset*/ - IssmDouble ls[NUMVERTICES]; - GetInputListOnVertices(&ls[0],MaskIceLevelsetEnum); - - /*If the level set is >0, ice is present in this element*/ - if(ls[0]>0. || ls[1]>0. || ls[2]>0.) return false; - - /*If the level set is awlays <=0, there is no ice here*/ - return true; +/*FUNCTION Tria::NewGauss(){{{*/ +Gauss* Tria::NewGauss(void){ + return new GaussTria(); +} +/*}}}*/ +/*FUNCTION Tria::NewGauss(int order){{{*/ +Gauss* Tria::NewGauss(int order){ + return new GaussTria(order); +} +/*}}}*/ +/*FUNCTION Tria::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order){{{*/ +Gauss* Tria::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order){ + + IssmDouble area_coordinates[2][3]; + GetAreaCoordinates(&area_coordinates[0][0],xyz_list_front,xyz_list,2); + return new GaussTria(area_coordinates,order); +} +/*}}}*/ +/*FUNCTION Tria::NewGauss(int point1,IssmDouble fraction1,IssmDouble fraction2,bool mainlyfloating){{{*/ +Gauss* Tria::NewGauss(int point1,IssmDouble fraction1,IssmDouble fraction2,bool mainlyfloating,int order){ + + return new GaussTria(point1,fraction1,fraction2,mainlyfloating,order); +} +/*}}}*/ +/*FUNCTION Tria::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert){{{*/ +Gauss* Tria::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert){ + + IssmDouble area_coordinates[2][3]; + GetAreaCoordinates(&area_coordinates[0][0],xyz_list_front,xyz_list,2); + return new GaussTria(area_coordinates,order_vert); +} +/*}}}*/ +/*FUNCTION Tria::NewGaussBase(int order){{{*/ +Gauss* Tria::NewGaussBase(int order){ + + int indices[2]; + this->EdgeOnBaseIndices(&indices[0],&indices[1]); + return new GaussTria(indices[0],indices[1],order); +} +/*}}}*/ +/*FUNCTION Tria::NewGaussTop(int order){{{*/ +Gauss* Tria::NewGaussTop(int order){ + + int indices[2]; + this->EdgeOnSurfaceIndices(&indices[0],&indices[1]); + return new GaussTria(indices[0],indices[1],order); +} +/*}}}*/ +/*FUNCTION Tria::NodalFunctions{{{*/ +void Tria::NodalFunctions(IssmDouble* basis, Gauss* gauss){ + + _assert_(gauss->Enum()==GaussTriaEnum); + this->GetNodalFunctions(basis,(GaussTria*)gauss); + +} +/*}}}*/ +/*FUNCTION Tria::NodalFunctionsDerivatives{{{*/ +void Tria::NodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){ + + _assert_(gauss->Enum()==GaussTriaEnum); + this->GetNodalFunctionsDerivatives(dbasis,xyz_list,(GaussTria*)gauss); + +} +/*}}}*/ +/*FUNCTION Tria::NodalFunctionsDerivativesVelocity{{{*/ +void Tria::NodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){ + + _assert_(gauss->Enum()==GaussTriaEnum); + this->GetNodalFunctionsDerivativesVelocity(dbasis,xyz_list,(GaussTria*)gauss); + +} +/*}}}*/ +/*FUNCTION Tria::NodalFunctionsVelocity{{{*/ +void Tria::NodalFunctionsVelocity(IssmDouble* basis, Gauss* gauss){ + + _assert_(gauss->Enum()==GaussTriaEnum); + this->GetNodalFunctionsVelocity(basis,(GaussTria*)gauss); + +} +/*}}}*/ +/*FUNCTION Tria::NodalFunctionsPressure{{{*/ +void Tria::NodalFunctionsPressure(IssmDouble* basis, Gauss* gauss){ + + _assert_(gauss->Enum()==GaussTriaEnum); + this->GetNodalFunctionsPressure(basis,(GaussTria*)gauss); + +} +/*}}}*/ +/*FUNCTION Tria::NodalFunctionsTensor{{{*/ +void Tria::NodalFunctionsTensor(IssmDouble* basis, Gauss* gauss){ + + _assert_(gauss->Enum()==GaussTriaEnum); + this->GetNodalFunctionsTensor(basis,(GaussTria*)gauss); + } /*}}}*/ @@ -2328,4 +1618,56 @@ if(found)*pvalue=value; return found; +} +/*}}}*/ +/*FUNCTION Tria::NormalBase {{{*/ +void Tria::NormalBase(IssmDouble* bed_normal,IssmDouble* xyz_list){ + + /*Build unit outward pointing vector*/ + IssmDouble vector[2]; + IssmDouble norm; + + vector[0]=xyz_list[1*3+0] - xyz_list[0*3+0]; + vector[1]=xyz_list[1*3+1] - xyz_list[0*3+1]; + + norm=sqrt(vector[0]*vector[0] + vector[1]*vector[1]); + + bed_normal[0]= + vector[1]/norm; + bed_normal[1]= - vector[0]/norm; +} +/*}}}*/ +/*FUNCTION Tria::NormalTop {{{*/ +void Tria::NormalTop(IssmDouble* bed_normal,IssmDouble* xyz_list){ + + /*Build unit outward pointing vector*/ + IssmDouble vector[2]; + IssmDouble norm; + + vector[0]=xyz_list[1*3+0] - xyz_list[0*3+0]; + vector[1]=xyz_list[1*3+1] - xyz_list[0*3+1]; + + norm=sqrt(vector[0]*vector[0] + vector[1]*vector[1]); + + bed_normal[0]= + vector[1]/norm; + bed_normal[1]= - vector[0]/norm; +} +/*}}}*/ +/*FUNCTION Tria::VelocityInterpolation{{{*/ +int Tria::VelocityInterpolation(void){ + return TriaRef::VelocityInterpolation(); +} +/*}}}*/ +/*FUNCTION Tria::PressureInterpolation{{{*/ +int Tria::PressureInterpolation(void){ + return TriaRef::PressureInterpolation(); +} +/*}}}*/ +/*FUNCTION Tria::NumberofNodesPressure{{{*/ +int Tria::NumberofNodesPressure(void){ + return TriaRef::NumberofNodesPressure(); +} +/*}}}*/ +/*FUNCTION Tria::NumberofNodesVelocity{{{*/ +int Tria::NumberofNodesVelocity(void){ + return TriaRef::NumberofNodesVelocity(); } /*}}}*/ @@ -2380,116 +1722,92 @@ } /*}}}*/ -/*FUNCTION Tria::ResetCoordinateSystem{{{*/ -void Tria::ResetCoordinateSystem(void){ - - int approximation; - int numindices; - int *indices = NULL; - IssmDouble slope; - IssmDouble xz_plane[6]; +/*FUNCTION Tria::ReduceMatrices {{{*/ +void Tria::ReduceMatrices(ElementMatrix* Ke,ElementVector* pe){ + + /*Static condensation if requested*/ + if(pe){ + if(this->element_type==MINIcondensedEnum){ + int indices[2]={6,7}; + pe->StaticCondensation(Ke,2,&indices[0]); + } + else if(this->element_type==P1bubblecondensedEnum){ + int size = nodes[3]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum); + int offset = 0; + for(int i=0;i<3;i++) offset+=nodes[i]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum); + int* indices=xNew(size); + for(int i=0;iStaticCondensation(Ke,size,indices); + xDelete(indices); + } + } + + if(Ke){ + if(this->element_type==MINIcondensedEnum){ + int indices[2]={6,7}; + Ke->StaticCondensation(2,&indices[0]); + } + else if(this->element_type==P1bubblecondensedEnum){ + int size = nodes[3]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum); + int offset = 0; + for(int i=0;i<3;i++) offset+=nodes[i]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum); + int* indices=xNew(size); + for(int i=0;iStaticCondensation(size,indices); + xDelete(indices); + } + } + + +} +/*}}}*/ +/*FUNCTION Tria::ResetFSBasalBoundaryCondition{{{*/ +void Tria::ResetFSBasalBoundaryCondition(void){ + + int numnodes = this->NumberofNodesVelocity(); + + int approximation; + IssmDouble* vertexonbase= NULL; + IssmDouble slope,groundedice; + IssmDouble xz_plane[6]; /*For FS only: we want the CS to be tangential to the bedrock*/ inputs->GetInputValue(&approximation,ApproximationEnum); - if(IsFloating() || !HasEdgeOnBed() || approximation!=FSApproximationEnum) return; - - /*Get number of nodes for velocity only and base*/ - int index = this->EdgeOnBedIndex(); - NodeOnEdgeIndices(&numindices,&indices,index,this->VelocityInterpolation()); - + if(!HasNodeOnBase() || approximation!=FSApproximationEnum) return; + + //printf("element number %i \n",this->id); /*Get inputs*/ - Input* slope_input=inputs->GetInput(BedSlopeXEnum); _assert_(slope_input); + Input* slope_input=inputs->GetInput(BedSlopeXEnum); _assert_(slope_input); + Input* groundedicelevelset_input=inputs->GetInput(MaskGroundediceLevelsetEnum); _assert_(groundedicelevelset_input); + vertexonbase = xNew(numnodes); + this->GetInputListOnNodesVelocity(&vertexonbase[0],MeshVertexonbaseEnum); /*Loop over basal nodes and update their CS*/ GaussTria* gauss = new GaussTria(); - for(int i=0;iGaussNode(this->VelocityInterpolation(),indices[i]); - slope_input->GetInputValue(&slope,gauss); - IssmDouble theta = atan(slope); - - /*New X axis New Z axis*/ - xz_plane[0]=cos(theta); xz_plane[3]=0.; - xz_plane[1]=sin(theta); xz_plane[4]=0.; - xz_plane[2]=0.; xz_plane[5]=1.; - - XZvectorsToCoordinateSystem(&this->nodes[indices[i]]->coord_system[0][0],&xz_plane[0]); + for(int i=0;iNumberofNodesVelocity();i++){ + + if(vertexonbase[i]==1){ + gauss->GaussNode(this->VelocityInterpolation(),i); + slope_input->GetInputValue(&slope,gauss); + groundedicelevelset_input->GetInputValue(&groundedice,gauss); + IssmDouble theta = atan(slope); + + /*New X axis New Z axis*/ + xz_plane[0]=cos(theta); xz_plane[3]=0.; + xz_plane[1]=sin(theta); xz_plane[4]=0.; + xz_plane[2]=0.; xz_plane[5]=1.; + if(groundedice>=0){ + this->nodes[i]->DofInSSet(1); //vy + } + else{ + this->nodes[i]->DofInFSet(1); //vy + } + + XZvectorsToCoordinateSystem(&this->nodes[i]->coord_system[0][0],&xz_plane[0]); + } } /*cleanup*/ - xDelete(indices); + xDelete(vertexonbase); delete gauss; -} -/*}}}*/ -/*FUNCTION Tria::ResultInterpolation{{{*/ -void Tria::ResultInterpolation(int* pinterpolation,int output_enum){ - - Input* input=this->inputs->GetInput(output_enum); - - /*If this input is not already in Inputs, maybe it needs to be computed?*/ - if(!input){ - switch(output_enum){ - case StressTensorxxEnum: - this->ComputeStressTensor(); - input=this->inputs->GetInput(output_enum); - break; - case StressTensorxyEnum: - this->ComputeStressTensor(); - input=this->inputs->GetInput(output_enum); - break; - case StressTensorxzEnum: - this->ComputeStressTensor(); - input=this->inputs->GetInput(output_enum); - break; - case StressTensoryyEnum: - this->ComputeStressTensor(); - input=this->inputs->GetInput(output_enum); - break; - case StressTensoryzEnum: - this->ComputeStressTensor(); - input=this->inputs->GetInput(output_enum); - break; - case StressTensorzzEnum: - this->ComputeStressTensor(); - input=this->inputs->GetInput(output_enum); - break; - default: - _error_("input "<GetResultInterpolation(); - -} -/*}}}*/ -/*FUNCTION Tria::ResultToVector{{{*/ -void Tria::ResultToVector(Vector* vector,int output_enum){ - - Input* input=this->inputs->GetInput(output_enum); - if(!input) _error_("input "<GetResultInterpolation()){ - case P0Enum: - _error_("not implemented..."); - break; - case P1Enum:{ - IssmDouble values[NUMVERTICES]; - IssmPDouble pvalues[NUMVERTICES]; - int connectivity[NUMVERTICES]; - int sidlist[NUMVERTICES]; - - this->GetVertexSidList(&sidlist[0]); - this->GetConnectivityList(&connectivity[0]); - this->GetInputListOnVertices(&values[0],output_enum); - for(int i=0;i(values[i])/reCast(connectivity[i]); - - vector->SetValues(NUMVERTICES,&sidlist[0],&pvalues[0],ADD_VAL); - break; - } - default: - _error_("interpolation "<GetResultInterpolation())<<" not supported yet"); - } - - } /*}}}*/ @@ -2546,20 +1864,4 @@ } /*}}}*/ -/*FUNCTION Tria::SetCurrentConfiguration {{{*/ -void Tria::SetCurrentConfiguration(Elements* elementsin, Loads* loadsin, Nodes* nodesin, Materials* materialsin, Parameters* parametersin){ - - /*go into parameters and get the analysis_counter: */ - int analysis_counter; - parametersin->FindParam(&analysis_counter,AnalysisCounterEnum); - - /*Get Element type*/ - this->element_type=this->element_type_list[analysis_counter]; - - /*Pick up nodes*/ - if(this->hnodes[analysis_counter]) this->nodes=(Node**)this->hnodes[analysis_counter]->deliverp(); - else this->nodes=NULL; - -} -/*}}}*/ /*FUNCTION Tria::SpawnSeg {{{*/ Seg* Tria::SpawnSeg(int index1,int index2){ @@ -2579,7 +1881,5 @@ /*Spawn material*/ - seg->material=(Material*)this->material->copy(); - delete seg->material->inputs; - seg->material->inputs=(Inputs*)this->material->inputs->SpawnSegInputs(index1,index2); + seg->material=(Material*)this->material->copy2(seg); /*recover nodes, material and matpar: */ @@ -2592,4 +1892,58 @@ } /*}}}*/ +/*FUNCTION Tria::SpawnBasalElement{{{*/ +Element* Tria::SpawnBasalElement(void){ + + int index1,index2; + int domaintype; + + this->parameters->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + return this; + case Domain2DverticalEnum: + _assert_(HasEdgeOnBase()); + this->EdgeOnBaseIndices(&index1,&index2); + return SpawnSeg(index1,index2); + default: + _error_("not implemented yet"); + } +} +/*}}}*/ +/*FUNCTION Tria::SpawnTopElement{{{*/ +Element* Tria::SpawnTopElement(void){ + + int index1,index2; + int domaintype; + + this->parameters->FindParam(&domaintype,DomainTypeEnum); + switch(domaintype){ + case Domain2DhorizontalEnum: + return this; + case Domain2DverticalEnum: + _assert_(HasEdgeOnSurface()); + this->EdgeOnSurfaceIndices(&index1,&index2); + return SpawnSeg(index2,index1); //reverse order + default: + _error_("not implemented yet"); + } +} +/*}}}*/ +/*FUNCTION Tria::SetCurrentConfiguration {{{*/ +void Tria::SetCurrentConfiguration(Elements* elementsin, Loads* loadsin, Nodes* nodesin, Materials* materialsin, Parameters* parametersin){ + + /*go into parameters and get the analysis_counter: */ + int analysis_counter; + parametersin->FindParam(&analysis_counter,AnalysisCounterEnum); + + /*Get Element type*/ + this->element_type=this->element_type_list[analysis_counter]; + + /*Pick up nodes*/ + if(this->hnodes[analysis_counter]) this->nodes=(Node**)this->hnodes[analysis_counter]->deliverp(); + else this->nodes=NULL; + +} +/*}}}*/ /*FUNCTION Tria::SurfaceArea {{{*/ IssmDouble Tria::SurfaceArea(void){ @@ -2601,7 +1955,7 @@ /*If on water, return 0: */ - if(NoIceInElement())return 0; - - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + if(!IsIceInElement()) return 0.; + + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); for(int i=0;i<3;i++){ @@ -2618,27 +1972,4 @@ /*Return: */ return S; -} -/*}}}*/ -/*FUNCTION Tria::SurfaceNormal{{{*/ -void Tria::SurfaceNormal(IssmDouble* surface_normal, IssmDouble xyz_list[3][3]){ - - IssmDouble v13[3],v23[3]; - IssmDouble normal[3]; - IssmDouble normal_norm; - - for(int i=0;i<3;i++){ - v13[i]=xyz_list[0][i]-xyz_list[2][i]; - v23[i]=xyz_list[1][i]-xyz_list[2][i]; - } - - normal[0]=v13[1]*v23[2]-v13[2]*v23[1]; - normal[1]=v13[2]*v23[0]-v13[0]*v23[2]; - normal[2]=v13[0]*v23[1]-v13[1]*v23[0]; - - normal_norm=sqrt( normal[0]*normal[0] + normal[1]*normal[1] + normal[2]*normal[2]); - - *(surface_normal+0) = normal[0]/normal_norm; - *(surface_normal+1) = normal[1]/normal_norm; - *(surface_normal+2) = normal[2]/normal_norm; } /*}}}*/ @@ -2659,13 +1990,9 @@ /*Get for Vx and Vy, the max of abs value: */ - #ifdef _HAVE_RESPONSES_ this->MaxAbsVx(&maxabsvx); this->MaxAbsVy(&maxabsvy); - #else - _error_("ISSM was not compiled with responses compiled in, exiting!"); - #endif /* Get node coordinates and dof list: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); minx=xyz_list[0][0]; @@ -2760,4 +2087,5 @@ break; case TaylorHoodEnum: + case XTaylorHoodEnum: numnodes = 9; tria_node_ids = xNew(numnodes); @@ -2788,5 +2116,30 @@ void Tria::UpdateConstraintsExtrudeFromBase(void){ - if(!HasEdgeOnBed()) return; + if(!HasEdgeOnBase()) return; + + int extrusioninput; + IssmDouble value,isonbase; + + this->parameters->FindParam(&extrusioninput,InputToExtrudeEnum); + Input* input = inputs->GetInput(extrusioninput); _assert_(input); + Input* onbase = inputs->GetInput(MeshVertexonbaseEnum); _assert_(onbase); + + GaussTria* gauss=new GaussTria(); + for(int iv=0;ivNumberofNodes();iv++){ + gauss->GaussNode(this->element_type,iv); + onbase->GetInputValue(&isonbase,gauss); + if(isonbase==1.){ + input->GetInputValue(&value,gauss); + this->nodes[iv]->ApplyConstraint(0,value); + } + } + delete gauss; + +} +/*}}}*/ +/*FUNCTION Tria::UpdateConstraintsExtrudeFromTop{{{*/ +void Tria::UpdateConstraintsExtrudeFromTop(void){ + + if(!HasEdgeOnSurface()) return; int extrusioninput; @@ -2795,6 +2148,6 @@ this->parameters->FindParam(&extrusioninput,InputToExtrudeEnum); - Input* input = inputs->GetInput(extrusioninput); _assert_(extrusioninput); - this->EdgeOnBedIndices(&indices[0],&indices[1]); + Input* input = inputs->GetInput(extrusioninput); _assert_(input); + this->EdgeOnSurfaceIndices(&indices[0],&indices[1]); GaussTria* gauss=new GaussTria(); @@ -2802,33 +2155,65 @@ gauss->GaussNode(P1Enum,indices[i]); input->GetInputValue(&value,gauss); - this->nodes[indices[i]]->ApplyConstraint(1,value); - } - -} -/*}}}*/ -/*FUNCTION Tria::UpdateConstraintsExtrudeFromTop{{{*/ -void Tria::UpdateConstraintsExtrudeFromTop(void){ - - if(!HasEdgeOnSurface()) return; - - int extrusioninput; - int indices[2]; - IssmDouble value; - - this->parameters->FindParam(&extrusioninput,InputToExtrudeEnum); - Input* input = inputs->GetInput(extrusioninput); _assert_(extrusioninput); - this->EdgeOnSurfaceIndices(&indices[0],&indices[1]); - - GaussTria* gauss=new GaussTria(); - for(int i=0;i<2;i++){ - gauss->GaussNode(P1Enum,indices[i]); - input->GetInputValue(&value,gauss); - this->nodes[indices[i]]->ApplyConstraint(1,value); - } - -} -/*}}}*/ - -#ifdef _HAVE_RESPONSES_ + this->nodes[indices[i]]->ApplyConstraint(0,value); + } + delete gauss; + +} +/*}}}*/ +/*FUNCTION Tria::ValueP1OnGauss{{{*/ +void Tria::ValueP1OnGauss(IssmDouble* pvalue,IssmDouble* values,Gauss* gauss){ + TriaRef::GetInputValue(pvalue,values,gauss,P1Enum); +} +/*}}}*/ +/*FUNCTION Tria::ValueP1DerivativesOnGauss{{{*/ +void Tria::ValueP1DerivativesOnGauss(IssmDouble* dvalue,IssmDouble* values,IssmDouble* xyz_list,Gauss* gauss){ + TriaRef::GetInputDerivativeValue(dvalue,values,xyz_list,gauss); +} +/*}}}*/ +/*FUNCTION Tria::VertexConnectivity{{{*/ +int Tria::VertexConnectivity(int vertexindex){ + _assert_(this->vertices); + return this->vertices[vertexindex]->Connectivity(); +} +/*}}}*/ +/*FUNCTION Tria::IsZeroLevelset{{{*/ +bool Tria::IsZeroLevelset(int levelset_enum){ + + bool iszerols; + IssmDouble ls[NUMVERTICES]; + + /*Retrieve all inputs and parameters*/ + GetInputListOnVertices(&ls[0],levelset_enum); + + /*If the level set is awlays <0, there is no ice front here*/ + iszerols= false; + if(IsIceInElement()){ + if(ls[0]*ls[1]<0. || ls[0]*ls[2]<0. || (ls[0]*ls[1]*ls[2]==0. && ls[0]*ls[1]+ls[0]*ls[2]+ls[1]*ls[2]<=0.)){ + iszerols = true; + } + } + + return iszerols; +} +/*}}}*/ +bool Tria::IsIcefront(void){/*{{{*/ + + bool isicefront; + int i,nrice; + IssmDouble ls[NUMVERTICES]; + + /*Retrieve all inputs and parameters*/ + GetInputListOnVertices(&ls[0],MaskIceLevelsetEnum); + + /* If only one vertex has ice, there is an ice front here */ + isicefront=false; + if(IsIceInElement()){ + nrice=0; + for(i=0;i* partition_contributions,Vector* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part){ @@ -2846,5 +2231,5 @@ /*Figure out the average for this element: */ - this->GetVertexSidList(&offsetsid[0]); + this->GetVerticesSidList(&offsetsid[0]); this->GetVertexPidList(&offsetdof[0]); mean=0; @@ -2877,7 +2262,39 @@ IssmDouble xyz_list[NUMVERTICES][3]; - if(NoIceInElement())return 0; - - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + if(!IsIceInElement())return 0; + + /*First get back the area of the base*/ + base=this->GetArea(); + + /*Now get the average height*/ + Input* surface_input = inputs->GetInput(SurfaceEnum); _assert_(surface_input); + Input* base_input = inputs->GetInput(BaseEnum); _assert_(base_input); + surface_input->GetInputAverage(&surface); + base_input->GetInputAverage(&bed); + + /*Return: */ + int domaintype; + parameters->FindParam(&domaintype,DomainTypeEnum); + if(domaintype==Domain2DverticalEnum){ + return base; + } + else{ + return base*(surface-bed); + } +} +/*}}}*/ +/*FUNCTION Tria::IceVolumeAboveFloatation {{{*/ +IssmDouble Tria::IceVolumeAboveFloatation(void){ + + /*The volume above floatation: H + rho_water/rho_ice * bathymetry */ + IssmDouble rho_ice,rho_water; + IssmDouble base,surface,bed,bathymetry; + IssmDouble xyz_list[NUMVERTICES][3]; + + if(!IsIceInElement() || IsFloating())return 0; + + rho_ice=matpar->GetRhoIce(); + rho_water=matpar->GetRhoWater(); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); /*First calculate the area of the base (cross section triangle) @@ -2886,40 +2303,11 @@ base = 1./2. * fabs((xyz_list[0][0]-xyz_list[2][0])*(xyz_list[1][1]-xyz_list[0][1]) - (xyz_list[0][0]-xyz_list[1][0])*(xyz_list[2][1]-xyz_list[0][1])); - /*Now get the average height*/ - Input* surface_input = inputs->GetInput(SurfaceEnum); _assert_(surface_input); - Input* bed_input = inputs->GetInput(BedEnum); _assert_(bed_input); - surface_input->GetInputAverage(&surface); - bed_input->GetInputAverage(&bed); - - /*Return: */ - return base*(surface-bed); -} -/*}}}*/ -/*FUNCTION Tria::IceVolumeAboveFloatation {{{*/ -IssmDouble Tria::IceVolumeAboveFloatation(void){ - - /*The volume above floatation: H + rho_water/rho_ice * bathymetry */ - IssmDouble rho_ice,rho_water; - IssmDouble base,surface,bed,bathymetry; - IssmDouble xyz_list[NUMVERTICES][3]; - - if(NoIceInElement() || IsFloating())return 0; - - rho_ice=matpar->GetRhoIce(); - rho_water=matpar->GetRhoWater(); - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - - /*First calculate the area of the base (cross section triangle) - * http://en.wikipedia.org/wiki/Triangle - * base = 1/2 abs((xA-xC)(yB-yA)-(xA-xB)(yC-yA))*/ - base = 1./2. * fabs((xyz_list[0][0]-xyz_list[2][0])*(xyz_list[1][1]-xyz_list[0][1]) - (xyz_list[0][0]-xyz_list[1][0])*(xyz_list[2][1]-xyz_list[0][1])); - /*Now get the average height and bathymetry*/ Input* surface_input = inputs->GetInput(SurfaceEnum); _assert_(surface_input); - Input* bed_input = inputs->GetInput(BedEnum); _assert_(bed_input); - Input* bathymetry_input = inputs->GetInput(BathymetryEnum); _assert_(bathymetry_input); + Input* base_input = inputs->GetInput(BaseEnum); _assert_(base_input); + Input* bed_input = inputs->GetInput(BedEnum); _assert_(bed_input); surface_input->GetInputAverage(&surface); - bed_input->GetInputAverage(&bed); - bathymetry_input->GetInputAverage(&bathymetry); + base_input->GetInputAverage(&bed); + bed_input->GetInputAverage(&bathymetry); /*Return: */ @@ -2930,5 +2318,5 @@ IssmDouble Tria::MassFlux( IssmDouble x1, IssmDouble y1, IssmDouble x2, IssmDouble y2,int segment_id){ - int meshtype; + int domaintype; IssmDouble mass_flux=0.; IssmDouble xyz_list[NUMVERTICES][3]; @@ -2947,5 +2335,5 @@ /*Get xyz list: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); /*get area coordinates of 0 and 1 locations: */ @@ -2961,8 +2349,8 @@ Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input); - this->parameters->FindParam(&meshtype,MeshTypeEnum); + this->parameters->FindParam(&domaintype,DomainTypeEnum); Input* vx_input=NULL; Input* vy_input=NULL; - if(meshtype==Mesh2DhorizontalEnum){ + if(domaintype==Domain2DhorizontalEnum){ vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); @@ -2994,5 +2382,5 @@ IssmDouble Tria::MassFlux( IssmDouble* segment){ - int meshtype; + int domaintype; IssmDouble mass_flux=0.; IssmDouble xyz_list[NUMVERTICES][3]; @@ -3014,5 +2402,5 @@ /*Get xyz list: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); /*get area coordinates of 0 and 1 locations: */ @@ -3028,8 +2416,8 @@ Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input); - this->parameters->FindParam(&meshtype,MeshTypeEnum); + this->parameters->FindParam(&domaintype,DomainTypeEnum); Input* vx_input=NULL; Input* vy_input=NULL; - if(meshtype==Mesh2DhorizontalEnum){ + if(domaintype==Domain2DhorizontalEnum){ vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); @@ -3206,7 +2594,7 @@ rho_ice=matpar->GetRhoIce(); - if(NoIceInElement())return 0; - - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + if(!IsIceInElement())return 0; + + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); /*First calculate the area of the base (cross section triangle) @@ -3224,5 +2612,84 @@ } /*}}}*/ -#endif +/*FUNCTION Tria::MisfitArea{{{*/ +IssmDouble Tria::MisfitArea(int weightsenum){ + + /*Intermediaries*/ + IssmDouble weight; + IssmDouble Jdet; + IssmDouble Jelem = 0; + IssmDouble xyz_list[NUMVERTICES][3]; + GaussTria *gauss = NULL; + + /*If on water, return 0: */ + if(!IsIceInElement())return 0; + + /*Retrieve all inputs we will be needing: */ + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + Input* weights_input =inputs->GetInput(weightsenum); _assert_(weights_input); + + /* Start looping on the number of gaussian points: */ + gauss=new GaussTria(2); + for(int ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); + + /* Get Jacobian determinant: */ + GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); + + /*Get parameters at gauss point*/ + weights_input->GetInputValue(&weight,gauss); + + /*compute misfit between model and observation */ + Jelem+=Jdet*weight*gauss->weight; + } + + /* clean up and Return: */ + delete gauss; + return Jelem; +} +/*}}}*/ +/*FUNCTION Tria::Misfit{{{*/ +IssmDouble Tria::Misfit(int modelenum,int observationenum,int weightsenum){ + + /*Intermediaries*/ + IssmDouble model,observation,weight; + IssmDouble Jdet; + IssmDouble Jelem = 0; + IssmDouble xyz_list[NUMVERTICES][3]; + GaussTria *gauss = NULL; + + /*If on water, return 0: */ + if(!IsIceInElement())return 0; + + /*Retrieve all inputs we will be needing: */ + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + Input* model_input=inputs->GetInput(modelenum); _assert_(model_input); + Input* observation_input=inputs->GetInput(observationenum);_assert_(observation_input); + Input* weights_input =inputs->GetInput(weightsenum); _assert_(weights_input); + + /* Start looping on the number of gaussian points: */ + gauss=new GaussTria(2); + for(int ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); + + /* Get Jacobian determinant: */ + GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); + + /*Get parameters at gauss point*/ + model_input->GetInputValue(&model,gauss); + observation_input->GetInputValue(&observation,gauss); + weights_input->GetInputValue(&weight,gauss); + + /*compute misfit between model and observation */ + Jelem+=0.5*(model-observation)*(model-observation)*Jdet*weight*gauss->weight; + } + + /* clean up and Return: */ + delete gauss; + return Jelem; +} +/*}}}*/ #ifdef _HAVE_GIA_ @@ -3308,5 +2775,5 @@ /*figure out gravity center of our element: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); x0=(xyz_list[0][0]+xyz_list[1][0]+xyz_list[2][0])/3.0; y0=(xyz_list[0][1]+xyz_list[1][1]+xyz_list[2][1])/3.0; @@ -3355,1225 +2822,4 @@ #endif -#ifdef _HAVE_STRESSBALANCE_ -/*FUNCTION Tria::CreateKMatrixStressbalanceFS{{{*/ -ElementMatrix* Tria::CreateKMatrixStressbalanceFS(void){ - - ElementMatrix* Ke1 = NULL; - ElementMatrix* Ke2 = NULL; - ElementMatrix* Ke = NULL; - - /*compute all stiffness matrices for this element*/ - Ke1=CreateKMatrixStressbalanceFSViscous(); - Ke2=CreateKMatrixStressbalanceFSFriction(); - Ke =new ElementMatrix(Ke1,Ke2); - - /*clean-up and return*/ - delete Ke1; - delete Ke2; - return Ke; - -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixStressbalanceFSViscous {{{*/ -ElementMatrix* Tria::CreateKMatrixStressbalanceFSViscous(void){ - - /*Intermediaries */ - int i,approximation; - IssmDouble Jdet,viscosity,FSreconditioning,D_scalar; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble epsilon[3]; /* epsilon=[exx,eyy,exy];*/ - GaussTria *gauss=NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - int numdof = vnumnodes*NDOF2 + pnumnodes*NDOF1; - - /*Prepare coordinate system list*/ - int* cs_list = xNew(vnumnodes+pnumnodes); - for(i=0;iparameters,FSvelocityEnum); - IssmDouble* B = xNew(5*numdof); - IssmDouble* Bprime = xNew(5*numdof); - IssmDouble* D = xNewZeroInit(5*5); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - parameters->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussTria(5); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetBFS(B,&xyz_list[0][0],gauss); - GetBprimeFS(Bprime,&xyz_list[0][0],gauss); - - this->GetStrainRate2d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); - material->GetViscosity2dvertical(&viscosity,&epsilon[0]); - - D_scalar=gauss->weight*Jdet; - for(i=0;i<3;i++) D[i*5+i] = +D_scalar*2.*viscosity; - for(i=3;i<5;i++) D[i*5+i] = -D_scalar*FSreconditioning; - - TripleMultiply(B,5,numdof,1, - D,5,5,0, - Bprime,5,numdof,0, - Ke->values,1); - } - - /*Transform Coordinate System*/ - TransformStiffnessMatrixCoord(Ke,nodes,(vnumnodes+pnumnodes),cs_list); - - /*Clean up and return*/ - delete gauss; - xDelete(cs_list); - xDelete(B); - xDelete(Bprime); - xDelete(D); - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixStressbalanceFSFriction{{{*/ -ElementMatrix* Tria::CreateKMatrixStressbalanceFSFriction(void){ - - /*Intermediaries */ - int i,j; - int analysis_type; - int indices[2]; - IssmDouble alpha2,Jdet; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_seg[NUMVERTICES1D][3]; - Friction *friction = NULL; - - /*Initialize Element matrix and return if necessary*/ - if(IsFloating() || !HasEdgeOnBed()) return NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - int numdof = vnumnodes*NDOF2 + pnumnodes*NDOF1; - - /*Prepare coordinate system list*/ - int* cs_list = xNew(vnumnodes+pnumnodes); - for(i=0;iparameters,FSvelocityEnum); - IssmDouble* BFriction = xNew(1*numdof); - IssmDouble D; - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - parameters->FindParam(&analysis_type,AnalysisTypeEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - - /*Get vertex indices that lie on bed*/ - this->EdgeOnBedIndices(&indices[0],&indices[1]); - for(i=0;ibegin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetSegmentJacobianDeterminant(&Jdet,&xyz_list_seg[0][0],gauss); - GetLFS(BFriction,gauss); - - friction->GetAlpha2(&alpha2,gauss,VxEnum,VyEnum,VzEnum); - D = +alpha2*gauss->weight*Jdet; //taub_x = -alpha2 vx - - TripleMultiply(BFriction,1,numdof,1, - &D,1,1,0, - BFriction,1,numdof,0, - Ke->values,1); - } - - /*DO NOT Transform Coordinate System: this stiffness matrix is already expressed in tangential coordinates*/ - //TransformStiffnessMatrixCoord(Ke,nodes,(vnumnodes+pnumnodes),cs_list); - - /*Clean up and return*/ - delete gauss; - delete friction; - xDelete(BFriction); - xDelete(cs_list); - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixStressbalanceSSA {{{*/ -ElementMatrix* Tria::CreateKMatrixStressbalanceSSA(void){ - - /*compute all stiffness matrices for this element*/ - ElementMatrix* Ke1=CreateKMatrixStressbalanceSSAViscous(); - ElementMatrix* Ke2=CreateKMatrixStressbalanceSSAFriction(); - ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); - - /*clean-up and return*/ - delete Ke1; - delete Ke2; - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixStressbalanceSSAViscous{{{*/ -ElementMatrix* Tria::CreateKMatrixStressbalanceSSAViscous(void){ - - /*Intermediaries*/ - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble viscosity,newviscosity,oldviscosity; - IssmDouble viscosity_overshoot,thickness,Jdet; - IssmDouble epsilon[3],oldepsilon[3]; /* epsilon=[exx,eyy,exy]; */ - IssmDouble D_scalar; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - int numdof = numnodes*NDOF2; - - /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters,SSAApproximationEnum); - IssmDouble* B = xNew(3*numdof); - IssmDouble* Bprime = xNew(3*numdof); - IssmDouble* D = xNewZeroInit(3*3); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vxold_input=inputs->GetInput(VxPicardEnum); _assert_(vxold_input); - Input* vyold_input=inputs->GetInput(VyPicardEnum); _assert_(vyold_input); - this->parameters->FindParam(&viscosity_overshoot,StressbalanceViscosityOvershootEnum); - - /* Start looping on the number of gaussian points: */ - GaussTria* gauss = new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetBSSA(&B[0], &xyz_list[0][0], gauss); - GetBprimeSSA(&Bprime[0], &xyz_list[0][0], gauss); - - this->GetStrainRate2d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); - this->GetStrainRate2d(&oldepsilon[0],&xyz_list[0][0],gauss,vxold_input,vyold_input); - material->GetViscosity2d(&viscosity, &epsilon[0]); - material->GetViscosity2d(&oldviscosity, &oldepsilon[0]); - thickness_input->GetInputValue(&thickness, gauss); - - newviscosity=viscosity+viscosity_overshoot*(viscosity-oldviscosity); - D_scalar=2.*newviscosity*thickness*gauss->weight*Jdet; - for(int i=0;i<3;i++) D[i*3+i]=D_scalar; - - TripleMultiply(B,3,numdof,1, - D,3,3,0, - Bprime,3,numdof,0, - &Ke->values[0],1); - } - - /*Transform Coordinate System*/ - TransformStiffnessMatrixCoord(Ke,nodes,numnodes,XYEnum); - - /*Clean up and return*/ - delete gauss; - xDelete(D); - xDelete(Bprime); - xDelete(B); - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixStressbalanceSSAFriction {{{*/ -ElementMatrix* Tria::CreateKMatrixStressbalanceSSAFriction(void){ - - /*Intermediaries*/ - bool mainlyfloating; - int analysis_type,migration_style; - int point1; - IssmDouble alpha2,Jdet; - IssmDouble fraction1,fraction2; - IssmDouble phi=1.0; - IssmDouble D_scalar; - IssmDouble gllevelset; - IssmDouble xyz_list[NUMVERTICES][3]; - Friction *friction = NULL; - GaussTria *gauss = NULL; - - /*Return if element is inactive*/ - if(IsFloating()) return NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - int numdof = numnodes*NDOF2; - - /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters,SSAApproximationEnum); - IssmDouble* B = xNew(2*numdof); - IssmDouble* D = xNewZeroInit(2*2); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - parameters->FindParam(&migration_style,GroundinglineMigrationEnum); - Input* surface_input=inputs->GetInput(SurfaceEnum); _assert_(surface_input); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* gllevelset_input=NULL; - parameters->FindParam(&analysis_type,AnalysisTypeEnum); - - /*build friction object, used later on: */ - friction=new Friction("2d",inputs,matpar,analysis_type); - - /*Recover portion of element that is grounded*/ - if(migration_style==SubelementMigrationEnum) phi=this->GetGroundedPortion(&xyz_list[0][0]); - if(migration_style==SubelementMigration2Enum){ - gllevelset_input=inputs->GetInput(MaskGroundediceLevelsetEnum); _assert_(gllevelset_input); - this->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating); - gauss=new GaussTria(point1,fraction1,fraction2,mainlyfloating,2); - } - else{ - gauss=new GaussTria(2); - } - - /* Start looping on the number of gaussian points: */ - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - friction->GetAlpha2(&alpha2, gauss,VxEnum,VyEnum,VzEnum); - if(migration_style==SubelementMigrationEnum) alpha2=phi*alpha2; - if(migration_style==SubelementMigration2Enum){ - gllevelset_input->GetInputValue(&gllevelset, gauss); - if(gllevelset<0) alpha2=0; - } - - GetBSSAFriction(&B[0], &xyz_list[0][0], gauss); - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - D_scalar=alpha2*gauss->weight*Jdet; - for(int i=0;i<2;i++) D[i*2+i]=D_scalar; - - TripleMultiply(B,2,numdof,1, - D,2,2,0, - B,2,numdof,0, - &Ke->values[0],1); - } - - /*Transform Coordinate System*/ - TransformStiffnessMatrixCoord(Ke,nodes,numnodes,XYEnum); - - /*Clean up and return*/ - delete gauss; - delete friction; - xDelete(D); - xDelete(B); - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixStressbalanceSIA{{{*/ -ElementMatrix* Tria::CreateKMatrixStressbalanceSIA(void){ - - /*Intermediaries*/ - IssmDouble connectivity; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); _assert_(numnodes==3); - int numdof = numnodes*NDOF2; - - /*Initialize Element matrix*/ - ElementMatrix* Ke=new ElementMatrix(nodes,numnodes,this->parameters,NoneApproximationEnum); - - /*Create Element matrix*/ - for(int i=0;iConnectivity(); - Ke->values[(2*i+0)*numdof+(2*i+0)]=1./connectivity; - Ke->values[(2*i+1)*numdof+(2*i+1)]=1./connectivity; - } - - /*Clean up and return*/ - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorStressbalanceFS {{{*/ -ElementVector* Tria::CreatePVectorStressbalanceFS(void){ - - ElementVector* pe1; - ElementVector* pe2; - ElementVector* pe3; - ElementVector* pe; - - /*compute all stiffness matrices for this element*/ - pe1=CreatePVectorStressbalanceFSViscous(); - pe2=CreatePVectorStressbalanceFSShelf(); - pe3=CreatePVectorStressbalanceFSFront(); - pe =new ElementVector(pe1,pe2,pe3); - - /*clean-up and return*/ - delete pe1; - delete pe2; - delete pe3; - return pe; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorStressbalanceFSFront{{{*/ -ElementVector* Tria::CreatePVectorStressbalanceFSFront(void){ - - /*Intermediaries */ - int i; - IssmDouble ls[NUMVERTICES]; - IssmDouble xyz_list[NUMVERTICES][3]; - bool isfront; - - /*Retrieve all inputs and parameters*/ - GetInputListOnVertices(&ls[0],MaskIceLevelsetEnum); - - /*If the level set is awlays <=0, there is no ice front here*/ - isfront = false; - if(ls[0]>0. || ls[1]>0. || ls[2]>0.){ - if(ls[0]*ls[1]<0. || ls[0]*ls[2]<0. || (ls[0]*ls[1]+ls[0]*ls[2]+ls[1]*ls[2]==0.)){ - isfront = true; - } - } - - /*If no front, return NULL*/ - if(!isfront) return NULL; - - /*Intermediaries*/ - IssmDouble rho_ice,rho_water,gravity,y_g; - IssmDouble Jdet,water_pressure,air_pressure,pressure; - IssmDouble xyz_list_front[2][3]; - IssmDouble area_coordinates[2][3]; - IssmDouble normal[2]; - GaussTria* gauss = NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - - /*Prepare coordinate system list*/ - int* cs_list = xNew(vnumnodes+pnumnodes); - for(i=0;iparameters,FSvelocityEnum); - IssmDouble* vbasis = xNew(vnumnodes); - - /*Retrieve all inputs and parameters*/ - rho_water = matpar->GetRhoWater(); - gravity = matpar->GetG(); - GetZeroLevelsetCoordinates(&xyz_list_front[0][0],xyz_list,MaskIceLevelsetEnum); - GetAreaCoordinates(&area_coordinates[0][0],xyz_list_front,xyz_list,2); - GetSegmentNormal(&normal[0],xyz_list_front); - - /*Start looping on Gaussian points*/ - IssmDouble ymax=max(xyz_list_front[0][1],xyz_list_front[1][1]); - IssmDouble ymin=min(xyz_list_front[0][1],xyz_list_front[1][1]); - if(ymax>0. && ymin<0.) gauss=new GaussTria(area_coordinates,30); //refined in vertical because of the sea level discontinuity - else gauss=new GaussTria(area_coordinates,3); - - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - y_g=GetYcoord(gauss); - GetNodalFunctionsVelocity(vbasis,gauss); - GetSegmentJacobianDeterminant(&Jdet,&xyz_list_front[0][0],gauss); - - water_pressure = rho_water*gravity*min(0.,y_g); //0 if the gaussian point is above water level - air_pressure = 0.; - pressure = water_pressure + air_pressure; - - for(i=0;ivalues[2*i+0]+= pressure*Jdet*gauss->weight*normal[0]*vbasis[i]; - pe->values[2*i+1]+= pressure*Jdet*gauss->weight*normal[1]*vbasis[i]; - } - } - - - /*Transform coordinate system*/ - TransformLoadVectorCoord(pe,nodes,(vnumnodes+pnumnodes),cs_list); - - /*Clean up and return*/ - xDelete(cs_list); - xDelete(vbasis); - delete gauss; - return pe; - -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorStressbalanceFSViscous {{{*/ -ElementVector* Tria::CreatePVectorStressbalanceFSViscous(void){ - - /*Intermediaries*/ - int i; - int approximation; - IssmDouble Jdet,gravity,rho_ice; - IssmDouble forcex,forcey; - IssmDouble xyz_list[NUMVERTICES][3]; - GaussTria *gauss=NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - - /*Prepare coordinate system list*/ - int* cs_list = xNew(vnumnodes+pnumnodes); - for(i=0;iparameters,FSvelocityEnum); - IssmDouble* vbasis = xNew(vnumnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* loadingforcex_input=inputs->GetInput(LoadingforceXEnum); _assert_(loadingforcex_input); - Input* loadingforcey_input=inputs->GetInput(LoadingforceYEnum); _assert_(loadingforcey_input); - rho_ice = matpar->GetRhoIce(); - gravity = matpar->GetG(); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussTria(5); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctionsVelocity(vbasis, gauss); - - loadingforcex_input->GetInputValue(&forcex,gauss); - loadingforcey_input->GetInputValue(&forcey,gauss); - - for(i=0;ivalues[i*NDOF2+1] += -rho_ice*gravity*Jdet*gauss->weight*vbasis[i]; - pe->values[i*NDOF2+0] += +rho_ice*forcex *Jdet*gauss->weight*vbasis[i]; - pe->values[i*NDOF2+1] += +rho_ice*forcey *Jdet*gauss->weight*vbasis[i]; - } - } - - /*Transform coordinate system*/ - TransformLoadVectorCoord(pe,nodes,vnumnodes+pnumnodes,cs_list); - - /*Clean up and return*/ - delete gauss; - xDelete(cs_list); - xDelete(vbasis); - return pe; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorStressbalanceFSShelf{{{*/ -ElementVector* Tria::CreatePVectorStressbalanceFSShelf(void){ - - /*Intermediaries*/ - int i,j; - int indices[2]; - IssmDouble gravity,rho_water,bed,water_pressure; - IssmDouble normal_vel,vx,vy,dt; - IssmDouble xyz_list_seg[NUMVERTICES1D][3]; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble normal[2]; - IssmDouble Jdet; - - /*Initialize Element vector and return if necessary*/ - if(!HasEdgeOnBed() || !IsFloating()) return NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - - /*Prepare coordinate system list*/ - int* cs_list = xNew(vnumnodes+pnumnodes); - for(i=0;iparameters,FSvelocityEnum); - IssmDouble* vbasis = xNew(vnumnodes); - - /*Retrieve all inputs and parameters*/ - rho_water=matpar->GetRhoWater(); - gravity=matpar->GetG(); - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* bed_input=inputs->GetInput(BedEnum); _assert_(bed_input); - - /*Get vertex indices that lie on bed*/ - this->EdgeOnBedIndices(&indices[0],&indices[1]); - - for(i=0;ibegin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetSegmentJacobianDeterminant(&Jdet,&xyz_list_seg[0][0],gauss); - GetNodalFunctionsVelocity(vbasis, gauss); - - GetSegmentNormal(&normal[0],xyz_list_seg); - _assert_(normal[1]<0.); - bed_input->GetInputValue(&bed, gauss); - water_pressure=gravity*rho_water*bed; - - for(i=0;ivalues[2*i+0]+=(water_pressure)*gauss->weight*Jdet*vbasis[i]*normal[0]; - pe->values[2*i+1]+=(water_pressure)*gauss->weight*Jdet*vbasis[i]*normal[1]; - } - } - - /*Transform coordinate system*/ - TransformLoadVectorCoord(pe,nodes,(vnumnodes+pnumnodes),cs_list); - - /*Clean up and return*/ - delete gauss; - xDelete(cs_list); - xDelete(vbasis); - return pe; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorStressbalanceSSA {{{*/ -ElementVector* Tria::CreatePVectorStressbalanceSSA(){ - - /*compute all load vectors for this element*/ - ElementVector* pe1=CreatePVectorStressbalanceSSADrivingStress(); - ElementVector* pe2=CreatePVectorStressbalanceSSAFront(); - ElementVector* pe =new ElementVector(pe1,pe2); - - /*clean-up and return*/ - delete pe1; - delete pe2; - return pe; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorStressbalanceSSADrivingStress {{{*/ -ElementVector* Tria::CreatePVectorStressbalanceSSADrivingStress(){ - - /*Intermediaries */ - int i; - IssmDouble driving_stress_baseline,thickness; - IssmDouble Jdet; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble slope[2]; - IssmDouble icefrontlevel[3]; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector and vectors*/ - ElementVector* pe=new ElementVector(nodes,numnodes,this->parameters,SSAApproximationEnum); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input); - Input* surface_input=inputs->GetInput(SurfaceEnum); _assert_(surface_input); - Input* drag_input=inputs->GetInput(FrictionCoefficientEnum);_assert_(drag_input); - GetInputListOnVertices(&icefrontlevel[0],BedEnum); - - /* Start looping on the number of gaussian points: */ - GaussTria* gauss = new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis, gauss); - - thickness_input->GetInputValue(&thickness,gauss); - surface_input->GetInputDerivativeValue(&slope[0],&xyz_list[0][0],gauss); - driving_stress_baseline=matpar->GetRhoIce()*matpar->GetG()*thickness; - - /*Build load vector: */ - for(i=0;ivalues[i*NDOF2+0]+=-driving_stress_baseline*slope[0]*Jdet*gauss->weight*basis[i]; - pe->values[i*NDOF2+1]+=-driving_stress_baseline*slope[1]*Jdet*gauss->weight*basis[i]; - } - } - - /*Transform coordinate system*/ - TransformLoadVectorCoord(pe,nodes,numnodes,XYEnum); - - /*Clean up and return*/ - xDelete(basis); - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorStressbalanceSSAFront {{{*/ -ElementVector* Tria::CreatePVectorStressbalanceSSAFront(){ - - /*Intermediaries */ - IssmDouble ls[NUMVERTICES]; - IssmDouble xyz_list[NUMVERTICES][3]; - bool isfront; - - /*Retrieve all inputs and parameters*/ - GetInputListOnVertices(&ls[0],MaskIceLevelsetEnum); - - /*If the level set is awlays <0, there is no ice front here*/ - isfront = false; - if(ls[0]>0. || ls[1]>0. || ls[2]>0.){ - if(ls[0]*ls[1]<0. || ls[0]*ls[2]<0. || (ls[0]*ls[1]+ls[0]*ls[2]+ls[1]*ls[2]==0.)){ - isfront = true; - } - } - - /*If no front, return NULL*/ - if(!isfront) return NULL; - - /*Intermediaries*/ - IssmDouble rho_ice,rho_water,gravity; - IssmDouble Jdet,thickness,bed,water_pressure,ice_pressure,air_pressure; - IssmDouble surface_under_water,base_under_water,pressure; - IssmDouble xyz_list_front[2][3]; - IssmDouble area_coordinates[2][3]; - IssmDouble normal[2]; - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector and other vectors*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - ElementVector* pe = new ElementVector(nodes,numnodes,this->parameters,SSAApproximationEnum); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input); - Input* bed_input =inputs->GetInput(BedEnum); _assert_(bed_input); - rho_water = matpar->GetRhoWater(); - rho_ice = matpar->GetRhoIce(); - gravity = matpar->GetG(); - GetZeroLevelsetCoordinates(&xyz_list_front[0][0],xyz_list,MaskIceLevelsetEnum); - GetAreaCoordinates(&area_coordinates[0][0],xyz_list_front,xyz_list,2); - GetSegmentNormal(&normal[0],xyz_list_front); - - /*Start looping on Gaussian points*/ - GaussTria* gauss=new GaussTria(area_coordinates,3); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - thickness_input->GetInputValue(&thickness,gauss); - bed_input->GetInputValue(&bed,gauss); - GetSegmentJacobianDeterminant(&Jdet,&xyz_list_front[0][0],gauss); - GetNodalFunctions(basis,gauss); - - surface_under_water = min(0.,thickness+bed); // 0 if the top of the glacier is above water level - base_under_water = min(0.,bed); // 0 if the bottom of the glacier is above water level - water_pressure = 1.0/2.0*gravity*rho_water*(pow(surface_under_water,2) - pow(base_under_water,2)); - ice_pressure = 1.0/2.0*gravity*rho_ice*pow(thickness,2); - air_pressure = 0; - pressure = ice_pressure + water_pressure + air_pressure; - - for (int i=0;ivalues[2*i+0]+= pressure*Jdet*gauss->weight*normal[0]*basis[i]; - pe->values[2*i+1]+= pressure*Jdet*gauss->weight*normal[1]*basis[i]; - } - } - - /*Transform coordinate system*/ - TransformLoadVectorCoord(pe,nodes,numnodes,XYEnum); - - /*Clean up and return*/ - xDelete(basis); - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorStressbalanceSIA{{{*/ -ElementVector* Tria::CreatePVectorStressbalanceSIA(void){ - - /*Intermediaries */ - IssmDouble constant_part,ub,vb; - IssmDouble rho_ice,gravity,n,B; - IssmDouble slope2,thickness,connectivity; - IssmDouble slope[2]; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); _assert_(numnodes==3); - - /*Initialize Element vector*/ - ElementVector* pe=new ElementVector(nodes,numnodes,this->parameters); - - /*Retrieve all inputs and parameters*/ - rho_ice=matpar->GetRhoIce(); - gravity=matpar->GetG(); - n=material->GetN(); - B=material->GetBbar(); - Input* slopex_input=inputs->GetInput(SurfaceSlopeXEnum); _assert_(slopex_input); - Input* slopey_input=inputs->GetInput(SurfaceSlopeYEnum); _assert_(slopey_input); - Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input); - - /*Spawn 3 sing elements: */ - GaussTria* gauss=new GaussTria(); - for(int i=0;iGaussVertex(i); - - connectivity=(IssmDouble)vertices[i]->Connectivity(); - - thickness_input->GetInputValue(&thickness,gauss); - slopex_input->GetInputValue(&slope[0],gauss); - slopey_input->GetInputValue(&slope[1],gauss); - slope2=pow(slope[0],2)+pow(slope[1],2); - - constant_part=-2.*pow(rho_ice*gravity,n)*pow(slope2,((n-1.)/2.)); - - ub=-1.58*1.e-10*rho_ice*gravity*thickness*slope[0]; - vb=-1.58*1.e-10*rho_ice*gravity*thickness*slope[1]; - - pe->values[2*i+0]=(ub-2.*pow(rho_ice*gravity,n)*pow(slope2,((n-1.)/2.))*pow(thickness,n)/(pow(B,n)*(n+1))*slope[0])/connectivity; - pe->values[2*i+1]=(vb-2.*pow(rho_ice*gravity,n)*pow(slope2,((n-1.)/2.))*pow(thickness,n)/(pow(B,n)*(n+1))*slope[1])/connectivity; - } - - /*Clean up and return*/ - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Tria::CreateJacobianStressbalanceSSA{{{*/ -ElementMatrix* Tria::CreateJacobianStressbalanceSSA(void){ - - /*Intermediaries */ - int i,j; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble Jdet,thickness; - IssmDouble eps1dotdphii,eps1dotdphij; - IssmDouble eps2dotdphii,eps2dotdphij; - IssmDouble mu_prime; - IssmDouble epsilon[3];/* epsilon=[exx,eyy,exy];*/ - IssmDouble eps1[2],eps2[2]; - GaussTria* gauss = NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element matrix, vectors and Gaussian points*/ - ElementMatrix* Ke=CreateKMatrixStressbalanceSSA(); //Initialize Jacobian with regular SSA (first part of the Gateau derivative) - IssmDouble* dbasis = xNew(2*numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctionsDerivatives(dbasis,&xyz_list[0][0],gauss); - - thickness_input->GetInputValue(&thickness, gauss); - this->GetStrainRate2d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); - material->GetViscosity2dDerivativeEpsSquare(&mu_prime,&epsilon[0]); - eps1[0]=2*epsilon[0]+epsilon[1]; eps2[0]=epsilon[2]; - eps1[1]=epsilon[2]; eps2[1]=epsilon[0]+2*epsilon[1]; - - for(i=0;ivalues[2*numnodes*(2*i+0)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*thickness*eps1dotdphij*eps1dotdphii; - Ke->values[2*numnodes*(2*i+0)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*thickness*eps2dotdphij*eps1dotdphii; - Ke->values[2*numnodes*(2*i+1)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*thickness*eps1dotdphij*eps2dotdphii; - Ke->values[2*numnodes*(2*i+1)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*thickness*eps2dotdphij*eps2dotdphii; - } - } - } - - /*Transform Coordinate System*/ - TransformStiffnessMatrixCoord(Ke,nodes,numnodes,XYEnum); - - /*Clean up and return*/ - xDelete(dbasis); - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::GetSolutionFromInputsStressbalanceFS{{{*/ -void Tria::GetSolutionFromInputsStressbalanceFS(Vector* solution){ - - int* vdoflist=NULL; - int* pdoflist=NULL; - IssmDouble vx,vy,p; - IssmDouble FSreconditioning; - GaussTria *gauss; - - /*Fetch number of nodes and dof for this finite element*/ - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - int vnumdof = vnumnodes*NDOF2; - int pnumdof = pnumnodes*NDOF1; - - /*Initialize values*/ - IssmDouble* vvalues = xNew(vnumdof); - IssmDouble* pvalues = xNew(pnumdof); - - /*Get dof list: */ - GetDofListVelocity(&vdoflist,GsetEnum); - GetDofListPressure(&pdoflist,GsetEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* p_input =inputs->GetInput(PressureEnum); _assert_(p_input); - - this->parameters->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); - - /*Ok, we have vx vy vz in values, fill in vx vy vz arrays: */ - gauss = new GaussTria(); - for(int i=0;iGaussNode(this->VelocityInterpolation(),i); - vx_input->GetInputValue(&vx,gauss); - vy_input->GetInputValue(&vy,gauss); - vvalues[i*NDOF2+0]=vx; - vvalues[i*NDOF2+1]=vy; - } - for(int i=0;iGaussNode(this->PressureInterpolation(),i); - p_input->GetInputValue(&p ,gauss); - pvalues[i]=p/FSreconditioning; - } - - /*Add value to global vector*/ - solution->SetValues(vnumdof,vdoflist,vvalues,INS_VAL); - solution->SetValues(pnumdof,pdoflist,pvalues,INS_VAL); - - /*Free ressources:*/ - delete gauss; - xDelete(pdoflist); - xDelete(vdoflist); - xDelete(pvalues); - xDelete(vvalues); -} -/*}}}*/ -/*FUNCTION Tria::GetSolutionFromInputsStressbalanceHoriz{{{*/ -void Tria::GetSolutionFromInputsStressbalanceHoriz(Vector* solution){ - - IssmDouble vx,vy; - int* doflist = NULL; - GaussTria* gauss = NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - int numdof = numnodes*NDOF2; - - /*Fetch dof list and allocate solution vector*/ - GetDofList(&doflist,NoneApproximationEnum,GsetEnum); - IssmDouble* values = xNew(numdof); - - /*Get inputs*/ - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - - /*Ok, we have vx and vy in values, fill in vx and vy arrays: */ - gauss=new GaussTria(); - for(int i=0;iGaussNode(this->element_type,i); - - /*Recover vx and vy*/ - vx_input->GetInputValue(&vx,gauss); - vy_input->GetInputValue(&vy,gauss); - values[i*NDOF2+0]=vx; - values[i*NDOF2+1]=vy; - } - - solution->SetValues(numdof,doflist,values,INS_VAL); - - /*Free ressources:*/ - delete gauss; - xDelete(values); - xDelete(doflist); -} -/*}}}*/ -/*FUNCTION Tria::GetSolutionFromInputsStressbalanceSIA{{{*/ -void Tria::GetSolutionFromInputsStressbalanceSIA(Vector* solution){ - - const int numdof=NDOF2*NUMVERTICES; - - int i; - IssmDouble vx,vy; - IssmDouble values[numdof]; - int *doflist = NULL; - GaussTria *gauss = NULL; - - /*Get dof list: */ - GetDofList(&doflist,NoneApproximationEnum,GsetEnum); - - /*Get inputs*/ - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - - /*Ok, we have vx and vy in values, fill in vx and vy arrays: */ - /*P1 element only for now*/ - gauss=new GaussTria(); - for(i=0;iGaussVertex(i); - - /*Recover vx and vy*/ - vx_input->GetInputValue(&vx,gauss); - vy_input->GetInputValue(&vy,gauss); - values[i*NDOF2+0]=vx; - values[i*NDOF2+1]=vy; - } - - solution->SetValues(numdof,doflist,values,INS_VAL); - - /*Free ressources:*/ - delete gauss; - xDelete(doflist); -} -/*}}}*/ -/*FUNCTION Tria::GetYcoord {{{*/ -IssmDouble Tria::GetYcoord(GaussTria* gauss){ - - IssmDouble y; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble y_list[NUMVERTICES]; - - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - for(int i=0;iNumberofNodes(); - int numdof = numnodes*NDOF2; - - /*Fetch dof list and allocate solution vectors*/ - GetDofList(&doflist,NoneApproximationEnum,GsetEnum); - IssmDouble* values = xNew(numdof); - IssmDouble* vx = xNew(numnodes); - IssmDouble* vy = xNew(numnodes); - IssmDouble* vz = xNew(numnodes); - IssmDouble* vel = xNew(numnodes); - IssmDouble* pressure = xNew(numnodes); - IssmDouble* thickness = xNew(numnodes); - - /*Use the dof list to index into the solution vector: */ - for(i=0;i(vx[i])) _error_("NaN found in solution vector"); - if(xIsNan(vy[i])) _error_("NaN found in solution vector"); - } - - /*Get Vz and compute vel*/ - GetInputListOnNodes(&vz[0],VzEnum,0.); - for(i=0;iGetRhoIce(); - g=matpar->GetG(); - GetInputListOnNodes(&thickness[0],ThicknessEnum); - for(i=0;iinputs->ChangeEnum(VxEnum,VxPicardEnum); - this->inputs->ChangeEnum(VyEnum,VyPicardEnum); - this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); - - /*Add vx and vy as inputs to the tria element: */ - this->inputs->AddInput(new TriaInput(VxEnum,vx,P1Enum)); - this->inputs->AddInput(new TriaInput(VyEnum,vy,P1Enum)); - this->inputs->AddInput(new TriaInput(VelEnum,vel,P1Enum)); - this->inputs->AddInput(new TriaInput(PressureEnum,pressure,P1Enum)); - - /*Free ressources:*/ - xDelete(thickness); - xDelete(pressure); - xDelete(vel); - xDelete(vz); - xDelete(vy); - xDelete(vx); - xDelete(values); - xDelete(doflist); - -} -/*}}}*/ -/*FUNCTION Tria::InputUpdateFromSolutionStressbalanceFS {{{*/ -void Tria::InputUpdateFromSolutionStressbalanceFS(IssmDouble* solution){ - - int i; - int* vdoflist=NULL; - int* pdoflist=NULL; - IssmDouble FSreconditioning; - - /*Fetch number of nodes and dof for this finite element*/ - int vnumnodes = this->NumberofNodesVelocity(); - int pnumnodes = this->NumberofNodesPressure(); - int vnumdof = vnumnodes*NDOF2; - int pnumdof = pnumnodes*NDOF1; - - /*Initialize values*/ - IssmDouble* values = xNew(vnumdof+pnumdof); - IssmDouble* vx = xNew(vnumnodes); - IssmDouble* vy = xNew(vnumnodes); - IssmDouble* vel = xNew(vnumnodes); - IssmDouble* pressure = xNew(pnumnodes); - - /*Prepare coordinate system list*/ - int* cs_list = xNew(vnumnodes+pnumnodes); - for(i=0;i(vx[i])) _error_("NaN found in solution vector"); - if(xIsNan(vy[i])) _error_("NaN found in solution vector"); - } - for(i=0;i(pressure[i])) _error_("NaN found in solution vector"); - } - - /*Recondition pressure and compute vel: */ - this->parameters->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); - for(i=0;iinputs->ChangeEnum(VxEnum,VxPicardEnum); - this->inputs->ChangeEnum(VyEnum,VyPicardEnum); - this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); - - /*Add vx and vy as inputs to the tria element: */ - this->inputs->AddInput(new TriaInput(VxEnum,vx,P1Enum)); - this->inputs->AddInput(new TriaInput(VyEnum,vy,P1Enum)); - this->inputs->AddInput(new TriaInput(VelEnum,vel,P1Enum)); - this->inputs->AddInput(new TriaInput(PressureEnum,pressure,P1Enum)); - - /*Free ressources:*/ - xDelete(pressure); - xDelete(vel); - xDelete(vy); - xDelete(vx); - xDelete(values); - xDelete(vdoflist); - xDelete(pdoflist); - xDelete(cs_list); -} -/*}}}*/ -/*FUNCTION Tria::InputUpdateFromSolutionStressbalanceSIA {{{*/ -void Tria::InputUpdateFromSolutionStressbalanceSIA(IssmDouble* solution){ - - int i; - IssmDouble rho_ice,g; - int* doflist=NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - int numdof = numnodes*NDOF2; - - /*Fetch dof list and allocate solution vectors*/ - GetDofList(&doflist,NoneApproximationEnum,GsetEnum); - IssmDouble* values = xNew(numdof); - IssmDouble* vx = xNew(numdof); - IssmDouble* vy = xNew(numdof); - IssmDouble* vz = xNew(numdof); - IssmDouble* vel = xNew(numdof); - IssmDouble* pressure = xNew(numdof); - IssmDouble* thickness = xNew(numdof); - - /*Use the dof list to index into the solution vector: */ - for(i=0;i(vx[i])) _error_("NaN found in solution vector"); - if(xIsNan(vy[i])) _error_("NaN found in solution vector"); - } - - /*Get Vz and compute vel*/ - GetInputListOnNodes(&vz[0],VzEnum,0.); - for(i=0;iGetRhoIce(); - g=matpar->GetG(); - GetInputListOnNodes(&thickness[0],ThicknessEnum); - for(i=0;iinputs->ChangeEnum(VxEnum,VxPicardEnum); - this->inputs->ChangeEnum(VyEnum,VyPicardEnum); - this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); - - /*Add vx and vy as inputs to the tria element: */ - this->inputs->AddInput(new TriaInput(VxEnum,vx,P1Enum)); - this->inputs->AddInput(new TriaInput(VyEnum,vy,P1Enum)); - this->inputs->AddInput(new TriaInput(VelEnum,vel,P1Enum)); - this->inputs->AddInput(new TriaInput(PressureEnum,pressure,P1Enum)); - - /*Free ressources:*/ - xDelete(thickness); - xDelete(pressure); - xDelete(vel); - xDelete(vz); - xDelete(vy); - xDelete(vx); - xDelete(values); - xDelete(doflist); -} -/*}}}*/ -#endif - -#ifdef _HAVE_CONTROL_ /*FUNCTION Tria::BalancethicknessMisfit{{{*/ IssmDouble Tria::BalancethicknessMisfit(void){ @@ -4591,8 +2837,8 @@ /*If on water, return 0: */ - if(NoIceInElement()) return 0; + if(!IsIceInElement()) return 0; /*Retrieve all inputs we will be needing: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); Input* weights_input = inputs->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input); Input* thickness_input = inputs->GetInput(ThicknessEnum); _assert_(thickness_input); @@ -4647,12 +2893,5 @@ for(int i=0;iinputs->GetInput(control_type[i]); _assert_(input); - } - else{ - input=(Input*)this->inputs->GetInput(control_type[i]); _assert_(input); - } - + input=(Input*)this->inputs->GetInput(control_type[i]); _assert_(input); if (input->ObjectEnum()!=ControlInputEnum){ _error_("input " << EnumToStringx(control_type[i]) << " is not a ControlInput"); @@ -4673,12 +2912,6 @@ int vertexpidlist[NUMVERTICES]; - Input* input=NULL; - - if(enum_type==MaterialsRheologyBbarEnum || enum_type==DamageDbarEnum){ - input=(Input*)material->inputs->GetInput(enum_type); - } - else{ - input=inputs->GetInput(enum_type); - } + + Input* input=inputs->GetInput(enum_type); if (!input) _error_("Input " << EnumToStringx(enum_type) << " not found"); if (input->ObjectEnum()!=ControlInputEnum) _error_("Input " << EnumToStringx(enum_type) << " is not a ControlInput"); @@ -4691,12 +2924,5 @@ void Tria::ControlInputScaleGradient(int enum_type,IssmDouble scale){ - Input* input=NULL; - - if(enum_type==MaterialsRheologyBbarEnum || enum_type==DamageDbarEnum){ - input=(Input*)material->inputs->GetInput(enum_type); - } - else{ - input=inputs->GetInput(enum_type); - } + Input* input=inputs->GetInput(enum_type); if (!input) _error_("Input " << EnumToStringx(enum_type) << " not found"); if (input->ObjectEnum()!=ControlInputEnum) _error_("Input " << EnumToStringx(enum_type) << " is not a ControlInput"); @@ -4710,12 +2936,6 @@ IssmDouble grad_list[NUMVERTICES]; Input* grad_input=NULL; - Input* input=NULL; - - if(enum_type==MaterialsRheologyBbarEnum || enum_type==DamageDbarEnum){ - input=(Input*)material->inputs->GetInput(enum_type); - } - else{ - input=inputs->GetInput(enum_type); - } + + Input* input=inputs->GetInput(enum_type); if (!input) _error_("Input " << EnumToStringx(enum_type) << " not found"); if (input->ObjectEnum()!=ControlInputEnum) _error_("Input " << EnumToStringx(enum_type) << " is not a ControlInput"); @@ -4731,11 +2951,5 @@ void Tria::ControlToVectors(Vector* vector_control, Vector* vector_gradient,int control_enum){ - Input* input=NULL; - if(control_enum==MaterialsRheologyBbarEnum || control_enum==DamageDbarEnum){ - input=(Input*)material->inputs->GetInput(control_enum); - } - else{ - input=inputs->GetInput(control_enum); - } + Input* input=inputs->GetInput(control_enum); if (!input) _error_("Input " << EnumToStringx(control_enum) << " not found"); if (input->ObjectEnum()!=ControlInputEnum) _error_("Input " << EnumToStringx(control_enum) << " is not a ControlInput"); @@ -4747,6 +2961,6 @@ IssmDouble value,gradient; - this->GetConnectivityList(&connectivity[0]); - this->GetVertexSidList(&sidlist[0]); + this->GetVerticesConnectivityList(&connectivity[0]); + this->GetVerticesSidList(&sidlist[0]); GaussTria* gauss=new GaussTria(); @@ -4771,5 +2985,5 @@ /*If on water, grad = 0: */ - if(NoIceInElement()) return; + if(!IsIceInElement()) return; /*First deal with āˆ‚/āˆ‚alpha(KU-F)*/ @@ -4847,7 +3061,7 @@ /*Retrieve all inputs we will be needing: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); GradientIndexing(&vertexpidlist[0],control_index); - Input* rheologyb_input=material->inputs->GetInput(MaterialsRheologyBbarEnum); _assert_(rheologyb_input); + Input* rheologyb_input=inputs->GetInput(MaterialsRheologyBbarEnum); _assert_(rheologyb_input); Input* weights_input=inputs->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input); @@ -4889,5 +3103,5 @@ /* Get node coordinates and dof list: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); GradientIndexing(&doflist[0],control_index); @@ -4898,5 +3112,5 @@ Input* adjointx_input=inputs->GetInput(AdjointxEnum); _assert_(adjointx_input); Input* adjointy_input=inputs->GetInput(AdjointyEnum); _assert_(adjointy_input); - Input* rheologyb_input=material->inputs->GetInput(MaterialsRheologyBbarEnum); _assert_(rheologyb_input); + Input* rheologyb_input=inputs->GetInput(MaterialsRheologyBbarEnum); _assert_(rheologyb_input); /* Start looping on the number of gaussian points: */ @@ -4913,5 +3127,5 @@ adjointy_input->GetInputDerivativeValue(&dadjy[0],&xyz_list[0][0],gauss); - this->GetStrainRate2d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); + this->StrainRateSSA(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); material->GetViscosityComplement(&viscosity_complement,&epsilon[0]); @@ -4946,5 +3160,5 @@ /* Get node coordinates and dof list: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); GradientIndexing(&doflist[0],control_index); @@ -4955,5 +3169,7 @@ Input* adjointx_input=inputs->GetInput(AdjointxEnum); _assert_(adjointx_input); Input* adjointy_input=inputs->GetInput(AdjointyEnum); _assert_(adjointy_input); - Input* rheologyd_input=material->inputs->GetInput(DamageDbarEnum); _assert_(rheologyd_input); + if(this->material->IsDamage()){ + Input* rheologyd_input=inputs->GetInput(DamageDbarEnum); _assert_(rheologyd_input); + } /* Start looping on the number of gaussian points: */ @@ -4969,5 +3185,5 @@ adjointy_input->GetInputDerivativeValue(&dadjy[0],&xyz_list[0][0],gauss); - this->GetStrainRate2d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); + this->StrainRateSSA(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); material->GetViscosityDComplement(&viscosity_complement,&epsilon[0]); @@ -5008,10 +3224,10 @@ /*retrive parameters: */ parameters->FindParam(&analysis_type,AnalysisTypeEnum); - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); GradientIndexing(&vertexpidlist[0],control_index); - this->GetConnectivityList(&connectivity[0]); + this->GetVerticesConnectivityList(&connectivity[0]); /*Build frictoin element, needed later: */ - friction=new Friction("2d",inputs,matpar,analysis_type); + friction=new Friction(this,2); /*Retrieve all inputs we will be needing: */ @@ -5032,5 +3248,5 @@ /*Build alpha_complement_list: */ - friction->GetAlphaComplement(&alpha_complement, gauss,VxEnum,VyEnum,VzEnum); + friction->GetAlphaComplement(&alpha_complement,gauss,vx_input,vy_input,NULL); dragcoefficient_input->GetInputValue(&drag, gauss); @@ -5057,5 +3273,5 @@ //for (int iv=0;ivGaussVertex(iv); - // friction->GetAlphaComplement(&alpha_complement, gauss,VxEnum,VyEnum,VzEnum); + // friction->GetAlphaComplement(&alpha_complement,gauss,vx_input,vy_input,vz_input); // dragcoefficient_input->GetInputValue(&drag, gauss); // adjointx_input->GetInputValue(&lambda, gauss); @@ -5088,5 +3304,5 @@ /*Retrieve all inputs we will be needing: */ if(IsFloating())return; - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); GradientIndexing(&vertexpidlist[0],control_index); Input* dragcoefficient_input=inputs->GetInput(FrictionCoefficientEnum); _assert_(dragcoefficient_input); @@ -5148,5 +3364,5 @@ /* Get node coordinates and dof list: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); GradientIndexing(&vertexpidlist[0],control_index); @@ -5191,5 +3407,5 @@ /* Get node coordinates and dof list: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); GradientIndexing(&vertexpidlist[0],control_index); @@ -5240,9 +3456,9 @@ /* Get node coordinates and dof list: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); GradientIndexing(&vertexpidlist[0],control_index); /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); this->parameters->FindParam(&num_responses,InversionNumCostFunctionsEnum); this->parameters->FindParam(&responses,NULL,InversionCostFunctionsEnum); @@ -5356,10 +3572,10 @@ /*If on water, return 0: */ - if(NoIceInElement()) return 0; + if(!IsIceInElement()) return 0; /*Retrieve all inputs we will be needing: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); Input* weights_input =inputs->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input); - Input* rheologyb_input=material->inputs->GetInput(MaterialsRheologyBbarEnum); _assert_(rheologyb_input); + Input* rheologyb_input=inputs->GetInput(MaterialsRheologyBbarEnum); _assert_(rheologyb_input); /* Start looping on the number of gaussian points: */ @@ -5395,8 +3611,8 @@ /*If on water, return 0: */ - if(NoIceInElement())return 0; + if(!IsIceInElement())return 0; /* Get node coordinates and dof list: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); /*Retrieve all inputs we will be needing: */ @@ -5454,8 +3670,8 @@ /*If on water, return 0: */ - if(NoIceInElement())return 0; + if(!IsIceInElement())return 0; /* Get node coordinates and dof list: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); /*Retrieve all inputs we will be needing: */ @@ -5513,8 +3729,8 @@ /*If on water, return 0: */ - if(NoIceInElement())return 0; + if(!IsIceInElement())return 0; /* Get node coordinates and dof list: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); /*Retrieve all inputs we will be needing: */ @@ -5571,8 +3787,8 @@ /*If on water, return 0: */ - if(NoIceInElement())return 0; + if(!IsIceInElement())return 0; /* Get node coordinates and dof list: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); /*Retrieve all inputs we will be needing: */ @@ -5630,8 +3846,8 @@ /*If on water, return 0: */ - if(NoIceInElement())return 0; + if(!IsIceInElement())return 0; /* Get node coordinates and dof list: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); /*Retrieve all inputs we will be needing: */ @@ -5692,8 +3908,8 @@ /*If on water, return 0: */ - if(NoIceInElement()) return 0; + if(!IsIceInElement()) return 0; /*Retrieve all inputs we will be needing: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); Input* weights_input =inputs->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input); Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input); @@ -5736,8 +3952,8 @@ /*If on water, return 0: */ - if(NoIceInElement()) return 0; + if(!IsIceInElement()) return 0; /*Retrieve all inputs we will be needing: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); Input* weights_input = inputs->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input); Input* thickness_input= inputs->GetInput(ThicknessEnum); _assert_(thickness_input); @@ -5787,8 +4003,8 @@ /*If on water, return 0: */ - if(NoIceInElement()) return 0; + if(!IsIceInElement()) return 0; /*Retrieve all inputs we will be needing: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); Input* weights_input = inputs->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input); Input* thickness_input= inputs->GetInput(ThicknessEnum); _assert_(thickness_input); @@ -5835,8 +4051,8 @@ /*If on water, return 0: */ - if(NoIceInElement())return 0; + if(!IsIceInElement())return 0; /*Retrieve all inputs we will be needing: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); Input* thickness_input =inputs->GetInput(ThicknessEnum); _assert_(thickness_input); Input* thicknessobs_input=inputs->GetInput(InversionThicknessObsEnum);_assert_(thicknessobs_input); @@ -5865,277 +4081,4 @@ delete gauss; return Jelem; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorAdjointBalancethickness{{{*/ -ElementVector* Tria::CreatePVectorAdjointBalancethickness(void){ - - /*Intermediaries */ - int i,resp; - IssmDouble Jdet; - IssmDouble thickness,thicknessobs,weight; - int num_responses; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble dH[2]; - IssmDouble vx,vy,vel; - int *responses = NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector and vectors*/ - ElementVector* pe = new ElementVector(nodes,numnodes,this->parameters); - IssmDouble* basis = xNew(numnodes); - IssmDouble* dbasis = xNew(2*numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&num_responses,InversionNumCostFunctionsEnum); - this->parameters->FindParam(&responses,NULL,InversionCostFunctionsEnum); - Input* thickness_input = inputs->GetInput(ThicknessEnum); _assert_(thickness_input); - Input* thicknessobs_input = inputs->GetInput(InversionThicknessObsEnum); _assert_(thicknessobs_input); - Input* weights_input = inputs->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input); - Input* vx_input = inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input = inputs->GetInput(VyEnum); _assert_(vy_input); - - /* Start looping on the number of gaussian points: */ - GaussTria* gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis, gauss); - GetNodalFunctionsDerivatives(dbasis,&xyz_list[0][0],gauss); - - thickness_input->GetInputValue(&thickness, gauss); - thickness_input->GetInputDerivativeValue(&dH[0],&xyz_list[0][0],gauss); - thicknessobs_input->GetInputValue(&thicknessobs, gauss); - - /*Loop over all requested responses*/ - for(resp=0;respGetInputValue(&weight,gauss,responses[resp]); - - switch(responses[resp]){ - case ThicknessAbsMisfitEnum: - for(i=0;ivalues[i]+=(thicknessobs-thickness)*weight*Jdet*gauss->weight*basis[i]; - break; - case ThicknessAbsGradientEnum: - for(i=0;ivalues[i]+= - weight*dH[0]*dbasis[0*numnodes+i]*Jdet*gauss->weight; - for(i=0;ivalues[i]+= - weight*dH[1]*dbasis[1*numnodes+i]*Jdet*gauss->weight; - break; - case ThicknessAlongGradientEnum: - vx_input->GetInputValue(&vx,gauss); - vy_input->GetInputValue(&vy,gauss); - vel = sqrt(vx*vx+vy*vy); - vx = vx/(vel+1.e-9); - vy = vy/(vel+1.e-9); - for(i=0;ivalues[i]+= - weight*(dH[0]*vx+dH[1]*vy)*(dbasis[0*numnodes+i]*vx+dbasis[1*numnodes+i]*vy)*Jdet*gauss->weight; - break; - case ThicknessAcrossGradientEnum: - vx_input->GetInputValue(&vx,gauss); - vy_input->GetInputValue(&vy,gauss); - vel = sqrt(vx*vx+vy*vy); - vx = vx/(vel+1.e-9); - vy = vy/(vel+1.e-9); - for(i=0;ivalues[i]+= - weight*(dH[0]*(-vy)+dH[1]*vx)*(dbasis[0*numnodes+i]*(-vy)+dbasis[1*numnodes+i]*vx)*Jdet*gauss->weight; - break; - default: - _error_("response " << EnumToStringx(responses[resp]) << " not supported yet"); - } - } - } - - /*Clean up and return*/ - xDelete(basis); - xDelete(dbasis); - xDelete(responses); - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorAdjointHoriz{{{*/ -ElementVector* Tria::CreatePVectorAdjointHoriz(void){ - - /*Intermediaries */ - int i,resp; - int *responses=NULL; - int num_responses; - IssmDouble Jdet; - IssmDouble obs_velocity_mag,velocity_mag; - IssmDouble dux,duy; - IssmDouble epsvel=2.220446049250313e-16; - IssmDouble meanvel=3.170979198376458e-05; /*1000 m/yr*/ - IssmDouble scalex=0.,scaley=0.,scale=0.,S=0.; - IssmDouble vx,vy,vxobs,vyobs,weight; - IssmDouble xyz_list[NUMVERTICES][3]; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector*/ - ElementVector* pe = new ElementVector(nodes,numnodes,this->parameters); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&num_responses,InversionNumCostFunctionsEnum); - this->parameters->FindParam(&responses,NULL,InversionCostFunctionsEnum); - Input* weights_input=inputs->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input); - Input* vx_input =inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input =inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vxobs_input =inputs->GetInput(InversionVxObsEnum); _assert_(vxobs_input); - Input* vyobs_input =inputs->GetInput(InversionVyObsEnum); _assert_(vyobs_input); - - /*Get Surface if required by one response*/ - for(resp=0;respGetInputValue(&S,SurfaceAreaEnum); break; - } - } - - /* Start looping on the number of gaussian points: */ - GaussTria* gauss=new GaussTria(4); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - /* Get Jacobian determinant: */ - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - - /*Get all parameters at gaussian point*/ - vx_input->GetInputValue(&vx,gauss); - vy_input->GetInputValue(&vy,gauss); - vxobs_input->GetInputValue(&vxobs,gauss); - vyobs_input->GetInputValue(&vyobs,gauss); - GetNodalFunctions(basis, gauss); - - /*Loop over all requested responses*/ - for(resp=0;respGetInputValue(&weight,gauss,responses[resp]); - - switch(responses[resp]){ - case SurfaceAbsVelMisfitEnum: - /* - * 1 [ 2 2 ] - * J = --- | (u - u ) + (v - v ) | - * 2 [ obs obs ] - * - * dJ - * DU = - -- = (u - u ) - * du obs - */ - for(i=0;ivalues[i*NDOF2+0]+=dux*weight*Jdet*gauss->weight*basis[i]; - pe->values[i*NDOF2+1]+=duy*weight*Jdet*gauss->weight*basis[i]; - } - break; - case SurfaceRelVelMisfitEnum: - /* - * 1 [ \bar{v}^2 2 \bar{v}^2 2 ] - * J = --- | ------------- (u - u ) + ------------- (v - v ) | - * 2 [ (u + eps)^2 obs (v + eps)^2 obs ] - * obs obs - * - * dJ \bar{v}^2 - * DU = - -- = ------------- (u - u ) - * du (u + eps)^2 obs - * obs - */ - for(i=0;ivalues[i*NDOF2+0]+=dux*weight*Jdet*gauss->weight*basis[i]; - pe->values[i*NDOF2+1]+=duy*weight*Jdet*gauss->weight*basis[i]; - } - break; - case SurfaceLogVelMisfitEnum: - /* - * [ vel + eps ] 2 - * J = 4 \bar{v}^2 | log ( ----------- ) | - * [ vel + eps ] - * obs - * - * dJ 2 * log(...) - * DU = - -- = - 4 \bar{v}^2 ------------- u - * du vel^2 + eps - * - */ - for(i=0;ivalues[i*NDOF2+0]+=dux*weight*Jdet*gauss->weight*basis[i]; - pe->values[i*NDOF2+1]+=duy*weight*Jdet*gauss->weight*basis[i]; - } - break; - case SurfaceAverageVelMisfitEnum: - /* - * 1 2 2 - * J = --- sqrt( (u - u ) + (v - v ) ) - * S obs obs - * - * dJ 1 1 - * DU = - -- = - --- ----------- * 2 (u - u ) - * du S 2 sqrt(...) obs - */ - for(i=0;ivalues[i*NDOF2+0]+=dux*weight*Jdet*gauss->weight*basis[i]; - pe->values[i*NDOF2+1]+=duy*weight*Jdet*gauss->weight*basis[i]; - } - break; - case SurfaceLogVxVyMisfitEnum: - /* - * 1 [ |u| + eps 2 |v| + eps 2 ] - * J = --- \bar{v}^2 | log ( ----------- ) + log ( ----------- ) | - * 2 [ |u |+ eps |v |+ eps ] - * obs obs - * dJ 1 u 1 - * DU = - -- = - \bar{v}^2 log(u...) --------- ---- ~ - \bar{v}^2 log(u...) ------ - * du |u| + eps |u| u + eps - */ - for(i=0;ivalues[i*NDOF2+0]+=dux*weight*Jdet*gauss->weight*basis[i]; - pe->values[i*NDOF2+1]+=duy*weight*Jdet*gauss->weight*basis[i]; - } - break; - case DragCoefficientAbsGradientEnum: - /*Nothing in P vector*/ - break; - case ThicknessAbsGradientEnum: - /*Nothing in P vector*/ - break; - case ThicknessAlongGradientEnum: - /*Nothing in P vector*/ - break; - case ThicknessAcrossGradientEnum: - /*Nothing in P vector*/ - break; - case RheologyBbarAbsGradientEnum: - /*Nothing in P vector*/ - break; - default: - _error_("response " << EnumToStringx(responses[resp]) << " not supported yet"); - } - } - } - - /*Clean up and return*/ - xDelete(basis); - xDelete(responses); - delete gauss; - return pe; } /*}}}*/ @@ -6154,8 +4097,8 @@ /*If on water, return 0: */ - if(NoIceInElement()) return 0; + if(!IsIceInElement()) return 0; /*Retrieve all inputs we will be needing: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); Input* weights_input=inputs->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input); Input* drag_input =inputs->GetInput(FrictionCoefficientEnum); _assert_(drag_input); @@ -6183,141 +4126,4 @@ } /*}}}*/ -/*FUNCTION Tria::CreateKMatrixAdjointBalancethickness {{{*/ -ElementMatrix* Tria::CreateKMatrixAdjointBalancethickness(void){ - - ElementMatrix* Ke=NULL; - - /*Get Element Matrix of the forward model*/ - switch(GetElementType()){ - case P1Enum: - Ke=CreateKMatrixBalancethickness_CG(); - break; - case P1DGEnum: - Ke=CreateKMatrixBalancethickness_DG(); - break; - default: - _error_("Element type " << EnumToStringx(GetElementType()) << " not supported yet"); - } - - /*Transpose and return Ke*/ - Ke->Transpose(); - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixAdjointSSA{{{*/ -ElementMatrix* Tria::CreateKMatrixAdjointSSA(void){ - - /*Intermediaries */ - int i,j; - bool incomplete_adjoint; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble Jdet,thickness; - IssmDouble eps1dotdphii,eps1dotdphij; - IssmDouble eps2dotdphii,eps2dotdphij; - IssmDouble mu_prime; - IssmDouble epsilon[3];/* epsilon=[exx,eyy,exy];*/ - IssmDouble eps1[2],eps2[2]; - GaussTria *gauss=NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Jacobian with regular SSA (first part of the Gateau derivative)*/ - parameters->FindParam(&incomplete_adjoint,InversionIncompleteAdjointEnum); - ElementMatrix* Ke=CreateKMatrixStressbalanceSSA(); - if(incomplete_adjoint) return Ke; - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input); - - /*Allocate dbasis*/ - IssmDouble* dbasis = xNew(2*numnodes); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctionsDerivatives(dbasis,&xyz_list[0][0],gauss); - - thickness_input->GetInputValue(&thickness, gauss); - this->GetStrainRate2d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); - material->GetViscosity2dDerivativeEpsSquare(&mu_prime,&epsilon[0]); - eps1[0]=2*epsilon[0]+epsilon[1]; eps2[0]=epsilon[2]; - eps1[1]=epsilon[2]; eps2[1]=epsilon[0]+2*epsilon[1]; - - for(i=0;ivalues[2*numnodes*(2*i+0)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*thickness*eps1dotdphij*eps1dotdphii; - Ke->values[2*numnodes*(2*i+0)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*thickness*eps2dotdphij*eps1dotdphii; - Ke->values[2*numnodes*(2*i+1)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*thickness*eps1dotdphij*eps2dotdphii; - Ke->values[2*numnodes*(2*i+1)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*thickness*eps2dotdphij*eps2dotdphii; - } - } - } - - /*Transform Coordinate System*/ - TransformStiffnessMatrixCoord(Ke,nodes,numnodes,XYEnum); - - /*Clean up and return*/ - delete gauss; - xDelete(dbasis); - //Ke->Transpose(); - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::InputUpdateFromSolutionAdjointHoriz {{{*/ -void Tria::InputUpdateFromSolutionAdjointHoriz(IssmDouble* solution){ - - int i; - int* doflist=NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - int numdof = numnodes*NDOF2; - - /*Fetch dof list and allocate solution vectors*/ - GetDofList(&doflist,NoneApproximationEnum,GsetEnum); - IssmDouble* values = xNew(numdof); - IssmDouble* lambdax = xNew(numnodes); - IssmDouble* lambday = xNew(numnodes); - - /*Use the dof list to index into the solution vector: */ - for(i=0;i(lambdax[i])) _error_("NaN found in solution vector"); - if(xIsNan(lambday[i])) _error_("NaN found in solution vector"); - } - - /*Add vx and vy as inputs to the tria element: */ - this->inputs->AddInput(new TriaInput(AdjointxEnum,lambdax,P1Enum)); - this->inputs->AddInput(new TriaInput(AdjointyEnum,lambday,P1Enum)); - - /*Free ressources:*/ - xDelete(values); - xDelete(lambdax); - xDelete(lambday); - xDelete(doflist); -} -/*}}}*/ /*FUNCTION Tria::GetVectorFromControlInputs{{{*/ void Tria::GetVectorFromControlInputs(Vector* vector,int control_enum,int control_index,const char* data){ @@ -6333,10 +4139,5 @@ /*Get input (either in element or material)*/ - if(control_enum==MaterialsRheologyBbarEnum || control_enum==DamageDbarEnum){ - input=(Input*)material->inputs->GetInput(control_enum); _assert_(input); - } - else{ - input=(Input*)this->inputs->GetInput(control_enum); _assert_(input); - } + input=(Input*)this->inputs->GetInput(control_enum); _assert_(input); /*Check that it is a ControlInput*/ @@ -6368,11 +4169,5 @@ new_input = new TriaInput(control_enum,values,P1Enum); - if(control_enum==MaterialsRheologyBbarEnum || control_enum==DamageDbarEnum){ - input=(Input*)material->inputs->GetInput(control_enum); _assert_(input); - } - else{ - input=(Input*)this->inputs->GetInput(control_enum); _assert_(input); - } - + input=(Input*)this->inputs->GetInput(control_enum); _assert_(input); if (input->ObjectEnum()!=ControlInputEnum){ _error_("input " << EnumToStringx(control_enum) << " is not a ControlInput"); @@ -6382,78 +4177,4 @@ } /*}}}*/ -#endif - -#ifdef _HAVE_THERMAL_ -/*FUNCTION Tria::CreateKMatrixMelting {{{*/ -ElementMatrix* Tria::CreateKMatrixMelting(void){ - - /*Intermediaries */ - IssmDouble heatcapacity,latentheat; - IssmDouble Jdet,D_scalar; - IssmDouble xyz_list[NUMVERTICES][3]; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector and vectors*/ - ElementMatrix* Ke=new ElementMatrix(nodes,numnodes,this->parameters,NoneApproximationEnum); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - latentheat = matpar->GetLatentHeat(); - heatcapacity = matpar->GetHeatCapacity(); - - /* Start looping on the number of gauss (nodes on the bedrock) */ - GaussTria* gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetNodalFunctions(&basis[0],gauss); - GetJacobianDeterminant(&Jdet, &xyz_list[0][0], gauss); - - D_scalar=latentheat/heatcapacity*gauss->weight*Jdet; - - TripleMultiply(basis,numnodes,1,0, - &D_scalar,1,1,0, - basis,1,numnodes,0, - &Ke->values[0],1); - } - - /*Clean up and return*/ - xDelete(basis); - delete gauss; - return Ke; -} -/*}}}*/ -#endif - -#ifdef _HAVE_HYDROLOGY_ -/*FUNCTION Tria::AllActive{{{*/ -bool Tria::AllActive(void){ - - /*Intermediaries*/ - const int numnodes = NUMVERTICES; - - for(int i=0;inodes[i]->IsActive()) return false; - } - - return true; -} -/*}}}*/ -/*FUNCTION Tria::AnyActive{{{*/ -bool Tria::AnyActive(void){ - - /*Intermediaries*/ - const int numnodes = NUMVERTICES; - - for(int i=0;inodes[i]->IsActive()) return true; - } - - return false; -}/*}}}*/ /*FUNCTION Tria::CreateHydrologyWaterVelocityInput {{{*/ void Tria::CreateHydrologyWaterVelocityInput(void){ @@ -6510,415 +4231,4 @@ } /*}}}*/ -/*FUNCTION Tria::CreateKMatrixHydrologyShreve{{{*/ -ElementMatrix* Tria::CreateKMatrixHydrologyShreve(void){ - - /*Intermediaries */ - IssmDouble diffusivity; - IssmDouble Jdet,D_scalar,dt,h; - IssmDouble vx,vy,vel,dvxdx,dvydy; - IssmDouble dvx[2],dvy[2]; - IssmDouble xyz_list[NUMVERTICES][3]; - - /*Skip if water or ice shelf element*/ - if(NoIceInElement() || IsFloating()) return NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters,NoneApproximationEnum); - IssmDouble* basis = xNew(numnodes); - IssmDouble* B = xNew(2*numnodes); - IssmDouble* Bprime = xNew(2*numnodes); - IssmDouble D[2][2]; - - /*Create water velocity vx and vy from current inputs*/ - CreateHydrologyWaterVelocityInput(); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - this->parameters->FindParam(&diffusivity,HydrologyshreveStabilizationEnum); - Input* vx_input=inputs->GetInput(HydrologyWaterVxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(HydrologyWaterVyEnum); _assert_(vy_input); - h=sqrt(2*this->GetArea()); - - /* Start looping on the number of gaussian points: */ - GaussTria* gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - - vx_input->GetInputValue(&vx,gauss); - vy_input->GetInputValue(&vy,gauss); - vx_input->GetInputDerivativeValue(&dvx[0],&xyz_list[0][0],gauss); - vy_input->GetInputDerivativeValue(&dvy[0],&xyz_list[0][0],gauss); - - D_scalar=gauss->weight*Jdet; - - TripleMultiply(basis,1,numnodes,1, - &D_scalar,1,1,0, - basis,1,numnodes,0, - Ke->values,1); - - GetBMasstransport(B,&xyz_list[0][0], gauss); - GetBprimeMasstransport(Bprime,&xyz_list[0][0], gauss); - - dvxdx=dvx[0]; - dvydy=dvy[1]; - D_scalar=dt*gauss->weight*Jdet; - - D[0][0]=D_scalar*dvxdx; - D[0][1]=0.; - D[1][0]=0.; - D[1][1]=D_scalar*dvydy; - TripleMultiply(B,2,numnodes,1, - &D[0][0],2,2,0, - B,2,numnodes,0, - &Ke->values[0],1); - - D[0][0]=D_scalar*vx; - D[1][1]=D_scalar*vy; - TripleMultiply(B,2,numnodes,1, - &D[0][0],2,2,0, - Bprime,2,numnodes,0, - &Ke->values[0],1); - - /*Artificial diffusivity*/ - vel=sqrt(vx*vx+vy*vy); - D[0][0]=D_scalar*diffusivity*h/(2*vel)*vx*vx; - D[1][0]=D_scalar*diffusivity*h/(2*vel)*vy*vx; - D[0][1]=D_scalar*diffusivity*h/(2*vel)*vx*vy; - D[1][1]=D_scalar*diffusivity*h/(2*vel)*vy*vy; - TripleMultiply(Bprime,2,numnodes,1, - &D[0][0],2,2,0, - Bprime,2,numnodes,0, - &Ke->values[0],1); - } - - /*Clean up and return*/ - xDelete(basis); - xDelete(B); - xDelete(Bprime); - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixHydrologyDCInefficient{{{*/ -ElementMatrix* Tria::CreateKMatrixHydrologyDCInefficient(void){ - - /* Intermediaries */ - IssmDouble D_scalar,Jdet; - IssmDouble sediment_transmitivity,dt; - IssmDouble sediment_storing; - IssmDouble xyz_list[NUMVERTICES][3]; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters); - IssmDouble* B = xNew(5*numnodes); - IssmDouble* basis = xNew(numnodes); - IssmDouble D[2][2]; - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - sediment_storing = matpar->GetSedimentStoring(); - sediment_transmitivity = matpar->GetSedimentTransmitivity(); - - /* Start looping on the number of gaussian points: */ - GaussTria* gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - - /*Diffusivity*/ - D_scalar=sediment_transmitivity*gauss->weight*Jdet; - if(reCast(dt)) D_scalar=D_scalar*dt; - D[0][0]=D_scalar; D[0][1]=0.; - D[1][0]=0.; D[1][1]=D_scalar; - GetBHydro(B,&xyz_list[0][0],gauss); - TripleMultiply(B,2,numnodes,1, - &D[0][0],2,2,0, - B,2,numnodes,0, - &Ke->values[0],1); - - /*Transient*/ - if(reCast(dt)){ - GetNodalFunctions(&basis[0],gauss); - D_scalar=sediment_storing*gauss->weight*Jdet; - - TripleMultiply(basis,numnodes,1,0, - &D_scalar,1,1,0, - basis,1,numnodes,0, - &Ke->values[0],1); - } - } - /*Clean up and return*/ - xDelete(basis); - xDelete(B); - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixHydrologyDCEfficient{{{*/ -ElementMatrix* Tria::CreateKMatrixHydrologyDCEfficient(void){ - - /* Intermediaries */ - IssmDouble D_scalar,Jdet; - IssmDouble epl_transmitivity,dt; - IssmDouble epl_storing; - IssmDouble xyz_list[NUMVERTICES][3]; - - /*Check that all nodes are active, else return empty matrix*/ - if(!this->AllActive()){ - return NULL; - } - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters); - IssmDouble* B = xNew(5*numnodes); - IssmDouble* basis = xNew(numnodes); - IssmDouble D[2][2]; - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - epl_storing = matpar->GetEplStoring(); - epl_transmitivity = matpar->GetEplTransmitivity(); - - /* Start looping on the number of gaussian points: */ - GaussTria* gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - - /*Diffusivity*/ - D_scalar=epl_transmitivity*gauss->weight*Jdet; - if(reCast(dt)) D_scalar=D_scalar*dt; - D[0][0]=D_scalar; D[0][1]=0.; - D[1][0]=0.; D[1][1]=D_scalar; - GetBHydro(B,&xyz_list[0][0],gauss); - TripleMultiply(B,2,numnodes,1, - &D[0][0],2,2,0, - B,2,numnodes,0, - &Ke->values[0],1); - - /*Transient*/ - if(reCast(dt)){ - GetNodalFunctions(basis,gauss); - D_scalar=epl_storing*gauss->weight*Jdet; - - TripleMultiply(basis,numnodes,1,0, - &D_scalar,1,1,0, - basis,1,numnodes,0, - &Ke->values[0],1); - } - } - - /*Clean up and return*/ - xDelete(basis); - xDelete(B); - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorHydrologyShreve {{{*/ -ElementVector* Tria::CreatePVectorHydrologyShreve(void){ - - /*Intermediaries */ - int i; - IssmDouble Jdet,dt; - IssmDouble basal_melting_g; - IssmDouble old_watercolumn_g; - IssmDouble xyz_list[NUMVERTICES][3]; - - /*Skip if water or ice shelf element*/ - if(NoIceInElement() || IsFloating()) return NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector*/ - ElementVector* pe=new ElementVector(nodes,numnodes,this->parameters); - IssmDouble* basis = xNewZeroInit(numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - Input* basal_melting_input=inputs->GetInput(BasalforcingsMeltingRateEnum); _assert_(basal_melting_input); - Input* old_watercolumn_input=inputs->GetInput(WaterColumnOldEnum); _assert_(old_watercolumn_input); - - /*Initialize basal_melting_correction_g to 0, do not forget!:*/ - /* Start looping on the number of gaussian points: */ - GaussTria* gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis, gauss); - - basal_melting_input->GetInputValue(&basal_melting_g,gauss); - old_watercolumn_input->GetInputValue(&old_watercolumn_g,gauss); - - if(reCast(dt)){ - for(i=0;ivalues[i]+=Jdet*gauss->weight*(old_watercolumn_g+dt*basal_melting_g)*basis[i]; - } - else{ - for(i=0;ivalues[i]+=Jdet*gauss->weight*basal_melting_g*basis[i]; - } - } - - /*Clean up and return*/ - xDelete(basis); - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorHydrologyDCInefficient {{{*/ -ElementVector* Tria::CreatePVectorHydrologyDCInefficient(void){ - - /*Intermediaries */ - IssmDouble Jdet; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble dt,scalar,water_head; - IssmDouble water_load,transfer; - IssmDouble sediment_storing; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector and other vectors*/ - ElementVector* pe = new ElementVector(nodes,numnodes,this->parameters); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - sediment_storing = matpar->GetSedimentStoring(); - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - Input* water_input=inputs->GetInput(BasalforcingsMeltingRateEnum); _assert_(water_input); - Input* transfer_input=inputs->GetInput(WaterTransferEnum); _assert_(transfer_input); - Input* old_wh_input=NULL; - - if(reCast(dt)){ - old_wh_input=inputs->GetInput(SedimentHeadOldEnum); _assert_(old_wh_input); - } - - /* Start looping on the number of gaussian points: */ - GaussTria* gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis, gauss); - - /*Loading term*/ - water_input->GetInputValue(&water_load,gauss); - transfer_input->GetInputValue(&transfer,gauss); - scalar = Jdet*gauss->weight*(water_load+transfer); - if(reCast(dt)) scalar = scalar*dt; - for(int i=0;ivalues[i]+=scalar*basis[i]; - - /*Transient term*/ - if(reCast(dt)){ - old_wh_input->GetInputValue(&water_head,gauss); - scalar = Jdet*gauss->weight*water_head*sediment_storing; - for(int i=0;ivalues[i]+=scalar*basis[i]; - } - } - - /*Clean up and return*/ - xDelete(basis); - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorHydrologyDCEfficient {{{*/ -ElementVector* Tria::CreatePVectorHydrologyDCEfficient(void){ - - /*Intermediaries */ - IssmDouble connectivity; - IssmDouble Jdet; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble dt,scalar,water_head; - IssmDouble transfer,residual; - IssmDouble epl_storing; - GaussTria* gauss = NULL; - - /*Check that all nodes are active, else return empty matrix*/ - if(!this->AllActive()){ - return NULL; - } - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector and other vectors*/ - ElementVector* pe = new ElementVector(nodes,numnodes,this->parameters); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - epl_storing = matpar->GetEplStoring(); - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - Input* residual_input=inputs->GetInput(SedimentHeadResidualEnum); _assert_(residual_input); - Input* transfer_input=inputs->GetInput(WaterTransferEnum); _assert_(transfer_input); - Input* old_wh_input=NULL; - - if(reCast(dt)){ - old_wh_input=inputs->GetInput(EplHeadOldEnum); _assert_(old_wh_input); - } - - /* Start looping on the number of gaussian points: */ - gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - - /*Loading term*/ - transfer_input->GetInputValue(&transfer,gauss); - scalar = Jdet*gauss->weight*(-transfer); - if(reCast(dt)) scalar = scalar*dt; - for(int i=0;ivalues[i]+=scalar*basis[i]; - - /*Transient term*/ - if(reCast(dt)){ - old_wh_input->GetInputValue(&water_head,gauss); - scalar = Jdet*gauss->weight*water_head*epl_storing; - for(int i=0;ivalues[i]+=scalar*basis[i]; - } - } - delete gauss; - - /* Add residual if necessary*/ - gauss=new GaussTria(); - for(int iv=0;ivGaussVertex(iv); - - connectivity = IssmDouble(vertices[iv]->Connectivity()); - residual_input->GetInputValue(&residual,gauss); - pe->values[iv]+=residual/connectivity; - } - - /*Clean up and return*/ - xDelete(basis); - delete gauss; - return pe; -} -/*}}}*/ /*FUNCTION Tria::GetSolutionFromInputsOneDof{{{*/ void Tria::GetSolutionFromInputsOneDof(Vector* solution, int enum_type){ @@ -6954,1389 +4264,4 @@ } /*}}}*/ -/*FUNCTION Tria::InputUpdateFromSolutionHydrologyShreve{{{*/ -void Tria::InputUpdateFromSolutionHydrologyShreve(IssmDouble* solution){ - - /*Intermediary*/ - int* doflist = NULL; - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Fetch dof list and allocate solution vector*/ - GetDofList(&doflist,NoneApproximationEnum,GsetEnum); - IssmDouble* values = xNew(numnodes); - - /*Use the dof list to index into the solution vector: */ - for(int i=0;i(values[i])) _error_("NaN found in solution vector"); - if (values[i]<10e-10) values[i]=10e-10; //correcting the water column to positive values - } - - /*Add input to the element: */ - this->inputs->AddInput(new TriaInput(WatercolumnEnum,values,P1Enum)); - - /*Free ressources:*/ - xDelete(values); - xDelete(doflist); -} -/*}}}*/ -/*FUNCTION Tria::InputUpdateFromSolutionHydrologyDCInefficient{{{*/ -void Tria::InputUpdateFromSolutionHydrologyDCInefficient(IssmDouble* solution){ - - /*Intermediaries*/ - int *doflist = NULL; - bool converged; - IssmDouble penalty_factor, dt; - IssmDouble kmax, kappa, h_max; - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Fetch dof list and allocate solution vector*/ - GetDofList(&doflist,NoneApproximationEnum,GsetEnum); - IssmDouble* values = xNew(numnodes); - IssmDouble* residual = xNew(numnodes); - - /*Use the dof list to index into the solution vector: */ - for(int i=0;i(values[i])) _error_("NaN found in solution vector"); - } - - /*If converged keep the residual in mind*/ - this->inputs->GetInputValue(&converged,ConvergedEnum); - - /*Get inputs*/ - if(converged){ - this->parameters->FindParam(&kmax,HydrologySedimentKmaxEnum); - this->parameters->FindParam(&penalty_factor,HydrologydcPenaltyFactorEnum); - - kappa=kmax*pow(10.,penalty_factor); - - for(int i=0;iGetHydrologyDCInefficientHmax(&h_max,nodes[i]); - if(values[i]>h_max){ - residual[i]=kappa*(values[i]-h_max); - } - else{ - residual[i]=0.0; - } - } - this->inputs->AddInput(new TriaInput(SedimentHeadResidualEnum,residual,P1Enum)); - } - - /*Add input to the element: */ - this->inputs->AddInput(new TriaInput(SedimentHeadEnum,values,P1Enum)); - - /*Free ressources:*/ - xDelete(values); - xDelete(residual); - xDelete(doflist); -} -/*}}}*/ -/*FUNCTION Tria::GetHydrologyDCInefficientHmax{{{*/ -void Tria::GetHydrologyDCInefficientHmax(IssmDouble* ph_max, Node* innode){ - - int hmax_flag; - IssmDouble h_max; - IssmDouble rho_ice,rho_water; - IssmDouble thickness,bed; - /*Get the flag to the limitation method*/ - this->parameters->FindParam(&hmax_flag,HydrologydcSedimentlimitFlagEnum); - - /*Switch between the different cases*/ - switch(hmax_flag){ - case 0: - h_max=1.0e+10; - break; - case 1: - parameters->FindParam(&h_max,HydrologydcSedimentlimitEnum); - break; - case 2: - rho_ice=matpar->GetRhoIce(); - rho_water=matpar->GetRhoFreshwater(); - this->GetInputValue(&thickness,innode,ThicknessEnum); - this->GetInputValue(&bed,innode,BedEnum); - h_max=((rho_ice*thickness)/rho_water)+bed; - break; - case 3: - _error_("Using normal stress not supported yet"); - break; - default: - _error_("no case higher than 3 for SedimentlimitFlag"); - } - /*Assign output pointer*/ - *ph_max=h_max; -} -/*}}}*/ -/*FUNCTION Tria::GetHydrologyTransfer{{{*/ -void Tria::GetHydrologyTransfer(Vector* transfer){ - - const int numdof = NDOF1 *NUMVERTICES; - int *doflist = NULL; - bool isefficientlayer; - int transfermethod; - IssmDouble sed_trans,sed_thick; - IssmDouble leakage,h_max; - IssmDouble wh_trans; - IssmDouble activeEpl[numdof]; - IssmDouble eplstoring[numdof],sedstoring[numdof]; - IssmDouble epl_head[numdof],sed_head[numdof]; - - GetDofList(&doflist,NoneApproximationEnum,GsetEnum); - - /*Get the flag to know if the efficient layer is present*/ - this->parameters->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum); - - if(isefficientlayer){ - /*Also get the flag to the transfer method*/ - this->parameters->FindParam(&transfermethod,HydrologydcTransferFlagEnum); - - /*Switch between the different transfer methods cases*/ - switch(transfermethod){ - case 0: - /*Just keepping the transfer to zero, should be OK with the initial value of transfer*/ - break; - case 1: - - GetInputListOnVertices(&activeEpl[0],HydrologydcMaskEplactiveEnum); - GetInputListOnVertices(&sed_head[0],SedimentHeadEnum); - GetInputListOnVertices(&epl_head[0],EplHeadEnum); - - this->parameters->FindParam(&leakage,HydrologydcLeakageFactorEnum); - - sed_trans = matpar->GetSedimentTransmitivity(); - sed_thick = matpar->GetSedimentThickness(); - - for(int i=0;iGetEplStoring(); - sedstoring[i]=matpar->GetSedimentStoring(); - - /*EPL head higher than sediment head, transfer from the epl to the sediment*/ - if(epl_head[i]>sed_head[i]){ - wh_trans=eplstoring[i]*sed_trans*(epl_head[i]-sed_head[i])/(leakage*sed_thick); - - /*No transfer if the sediment head is allready at the maximum*/ - this->GetHydrologyDCInefficientHmax(&h_max,nodes[i]); - if(sed_head[i]>=h_max)wh_trans=0.0; - } - /*EPL head lower than sediment head, transfer from the sediment to the epl*/ - else if(epl_head[i]<=sed_head[i]){ - wh_trans=sedstoring[i]*sed_trans*(epl_head[i]-sed_head[i])/(leakage*sed_thick); - } - } - /*Assign output pointer*/ - transfer->SetValue(doflist[i],wh_trans,INS_VAL); - } - break; - default: - _error_("no case higher than 1 for the Transfer method"); - } - } - /*Free ressources:*/ - xDelete(doflist); -} -/*}}}*/ -/*FUNCTION Tria::HydrologyEPLGetActive {{{*/ -void Tria::HydrologyEPLGetActive(Vector* active_vec){ - - /*Constants*/ - const int numnodes = NUMVERTICES; - IssmDouble flag = 0.; - IssmDouble active[numnodes]; - - GetInputListOnVertices(&active[0],HydrologydcMaskEplactiveEnum); - - for(int i=0;i0.){ - for(int i=0;iSetValue(nodes[i]->Sid(),1.,INS_VAL); - } - } - else{ - /*Do not do anything: at least one node is active for this element but this element is not solved for*/ - } - -} -/*}}}*/ -/*FUNCTION Tria::HydrologyEPLGetMask{{{*/ -void Tria::HydrologyEPLGetMask(Vector* vec_mask){ - - /*Intermediaries*/ - int i,j; - const int numdof = NDOF1 *NUMVERTICES; - IssmDouble h_max; - IssmDouble sedheadmin; - IssmDouble old_active[numdof]; - IssmDouble sedhead[numdof]; - IssmDouble eplhead[numdof]; - IssmDouble residual[numdof]; - - GetInputListOnVertices(&old_active[0],HydrologydcMaskEplactiveEnum); - GetInputListOnVertices(&sedhead[0],SedimentHeadEnum); - GetInputListOnVertices(&eplhead[0],EplHeadEnum); - GetInputListOnVertices(&residual[0],SedimentHeadResidualEnum); - - /*Get minimum sediment head*/ - sedheadmin=sedhead[0]; - for(i=1;i0 */ - if(residual[i]>0.){ - vec_mask->SetValue(nodes[i]->Sid(),1.,INS_VAL); - } - - /*If mask was alread one, keep one*/ - else if(old_active[i]>0.){ - vec_mask->SetValue(nodes[i]->Sid(),1.,INS_VAL); - } - - /*Increase of the efficient system is needed if the epl head reach the maximum value (sediment max value for now)*/ - this->GetHydrologyDCInefficientHmax(&h_max,nodes[i]); - if(eplhead[i]>=h_max && this->AnyActive()){ - for(j=0;j0.){ - vec_mask->SetValue(nodes[i]->Sid(),1.,INS_VAL); - } - /*Increase of the domain is on the downstream node in term of sediment head*/ - if(sedhead[j] == sedheadmin){ - vec_mask->SetValue(nodes[j]->Sid(),1.,INS_VAL); - // break; - } - } - } - } -} -/*}}}*/ -#endif - -#ifdef _HAVE_MASSTRANSPORT_ -/*FUNCTION Tria::CreateKMatrixExtrusion {{{*/ -ElementMatrix* Tria::CreateKMatrixExtrusion(void){ - - /*compute all stiffness matrices for this element*/ - ElementMatrix* Ke1=CreateKMatrixExtrusionVolume(); - ElementMatrix* Ke2=CreateKMatrixExtrusionSurface(); - ElementMatrix* Ke3=CreateKMatrixExtrusionBed(); - ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2,Ke3); - - /*clean-up and return*/ - delete Ke1; - delete Ke2; - delete Ke3; - return Ke; - -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixExtrusionVolume {{{*/ -ElementMatrix* Tria::CreateKMatrixExtrusionVolume(void){ - - /*Intermediaries */ - IssmDouble Jdet; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble B[NDOF1][NUMVERTICES]; - IssmDouble Bprime[NDOF1][NUMVERTICES]; - IssmDouble DL_scalar; - GaussTria *gauss=NULL; - - /*Initialize Element matrix*/ - ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetBExtrusion(&B[0][0], &xyz_list[0][0], gauss); - GetNodalFunctions(&Bprime[0][0],gauss); - - DL_scalar=gauss->weight*Jdet; - - TripleMultiply(&B[0][0],1,NUMVERTICES,1, - &DL_scalar,1,1,0, - &Bprime[0][0],1,NUMVERTICES,0, - &Ke->values[0],1); - } - - /*Clean up and return*/ - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixExtrusionSurface {{{*/ -ElementMatrix* Tria::CreateKMatrixExtrusionSurface(void){ - - if (!HasEdgeOnSurface()) return NULL; - - /*Constants*/ - const int numdof=NDOF1*NUMVERTICES; - - /*Intermediaries */ - int indices[2]; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_seg[NUMVERTICES1D][3]; - IssmDouble normal[3]; - IssmDouble Jdet,DL_scalar; - IssmDouble basis[NUMVERTICES]; - GaussTria *gauss=NULL; - - /*Initialize Element matrix*/ - ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - - /*Get vertex indices that lie on bed*/ - this->EdgeOnSurfaceIndices(&indices[0],&indices[1]); - for(int i=0;ibegin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetSegmentJacobianDeterminant(&Jdet,&xyz_list_seg[0][0],gauss); - GetNodalFunctions(&basis[0], gauss); - - DL_scalar= - gauss->weight*Jdet*normal[1]; - - TripleMultiply( basis,1,numdof,1, - &DL_scalar,1,1,0, - basis,1,numdof,0, - &Ke->values[0],1); - } - - /*Clean up and return*/ - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixExtrusionBed {{{*/ -ElementMatrix* Tria::CreateKMatrixExtrusionBed(void){ - - if (!HasEdgeOnBed()) return NULL; - - /*Constants*/ - const int numdof=NDOF1*NUMVERTICES; - - /*Intermediaries */ - int indices[2]; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_seg[NUMVERTICES1D][3]; - IssmDouble normal[3]; - IssmDouble Jdet,DL_scalar; - IssmDouble basis[NUMVERTICES]; - GaussTria *gauss=NULL; - - /*Initialize Element matrix*/ - ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - - /*Get vertex indices that lie on bed*/ - this->EdgeOnBedIndices(&indices[0],&indices[1]); - for(int i=0;ibegin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetSegmentJacobianDeterminant(&Jdet,&xyz_list_seg[0][0],gauss); - GetNodalFunctions(&basis[0], gauss); - - DL_scalar= - gauss->weight*Jdet*normal[1]; - - TripleMultiply( basis,1,numdof,1, - &DL_scalar,1,1,0, - basis,1,numdof,0, - &Ke->values[0],1); - } - - /*Clean up and return*/ - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixMasstransport {{{*/ -ElementMatrix* Tria::CreateKMatrixMasstransport(void){ - - switch(GetElementType()){ - case P1Enum: case P2Enum: - return CreateKMatrixMasstransport_CG(); - case P1DGEnum: - return CreateKMatrixMasstransport_DG(); - default: - _error_("Element type " << EnumToStringx(GetElementType()) << " not supported yet"); - } -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixMasstransport_CG {{{*/ -ElementMatrix* Tria::CreateKMatrixMasstransport_CG(void){ - - /*Intermediaries */ - int stabilization; - int meshtype; - IssmDouble Jdet,D_scalar,dt,h; - IssmDouble vel,vx,vy,dvxdx,dvydy; - IssmDouble dvx[2],dvy[2]; - IssmDouble xyz_list[NUMVERTICES][3]; - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters,NoneApproximationEnum); - IssmDouble* basis = xNew(numnodes); - IssmDouble* B = xNew(2*numnodes); - IssmDouble* Bprime = xNew(2*numnodes); - IssmDouble D[2][2]; - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - this->parameters->FindParam(&meshtype,MeshTypeEnum); - this->parameters->FindParam(&stabilization,MasstransportStabilizationEnum); - Input* vxaverage_input=NULL; - Input* vyaverage_input=NULL; - if(meshtype==Mesh2DhorizontalEnum){ - vxaverage_input=inputs->GetInput(VxEnum); _assert_(vxaverage_input); - vyaverage_input=inputs->GetInput(VyEnum); _assert_(vyaverage_input); - } - else{ - vxaverage_input=inputs->GetInput(VxAverageEnum); _assert_(vxaverage_input); - vyaverage_input=inputs->GetInput(VyAverageEnum); _assert_(vyaverage_input); - } - h=sqrt(2*this->GetArea()); - - /* Start looping on the number of gaussian points: */ - GaussTria *gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - - vxaverage_input->GetInputValue(&vx,gauss); - vyaverage_input->GetInputValue(&vy,gauss); - vxaverage_input->GetInputDerivativeValue(&dvx[0],&xyz_list[0][0],gauss); - vyaverage_input->GetInputDerivativeValue(&dvy[0],&xyz_list[0][0],gauss); - - D_scalar=gauss->weight*Jdet; - - TripleMultiply(basis,1,numnodes,1, - &D_scalar,1,1,0, - basis,1,numnodes,0, - &Ke->values[0],1); - - GetBMasstransport(B,&xyz_list[0][0],gauss); - GetBprimeMasstransport(Bprime,&xyz_list[0][0],gauss); - - dvxdx=dvx[0]; - dvydy=dvy[1]; - D_scalar=dt*gauss->weight*Jdet; - - D[0][0]=D_scalar*dvxdx; - D[0][1]=0.; - D[1][0]=0.; - D[1][1]=D_scalar*dvydy; - TripleMultiply(B,2,numnodes,1, - &D[0][0],2,2,0, - B,2,numnodes,0, - &Ke->values[0],1); - - D[0][0]=D_scalar*vx; - D[1][1]=D_scalar*vy; - TripleMultiply(B,2,numnodes,1, - &D[0][0],2,2,0, - Bprime,2,numnodes,0, - &Ke->values[0],1); - - if(stabilization==2){ - /*Streamline upwinding*/ - vel=sqrt(vx*vx+vy*vy)+1.e-8; - D[0][0]=h/(2*vel)*vx*vx; - D[1][0]=h/(2*vel)*vy*vx; - D[0][1]=h/(2*vel)*vx*vy; - D[1][1]=h/(2*vel)*vy*vy; - } - else if(stabilization==1){ - /*SSA*/ - vxaverage_input->GetInputAverage(&vx); - vyaverage_input->GetInputAverage(&vy); - D[0][0]=h/2.0*fabs(vx); - D[0][1]=0.; - D[1][0]=0.; - D[1][1]=h/2.0*fabs(vy); - } - if(stabilization==1 || stabilization==2){ - D[0][0]=D_scalar*D[0][0]; - D[1][0]=D_scalar*D[1][0]; - D[0][1]=D_scalar*D[0][1]; - D[1][1]=D_scalar*D[1][1]; - TripleMultiply(Bprime,2,numnodes,1, - &D[0][0],2,2,0, - Bprime,2,numnodes,0, - &Ke->values[0],1); - } - } - - /*Clean up and return*/ - xDelete(basis); - xDelete(B); - xDelete(Bprime); - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixMasstransport_DG {{{*/ -ElementMatrix* Tria::CreateKMatrixMasstransport_DG(void){ - - /*Intermediaries */ - int meshtype; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble Jdet,D_scalar,dt,vx,vy; - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters,NoneApproximationEnum); - IssmDouble* basis = xNew(numnodes); - IssmDouble* B = xNew(2*numnodes); - IssmDouble* Bprime = xNew(2*numnodes); - IssmDouble D[2][2]; - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - this->parameters->FindParam(&meshtype,MeshTypeEnum); - Input* vxaverage_input=NULL; - Input* vyaverage_input=NULL; - if(meshtype==Mesh2DhorizontalEnum){ - vxaverage_input=inputs->GetInput(VxEnum); _assert_(vxaverage_input); - vyaverage_input=inputs->GetInput(VyEnum); _assert_(vyaverage_input); - } - else{ - vxaverage_input=inputs->GetInput(VxAverageEnum); _assert_(vxaverage_input); - vyaverage_input=inputs->GetInput(VyAverageEnum); _assert_(vyaverage_input); - } - - /* Start looping on the number of gaussian points: */ - GaussTria* gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - vxaverage_input->GetInputValue(&vx,gauss); - vyaverage_input->GetInputValue(&vy,gauss); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - - D_scalar=gauss->weight*Jdet; - - TripleMultiply(basis,1,numnodes,1, - &D_scalar,1,1,0, - basis,1,numnodes,0, - &Ke->values[0],1); - - /*WARNING: B and Bprime are inverted compared to usual masstransport!!!!*/ - GetBMasstransport(Bprime, &xyz_list[0][0], gauss); - GetBprimeMasstransport(B, &xyz_list[0][0], gauss); - - D_scalar=-dt*gauss->weight*Jdet; - D[0][0]=D_scalar*vx; - D[0][1]=0.; - D[1][0]=0.; - D[1][1]=D_scalar*vy; - - TripleMultiply(B,2,numnodes,1, - &D[0][0],2,2,0, - Bprime,2,numnodes,0, - &Ke->values[0],1); - } - - /*Clean up and return*/ - xDelete(basis); - xDelete(B); - xDelete(Bprime); - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixFreeSurfaceTop {{{*/ -ElementMatrix* Tria::CreateKMatrixFreeSurfaceTop(void){ - - /*Intermediaries */ - int stabilization; - IssmDouble Jdet,D_scalar,dt,h; - IssmDouble vel,vx,vy; - IssmDouble xyz_list[NUMVERTICES][3]; - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters,NoneApproximationEnum); - IssmDouble* basis = xNew(numnodes); - IssmDouble* B = xNew(2*numnodes); - IssmDouble* Bprime = xNew(2*numnodes); - IssmDouble D[2][2]; - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - this->parameters->FindParam(&stabilization,MasstransportStabilizationEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - h=sqrt(2*this->GetArea()); - - /* Start looping on the number of gaussian points: */ - GaussTria *gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - - vx_input->GetInputValue(&vx,gauss); - vy_input->GetInputValue(&vy,gauss); - - D_scalar=gauss->weight*Jdet; - - TripleMultiply(basis,1,numnodes,1, - &D_scalar,1,1,0, - basis,1,numnodes,0, - &Ke->values[0],1); - - GetBMasstransport(B,&xyz_list[0][0],gauss); - GetBprimeMasstransport(Bprime,&xyz_list[0][0],gauss); - - D_scalar=dt*gauss->weight*Jdet; - - D[0][0]=D_scalar*vx; - D[0][1]=0.; - D[1][0]=0.; - D[1][1]=D_scalar*vy; - TripleMultiply(B,2,numnodes,1, - &D[0][0],2,2,0, - Bprime,2,numnodes,0, - &Ke->values[0],1); - - if(stabilization==2){ - /*Streamline upwinding*/ - vel=sqrt(vx*vx+vy*vy)+1.e-8; - D[0][0]=h/(2*vel)*vx*vx; - D[1][0]=h/(2*vel)*vy*vx; - D[0][1]=h/(2*vel)*vx*vy; - D[1][1]=h/(2*vel)*vy*vy; - } - else if(stabilization==1){ - /*SSA*/ - vx_input->GetInputAverage(&vx); - vy_input->GetInputAverage(&vy); - D[0][0]=h/2.0*fabs(vx); - D[0][1]=0.; - D[1][0]=0.; - D[1][1]=h/2.0*fabs(vy); - } - if(stabilization==1 || stabilization==2){ - D[0][0]=D_scalar*D[0][0]; - D[1][0]=D_scalar*D[1][0]; - D[0][1]=D_scalar*D[0][1]; - D[1][1]=D_scalar*D[1][1]; - TripleMultiply(Bprime,2,numnodes,1, - &D[0][0],2,2,0, - Bprime,2,numnodes,0, - &Ke->values[0],1); - } - } - - /*Clean up and return*/ - xDelete(basis); - xDelete(B); - xDelete(Bprime); - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixFreeSurfaceTop1D {{{*/ -ElementMatrix* Tria::CreateKMatrixFreeSurfaceTop1D(void){ - - if(!HasEdgeOnSurface()) return NULL; - - int index1,index2; - this->EdgeOnSurfaceIndices(&index1,&index2); - - Seg* seg=(Seg*)SpawnSeg(index1,index2); - ElementMatrix* Ke=seg->CreateKMatrixFreeSurfaceTop(); - delete seg->material; delete seg; - - /*clean up and return*/ - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixFreeSurfaceBase {{{*/ -ElementMatrix* Tria::CreateKMatrixFreeSurfaceBase(void){ - - /*Intermediaries */ - int stabilization; - IssmDouble Jdet,D_scalar,dt,h; - IssmDouble vel,vx,vy; - IssmDouble xyz_list[NUMVERTICES][3]; - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters,NoneApproximationEnum); - IssmDouble* basis = xNew(numnodes); - IssmDouble* B = xNew(2*numnodes); - IssmDouble* Bprime = xNew(2*numnodes); - IssmDouble D[2][2]; - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - this->parameters->FindParam(&stabilization,MasstransportStabilizationEnum); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - h=sqrt(2*this->GetArea()); - - /* Start looping on the number of gaussian points: */ - GaussTria *gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - - vx_input->GetInputValue(&vx,gauss); - vy_input->GetInputValue(&vy,gauss); - - D_scalar=gauss->weight*Jdet; - - TripleMultiply(basis,1,numnodes,1, - &D_scalar,1,1,0, - basis,1,numnodes,0, - &Ke->values[0],1); - - GetBMasstransport(B,&xyz_list[0][0],gauss); - GetBprimeMasstransport(Bprime,&xyz_list[0][0],gauss); - - D_scalar=dt*gauss->weight*Jdet; - - D[0][0]=D_scalar*vx; - D[0][1]=0.; - D[1][0]=0.; - D[1][1]=D_scalar*vy; - TripleMultiply(B,2,numnodes,1, - &D[0][0],2,2,0, - Bprime,2,numnodes,0, - &Ke->values[0],1); - - if(stabilization==2){ - /*Streamline upwinding*/ - vel=sqrt(vx*vx+vy*vy)+1.e-8; - D[0][0]=h/(2*vel)*vx*vx; - D[1][0]=h/(2*vel)*vy*vx; - D[0][1]=h/(2*vel)*vx*vy; - D[1][1]=h/(2*vel)*vy*vy; - } - else if(stabilization==1){ - /*SSA*/ - vx_input->GetInputAverage(&vx); - vy_input->GetInputAverage(&vy); - D[0][0]=h/2.0*fabs(vx); - D[0][1]=0.; - D[1][0]=0.; - D[1][1]=h/2.0*fabs(vy); - } - if(stabilization==1 || stabilization==2){ - D[0][0]=D_scalar*D[0][0]; - D[1][0]=D_scalar*D[1][0]; - D[0][1]=D_scalar*D[0][1]; - D[1][1]=D_scalar*D[1][1]; - TripleMultiply(Bprime,2,numnodes,1, - &D[0][0],2,2,0, - Bprime,2,numnodes,0, - &Ke->values[0],1); - } - } - - /*Clean up and return*/ - xDelete(basis); - xDelete(B); - xDelete(Bprime); - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixFreeSurfaceBase1D {{{*/ -ElementMatrix* Tria::CreateKMatrixFreeSurfaceBase1D(void){ - - if(!HasEdgeOnBed()) return NULL; - - int index1,index2; - this->EdgeOnBedIndices(&index1,&index2); - - Seg* seg=(Seg*)SpawnSeg(index1,index2); - ElementMatrix* Ke=seg->CreateKMatrixFreeSurfaceBase(); - delete seg->material; delete seg; - - /*clean up and return*/ - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorMasstransport{{{*/ -ElementVector* Tria::CreatePVectorMasstransport(void){ - - switch(GetElementType()){ - case P1Enum: case P2Enum: - return CreatePVectorMasstransport_CG(); - case P1DGEnum: - return CreatePVectorMasstransport_DG(); - default: - _error_("Element type " << EnumToStringx(GetElementType()) << " not supported yet"); - } -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorMasstransport_CG {{{*/ -ElementVector* Tria::CreatePVectorMasstransport_CG(void){ - - /*Intermediaries */ - IssmDouble Jdet,dt; - IssmDouble ms,mb,mb_correction,thickness; - IssmDouble xyz_list[NUMVERTICES][3]; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector and other vectors*/ - ElementVector* pe = new ElementVector(nodes,numnodes,this->parameters); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - Input* ms_input = inputs->GetInput(SurfaceforcingsMassBalanceEnum); _assert_(ms_input); - Input* mb_input = inputs->GetInput(BasalforcingsMeltingRateEnum); _assert_(mb_input); - Input* mb_correction_input = inputs->GetInput(BasalforcingsMeltingRateCorrectionEnum); - Input* thickness_input = inputs->GetInput(ThicknessEnum); _assert_(thickness_input); - - /*Initialize mb_correction to 0, do not forget!:*/ - /* Start looping on the number of gaussian points: */ - GaussTria* gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - - ms_input->GetInputValue(&ms,gauss); - mb_input->GetInputValue(&mb,gauss); - thickness_input->GetInputValue(&thickness,gauss); - if(mb_correction_input) - mb_correction_input->GetInputValue(&mb_correction,gauss); - else - mb_correction=0.; - - for(int i=0;ivalues[i]+=Jdet*gauss->weight*(thickness+dt*(ms-mb-mb_correction))*basis[i]; - } - - /*Clean up and return*/ - xDelete(basis); - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorMasstransport_DG {{{*/ -ElementVector* Tria::CreatePVectorMasstransport_DG(void){ - - /*Intermediaries */ - IssmDouble Jdet,dt; - IssmDouble ms,mb,thickness; - IssmDouble xyz_list[NUMVERTICES][3]; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector and other vectors*/ - ElementVector* pe = new ElementVector(nodes,numnodes,this->parameters); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* ms_input=inputs->GetInput(SurfaceforcingsMassBalanceEnum); _assert_(ms_input); - Input* mb_input=inputs->GetInput(BasalforcingsMeltingRateEnum); _assert_(mb_input); - Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input); - - /* Start looping on the number of gaussian points: */ - GaussTria* gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - - ms_input->GetInputValue(&ms,gauss); - mb_input->GetInputValue(&mb,gauss); - thickness_input->GetInputValue(&thickness,gauss); - - for(int i=0;ivalues[i]+=Jdet*gauss->weight*(thickness+dt*(ms-mb))*basis[i]; - } - - /*Clean up and return*/ - xDelete(basis); - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorFreeSurfaceTop {{{*/ -ElementVector* Tria::CreatePVectorFreeSurfaceTop(void){ - - /*Intermediaries */ - IssmDouble Jdet,dt; - IssmDouble ms,surface,vz; - IssmDouble xyz_list[NUMVERTICES][3]; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector and other vectors*/ - ElementVector* pe = new ElementVector(nodes,numnodes,this->parameters); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - Input* vz_input = inputs->GetInput(VzEnum); _assert_(vz_input); - Input* ms_input = inputs->GetInput(SurfaceforcingsMassBalanceEnum); _assert_(ms_input); - Input* surface_input= inputs->GetInput(SurfaceEnum); _assert_(surface_input); - - /*Initialize mb_correction to 0, do not forget!:*/ - /* Start looping on the number of gaussian points: */ - GaussTria* gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - - vz_input->GetInputValue(&vz,gauss); - ms_input->GetInputValue(&ms,gauss); - surface_input->GetInputValue(&surface,gauss); - - for(int i=0;ivalues[i]+=Jdet*gauss->weight*(surface + dt*ms + dt*vz)*basis[i]; - } - - /*Clean up and return*/ - xDelete(basis); - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorFreeSurfaceTop1D {{{*/ -ElementVector* Tria::CreatePVectorFreeSurfaceTop1D(void){ - - if(!HasEdgeOnSurface()) return NULL; - - int index1,index2; - this->EdgeOnSurfaceIndices(&index1,&index2); - - Seg* seg=(Seg*)SpawnSeg(index1,index2); - ElementVector* pe=seg->CreatePVectorFreeSurfaceTop(); - delete seg->material; delete seg; - - /*clean up and return*/ - return pe; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorFreeSurfaceBase {{{*/ -ElementVector* Tria::CreatePVectorFreeSurfaceBase(void){ - - /*Intermediaries */ - IssmDouble Jdet,dt; - IssmDouble mb,mb_correction,bed,vz; - IssmDouble xyz_list[NUMVERTICES][3]; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector and other vectors*/ - ElementVector* pe = new ElementVector(nodes,numnodes,this->parameters); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - Input* vz_input = inputs->GetInput(VzEnum); _assert_(vz_input); - Input* mb_input = inputs->GetInput(BasalforcingsMeltingRateEnum); _assert_(mb_input); - Input* mb_correction_input = inputs->GetInput(BasalforcingsMeltingRateCorrectionEnum); - Input* bed_input = inputs->GetInput(BedEnum); _assert_(bed_input); - - /*Initialize mb_correction to 0, do not forget!:*/ - /* Start looping on the number of gaussian points: */ - GaussTria* gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - - vz_input->GetInputValue(&vz,gauss); - mb_input->GetInputValue(&mb,gauss); - bed_input->GetInputValue(&bed,gauss); - if(mb_correction_input) - mb_correction_input->GetInputValue(&mb_correction,gauss); - else - mb_correction=0.; - - for(int i=0;ivalues[i]+=Jdet*gauss->weight*(bed+dt*(mb-mb_correction) + dt*vz)*basis[i]; - } - - /*Clean up and return*/ - xDelete(basis); - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorFreeSurfaceBase1D {{{*/ -ElementVector* Tria::CreatePVectorFreeSurfaceBase1D(void){ - - if(!HasEdgeOnBed()) return NULL; - - int index1,index2; - this->EdgeOnBedIndices(&index1,&index2); - - Seg* seg=(Seg*)SpawnSeg(index1,index2); - ElementVector* pe=seg->CreatePVectorFreeSurfaceBase(); - delete seg->material; delete seg; - - /*clean up and return*/ - return pe; -} -/*}}}*/ -#endif - -#ifdef _HAVE_DAMAGE_ -/*FUNCTION Tria::CreateKMatrixDamageEvolution {{{*/ -ElementMatrix* Tria::CreateKMatrixDamageEvolution(void){ - - switch(GetElementType()){ - case P1Enum: case P2Enum: - return CreateKMatrixDamageEvolution_CG(); - case P1DGEnum: - _error_("DG not implemented yet!");break; - default: - _error_("Element type " << EnumToStringx(GetElementType()) << " not supported yet"); - } -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixDamageEvolution_CG {{{*/ -ElementMatrix* Tria::CreateKMatrixDamageEvolution_CG(void){ - - /*Intermediaries */ - int stabilization; - int meshtype; - IssmDouble Jdet,D_scalar,dt,h; - IssmDouble vel,vx,vy,dvxdx,dvydy; - IssmDouble dvx[2],dvy[2]; - IssmDouble xyz_list[NUMVERTICES][3]; - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters,NoneApproximationEnum); - IssmDouble* basis = xNew(numnodes); - IssmDouble* B = xNew(2*numnodes); - IssmDouble* Bprime = xNew(2*numnodes); - IssmDouble D[2][2]; - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - this->parameters->FindParam(&meshtype,MeshTypeEnum); - this->parameters->FindParam(&stabilization,DamageStabilizationEnum); - Input* vxaverage_input=NULL; - Input* vyaverage_input=NULL; - if(meshtype==Mesh2DhorizontalEnum){ - vxaverage_input=inputs->GetInput(VxEnum); _assert_(vxaverage_input); - vyaverage_input=inputs->GetInput(VyEnum); _assert_(vyaverage_input); - } - else{ - vxaverage_input=inputs->GetInput(VxAverageEnum); _assert_(vxaverage_input); - vyaverage_input=inputs->GetInput(VyAverageEnum); _assert_(vyaverage_input); - } - h=sqrt(2*this->GetArea()); - - /* Start looping on the number of gaussian points: */ - GaussTria *gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - - vxaverage_input->GetInputValue(&vx,gauss); - vyaverage_input->GetInputValue(&vy,gauss); - vxaverage_input->GetInputDerivativeValue(&dvx[0],&xyz_list[0][0],gauss); - vyaverage_input->GetInputDerivativeValue(&dvy[0],&xyz_list[0][0],gauss); - - D_scalar=gauss->weight*Jdet; - - TripleMultiply(basis,1,numnodes,1, - &D_scalar,1,1,0, - basis,1,numnodes,0, - &Ke->values[0],1); - GetBMasstransport(B,&xyz_list[0][0],gauss); - GetBprimeMasstransport(Bprime,&xyz_list[0][0],gauss); - - dvxdx=dvx[0]; - dvydy=dvy[1]; - D_scalar=dt*gauss->weight*Jdet; - - D[0][0]=D_scalar*dvxdx; - D[0][1]=0.; - D[1][0]=0.; - D[1][1]=D_scalar*dvydy; - TripleMultiply(B,2,numnodes,1, - &D[0][0],2,2,0, - B,2,numnodes,0, - &Ke->values[0],1); - - D[0][0]=D_scalar*vx; - D[1][1]=D_scalar*vy; - TripleMultiply(B,2,numnodes,1, - &D[0][0],2,2,0, - Bprime,2,numnodes,0, - &Ke->values[0],1); - - if(stabilization==2){ - /*Streamline upwinding*/ - vel=sqrt(vx*vx+vy*vy)+1.e-8; - D[0][0]=h/(2*vel)*vx*vx; - D[1][0]=h/(2*vel)*vy*vx; - D[0][1]=h/(2*vel)*vx*vy; - D[1][1]=h/(2*vel)*vy*vy; - } - else if(stabilization==1){ - /*SSA*/ - vxaverage_input->GetInputAverage(&vx); - vyaverage_input->GetInputAverage(&vy); - D[0][0]=h/2.0*fabs(vx); - D[0][1]=0.; - D[1][0]=0.; - D[1][1]=h/2.0*fabs(vy); - } - if(stabilization==1 || stabilization==2){ - D[0][0]=D_scalar*D[0][0]; - D[1][0]=D_scalar*D[1][0]; - D[0][1]=D_scalar*D[0][1]; - D[1][1]=D_scalar*D[1][1]; - TripleMultiply(Bprime,2,numnodes,1, - &D[0][0],2,2,0, - Bprime,2,numnodes,0, - &Ke->values[0],1); - } - } - - /*Clean up and return*/ - xDelete(basis); - xDelete(B); - xDelete(Bprime); - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorDamageEvolution{{{*/ -ElementVector* Tria::CreatePVectorDamageEvolution(void){ - - switch(GetElementType()){ - case P1Enum: case P2Enum: - return CreatePVectorDamageEvolution_CG(); - case P1DGEnum: - _error_("DG not implemented yet"); - default: - _error_("Element type " << EnumToStringx(GetElementType()) << " not supported yet"); - } -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorDamageEvolution_CG {{{*/ -ElementVector* Tria::CreatePVectorDamageEvolution_CG(void){ - - /*Intermediaries */ - IssmDouble Jdet ,dt; - IssmDouble f,damage; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble f_list[NUMVERTICES]; - Input *damage_input = NULL; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector and other vectors*/ - ElementVector* pe = new ElementVector(nodes,numnodes,this->parameters); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - damage_input = this->material->inputs->GetInput(DamageDbarEnum); _assert_(damage_input); - - /*retrieve damage evolution forcing function: */ - this->DamageEvolutionF(&f_list[0]); - - /*Initialize forcing function f to 0, do not forget!:*/ - /* Start looping on the number of gaussian points: */ - GaussTria* gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - - TriaRef::GetInputValue(&f,f_list,gauss); - damage_input->GetInputValue(&damage,gauss); - - for(int i=0;ivalues[i]+=Jdet*gauss->weight*(damage+dt*f)*basis[i]; - } - - /*Clean up and return*/ - xDelete(basis); - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Tria::DamageEvolutionF{{{*/ -void Tria::DamageEvolutionF(IssmDouble* f){ - - /*Intermediaries */ - IssmDouble c1,c2,c3,healing,stress_threshold; - IssmDouble s_xx,s_xy,s_yy; - IssmDouble J2s; - IssmDouble Xis; - IssmDouble Psi; - IssmDouble PosPsi; - IssmDouble NegPsi; - Input* damage_input=NULL; - Input* sigma_xx_input = NULL; - Input* sigma_xy_input = NULL; - Input* sigma_yy_input = NULL; - GaussTria* gauss=NULL; - IssmDouble damage,sigma_xx,sigma_xy,sigma_yy; - - /*retrieve parameters:*/ - this->parameters->FindParam(&c1,DamageC1Enum); - this->parameters->FindParam(&c2,DamageC2Enum); - this->parameters->FindParam(&c3,DamageC3Enum); - this->parameters->FindParam(&healing,DamageHealingEnum); - this->parameters->FindParam(&stress_threshold,DamageStressThresholdEnum); - - /*Compute stress tensor: */ - this->ComputeStressTensor(); - - /*retrieve what we need: */ - sigma_xx_input = inputs->GetInput(StressTensorxxEnum); _assert_(sigma_xx_input); - sigma_xy_input = inputs->GetInput(StressTensorxyEnum); _assert_(sigma_xy_input); - sigma_yy_input = inputs->GetInput(StressTensoryyEnum); _assert_(sigma_yy_input); - damage_input = this->material->inputs->GetInput(DamageDbarEnum); _assert_(damage_input); - - /*Damage evolution z mapping: */ - gauss=new GaussTria(); - J2s=0; - for (int iv=0;ivGaussVertex(iv); - - damage_input->GetInputValue(&damage,gauss); - sigma_xx_input->GetInputValue(&sigma_xx,gauss); - sigma_xy_input->GetInputValue(&sigma_xy,gauss); - sigma_yy_input->GetInputValue(&sigma_yy,gauss); - - s_xx=sigma_xx/(1-damage); - s_xy=sigma_xy/(1-damage); - s_yy=sigma_yy/(1-damage); - - J2s=1.0/sqrt(2.0)*sqrt(pow(s_xx,2)+pow(s_yy,2)+2*pow(s_xy,2)); - - Xis=sqrt(3.0)*J2s; - - Psi=Xis-stress_threshold; - - PosPsi=max(Psi,0.0); - NegPsi=max(-Psi,0.0); - - f[iv]= c1* ( pow(PosPsi,c2) - healing * pow(NegPsi,c2) ) * pow((1 - damage),-c3); - - } - - /*Clean up and return*/ - delete gauss; -} -/*}}}*/ -/*FUNCTION Tria::InputUpdateFromSolutionDamageEvolution {{{*/ -void Tria::InputUpdateFromSolutionDamageEvolution(IssmDouble* solution){ - - const int numdof=NDOF1*NUMVERTICES; - - int i; - IssmDouble values[numdof]; - IssmDouble max_damage; - int *doflist = NULL; - - /*Get dof list: */ - GetDofList(&doflist,NoneApproximationEnum,GsetEnum); - - /*Get user-supplied max_damage: */ - this->parameters->FindParam(&max_damage,DamageMaxDamageEnum); - - /*Use the dof list to index into the solution vector: */ - for(i=0;i(values[i])) _error_("NaN found in solution vector"); - /*Enforce D < max_damage and D > 0 */ - if(values[i]>max_damage) values[i]=max_damage; - else if(values[i]<0) values[i]=0; - } - - /*Get all inputs and parameters*/ - this->material->inputs->AddInput(new TriaInput(DamageDbarEnum,values,P1Enum)); - - /*Free ressources:*/ - xDelete(doflist); -} -/*}}}*/ -#endif #ifdef _HAVE_DAKOTA_ @@ -8373,5 +4298,5 @@ GetInputListOnVertices(&thickness_init[0],ThicknessEnum); GetInputListOnVertices(&hydrostatic_ratio[0],GeometryHydrostaticRatioEnum); - GetInputListOnVertices(&bed[0],BedEnum); + GetInputListOnVertices(&bed[0],BaseEnum); GetInputListOnVertices(&surface[0],SurfaceEnum); @@ -8415,7 +4340,10 @@ /*Add new inputs: */ this->inputs->AddInput(new TriaInput(ThicknessEnum,thickness,P1Enum)); - this->inputs->AddInput(new TriaInput(BedEnum,bed,P1Enum)); + this->inputs->AddInput(new TriaInput(BaseEnum,bed,P1Enum)); this->inputs->AddInput(new TriaInput(SurfaceEnum,surface,P1Enum)); + break; + case MaterialsRheologyBEnum: + this->inputs->AddInput(new TriaInput(MaterialsRheologyBbarEnum,values,P1Enum)); break; default: @@ -8471,600 +4399,4 @@ #endif -#ifdef _HAVE_BALANCED_ -/*FUNCTION Tria::CreateKMatrixBalancethickness {{{*/ -ElementMatrix* Tria::CreateKMatrixBalancethickness(void){ - - switch(GetElementType()){ - case P1Enum: - return CreateKMatrixBalancethickness_CG(); - case P1DGEnum: - return CreateKMatrixBalancethickness_DG(); - default: - _error_("Element type " << EnumToStringx(GetElementType()) << " not supported yet"); - } - -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixBalancethickness_CG {{{*/ -ElementMatrix* Tria::CreateKMatrixBalancethickness_CG(void){ - - /*Intermediaries */ - int stabilization,meshtype; - IssmDouble Jdet,vx,vy,dvxdx,dvydy,vel,h; - IssmDouble D_scalar; - IssmDouble dvx[2],dvy[2]; - IssmDouble xyz_list[NUMVERTICES][3]; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters,NoneApproximationEnum); - IssmDouble* basis = xNew(numnodes); - IssmDouble* B = xNew(2*numnodes); - IssmDouble* Bprime = xNew(2*numnodes); - IssmDouble D[2][2]; - - /*Retrieve all Inputs and parameters: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - this->parameters->FindParam(&stabilization,BalancethicknessStabilizationEnum); - this->parameters->FindParam(&meshtype,MeshTypeEnum); - Input* vxaverage_input=NULL; - Input* vyaverage_input=NULL; - if(meshtype==Mesh2DhorizontalEnum){ - vxaverage_input=inputs->GetInput(VxEnum); _assert_(vxaverage_input); - vyaverage_input=inputs->GetInput(VyEnum); _assert_(vyaverage_input); - } - else{ - vxaverage_input=inputs->GetInput(VxAverageEnum); _assert_(vxaverage_input); - vyaverage_input=inputs->GetInput(VyAverageEnum); _assert_(vyaverage_input); - } - h=sqrt(2.*this->GetArea()); - - /*Start looping on the number of gaussian points:*/ - GaussTria* gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetBMasstransport(B,&xyz_list[0][0],gauss); - GetBprimeMasstransport(Bprime,&xyz_list[0][0],gauss); - - vxaverage_input->GetInputValue(&vx,gauss); - vyaverage_input->GetInputValue(&vy,gauss); - vxaverage_input->GetInputDerivativeValue(&dvx[0],&xyz_list[0][0],gauss); - vyaverage_input->GetInputDerivativeValue(&dvy[0],&xyz_list[0][0],gauss); - - dvxdx=dvx[0]; - dvydy=dvy[1]; - D_scalar=gauss->weight*Jdet; - - D[0][0]=D_scalar*dvxdx; - D[0][1]=0.; - D[1][0]=0.; - D[1][1]=D_scalar*dvydy; - TripleMultiply(B,2,numnodes,1, - &D[0][0],2,2,0, - B,2,numnodes,0, - &Ke->values[0],1); - - D[0][0]=D_scalar*vx; - D[1][1]=D_scalar*vy; - TripleMultiply(B,2,numnodes,1, - &D[0][0],2,2,0, - Bprime,2,numnodes,0, - &Ke->values[0],1); - - if(stabilization==1){ - /*Streamline upwinding*/ - vel=sqrt(vx*vx+vy*vy); - D[0][0]=h/(2*vel)*vx*vx; - D[1][0]=h/(2*vel)*vy*vx; - D[0][1]=h/(2*vel)*vx*vy; - D[1][1]=h/(2*vel)*vy*vy; - } - else if(stabilization==2){ - /*SSA*/ - vxaverage_input->GetInputAverage(&vx); - vyaverage_input->GetInputAverage(&vy); - D[0][0]=h/2.0*fabs(vx); - D[0][1]=0.; - D[1][0]=0.; - D[1][1]=h/2.0*fabs(vy); - } - if(stabilization==1 || stabilization==2){ - D[0][0]=D_scalar*D[0][0]; - D[1][0]=D_scalar*D[1][0]; - D[0][1]=D_scalar*D[0][1]; - D[1][1]=D_scalar*D[1][1]; - TripleMultiply(Bprime,2,numnodes,1, - &D[0][0],2,2,0, - Bprime,2,numnodes,0, - &Ke->values[0],1); - } - } - - /*Clean up and return*/ - xDelete(basis); - xDelete(B); - xDelete(Bprime); - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixBalancethickness_DG {{{*/ -ElementMatrix* Tria::CreateKMatrixBalancethickness_DG(void){ - - /*Intermediaries*/ - IssmDouble vx,vy,D_scalar,Jdet; - IssmDouble xyz_list[NUMVERTICES][3]; - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters,NoneApproximationEnum); - IssmDouble* basis = xNew(numnodes); - IssmDouble* B = xNew(2*numnodes); - IssmDouble* Bprime = xNew(2*numnodes); - IssmDouble D[2][2]; - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - - /*Start looping on the number of gaussian points:*/ - GaussTria* gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - /*WARNING: B and Bprime are inverted compared to usual masstransport!!!!*/ - GetBMasstransport(Bprime,&xyz_list[0][0],gauss); - GetBprimeMasstransport(B,&xyz_list[0][0],gauss); - - vx_input->GetInputValue(&vx,gauss); - vy_input->GetInputValue(&vy,gauss); - - D_scalar=-gauss->weight*Jdet; - D[0][0]=D_scalar*vx; - D[0][1]=0.; - D[1][0]=0.; - D[1][1]=D_scalar*vy; - - TripleMultiply(B,2,numnodes,1, - &D[0][0],2,2,0, - Bprime,2,numnodes,0, - &Ke->values[0],1); - } - - /*Clean up and return*/ - xDelete(basis); - xDelete(B); - xDelete(Bprime); - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixBalancevelocity{{{*/ -ElementMatrix* Tria::CreateKMatrixBalancevelocity(void){ - - /*Intermediaries */ - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble dhdt_g,mb_g,ms_g,Jdet; - IssmDouble h,gamma,thickness; - IssmDouble hnx,hny,dhnx[2],dhny[2]; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters,NoneApproximationEnum); - IssmDouble* B = xNew(2*numnodes); - IssmDouble* basis = xNew(numnodes); - IssmDouble* dbasis = xNew(2*numnodes); - IssmDouble* HNx = xNew(numnodes); - IssmDouble* HNy = xNew(numnodes); - IssmDouble* H = xNew(numnodes); - IssmDouble* Nx = xNew(numnodes); - IssmDouble* Ny = xNew(numnodes); - - /*Retrieve all Inputs and parameters: */ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* H_input =inputs->GetInput(ThicknessEnum); _assert_(H_input); - h=sqrt(2.*this->GetArea()); - - /*Get vector N for all nodes and build HNx and HNy*/ - GetInputListOnNodes(Nx,SurfaceSlopeXEnum); - GetInputListOnNodes(Ny,SurfaceSlopeYEnum); - GetInputListOnNodes(H,ThicknessEnum); - for(int i=0;ibegin();igend();ig++){ - - gauss->GaussPoint(ig); - - H_input->GetInputValue(&thickness,gauss); - if(thickness<50.) thickness=50.; - TriaRef::GetInputDerivativeValue(&dhnx[0],HNx,&xyz_list[0][0],gauss); - TriaRef::GetInputDerivativeValue(&dhny[0],HNy,&xyz_list[0][0],gauss); - TriaRef::GetInputValue(&hnx,HNx,gauss); - TriaRef::GetInputValue(&hny,HNy,gauss); - - gamma=h/(2.*thickness+1.e-10); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - GetNodalFunctionsDerivatives(dbasis,&xyz_list[0][0],gauss); - - for(int i=0;ivalues[i*numnodes+j] += gauss->weight*Jdet*( - (basis[i]+gamma*(basis[i]*(dhnx[0]+dhny[1]) + dbasis[0*numnodes+i]*hnx + dbasis[1*numnodes+i]*hny))* - (basis[j]*(dhnx[0]+dhny[1]) + dbasis[0*numnodes+j]*hnx + dbasis[1*numnodes+j]*hny) - ); - } - } - } - - /*Clean up and return*/ - xDelete(basis); - xDelete(dbasis); - xDelete(H); - xDelete(Nx); - xDelete(Ny); - xDelete(HNx); - xDelete(HNy); - xDelete(B); - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixSmoothedSlope {{{*/ -ElementMatrix* Tria::CreateKMatrixSmoothedSlope(void){ - - /* Intermediaries */ - IssmDouble D_scalar,Jdet,thickness; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble l=8.; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters); - IssmDouble* dbasis = xNew(2*numnodes); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input); - - /* Start looping on the number of gaussian points: */ - GaussTria* gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - thickness_input->GetInputValue(&thickness,gauss); - if(thickness<50.) thickness=50.; - - GetNodalFunctions(basis,gauss); - GetNodalFunctionsDerivatives(dbasis,&xyz_list[0][0],gauss); - - for(int i=0;ivalues[i*numnodes+j] += gauss->weight*Jdet*( - basis[i]*basis[j] - +(l*thickness)*(l*thickness)*(dbasis[0*numnodes+i]*dbasis[0*numnodes+j] + dbasis[1*numnodes+i]*dbasis[1*numnodes+j]) - ); - } - } - } - - /*Clean up and return*/ - delete gauss; - xDelete(dbasis); - xDelete(basis); - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorBalancethickness{{{*/ -ElementVector* Tria::CreatePVectorBalancethickness(void){ - - switch(GetElementType()){ - case P1Enum: - return CreatePVectorBalancethickness_CG(); - break; - case P1DGEnum: - return CreatePVectorBalancethickness_DG(); - default: - _error_("Element type " << EnumToStringx(GetElementType()) << " not supported yet"); - } -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorBalancethickness_CG{{{*/ -ElementVector* Tria::CreatePVectorBalancethickness_CG(void){ - - /*Intermediaries */ - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble dhdt_g,mb_g,ms_g,Jdet; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector and other vectors*/ - ElementVector* pe = new ElementVector(nodes,numnodes,this->parameters); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* ms_input=inputs->GetInput(SurfaceforcingsMassBalanceEnum); _assert_(ms_input); - Input* mb_input=inputs->GetInput(BasalforcingsMeltingRateEnum); _assert_(mb_input); - Input* dhdt_input=inputs->GetInput(BalancethicknessThickeningRateEnum); _assert_(dhdt_input); - - /* Start looping on the number of gaussian points: */ - GaussTria* gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - ms_input->GetInputValue(&ms_g,gauss); - mb_input->GetInputValue(&mb_g,gauss); - dhdt_input->GetInputValue(&dhdt_g,gauss); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - - for(int i=0;ivalues[i]+=Jdet*gauss->weight*(ms_g-mb_g-dhdt_g)*basis[i]; - } - - /*Clean up and return*/ - xDelete(basis); - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorBalancethickness_DG {{{*/ -ElementVector* Tria::CreatePVectorBalancethickness_DG(void){ - - /*Intermediaries */ - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble mb_g,ms_g,dhdt_g,Jdet; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector and other vectors*/ - ElementVector* pe = new ElementVector(nodes,numnodes,this->parameters); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* ms_input=inputs->GetInput(SurfaceforcingsMassBalanceEnum); _assert_(ms_input); - Input* mb_input=inputs->GetInput(BasalforcingsMeltingRateEnum); _assert_(mb_input); - Input* dhdt_input=inputs->GetInput(BalancethicknessThickeningRateEnum);_assert_(dhdt_input); - - /* Start looping on the number of gaussian points: */ - GaussTria* gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - ms_input->GetInputValue(&ms_g,gauss); - mb_input->GetInputValue(&mb_g,gauss); - dhdt_input->GetInputValue(&dhdt_g,gauss); - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - - for(int i=0;ivalues[i]+=Jdet*gauss->weight*(ms_g-mb_g-dhdt_g)*basis[i]; - } - - /*Clean up and return*/ - xDelete(basis); - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorBalancevelocity{{{*/ -ElementVector* Tria::CreatePVectorBalancevelocity(void){ - - /*Intermediaries */ - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble dhdt_g,mb_g,ms_g,Jdet; - IssmDouble h,gamma,thickness; - IssmDouble hnx,hny,dhnx[2],dhny[2]; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector and other vectors*/ - ElementVector* pe = new ElementVector(nodes,numnodes,this->parameters); - IssmDouble* basis = xNew(numnodes); - IssmDouble* dbasis = xNew(numnodes*2); - IssmDouble* HNx = xNew(numnodes); - IssmDouble* HNy = xNew(numnodes); - IssmDouble* H = xNew(numnodes); - IssmDouble* Nx = xNew(numnodes); - IssmDouble* Ny = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* ms_input=inputs->GetInput(SurfaceforcingsMassBalanceEnum); _assert_(ms_input); - Input* mb_input=inputs->GetInput(BasalforcingsMeltingRateEnum); _assert_(mb_input); - Input* dhdt_input=inputs->GetInput(BalancethicknessThickeningRateEnum); _assert_(dhdt_input); - Input* H_input=inputs->GetInput(ThicknessEnum); _assert_(H_input); - h=sqrt(2.*this->GetArea()); - - /*Get vector N for all nodes*/ - GetInputListOnNodes(Nx,SurfaceSlopeXEnum); - GetInputListOnNodes(Ny,SurfaceSlopeYEnum); - GetInputListOnNodes(H,ThicknessEnum); - for(int i=0;ibegin();igend();ig++){ - - gauss->GaussPoint(ig); - - ms_input->GetInputValue(&ms_g,gauss); - mb_input->GetInputValue(&mb_g,gauss); - dhdt_input->GetInputValue(&dhdt_g,gauss); - H_input->GetInputValue(&thickness,gauss); - if(thickness<50.) thickness=50.; - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - GetNodalFunctionsDerivatives(dbasis,&xyz_list[0][0],gauss); - - TriaRef::GetInputDerivativeValue(&dhnx[0],HNx,&xyz_list[0][0],gauss); - TriaRef::GetInputDerivativeValue(&dhny[0],HNy,&xyz_list[0][0],gauss); - TriaRef::GetInputValue(&hnx,HNx,gauss); - TriaRef::GetInputValue(&hny,HNy,gauss); - - gamma=h/(2.*thickness+1.e-10); - - for(int i=0;ivalues[i]+=Jdet*gauss->weight*(ms_g-mb_g-dhdt_g)*( - basis[i] + gamma*(basis[i]*(dhnx[0]+dhny[1])+hnx*dbasis[0*numnodes+i] + hny*dbasis[1*numnodes+i]) - ); - } - } - - /*Clean up and return*/ - xDelete(basis); - xDelete(dbasis); - xDelete(H); - xDelete(Nx); - xDelete(Ny); - xDelete(HNx); - xDelete(HNy); - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorSmoothedSlopeX{{{*/ -ElementVector* Tria::CreatePVectorSmoothedSlopeX(void){ - - /*Intermediaries */ - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble Jdet; - IssmDouble thickness,slope[2]; - IssmDouble taud_x,norms,normv,vx,vy; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector and other vectors*/ - ElementVector* pe = new ElementVector(nodes,numnodes,this->parameters); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* H_input = inputs->GetInput(ThicknessEnum); _assert_(H_input); - Input* surface_input = inputs->GetInput(SurfaceEnum); _assert_(surface_input); - Input* vx_input = inputs->GetInput(VxEnum); - Input* vy_input = inputs->GetInput(VyEnum); - - /* Start looping on the number of gaussian points: */ - GaussTria* gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - H_input->GetInputValue(&thickness,gauss); - surface_input->GetInputDerivativeValue(&slope[0],&xyz_list[0][0],gauss); - if(vx_input && vy_input){ - vx_input->GetInputValue(&vx,gauss); - vy_input->GetInputValue(&vy,gauss); - norms = sqrt(slope[0]*slope[0]+slope[1]*slope[1]+1.e-10); - normv = sqrt(vx*vx + vy*vy); - if(normv>15./(365.*24.*3600.)) slope[0] = -vx/normv*norms; - } - taud_x = matpar->GetRhoIce()*matpar->GetG()*thickness*slope[0]; - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - - for(int i=0;ivalues[i]+=Jdet*gauss->weight*taud_x*basis[i]; - } - - /*Clean up and return*/ - xDelete(basis); - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorSmoothedSlopeY{{{*/ -ElementVector* Tria::CreatePVectorSmoothedSlopeY(void){ - - /*Intermediaries */ - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble Jdet; - IssmDouble thickness,slope[2]; - IssmDouble taud_y,norms,normv,vx,vy; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element vector and other vectors*/ - ElementVector* pe = new ElementVector(nodes,numnodes,this->parameters); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - Input* H_input = inputs->GetInput(ThicknessEnum); _assert_(H_input); - Input* surface_input = inputs->GetInput(SurfaceEnum); _assert_(surface_input); - Input* vx_input = inputs->GetInput(VxEnum); - Input* vy_input = inputs->GetInput(VyEnum); - - /* Start looping on the number of gaussian points: */ - GaussTria* gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - H_input->GetInputValue(&thickness,gauss); - surface_input->GetInputDerivativeValue(&slope[0],&xyz_list[0][0],gauss); - if(vx_input && vy_input){ - vx_input->GetInputValue(&vx,gauss); - vy_input->GetInputValue(&vy,gauss); - norms = sqrt(slope[0]*slope[0]+slope[1]*slope[1]+1.e-10); - normv = sqrt(vx*vx + vy*vy); - if(normv>15./(365.*24.*3600.)) slope[1] = -vy/normv*norms; - } - taud_y = matpar->GetRhoIce()*matpar->GetG()*thickness*slope[1]; - - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetNodalFunctions(basis,gauss); - - for(int i=0;ivalues[i]+=Jdet*gauss->weight*taud_y*basis[i]; - } - - /*Clean up and return*/ - xDelete(basis); - delete gauss; - return pe; -} -/*}}}*/ -#endif - -#ifdef _HAVE_GROUNDINGLINE_ /*FUNCTION Tria::MigrateGroundingLine{{{*/ void Tria::MigrateGroundingLine(IssmDouble* phi_ungrounding){ @@ -9085,6 +4417,6 @@ GetInputListOnVertices(&h[0],ThicknessEnum); GetInputListOnVertices(&s[0],SurfaceEnum); - GetInputListOnVertices(&b[0],BedEnum); - GetInputListOnVertices(&r[0],BathymetryEnum); + GetInputListOnVertices(&b[0],BaseEnum); + GetInputListOnVertices(&r[0],BedEnum); GetInputListOnVertices(&phi[0],MaskGroundediceLevelsetEnum); rho_water = matpar->GetRhoWater(); @@ -9092,4 +4424,35 @@ density = rho_ice/rho_water; oldfloating = this->IsFloating(); //figure out if element is floating before we start to change everything + + if(migration_style == ContactEnum){ + for(i = 0;i < NUMVERTICES;i++) phi[i] = phi_ungrounding[vertices[i]->Pid()]; + this->inputs->AddInput(new TriaInput(MaskGroundediceLevelsetEnum,&phi[0],P1Enum)); + + /*go through vertices, and update inputs, considering them to be TriaVertex type: */ + for(i = 0;i < NUMVERTICES;i++){ + /*Ice shelf: if bed below bathymetry, impose it at the bathymetry and update surface, elso do nothing */ + if(phi[i] >= 0.){ + b[i] = r[i]; + } + } + + /*Add basal melting rate if element just ungrounded*/ + for(i=0;iinputs->AddInput(new TriaInput(BasalforcingsMeltingRateEnum,&melting[0],P1Enum)); + } + + /*Update inputs*/ + this->inputs->AddInput(new TriaInput(BaseEnum,&b[0],P1Enum)); + return; + } + + this->inputs->AddInput(new TriaInput(MaskGroundediceLevelsetEnum,&phi[0],P1Enum)); /*go through vertices, and update inputs, considering them to be TriaVertex type: */ @@ -9155,5 +4518,5 @@ } - /*Add basal melting rate if element just ungrounded*/ + /*Add basal melting rate if element just ungrounded*/ if(!oldfloating && floatingelement==true){ for(i=0;iinputs->AddInput(new TriaInput(SurfaceEnum,&s[0],P1Enum)); - this->inputs->AddInput(new TriaInput(BedEnum,&b[0],P1Enum)); + this->inputs->AddInput(new TriaInput(BaseEnum,&b[0],P1Enum)); } @@ -9179,5 +4542,5 @@ density=rho_ice/rho_water; GetInputListOnVertices(&h[0],ThicknessEnum); - GetInputListOnVertices(&r[0],BathymetryEnum); + GetInputListOnVertices(&r[0],BedEnum); GetInputListOnVertices(&gl[0],MaskGroundediceLevelsetEnum); @@ -9215,3 +4578,2 @@ } /*}}}*/ -#endif Index: /issm/trunk/src/c/classes/Elements/Tria.h =================================================================== --- /issm/trunk/src/c/classes/Elements/Tria.h (revision 17805) +++ /issm/trunk/src/c/classes/Elements/Tria.h (revision 17806) @@ -22,4 +22,5 @@ class ElementVector; class Vertex; +class GaussTria; #include "../../shared/Exceptions/exceptions.h" @@ -31,29 +32,14 @@ public: - int id; - int sid; - - Node **nodes; // nodes - Vertex **vertices; // 3 vertices - Material *material; // 1 material ice - Matpar *matpar; // 1 material parameter - - Parameters *parameters; //pointer to solution parameters - Inputs *inputs; - /*Tria constructors, destructors {{{*/ - Tria(); + Tria(){}; Tria(int tria_id,int tria_sid,int i, IoModel* iomodel,int nummodels); ~Tria(); /*}}}*/ /*Object virtual functions definitions:{{{ */ - void Echo(); - void DeepEcho(); - int Id(); int ObjectEnum(); Object *copy(); /*}}}*/ /*Update virtual functions resolution: {{{*/ - void InputUpdateFromSolution(IssmDouble* solutiong); void InputUpdateFromVector(IssmDouble* vector, int name, int type); #ifdef _HAVE_DAKOTA_ @@ -61,40 +47,44 @@ void InputUpdateFromMatrixDakota(IssmDouble* matrix, int nows, int ncols, int name, int type); #endif - void InputUpdateFromConstant(IssmDouble constant, int name); - void InputUpdateFromConstant(int constant, int name); - void InputUpdateFromConstant(bool constant, int name); void InputUpdateFromIoModel(int index, IoModel* iomodel); /*}}}*/ /*Element virtual functions definitions: {{{*/ + IssmDouble CharacteristicLength(void); void ComputeBasalStress(Vector* sigma_b); + void ComputeSigmaNN(); void ComputeStrainRate(Vector* eps); void ComputeStressTensor(); + void ComputeDeviatoricStressTensor(); + void ComputeSurfaceNormalVelocity(); void Configure(Elements* elements,Loads* loads,Nodes* nodesin,Vertices* verticesin,Materials* materials,Parameters* parameters); void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Materials* materials,Parameters* parameters); - void SetwiseNodeConnectivity(int* d_nz,int* o_nz,Node* node,bool* flags,int* flagsindices,int set1_enum,int set2_enum); - void CreateKMatrix(Matrix* Kff, Matrix* Kfs); - void CreateDVector(Vector* df); - void CreatePVector(Vector* pf); - void CreateJacobianMatrix(Matrix* Jff); void Delta18oParameterization(void); + void ElementSizes(IssmDouble* hx,IssmDouble* hy,IssmDouble* hz); + void FSContactMigration(Vector* vertexgrounded,Vector* vertexfloating); + int FiniteElement(void); + Element* GetUpperElement(void){_error_("not implemented yet");}; + Element* GetLowerElement(void){_error_("not implemented yet");}; + Element* GetSurfaceElement(void){_error_("not implemented yet");}; + Element* GetBasalElement(void){_error_("not implemented yet");}; + void GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating); + IssmDouble GetGroundedPortion(IssmDouble* xyz_list); int GetNodeIndex(Node* node); - void GetNodesSidList(int* sidlist); - void GetNodesLidList(int* lidlist); int GetNumberOfNodes(void); - int Sid(); - bool IsOnBed(); - bool HasEdgeOnBed(); + int GetNumberOfVertices(void); + bool IsOnBase(); + bool IsOnSurface(); + bool HasEdgeOnBase(); bool HasEdgeOnSurface(); void EdgeOnSurfaceIndices(int* pindex1,int* pindex); - void EdgeOnBedIndices(int* pindex1,int* pindex); - int EdgeOnBedIndex(); + void EdgeOnBaseIndices(int* pindex1,int* pindex); + int EdgeOnBaseIndex(); int EdgeOnSurfaceIndex(); - bool IsFloating(); bool IsNodeOnShelfFromFlags(IssmDouble* flags); - bool NoIceInElement(); - void GetSolutionFromInputs(Vector* solution); - void GetVectorFromInputs(Vector* vector, int name_enum); - void InputCreate(IssmDouble* vector,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code); - void InputDepthAverageAtBase(int enum_type,int average_enum_type,int object_enum=MeshElementsEnum); + int NumberofNodesVelocity(void); + int NumberofNodesPressure(void); + void GetSolutionFromInputsOneDof(Vector* solution,int enum_type); + void GetVerticesCoordinatesBase(IssmDouble** pxyz_list); + void GetVerticesCoordinatesTop(IssmDouble** pxyz_list); + void InputDepthAverageAtBase(int enum_type,int average_enum_type); void InputDuplicate(int original_enum,int new_enum); void InputScale(int enum_type,IssmDouble scale_factor); @@ -102,13 +92,24 @@ int NodalValue(IssmDouble* pvalue, int index, int natureofdataenum); void PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm); - void ResultInterpolation(int* pinterpolation,int output_enum); - void ResultToVector(Vector* vector,int output_enum); - void ResetCoordinateSystem(void); + void ReduceMatrices(ElementMatrix* Ke,ElementVector* pe); + void ResetFSBasalBoundaryCondition(void); void SmbGradients(); + Element* SpawnBasalElement(void); + Element* SpawnTopElement(void); + int VelocityInterpolation(); + int PressureInterpolation(); IssmDouble SurfaceArea(void); void Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finitelement); IssmDouble TimeAdapt(); - - #ifdef _HAVE_RESPONSES_ + void ValueP1OnGauss(IssmDouble* pvalue,IssmDouble* values,Gauss* gauss); + void ValueP1DerivativesOnGauss(IssmDouble* dvalue,IssmDouble* values,IssmDouble* xyz_list,Gauss* gauss); + int VertexConnectivity(int vertexindex); + void VerticalSegmentIndices(int** pindices,int* pnumseg){_error_("not implemented yet");}; + void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum); + void GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum); + void GetNormalFromLSF(IssmDouble *pnormal); + bool IsZeroLevelset(int levelset_enum); + bool IsIcefront(void); + void AverageOntoPartition(Vector* partition_contributions,Vector* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part); IssmDouble IceVolume(void); @@ -129,5 +130,6 @@ void MaxVy(IssmDouble* pmaxvy); void MaxVz(IssmDouble* pmaxvz); - #endif + IssmDouble Misfit(int modelenum,int observationenum,int weightsenum); + IssmDouble MisfitArea(int weightsenum); #ifdef _HAVE_GIA_ @@ -135,5 +137,4 @@ #endif - #ifdef _HAVE_CONTROL_ IssmDouble DragCoefficientAbsGradient(void); void GradientIndexing(int* indexing,int control_index); @@ -168,153 +169,60 @@ IssmDouble SurfaceAverageVelMisfit(void); void InputControlUpdate(IssmDouble scalar,bool save_parameter); - #endif - - #ifdef _HAVE_GROUNDINGLINE_ + void PotentialUngrounding(Vector* potential_sheet_ungrounding); void MigrateGroundingLine(IssmDouble* sheet_ungrounding); int UpdatePotentialUngrounding(IssmDouble* vertices_potentially_ungrounding,Vector* vec_nodes_on_iceshelf,IssmDouble* nodes_on_iceshelf); - #endif /*}}}*/ /*Tria specific routines:{{{*/ - ElementMatrix* CreateKMatrix(void); - ElementMatrix* CreateKMatrixBalancethickness(void); - ElementMatrix* CreateKMatrixBalancethickness_DG(void); - ElementMatrix* CreateKMatrixBalancethickness_CG(void); - ElementMatrix* CreateKMatrixBalancevelocity(void); - ElementMatrix* CreateKMatrixSmoothedSlope(void); - ElementMatrix* CreateKMatrixMelting(void); - ElementMatrix* CreateKMatrixMasstransport(void); - ElementMatrix* CreateKMatrixMasstransport_CG(void); - ElementMatrix* CreateKMatrixMasstransport_DG(void); - ElementMatrix* CreateKMatrixExtrusion(void); - ElementMatrix* CreateKMatrixExtrusionVolume(void); - ElementMatrix* CreateKMatrixExtrusionSurface(void); - ElementMatrix* CreateKMatrixExtrusionBed(void); - ElementMatrix* CreateKMatrixFreeSurfaceTop(void); - ElementMatrix* CreateKMatrixFreeSurfaceTop1D(void); - ElementMatrix* CreateKMatrixFreeSurfaceBase(void); - ElementMatrix* CreateKMatrixFreeSurfaceBase1D(void); - ElementMatrix* CreateMassMatrix(void); - ElementMatrix* CreateBasalMassMatrix(void); - ElementVector* CreatePVector(void); - ElementVector* CreatePVectorBalancethickness(void); - ElementVector* CreatePVectorBalancethickness_DG(void); - ElementVector* CreatePVectorBalancethickness_CG(void); - ElementVector* CreatePVectorBalancevelocity(void); - ElementVector* CreatePVectorSmoothedSlopeX(void); - ElementVector* CreatePVectorSmoothedSlopeY(void); - ElementVector* CreatePVectorMasstransport(void); - ElementVector* CreatePVectorMasstransport_CG(void); - ElementVector* CreatePVectorMasstransport_DG(void); - ElementVector* CreatePVectorFreeSurfaceTop(void); - ElementVector* CreatePVectorFreeSurfaceTop1D(void); - ElementVector* CreatePVectorFreeSurfaceBase(void); - ElementVector* CreatePVectorFreeSurfaceBase1D(void); - ElementVector* CreatePVectorL2Projection(void); - ElementVector* CreatePVectorL2ProjectionBase(void); + void AddBasalInput(int input_enum, IssmDouble* values, int interpolation_enum); + void AddInput(int input_enum, IssmDouble* values, int interpolation_enum); IssmDouble GetArea(void); - void GetAreaCoordinates(IssmDouble *area_coordinates,IssmDouble xyz_zero[3][3],IssmDouble xyz_list[3][3],int numpoints); + void GetAreaCoordinates(IssmDouble *area_coordinates,IssmDouble* xyz_zero,IssmDouble* xyz_list,int numpoints); int GetElementType(void); - void GetDofList(int** pdoflist,int approximation_enum,int setenum); - void GetDofListVelocity(int** pdoflist,int setenum); - void GetDofListPressure(int** pdoflist,int setenum); - void GetVertexPidList(int* doflist); - void GetVertexSidList(int* sidlist); - void GetConnectivityList(int* connectivity); - void GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating); - IssmDouble GetGroundedPortion(IssmDouble* xyz_list); - void GetSegmentNormal(IssmDouble* normal,IssmDouble xyz_list[2][3]); - void GetZeroLevelsetCoordinates(IssmDouble* xyz_zero,IssmDouble xyz_list[3][3],int levelsetenum); - void GetInputListOnVertices(IssmDouble* pvalue,int enumtype); - void GetInputListOnVertices(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue); - void GetInputListOnVertices(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue,int index); //TO BE REMOVED - void GetInputListOnNodes(IssmDouble* pvalue,int enumtype); - void GetInputListOnNodes(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue); + IssmDouble GetXcoord(Gauss* gauss); + IssmDouble GetYcoord(Gauss* gauss); + IssmDouble GetZcoord(Gauss* gauss){_error_("not implemented");}; + void NormalSection(IssmDouble* normal,IssmDouble* xyz_list); + void NormalTop(IssmDouble* normal,IssmDouble* xyz_list); + void NormalBase(IssmDouble* normal,IssmDouble* xyz_list); void GetInputValue(IssmDouble* pvalue,Node* node,int enumtype); void GetMaterialInputValue(IssmDouble* pvalue,Node* node,int enumtype); - void GetStrainRate2d(IssmDouble* epsilon,IssmDouble* xyz_list, GaussTria* gauss, Input* vx_input, Input* vy_input); + Node* GetNode(int node_number); void InputUpdateFromSolutionOneDof(IssmDouble* solution,int enum_type); - void InputUpdateFromSolutionMasstransport(IssmDouble* solution); - bool IsInput(int name); + void InputUpdateFromSolutionOneDofCollapsed(IssmDouble* solution,int enum_type){_error_("not implemented yet");}; + void JacobianDeterminant(IssmDouble* pJdet, IssmDouble* xyz_list,Gauss* gauss); + void JacobianDeterminantLine(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss){_error_("not implemented yet");}; + void JacobianDeterminantSurface(IssmDouble* pJdet, IssmDouble* xyz_list,Gauss* gauss); + void JacobianDeterminantBase(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss); + void JacobianDeterminantTop(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss); + IssmDouble MinEdgeLength(IssmDouble* xyz_list){_error_("not implemented yet");}; + Gauss* NewGauss(void); + Gauss* NewGauss(int order); + Gauss* NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order); + Gauss* NewGauss(int point1,IssmDouble fraction1,IssmDouble fraction2,bool mainlyfloating,int order); + Gauss* NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert); + Gauss* NewGaussBase(int order); + Gauss* NewGaussLine(int vertex1,int vertex2,int order){_error_("not implemented yet");}; + Gauss* NewGaussTop(int order); + void NodalFunctions(IssmDouble* basis,Gauss* gauss); + void NodalFunctionsP1(IssmDouble* basis,Gauss* gauss){_error_("not implemented yet");}; + void NodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss); + void NodalFunctionsP1Derivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){_error_("not implemented yet");}; + void NodalFunctionsMINIDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){_error_("not implemented yet");}; + void NodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss); + void NodalFunctionsVelocity(IssmDouble* basis,Gauss* gauss); + void NodalFunctionsPressure(IssmDouble* basis,Gauss* gauss); + void NodalFunctionsTensor(IssmDouble* basis,Gauss* gauss); void SetClone(int* minranks); + void SetTemporaryElementType(int element_type_in){_error_("not implemented yet");}; Seg* SpawnSeg(int index1,int index2); - void SurfaceNormal(IssmDouble* surface_normal, IssmDouble xyz_list[3][3]); - - #ifdef _HAVE_STRESSBALANCE_ - ElementMatrix* CreateKMatrixStressbalanceSSA(void); - ElementMatrix* CreateKMatrixStressbalanceSSAViscous(void); - ElementMatrix* CreateKMatrixStressbalanceSSAFriction(void); - ElementMatrix* CreateKMatrixStressbalanceSIA(void); - ElementMatrix* CreateKMatrixStressbalanceFS(void); - ElementMatrix* CreateKMatrixStressbalanceFSViscous(void); - ElementMatrix* CreateKMatrixStressbalanceFSFriction(void); - ElementVector* CreatePVectorStressbalanceSSA(void); - ElementVector* CreatePVectorStressbalanceSSADrivingStress(void); - ElementVector* CreatePVectorStressbalanceSSAFront(void); - ElementVector* CreatePVectorStressbalanceSIA(void); - ElementVector* CreatePVectorStressbalanceFS(void); - ElementVector* CreatePVectorStressbalanceFSFront(void); - ElementVector* CreatePVectorStressbalanceFSViscous(void); - void PVectorGLSstabilization(ElementVector* pe); - ElementVector* CreatePVectorStressbalanceFSShelf(void); - ElementMatrix* CreateJacobianStressbalanceSSA(void); - void GetSolutionFromInputsStressbalanceFS(Vector* solution); - void GetSolutionFromInputsStressbalanceHoriz(Vector* solution); - void GetSolutionFromInputsStressbalanceSIA(Vector* solution); - IssmDouble GetYcoord(GaussTria* gauss); - void InputUpdateFromSolutionStressbalanceHoriz( IssmDouble* solution); - void InputUpdateFromSolutionStressbalanceFS( IssmDouble* solution); - void InputUpdateFromSolutionStressbalanceSIA( IssmDouble* solution); - #endif - - #ifdef _HAVE_CONTROL_ - ElementMatrix* CreateKMatrixAdjointBalancethickness(void); - ElementMatrix* CreateKMatrixAdjointSSA(void); - ElementVector* CreatePVectorAdjointHoriz(void); - ElementVector* CreatePVectorAdjointBalancethickness(void); - void InputUpdateFromSolutionAdjointHoriz( IssmDouble* solution); - #endif + IssmDouble StabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa){_error_("not implemented yet");}; + void ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){_error_("not implemented yet");}; void UpdateConstraintsExtrudeFromBase(void); void UpdateConstraintsExtrudeFromTop(void); - #ifdef _HAVE_THERMAL_ - void UpdateBasalConstraintsEnthalpy(void){_error_("not implemented yet");}; - void ComputeBasalMeltingrate(void){_error_("not implemented yet");}; - void DrainWaterfraction(void){_error_("not implemented yet");}; - #endif - - #ifdef _HAVE_HYDROLOGY_ - ElementMatrix* CreateKMatrixHydrologyShreve(void); - ElementMatrix* CreateKMatrixHydrologyDCInefficient(void); - ElementMatrix* CreateKMatrixHydrologyDCEfficient(void); - ElementVector* CreatePVectorHydrologyShreve(void); - ElementVector* CreatePVectorHydrologyDCInefficient(void); - ElementVector* CreatePVectorHydrologyDCEfficient(void); - void GetSolutionFromInputsOneDof(Vector* solution,int enum_type); - void CreateHydrologyWaterVelocityInput(void); - void InputUpdateFromSolutionHydrology(IssmDouble* solution); - void InputUpdateFromSolutionHydrologyShreve(IssmDouble* solution); - void InputUpdateFromSolutionHydrologyDC(IssmDouble* solution); - void InputUpdateFromSolutionHydrologyDCInefficient(IssmDouble* solution); - void InputUpdateFromSolutionHydrologyDCEfficient(IssmDouble* solution); - void GetHydrologyDCInefficientHmax(IssmDouble* ph_max, Node* innode); - void GetHydrologyTransfer(Vector* transfer); - void HydrologyEPLGetActive(Vector* active_vec); - void HydrologyEPLGetMask(Vector* vec_mask); - bool AllActive(void); - bool AnyActive(void); - #endif - - #ifdef _HAVE_DAMAGE_ - ElementMatrix* CreateKMatrixDamageEvolution(void); - ElementMatrix* CreateKMatrixDamageEvolution_CG(void); - ElementVector* CreatePVectorDamageEvolution(void); - ElementVector* CreatePVectorDamageEvolution_CG(void); - void DamageEvolutionF(IssmDouble* flist); - void InputUpdateFromSolutionDamageEvolution(IssmDouble* solution); - #endif - - + + void CreateHydrologyWaterVelocityInput(void); /*}}}*/ Index: /issm/trunk/src/c/classes/Elements/TriaRef.cpp =================================================================== --- /issm/trunk/src/c/classes/Elements/TriaRef.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Elements/TriaRef.cpp (revision 17806) @@ -16,4 +16,5 @@ /*Element macros*/ +#define NUMNODESP0 1 #define NUMNODESP1 3 #define NUMNODESP1b 4 @@ -50,104 +51,6 @@ /*Reference Element numerics*/ -/*FUNCTION TriaRef::GetBHydro {{{*/ -void TriaRef::GetBHydro(IssmDouble* B, IssmDouble* xyz_list, GaussTria* gauss){ - /*Compute B matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2. - * For node i, Bi can be expressed in the actual coordinate system - * by: - * Bi=[ dN/dx ] - * [ dN/dy ] - * where N is the finiteelement function for node i. - * - * We assume B has been allocated already, of size: 3x(NDOF2*numnodes) - */ - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Get nodal functions derivatives*/ - IssmDouble* dbasis=xNew(2*numnodes); - GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - - /*Build B: */ - for(int i=0;i(dbasis); -} -/*}}}*/ -/*FUNCTION TriaRef::GetBSSA {{{*/ -void TriaRef::GetBSSA(IssmDouble* B, IssmDouble* xyz_list, GaussTria* gauss){ - /*Compute B matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2. - * For node i, Bi can be expressed in the actual coordinate system - * by: - * Bi=[ dN/dx 0 ] - * [ 0 dN/dy ] - * [ 1/2*dN/dy 1/2*dN/dx ] - * where N is the finiteelement function for node i. - * - * We assume B has been allocated already, of size: 3x(NDOF2*numnodes) - */ - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Get nodal functions derivatives*/ - IssmDouble* dbasis=xNew(2*numnodes); - GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - - /*Build B: */ - for(int i=0;i(dbasis); -} -/*}}}*/ -/*FUNCTION TriaRef::GetBSSAFS {{{*/ -void TriaRef::GetBSSAFS(IssmDouble* B, IssmDouble* xyz_list, GaussTria* gauss){ - - /*Compute B matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2. - * For node i, Bi can be expressed in the actual coordinate system - * by: - * Bi=[ dN/dx 0 ] - * [ 0 dN/dy ] - * [ 1/2*dN/dy 1/2*dN/dx ] - * where N is the finiteelement function for node i. - * - * We assume B has been allocated already, of size: 3x(NDOF2*numnodes) - */ - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Get nodal functions derivatives*/ - IssmDouble* dbasis=xNew(2*numnodes); - GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - - /*Build B': */ - for(int i=0;i(dbasis); -} -/*}}}*/ /*FUNCTION TriaRef::GetSegmentBFlux{{{*/ -void TriaRef::GetSegmentBFlux(IssmDouble* B,GaussTria* gauss, int index1,int index2){ +void TriaRef::GetSegmentBFlux(IssmDouble* B,Gauss* gauss, int index1,int index2){ /*Compute B matrix. B=[phi1 phi2 -phi3 -phi4] * @@ -175,5 +78,5 @@ /*}}}*/ /*FUNCTION TriaRef::GetSegmentBprimeFlux{{{*/ -void TriaRef::GetSegmentBprimeFlux(IssmDouble* Bprime,GaussTria* gauss, int index1,int index2){ +void TriaRef::GetSegmentBprimeFlux(IssmDouble* Bprime,Gauss* gauss, int index1,int index2){ /*Compute Bprime matrix. Bprime=[phi1 phi2 phi3 phi4] * @@ -200,331 +103,6 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetBExtrusion{{{*/ -void TriaRef::GetBExtrusion(IssmDouble* B, IssmDouble* xyz_list, GaussTria* gauss){ - /* Compute B matrix. B=[dh1/dz dh2/dz dh3/dz dh4/dz dh5/dz dh6/dz]; - where hi is the interpolation function for node i.*/ - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Get nodal functions derivatives*/ - IssmDouble* dbasis=xNew(2*numnodes); - GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - - /*Build B: */ - for(int i=0;i(dbasis); -} -/*}}}*/ -/*FUNCTION TriaRef::GetBFS {{{*/ -void TriaRef::GetBFS(IssmDouble* B, IssmDouble* xyz_list, GaussTria* gauss){ - /*Compute B matrix. B=[Bv1 Bv2 ... Bp1 Bp2 ...] where Bvi is of size 3*NDOF3. - * For node i, Bvi can be expressed in the actual coordinate system - * by: Bvi=[ dphi/dx 0 ] - * [ 0 dphi/dy ] - * [ 1/2*dphi/dy 1/2*dphi/dx] - * [ 0 0 ] - * [ dphi/dx dphi/dy ] - * - * by: Bpi=[ 0 ] - * [ 0 ] - * [ 0 ] - * [ phi_p ] - * [ 0 ] - * where phi is the finiteelement function for node i. - * Same thing for Bb except the last column that does not exist. - */ - - /*Fetch number of nodes for this finite element*/ - int pnumnodes = this->NumberofNodesPressure(); - int vnumnodes = this->NumberofNodesVelocity(); - - /*Get nodal functions derivatives*/ - IssmDouble* vdbasis=xNew(2*vnumnodes); - IssmDouble* pbasis =xNew(pnumnodes); - GetNodalFunctionsDerivativesVelocity(vdbasis,xyz_list,gauss); - GetNodalFunctionsPressure(pbasis,gauss); - - /*Build B: */ - for(int i=0;i(vdbasis); - xDelete(pbasis); -} -/*}}}*/ -/*FUNCTION TriaRef::GetBprimeFS {{{*/ -void TriaRef::GetBprimeFS(IssmDouble* B_prime, IssmDouble* xyz_list, GaussTria* gauss){ - /* Compute B' matrix. B'=[B1' B2' B3' B4' B5' B6' Bb'] where Bi' is of size 3*NDOF2. - * For node i, Bi' can be expressed in the actual coordinate system - * by: - * Bvi' = [ dphi/dx 0 ] - * [ 0 dphi/dy ] - * [ dphi/dy dphi/dx ] - * [ dphi/dx dphi/dy ] - * [ 0 0 ] - * - * by: Bpi=[ 0 ] - * [ 0 ] - * [ 0 ] - * [ 0 ] - * [ phi ] - * where phi is the finiteelement function for node i. - */ - - /*Fetch number of nodes for this finite element*/ - int pnumnodes = this->NumberofNodesPressure(); - int vnumnodes = this->NumberofNodesVelocity(); - - /*Get nodal functions derivatives*/ - IssmDouble* vdbasis=xNew(2*vnumnodes); - IssmDouble* pbasis =xNew(pnumnodes); - GetNodalFunctionsDerivativesVelocity(vdbasis,xyz_list,gauss); - GetNodalFunctionsPressure(pbasis,gauss); - - /*Build B_prime: */ - for(int i=0;i(vdbasis); - xDelete(pbasis); -} -/*}}}*/ -/*FUNCTION TriaRef::GetBMasstransport{{{*/ -void TriaRef::GetBMasstransport(IssmDouble* B, IssmDouble* xyz_list, GaussTria* gauss){ - /*Compute B matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2. - * For node i, Bi can be expressed in the actual coordinate system - * by: - * Bi=[ N ] - * [ N ] - * where N is the finiteelement function for node i. - * - * We assume B_prog has been allocated already, of size: 2x(NDOF1*numnodes) - */ - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Get nodal functions*/ - IssmDouble* basis=xNew(numnodes); - GetNodalFunctions(basis,gauss); - - /*Build B: */ - for(int i=0;i(basis); -} -/*}}}*/ -/*FUNCTION TriaRef::GetBprimeSSA {{{*/ -void TriaRef::GetBprimeSSA(IssmDouble* Bprime, IssmDouble* xyz_list, GaussTria* gauss){ - - /*Compute B' matrix. B'=[B1' B2' B3'] where Bi' is of size 3*NDOF2. - * For node i, Bi' can be expressed in the actual coordinate system - * by: - * Bi_prime=[ 2*dN/dx dN/dy ] - * [ dN/dx 2*dN/dy ] - * [ dN/dy dN/dx ] - * where hNis the finiteelement function for node i. - * - * We assume B' has been allocated already, of size: 3x(NDOF2*numnodes) - */ - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Get nodal functions derivatives*/ - IssmDouble* dbasis=xNew(2*numnodes); - GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - - /*Build B': */ - for(int i=0;i(dbasis); -} -/*}}}*/ -/*FUNCTION TriaRef::GetBprimeSSAFS {{{*/ -void TriaRef::GetBprimeSSAFS(IssmDouble* Bprime, IssmDouble* xyz_list, GaussTria* gauss){ - /*Compute Bprime matrix. Bprime=[Bprime1 Bprime2 Bprime3] where Bprimei is of size 3*NDOF2. - * For node i, Bprimei can be expressed in the actual coordinate system - * by: - * Bprimei=[ dN/dx 0 ] - * [ 0 dN/dy ] - * [ dN/dy dN/dx ] - N [ dN/dx dN/dy ] - * where N is the finiteelement function for node i. - * - * We assume Bprime has been allocated already, of size: 3x(NDOF2*numnodes) - */ - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Get nodal functions*/ - IssmDouble* dbasis=xNew(2*numnodes); - GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - - /*Build Bprime: */ - for(int i=0;i(dbasis); -} -/*}}}*/ -/*FUNCTION TriaRef::GetBprimeMasstransport{{{*/ -void TriaRef::GetBprimeMasstransport(IssmDouble* Bprime, IssmDouble* xyz_list, GaussTria* gauss){ - /*Compute B' matrix. B'=[B1' B2' B3'] where Bi' is of size 3*NDOF2. - * For node i, Bi' can be expressed in the actual coordinate system - * by: - * Bi_prime=[ dN/dx ] - * [ dN/dy ] - * where N is the finiteelement function for node i. - * - * We assume B' has been allocated already, of size: 3x(NDOF2*numnodes) - */ - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Get nodal functions derivatives*/ - IssmDouble* dbasis=xNew(2*numnodes); - GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - - /*Build B': */ - for(int i=0;i(dbasis); -} -/*}}}*/ -/*FUNCTION TriaRef::GetBSSAFriction{{{*/ -void TriaRef::GetBSSAFriction(IssmDouble* B, IssmDouble* xyz_list,GaussTria* gauss){ - /*Compute B matrix. B=[B1 B2 B3] where Bi is square and of size 2. - * For node i, Bi can be expressed in the actual coordinate system - * by: - * Bi=[ N 0 ] - * [ 0 N ] - * where N is the finiteelement function for node i. - * - * We assume B has been allocated already, of size: 2 x (numdof*numnodes) - */ - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Get nodal functions derivatives*/ - IssmDouble* basis=xNew(numnodes); - GetNodalFunctions(basis,gauss); - - /*Build L: */ - for(int i=0;i(basis); -} -/*}}}*/ -/*FUNCTION TriaRef::GetLFS{{{*/ -void TriaRef::GetLFS(IssmDouble* LFS, GaussTria* gauss){ - /* Compute L matrix. L=[L1 L2 L3] where Li is square and of size numdof. - * For node i, Li can be expressed in the actual coordinate system - * by: - * Li=[ h 0 0 ] - * where h is the interpolation function for node i. - */ - - /*Fetch number of nodes for this finite element*/ - int pnumnodes = this->NumberofNodesPressure(); - int vnumnodes = this->NumberofNodesVelocity(); - int pnumdof = pnumnodes; - int vnumdof = vnumnodes*NDOF2; - - /*Get nodal functions derivatives*/ - IssmDouble* vbasis=xNew(vnumnodes); - GetNodalFunctionsVelocity(vbasis,gauss); - - /*Build LFS: */ - for(int i=0;i(vbasis); -} -/*}}}*/ /*FUNCTION TriaRef::GetJacobian{{{*/ -void TriaRef::GetJacobian(IssmDouble* J, IssmDouble* xyz_list,GaussTria* gauss){ +void TriaRef::GetJacobian(IssmDouble* J, IssmDouble* xyz_list,Gauss* gauss){ /*The Jacobian is constant over the element, discard the gaussian points. * J is assumed to have been allocated of size NDOF2xNDOF2.*/ @@ -544,5 +122,5 @@ /*}}}*/ /*FUNCTION TriaRef::GetSegmentJacobianDeterminant{{{*/ -void TriaRef::GetSegmentJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,GaussTria* gauss){ +void TriaRef::GetSegmentJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss){ /*The Jacobian determinant is constant over the element, discard the gaussian points. * J is assumed to have been allocated*/ @@ -559,5 +137,5 @@ /*}}}*/ /*FUNCTION TriaRef::GetJacobianDeterminant{{{*/ -void TriaRef::GetJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,GaussTria* gauss){ +void TriaRef::GetJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss){ /*The Jacobian determinant is constant over the element, discard the gaussian points. * J is assumed to have been allocated of size NDOF2xNDOF2.*/ @@ -574,5 +152,5 @@ /*}}}*/ /*FUNCTION TriaRef::GetJacobianInvert{{{*/ -void TriaRef::GetJacobianInvert(IssmDouble* Jinv, IssmDouble* xyz_list,GaussTria* gauss){ +void TriaRef::GetJacobianInvert(IssmDouble* Jinv, IssmDouble* xyz_list,Gauss* gauss){ /*Jacobian*/ @@ -587,6 +165,6 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetNodalFunctions(IssmDouble* basis,GaussTria* gauss){{{*/ -void TriaRef::GetNodalFunctions(IssmDouble* basis,GaussTria* gauss){ +/*FUNCTION TriaRef::GetNodalFunctions(IssmDouble* basis,Gauss* gauss){{{*/ +void TriaRef::GetNodalFunctions(IssmDouble* basis,Gauss* gauss){ /*This routine returns the values of the nodal functions at the gaussian point.*/ @@ -596,11 +174,18 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetNodalFunctions(IssmDouble* basis,GaussTria* gauss,int finiteelement){{{*/ -void TriaRef::GetNodalFunctions(IssmDouble* basis,GaussTria* gauss,int finiteelement){ +/*FUNCTION TriaRef::GetNodalFunctions(IssmDouble* basis,Gauss* gauss,int finiteelement){{{*/ +void TriaRef::GetNodalFunctions(IssmDouble* basis,Gauss* gauss_in,int finiteelement){ /*This routine returns the values of the nodal functions at the gaussian point.*/ _assert_(basis); + /*Cast gauss to GaussTria*/ + _assert_(gauss_in->Enum()==GaussTriaEnum); + GaussTria* gauss = dynamic_cast(gauss_in); + switch(finiteelement){ + case P0Enum: + basis[0]=1.; + return; case P1Enum: case P1DGEnum: basis[0]=gauss->coord1; @@ -632,5 +217,5 @@ /*}}}*/ /*FUNCTION TriaRef::GetNodalFunctionsVelocity{{{*/ -void TriaRef::GetNodalFunctionsVelocity(IssmDouble* basis,GaussTria* gauss){ +void TriaRef::GetNodalFunctionsVelocity(IssmDouble* basis,Gauss* gauss){ /*This routine returns the values of the nodal functions at the gaussian point.*/ @@ -661,4 +246,9 @@ this->element_type = TaylorHoodEnum; return; + case XTaylorHoodEnum: + this->element_type = P2Enum; + this->GetNodalFunctions(basis,gauss); + this->element_type = XTaylorHoodEnum; + return; default: _error_("Element type "<element_type)<<" not supported yet"); @@ -667,5 +257,5 @@ /*}}}*/ /*FUNCTION TriaRef::GetNodalFunctionsPressure{{{*/ -void TriaRef::GetNodalFunctionsPressure(IssmDouble* basis,GaussTria* gauss){ +void TriaRef::GetNodalFunctionsPressure(IssmDouble* basis,Gauss* gauss){ /*This routine returns the values of the nodal functions at the gaussian point.*/ @@ -696,4 +286,24 @@ this->element_type = TaylorHoodEnum; return; + case XTaylorHoodEnum: + this->element_type = P1Enum; + this->GetNodalFunctions(basis,gauss); + this->element_type = XTaylorHoodEnum; + return; + default: + _error_("Element type "<element_type)<<" not supported yet"); + } +} +/*}}}*/ +/*FUNCTION TriaRef::GetNodalFunctionsTensor{{{*/ +void TriaRef::GetNodalFunctionsTensor(IssmDouble* basis,Gauss* gauss){ + /*This routine returns the values of the nodal functions at the gaussian point.*/ + + switch(this->element_type){ + case XTaylorHoodEnum: + this->element_type = P1DGEnum; + this->GetNodalFunctions(basis,gauss); + this->element_type = XTaylorHoodEnum; + return; default: _error_("Element type "<element_type)<<" not supported yet"); @@ -702,5 +312,5 @@ /*}}}*/ /*FUNCTION TriaRef::GetSegmentNodalFunctions{{{*/ -void TriaRef::GetSegmentNodalFunctions(IssmDouble* basis,GaussTria* gauss,int index1,int index2){ +void TriaRef::GetSegmentNodalFunctions(IssmDouble* basis,Gauss* gauss,int index1,int index2){ /*This routine returns the values of the nodal functions at the gaussian point.*/ @@ -741,6 +351,6 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTria* gauss){{{*/ -void TriaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTria* gauss){ +/*FUNCTION TriaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss){{{*/ +void TriaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss){ GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss,this->element_type); @@ -748,6 +358,6 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTria* gauss,int finiteelement){{{*/ -void TriaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTria* gauss,int finiteelement){ +/*FUNCTION TriaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss,int finiteelement){{{*/ +void TriaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss,int finiteelement){ /*This routine returns the values of the nodal functions derivatives (with respect to the @@ -780,5 +390,5 @@ /*}}}*/ /*FUNCTION TriaRef::GetNodalFunctionsDerivativesPressure{{{*/ -void TriaRef::GetNodalFunctionsDerivativesPressure(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTria* gauss){ +void TriaRef::GetNodalFunctionsDerivativesPressure(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss){ switch(this->element_type){ case P1P1Enum: @@ -813,5 +423,5 @@ /*}}}*/ /*FUNCTION TriaRef::GetNodalFunctionsDerivativesVelocity{{{*/ -void TriaRef::GetNodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTria* gauss){ +void TriaRef::GetNodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss){ switch(this->element_type){ case P1P1Enum: @@ -836,15 +446,16 @@ return; case TaylorHoodEnum: + case XTaylorHoodEnum: this->element_type = P2Enum; this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - this->element_type = TaylorHoodEnum; - return; - default: - _error_("Element type "<element_type)<<" not supported yet"); - } -} -/*}}}*/ -/*FUNCTION TriaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussTria* gauss){{{*/ -void TriaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussTria* gauss){ + this->element_type = XTaylorHoodEnum; + return; + default: + _error_("Element type "<element_type)<<" not supported yet"); + } +} +/*}}}*/ +/*FUNCTION TriaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss){{{*/ +void TriaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss){ /*This routine returns the values of the nodal functions derivatives (with respect to the * natural coordinate system) at the gaussian point. */ @@ -854,12 +465,21 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussTria* gauss,int finiteelement){{{*/ -void TriaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussTria* gauss,int finiteelement){ +/*FUNCTION TriaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss,int finiteelement){{{*/ +void TriaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss_in,int finiteelement){ /*This routine returns the values of the nodal functions derivatives (with respect to the * natural coordinate system) at the gaussian point. */ - _assert_(dbasis && gauss); + _assert_(dbasis && gauss_in); + + /*Cast gauss to GaussTria*/ + _assert_(gauss_in->Enum()==GaussTriaEnum); + GaussTria* gauss = dynamic_cast(gauss_in); switch(finiteelement){ + case P0Enum: + /*Nodal function 1*/ + dbasis[NUMNODESP0*0+0] = 0.; + dbasis[NUMNODESP0*1+0] = 0.; + return; case P1Enum: case P1DGEnum: /*Nodal function 1*/ @@ -914,5 +534,5 @@ /*}}}*/ /*FUNCTION TriaRef::GetInputDerivativeValue{{{*/ -void TriaRef::GetInputDerivativeValue(IssmDouble* p, IssmDouble* plist,IssmDouble* xyz_list, GaussTria* gauss){ +void TriaRef::GetInputDerivativeValue(IssmDouble* p, IssmDouble* plist,IssmDouble* xyz_list, Gauss* gauss){ /*From node values of parameter p (plist[0],plist[1],plist[2]), return parameter derivative value at gaussian @@ -946,12 +566,12 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetInputValue(IssmDouble* p, IssmDouble* plist, GaussTria* gauss){{{*/ -void TriaRef::GetInputValue(IssmDouble* p, IssmDouble* plist, GaussTria* gauss){ +/*FUNCTION TriaRef::GetInputValue(IssmDouble* p, IssmDouble* plist, Gauss* gauss){{{*/ +void TriaRef::GetInputValue(IssmDouble* p, IssmDouble* plist, Gauss* gauss){ GetInputValue(p,plist,gauss,this->element_type); } /*}}}*/ -/*FUNCTION TriaRef::GetInputValue(IssmDouble* p, IssmDouble* plist, GaussTria* gauss,int finiteelement){{{*/ -void TriaRef::GetInputValue(IssmDouble* p, IssmDouble* plist, GaussTria* gauss,int finiteelement){ +/*FUNCTION TriaRef::GetInputValue(IssmDouble* p, IssmDouble* plist, Gauss* gauss,int finiteelement){{{*/ +void TriaRef::GetInputValue(IssmDouble* p, IssmDouble* plist, Gauss* gauss,int finiteelement){ /*Output*/ @@ -983,4 +603,5 @@ switch(finiteelement){ + case P0Enum: return NUMNODESP0; case P1Enum: return NUMNODESP1; case P1DGEnum: return NUMNODESP1; @@ -993,4 +614,5 @@ case MINIEnum: return NUMNODESP1b+NUMNODESP1; case TaylorHoodEnum: return NUMNODESP2+NUMNODESP1; + case XTaylorHoodEnum: return NUMNODESP2+NUMNODESP1; default: _error_("Element type "<element_type)<<" not supported yet"); } @@ -1008,4 +630,5 @@ case MINIEnum: return NUMNODESP1; case TaylorHoodEnum: return NUMNODESP1; + case XTaylorHoodEnum: return NUMNODESP1; default: _error_("Element type "<element_type)<<" not supported yet"); } @@ -1023,4 +646,5 @@ case MINIEnum: return NUMNODESP1b; case TaylorHoodEnum: return NUMNODESP2; + case XTaylorHoodEnum: return NUMNODESP2; default: _error_("Element type "<element_type)<<" not supported yet"); } @@ -1038,4 +662,5 @@ case MINIEnum: return P1bubbleEnum; case TaylorHoodEnum: return P2Enum; + case XTaylorHoodEnum: return P2Enum; default: _error_("Element type "<element_type)<<" not supported yet"); } @@ -1053,4 +678,5 @@ case MINIEnum: return P1Enum; case TaylorHoodEnum: return P1Enum; + case XTaylorHoodEnum: return P1Enum; default: _error_("Element type "<element_type)<<" not supported yet"); } Index: /issm/trunk/src/c/classes/Elements/TriaRef.h =================================================================== --- /issm/trunk/src/c/classes/Elements/TriaRef.h (revision 17805) +++ /issm/trunk/src/c/classes/Elements/TriaRef.h (revision 17806) @@ -7,5 +7,5 @@ #define _TRIAREF_H_ -class GaussTria; +class Gauss; class TriaRef{ @@ -23,36 +23,25 @@ /*Numerics*/ - void GetBExtrusion(IssmDouble* B_prime, IssmDouble* xyz_list, GaussTria* gauss); - void GetBFS(IssmDouble* B_prime, IssmDouble* xyz_list, GaussTria* gauss); - void GetBSSA(IssmDouble* B, IssmDouble* xyz_list, GaussTria* gauss); - void GetBSSAFS(IssmDouble* B , IssmDouble* xyz_list, GaussTria* gauss); - void GetBprimeFS(IssmDouble* B_prime, IssmDouble* xyz_list, GaussTria* gauss); - void GetBprimeSSA(IssmDouble* Bprime, IssmDouble* xyz_list, GaussTria* gauss); - void GetBprimeSSAFS(IssmDouble* Bprime, IssmDouble* xyz_list, GaussTria* gauss); - void GetBprimeMasstransport(IssmDouble* Bprime, IssmDouble* xyz_list, GaussTria* gauss); - void GetBMasstransport(IssmDouble* B, IssmDouble* xyz_list, GaussTria* gauss); - void GetBHydro(IssmDouble* B, IssmDouble* xyz_list, GaussTria* gauss); - void GetBSSAFriction(IssmDouble* L, IssmDouble* xyz_list,GaussTria* gauss); - void GetJacobian(IssmDouble* J, IssmDouble* xyz_list,GaussTria* gauss); - void GetSegmentJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,GaussTria* gauss); - void GetJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,GaussTria* gauss); - void GetJacobianInvert(IssmDouble* Jinv, IssmDouble* xyz_list,GaussTria* gauss); - void GetLFS(IssmDouble* LFS, GaussTria* gauss); - void GetNodalFunctions(IssmDouble* basis,GaussTria* gauss); - void GetNodalFunctions(IssmDouble* basis,GaussTria* gauss,int finiteelement); - void GetNodalFunctionsVelocity(IssmDouble* basis, GaussTria* gauss); - void GetNodalFunctionsPressure(IssmDouble* basis, GaussTria* gauss); - void GetSegmentNodalFunctions(IssmDouble* basis,GaussTria* gauss, int index1,int index2); - void GetSegmentBFlux(IssmDouble* B,GaussTria* gauss, int index1,int index2); - void GetSegmentBprimeFlux(IssmDouble* Bprime,GaussTria* gauss, int index1,int index2); - void GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTria* gauss); - void GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTria* gauss,int finiteelement); - void GetNodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,GaussTria* gauss); - void GetNodalFunctionsDerivativesPressure(IssmDouble* dbasis,IssmDouble* xyz_list,GaussTria* gauss); - void GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussTria* gauss); - void GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussTria* gauss,int finiteelement); - void GetInputValue(IssmDouble* pp, IssmDouble* plist, GaussTria* gauss); - void GetInputValue(IssmDouble* pp, IssmDouble* plist, GaussTria* gauss,int finiteelement); - void GetInputDerivativeValue(IssmDouble* pp, IssmDouble* plist,IssmDouble* xyz_list, GaussTria* gauss); + void GetJacobian(IssmDouble* J, IssmDouble* xyz_list,Gauss* gauss); + void GetSegmentJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss); + void GetJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss); + void GetJacobianInvert(IssmDouble* Jinv, IssmDouble* xyz_list,Gauss* gauss); + void GetNodalFunctions(IssmDouble* basis,Gauss* gauss); + void GetNodalFunctions(IssmDouble* basis,Gauss* gauss,int finiteelement); + void GetNodalFunctionsVelocity(IssmDouble* basis, Gauss* gauss); + void GetNodalFunctionsPressure(IssmDouble* basis, Gauss* gauss); + void GetNodalFunctionsTensor(IssmDouble* basis, Gauss* gauss); + void GetSegmentNodalFunctions(IssmDouble* basis,Gauss* gauss, int index1,int index2); + void GetSegmentBFlux(IssmDouble* B,Gauss* gauss, int index1,int index2); + void GetSegmentBprimeFlux(IssmDouble* Bprime,Gauss* gauss, int index1,int index2); + void GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss); + void GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss,int finiteelement); + void GetNodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss); + void GetNodalFunctionsDerivativesPressure(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss); + void GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss); + void GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss,int finiteelement); + void GetInputValue(IssmDouble* pp, IssmDouble* plist, Gauss* gauss); + void GetInputValue(IssmDouble* pp, IssmDouble* plist, Gauss* gauss,int finiteelement); + void GetInputDerivativeValue(IssmDouble* pp, IssmDouble* plist,IssmDouble* xyz_list, Gauss* gauss); void NodeOnEdgeIndices(int* pnumindices,int** pindices,int index,int finiteelement); Index: /issm/trunk/src/c/classes/ExternalResults/GenericExternalResult.h =================================================================== --- /issm/trunk/src/c/classes/ExternalResults/GenericExternalResult.h (revision 17805) +++ /issm/trunk/src/c/classes/ExternalResults/GenericExternalResult.h (revision 17806) @@ -83,4 +83,14 @@ } /*}}}*/ + GenericExternalResult(int in_id, int in_enum_type,ResultType in_value,int in_step){ /*{{{*/ + id = in_id; + value = in_value; + step = in_step; + time = UNDEF; + + /*Convert enum to name*/ + EnumToStringx(&this->result_name,in_enum_type); + } + /*}}}*/ GenericExternalResult(int in_id,const char* in_result_name,ResultType in_value,int in_step, IssmDouble in_time){ /*{{{*/ id = in_id; @@ -212,4 +222,16 @@ } /*}}}*/ +template <> inline GenericExternalResult::GenericExternalResult(int in_id, int in_enum_type,char* in_value,int in_step){ /*{{{*/ + + id = in_id; + value = xNew(strlen(in_value)+1); + xMemCpy(value,in_value,(strlen(in_value)+1)); + step = in_step; + time = UNDEF; + + /*Convert enum to name*/ + EnumToStringx(&this->result_name,in_enum_type); + +} /*}}}*/ template <> inline GenericExternalResult::~GenericExternalResult(){ /*{{{*/ xDelete(result_name); @@ -346,4 +368,51 @@ } /*}}}*/ +/*Specific instantiations for IssmDouble*: */ +#if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_) //We hook off this specific specialization when not running ADOLC, otherwise we get a redeclaration with the next specialization. +template <> inline void GenericExternalResult::WriteData(FILE* fid,bool io_gather){ /*{{{*/ + + int i; + int my_rank; + int type; + int rows,cols; + char *name = NULL; + IssmPDouble passiveDouble; + IssmPDouble* passiveDoubles; + + /*recover my_rank:*/ + my_rank=IssmComm::GetRank(); + + if(io_gather){ + /*we are gathering the data on cpu 0, don't write on other cpus: */ + if(my_rank) return; + } + + /*First write enum: */ + int length=(strlen(this->result_name)+1)*sizeof(char); + fwrite(&length,sizeof(int),1,fid); + fwrite(this->result_name,length,1,fid); + + /*Now write time and step: */ + passiveDouble=reCast(time); + fwrite(&passiveDouble,sizeof(IssmPDouble),1,fid); + fwrite(&step,sizeof(int),1,fid); + + /*writing a IssmDouble array, type is 3:*/ + type=3; + fwrite(&type,sizeof(int),1,fid); + rows=this->M; + fwrite(&rows,sizeof(int),1,fid); + cols=this->N; + fwrite(&cols,sizeof(int),1,fid); + + passiveDoubles=xNew(this->M*this->N); + for (i=0;iM*this->N;i++)passiveDoubles[i]=reCast(value[i]); + fwrite(passiveDoubles,cols*rows*sizeof(IssmPDouble),1,fid); + xDelete(passiveDoubles); + +} +/*}}}*/ +#endif + /*Specifics instantiations for Vector*/ template <> inline GenericExternalResult*>::GenericExternalResult(int in_id, int in_enum_type,Vector* in_values, int in_M,int in_N,int in_step,IssmDouble in_time){/*{{{*/ @@ -383,4 +452,5 @@ return new GenericExternalResult*>(this->id,StringToEnumx(this->result_name),this->value,this->step,this->time); } /*}}}*/ +#if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_) //We hook off this specific specialization when not running ADOLC, otherwise we get a redeclaration with the next specialization. template <> inline void GenericExternalResult*>::WriteData(FILE* fid,bool io_gather){ /*{{{*/ @@ -420,4 +490,5 @@ } /*}}}*/ +#endif template <> inline int GenericExternalResult*>::ObjectEnum(void){ /*{{{*/ return NoneEnum; @@ -425,3 +496,49 @@ } /*}}}*/ +/*Specifics instantiations for Vector*/ +template <> inline void GenericExternalResult*>::WriteData(FILE* fid,bool io_gather){ /*{{{*/ + + int i; + char *name = NULL; + int length,rows,cols=1; + IssmDouble* serialvalues = NULL; + IssmPDouble* pserialvalues = NULL; + + if(!io_gather){ + _error_("not supported yet"); + } + + /*Serialize vector*/ + serialvalues = this->value->ToMPISerial(); + this->value->GetSize(&rows); + + pserialvalues=xNew(rows); + for(i=0;i(serialvalues[i]); + + if(IssmComm::GetRank()==0){ + /*First write name: */ + length=(strlen(this->result_name)+1)*sizeof(char); + fwrite(&length,sizeof(int),1,fid); + fwrite(this->result_name,length,1,fid); + + /*Now write time and step: */ + IssmPDouble passiveDouble=reCast(time); + fwrite(&passiveDouble,sizeof(IssmPDouble),1,fid); + fwrite(&step,sizeof(int),1,fid); + + /*writing a IssmDouble array, type is 3:*/ + int type=3; + fwrite(&type,sizeof(int),1,fid); + fwrite(&rows,sizeof(int),1,fid); + fwrite(&cols,sizeof(int),1,fid); + fwrite(pserialvalues,cols*rows*sizeof(IssmPDouble),1,fid); + } + + /*Clean up*/ + xDelete(pserialvalues); + xDelete(serialvalues); + +} +/*}}}*/ + #endif /* _EXTERNAL_RESULTOBJECT_H */ Index: /issm/trunk/src/c/classes/FemModel.cpp =================================================================== --- /issm/trunk/src/c/classes/FemModel.cpp (revision 17805) +++ /issm/trunk/src/c/classes/FemModel.cpp (revision 17806) @@ -16,4 +16,6 @@ #include "../shared/Enum/Enum.h" +#include "../analyses/analyses.h" + /*module includes: {{{*/ #include "../modules/ModelProcessorx/ModelProcessorx.h" @@ -22,5 +24,4 @@ #include "../modules/ConfigureObjectsx/ConfigureObjectsx.h" #include "../modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.h" -#include "../modules/OutputResultsx/OutputResultsx.h" #include "../modules/GetVectorFromInputsx/GetVectorFromInputsx.h" #include "../modules/InputUpdateFromVectorx/InputUpdateFromVectorx.h" @@ -118,5 +119,5 @@ this->parameters->FindParam(&waitonlock,SettingsWaitonlockEnum); this->parameters->FindParam(&lockfilename,LockFileNameEnum); - if (waitonlock>0){ + if(waitonlock){ _printf0_("write lock file:\n"); WriteLockFile(lockfilename); @@ -245,14 +246,4 @@ } /*}}}*/ -/*FUNCTION FemModel::OutputResults {{{*/ -void FemModel::OutputResults(void){ - - _printf0_("write results to disk:\n"); - - /*Just call the OutputResultsx module: */ - OutputResultsx(this->elements, this->nodes, this->vertices, this->loads, this->materials, this->parameters,this->results); - -} -/*}}}*/ /*FUNCTION FemModel::SetStaticComm {{{*/ void FemModel::SetStaticComm(void){ @@ -271,7 +262,7 @@ * analyses. For example: do a SurfaceSlopeX, SurfaceSlopeY, BedSlopeX and BedSlopeY analysis using the * Slope configuration.*/ - int found=-1; for(int i=0;iUpdateConstraints(this); + delete analysis; + /*Second, constraints might be time dependent: */ SpcNodesx(nodes,constraints,parameters,analysis_type); @@ -437,5 +432,5 @@ switch (response_descriptor_enum){ - #ifdef _HAVE_RESPONSES_ + case DivergenceEnum: this->Divergencex(responses); break; case IceVolumeEnum: this->IceVolumex(responses); break; case IceVolumeAboveFloatationEnum: this->IceVolumeAboveFloatationx(responses); break; @@ -452,5 +447,4 @@ case MaxAbsVzEnum: this->MaxAbsVzx( responses); break; case MassFluxEnum: this->MassFluxx( responses); break; - #ifdef _HAVE_CONTROL_ case SurfaceAbsVelMisfitEnum: SurfaceAbsVelMisfitx(responses, elements,nodes, vertices, loads, materials,parameters); break; case SurfaceRelVelMisfitEnum: SurfaceRelVelMisfitx(responses, elements,nodes, vertices, loads, materials,parameters); break; @@ -465,21 +459,17 @@ case DragCoefficientAbsGradientEnum:DragCoefficientAbsGradientx(responses, elements,nodes, vertices, loads, materials, parameters); break; case BalancethicknessMisfitEnum: BalancethicknessMisfitx(responses); break; - #endif case TotalSmbEnum: this->TotalSmbx(responses); break; case MaterialsRheologyBbarEnum: this->ElementResponsex(responses,MaterialsRheologyBbarEnum); break; case VelEnum: this->ElementResponsex(responses,VelEnum); break; case FrictionCoefficientEnum: NodalValuex(responses, FrictionCoefficientEnum,elements,nodes, vertices, loads, materials, parameters); break; - default: _error_("response descriptor \"" << EnumToStringx(response_descriptor_enum) << "\" not supported yet!"); break; - #else - default: _error_("ISSM was not compiled with responses capabilities, exiting!"); - #endif - } - -} -/*}}}*/ -void FemModel::RequestedOutputsx(Results **presults,char** requested_outputs, int numoutputs){/*{{{*/ + default: _error_("response descriptor \"" << EnumToStringx(response_descriptor_enum) << "\" not supported yet!"); break; + } + +} +/*}}}*/ +void FemModel::RequestedOutputsx(Results **presults,char** requested_outputs, int numoutputs, bool save_results){/*{{{*/ /*Intermediaries*/ - bool isvec; + bool isvec,results_on_nodes; int step,output_enum; IssmDouble time; @@ -494,4 +484,5 @@ parameters->FindParam(&step,StepEnum); parameters->FindParam(&time,TimeEnum); + parameters->FindParam(&results_on_nodes,SettingsResultsOnNodesEnum); /*Go through all requested output*/ @@ -505,10 +496,14 @@ if(output_enum<0){ double_result = OutputDefinitionsResponsex(this,output_string); + if(save_results){ + results->AddResult(new GenericExternalResult(results->Size()+1,output_string,reCast(double_result),step,time)); + continue; + } } else{ switch(output_enum){ - #ifdef _HAVE_RESPONSES_ /*Scalar output*/ + case DivergenceEnum: this->Divergencex(&double_result); break; case IceVolumeEnum: this->IceVolumex(&double_result); break; case IceVolumeAboveFloatationEnum: this->IceVolumeAboveFloatationx(&double_result); break; @@ -528,5 +523,4 @@ /*Scalar control output*/ - #ifdef _HAVE_CONTROL_ case SurfaceAbsVelMisfitEnum: SurfaceAbsVelMisfitx(&double_result,elements,nodes,vertices,loads,materials,parameters); break; case SurfaceRelVelMisfitEnum: SurfaceRelVelMisfitx(&double_result,elements,nodes,vertices,loads,materials,parameters); break; @@ -541,5 +535,4 @@ case DragCoefficientAbsGradientEnum:DragCoefficientAbsGradientx(&double_result,elements,nodes,vertices,loads,materials,parameters); break; case BalancethicknessMisfitEnum: BalancethicknessMisfitx(&double_result); break; - #endif /*Vector */ @@ -547,40 +540,60 @@ /*Vector layout*/ - int interpolation,size; + int interpolation,nodesperelement,size; /*Get interpolation (and compute input if necessary)*/ for(int j=0;jSize();j++){ Element* element=dynamic_cast(this->elements->GetObjectByOffset(j)); - element->ResultInterpolation(&interpolation,output_enum); + element->ResultInterpolation(&interpolation,&nodesperelement,output_enum); } - /*Allocate vector depending on interpolation*/ - switch(interpolation){ - case P0Enum: size = this->elements->NumberOfElements(); break; - case P1Enum: size = this->vertices->NumberOfVertices(); break; - default: _error_("Interpolation "<elements->NumberOfElements(); + IssmDouble* values = xNewZeroInit(nbe*nodesperelement); + IssmDouble* allvalues = xNew(nbe*nodesperelement); + + /*Fill-in matrix*/ + for(int j=0;jSize();j++){ + Element* element=dynamic_cast(this->elements->GetObjectByOffset(j)); + element->ResultToPatch(values,nodesperelement,output_enum); + } + + /*Gather from all cpus*/ + ISSM_MPI_Allreduce((void*)values,(void*)allvalues,nbe*nodesperelement,ISSM_MPI_PDOUBLE,ISSM_MPI_SUM,IssmComm::GetComm()); + xDelete(values); + + if(save_results)results->AddResult(new GenericExternalResult(results->Size()+1,output_enum,allvalues,nbe,nodesperelement,step,time)); + xDelete(allvalues); } - Vector *vector_result = new Vector(this->vertices->NumberOfVertices()); - - /*Fill in vector*/ - for(int j=0;jSize();j++){ - Element* element=(Element*)elements->GetObjectByOffset(j); - element->ResultToVector(vector_result,output_enum); + else{ + + /*Allocate vector depending on interpolation*/ + switch(interpolation){ + case P0Enum: size = this->elements->NumberOfElements(); break; + case P1Enum: size = this->vertices->NumberOfVertices(); break; + default: _error_("Interpolation "< *vector_result = new Vector(size); + + /*Fill in vector*/ + for(int j=0;jSize();j++){ + Element* element=(Element*)elements->GetObjectByOffset(j); + element->ResultToVector(vector_result,output_enum); + } + vector_result->Assemble(); + + if(save_results)results->AddResult(new GenericExternalResult*>(results->Size()+1,output_enum,vector_result,step,time)); } - vector_result->Assemble(); - - results->AddResult(new GenericExternalResult*>(results->Size()+1,output_enum,vector_result,step,time)); isvec = true; break; - - #else - default: _error_("ISSM was not compiled with responses capabilities, exiting!"); - #endif } } /*Add result to Results*/ - if(!isvec){ + if(!isvec && save_results){ results->AddResult(new GenericExternalResult(results->Size()+1,output_string,reCast(double_result),step,time)); } @@ -591,5 +604,5 @@ } /*}}}*/ -void FemModel::RequestedOutputsx(Results **presults,int* requested_outputs, int numoutputs){/*{{{*/ +void FemModel::RequestedOutputsx(Results **presults,int* requested_outputs, int numoutputs,bool save_results){/*{{{*/ /*Convert list of enums to list of string*/ @@ -600,5 +613,5 @@ /*Call main module*/ - this->RequestedOutputsx(presults,enumlist,numoutputs); + this->RequestedOutputsx(presults,enumlist,numoutputs,save_results); /*clean up and return*/ @@ -693,5 +706,4 @@ } /*}}}*/ -#ifdef _HAVE_RESPONSES_ void FemModel::MassFluxx(IssmDouble* pmass_flux){/*{{{*/ @@ -1032,4 +1044,20 @@ }/*}}}*/ +void FemModel::Divergencex(IssmDouble* pdiv){/*{{{*/ + + IssmDouble local_divergence=0; + IssmDouble total_divergence; + + for(int i=0;ielements->Size();i++){ + Element* element=dynamic_cast(this->elements->GetObjectByOffset(i)); + local_divergence+=element->Divergence(); + } + ISSM_MPI_Reduce(&local_divergence,&total_divergence,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,0,IssmComm::GetComm() ); + ISSM_MPI_Bcast(&total_divergence,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm()); + + /*Assign output pointers: */ + *pdiv=total_divergence; + +}/*}}}*/ void FemModel::IceVolumex(IssmDouble* pV){/*{{{*/ @@ -1104,6 +1132,4 @@ }/*}}}*/ -#endif -#ifdef _HAVE_CONTROL_ void FemModel::BalancethicknessMisfitx(IssmDouble* presponse){/*{{{*/ @@ -1228,5 +1254,4 @@ } /*}}}*/ -#endif #ifdef _HAVE_DAKOTA_ void FemModel::DakotaResponsesx(double* d_responses,char** responses_descriptors,int numresponsedescriptors,int d_numresponses){/*{{{*/ @@ -1341,5 +1366,4 @@ /*}}}*/ #endif -#ifdef _HAVE_HYDROLOGY_ void FemModel::HydrologyEPLupdateDomainx(void){ /*{{{*/ @@ -1348,10 +1372,12 @@ Vector* active = NULL; IssmDouble* serial_active = NULL; - - /*Step 1: update maks, the mask might be extended by residual and/or using downstream sediment head*/ + + HydrologyDCEfficientAnalysis* effanalysis = new HydrologyDCEfficientAnalysis(); + /*Step 1: update mask, the mask might be extended by residual and/or using downstream sediment head*/ mask=new Vector(nodes->NumberOfNodes(HydrologyDCEfficientAnalysisEnum)); + for (int i=0;iSize();i++){ Element* element=dynamic_cast(elements->GetObjectByOffset(i)); - element->HydrologyEPLGetMask(mask); + effanalysis->HydrologyEPLGetMask(mask,element); } @@ -1362,5 +1388,5 @@ /*Update Mask*/ - InputUpdateFromVectorx(this,serial_mask,HydrologydcMaskEplactiveEnum,NodeSIdEnum); + InputUpdateFromVectorx(this,serial_mask,HydrologydcMaskEplactiveNodeEnum,NodeSIdEnum); xDelete(serial_mask); @@ -1369,5 +1395,5 @@ for (int i=0;iSize();i++){ Element* element=dynamic_cast(elements->GetObjectByOffset(i)); - element->HydrologyEPLGetActive(active); + effanalysis->HydrologyEPLGetActive(active,element); } @@ -1392,4 +1418,5 @@ } xDelete(serial_active); + delete effanalysis; int sum_counter; ISSM_MPI_Reduce(&counter,&sum_counter,1,ISSM_MPI_INT,ISSM_MPI_SUM,0,IssmComm::GetComm() ); @@ -1403,22 +1430,46 @@ } /*}}}*/ -void FemModel::HydrologyTransferx(void){ /*{{{*/ - - Vector* transferg=NULL; - - /*Vector allocation*/ - transferg=new Vector(nodes->NumberOfNodes()); - +void FemModel::UpdateConstraintsL2ProjectionEPLx(void){ /*{{{*/ + + Vector* active = NULL; + IssmDouble* serial_active = NULL; + HydrologyDCEfficientAnalysis* effanalysis = new HydrologyDCEfficientAnalysis(); + + /*update node activity. If one element is connected to mask=1, all nodes are active*/ + active=new Vector(nodes->NumberOfNodes(HydrologyDCEfficientAnalysisEnum)); for (int i=0;iSize();i++){ Element* element=dynamic_cast(elements->GetObjectByOffset(i)); - element->GetHydrologyTransfer(transferg); - } - /*Assemble*/ - transferg->Assemble(); - - /*Update Inputs*/ - InputUpdateFromVectorx(this,transferg,WaterTransferEnum,NodesEnum); - delete transferg; -} -/*}}}*/ -#endif + effanalysis->HydrologyEPLGetActive(active,element); + } + + /*Assemble and serialize*/ + active->Assemble(); + serial_active=active->ToMPISerial(); + delete active; + delete effanalysis; + + /*Update node activation accordingly*/ + int counter =0; + for (int i=0;iSize();i++){ + Node* node=dynamic_cast(nodes->GetObjectByOffset(i)); + if(node->InAnalysis(L2ProjectionEPLAnalysisEnum)){ + if(serial_active[node->Sid()]==1.){ + node->Activate(); + counter++; + } + else{ + node->Deactivate(); + } + } + } + xDelete(serial_active); + int sum_counter; + ISSM_MPI_Reduce(&counter,&sum_counter,1,ISSM_MPI_INT,ISSM_MPI_SUM,0,IssmComm::GetComm() ); + ISSM_MPI_Bcast(&sum_counter,1,ISSM_MPI_INT,0,IssmComm::GetComm()); + counter=sum_counter; + if(VerboseSolution()) _printf0_(" Number of active nodes L2 Projection: "<< counter <<"\n"); + + /*Update dof indexings*/ + this->UpdateConstraintsx(); +} +/*}}}*/ Index: /issm/trunk/src/c/classes/FemModel.h =================================================================== --- /issm/trunk/src/c/classes/FemModel.h (revision 17805) +++ /issm/trunk/src/c/classes/FemModel.h (revision 17806) @@ -54,5 +54,4 @@ void InitFromFiles(char* rootpath, char* inputfilename, char* outputfilename, char* petscfilename, char* lockfilename, const int solution_type,const int* analyses,const int nummodels); void Solve(void); - void OutputResults(void); void SetStaticComm(); void SetCurrentConfiguration(int configuration_type); @@ -60,5 +59,4 @@ /*Modules*/ - #ifdef _HAVE_RESPONSES_ void MassFluxx(IssmDouble* presponse); void MaxAbsVxx(IssmDouble* presponse); @@ -74,22 +72,20 @@ void MinVzx(IssmDouble* presponse); void TotalSmbx(IssmDouble* pSmb); + void Divergencex(IssmDouble* pdiv); void IceVolumex(IssmDouble* pV); void IceVolumeAboveFloatationx(IssmDouble* pV); void ElementResponsex(IssmDouble* presponse,int response_enum); void BalancethicknessMisfitx(IssmDouble* pV); - #endif #ifdef _HAVE_DAKOTA_ void DakotaResponsesx(double* d_responses,char** responses_descriptors,int numresponsedescriptors,int d_numresponses); #endif - void RequestedOutputsx(Results **presults,char** requested_outputs, int numoutputs); - void RequestedOutputsx(Results **presults,int* requested_outputs, int numoutputs); + void RequestedOutputsx(Results **presults,char** requested_outputs, int numoutputs,bool save_results=true); + void RequestedOutputsx(Results **presults,int* requested_outputs, int numoutputs,bool save_results=true); void RequestedDependentsx(void); void Responsex(IssmDouble* presponse,int response_descriptor_enum); void Responsex(IssmDouble* presponse,const char* response_descriptor); - #ifdef _HAVE_CONTROL_ void OutputControlsx(Results **presults); void CostFunctionx( IssmDouble* pJ); void ThicknessAbsGradientx( IssmDouble* pJ); - #endif #ifdef _HAVE_GIA_ void Deflection(Vector* wg,Vector* dwgdt, IssmDouble* x, IssmDouble* y); @@ -100,8 +96,7 @@ void UpdateConstraintsExtrudeFromBasex(); void UpdateConstraintsExtrudeFromTopx(); - #ifdef _HAVE_HYDROLOGY_ - void HydrologyTransferx(void); void HydrologyEPLupdateDomainx(void); - #endif + // void HydrologyEPLThicknessx(void); + void UpdateConstraintsL2ProjectionEPLx(void); }; Index: /issm/trunk/src/c/classes/Inputs/BoolInput.cpp =================================================================== --- /issm/trunk/src/c/classes/Inputs/BoolInput.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Inputs/BoolInput.cpp (revision 17806) @@ -40,7 +40,5 @@ void BoolInput::DeepEcho(void){ - _printf_("BoolInput:\n"); - _printf_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n"); - _printf_(" value: " <<(value?"true":"false") << "\n"); + _printf_(setw(15)<<" BoolInput "<enum_type)<<" "<<(value?"true":"false") << "\n"); } /*}}}*/ @@ -72,5 +70,5 @@ /*}}}*/ /*FUNCTION BoolInput::SpawnTriaInput{{{*/ -Input* BoolInput::SpawnTriaInput(int location){ +Input* BoolInput::SpawnTriaInput(int index1,int index2,int index3){ /*output*/ @@ -114,15 +112,6 @@ void BoolInput::GetInputValue(IssmDouble* pvalue){_error_("not supported yet!");} /*}}}*/ -/*FUNCTION BoolInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){{{*/ -void BoolInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error_("not supported yet!");} -/*}}}*/ -/*FUNCTION BoolInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){{{*/ -void BoolInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error_("not supported yet!");} -/*}}}*/ -/*FUNCTION BoolInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){{{*/ -void BoolInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error_("not supported yet!");} -/*}}}*/ -/*FUNCTION BoolInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){{{*/ -void BoolInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error_("not supported yet!");} +/*FUNCTION BoolInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss){{{*/ +void BoolInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss){_error_("not supported yet!");} /*}}}*/ /*FUNCTION BoolInput::ChangeEnum{{{*/ Index: /issm/trunk/src/c/classes/Inputs/BoolInput.h =================================================================== --- /issm/trunk/src/c/classes/Inputs/BoolInput.h (revision 17805) +++ /issm/trunk/src/c/classes/Inputs/BoolInput.h (revision 17806) @@ -7,9 +7,5 @@ /*Headers:*/ -/*{{{*/ #include "./Input.h" -class GaussTria; -class GaussPenta; -/*}}}*/ class BoolInput: public Input{ @@ -34,5 +30,5 @@ /*BoolInput management: {{{*/ int InstanceEnum(); - Input* SpawnTriaInput(int location); + Input* SpawnTriaInput(int index1,int index2,int index3); Input* SpawnSegInput(int index1,int index2); Input* PointwiseDivide(Input* inputB){_error_("not implemented yet");}; @@ -40,4 +36,6 @@ Input* PointwiseMax(Input* inputB){_error_("not implemented yet");}; int GetResultInterpolation(void){return P0Enum;}; + int GetResultNumberOfNodes(void){return 1;}; + void ResultToPatch(IssmDouble* values,int nodesperelement,int sid){_error_("not supported yet");}; void Configure(Parameters* parameters); void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");}; @@ -47,24 +45,11 @@ void GetInputValue(int* pvalue); void GetInputValue(IssmDouble* pvalue); - void GetInputValue(IssmDouble* pvalue,GaussSeg* gauss){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss); - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss); - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");}; - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussSeg* gauss){_error_("not implemented yet");}; - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss); - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss); + void GetInputValue(IssmDouble* pvalue,Gauss* gauss); + void GetInputValue(IssmDouble* pvalue,Gauss* gauss,IssmDouble time){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,Gauss* gauss ,int index){_error_("not implemented yet");}; + void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, Gauss* gauss){_error_("not implemented yet");}; void GetInputAverage(IssmDouble* pvalue){_error_("not implemented yet");}; void GetInputAllTimeAverages(IssmDouble** pvalues,IssmDouble** ptimes, int* pnumtimes){_error_("not implemented yet");}; void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime){_error_("not implemented yet");}; - void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; - void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; - void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVxStrainRate3dHO(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVyStrainRate3dHO(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; void ChangeEnum(int newenumtype); void SquareMin(IssmDouble* psquaremin, Parameters* parameters); Index: /issm/trunk/src/c/classes/Inputs/ControlInput.cpp =================================================================== --- /issm/trunk/src/c/classes/Inputs/ControlInput.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Inputs/ControlInput.cpp (revision 17806) @@ -68,5 +68,5 @@ _printf_("ControlInput:\n"); - _printf_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n"); + _printf_(setw(15)<<" ControlInput "<enum_type)<<"\n"); _printf_("---values: \n"); if (values) values->Echo(); _printf_("---savedvalues: \n");if (savedvalues) savedvalues->Echo(); @@ -146,4 +146,11 @@ } /*}}}*/ +/*FUNCTION ControlInput::GetResultNumberOfNodes{{{*/ +int ControlInput::GetResultNumberOfNodes(void){ + + return values->GetResultNumberOfNodes(); + +} +/*}}}*/ /*FUNCTION ControlInput::GetGradient{{{*/ void ControlInput::GetGradient(Vector* gradient_vec,int* doflist){ @@ -186,6 +193,6 @@ }/*}}}*/ /*FUNCTION ControlInput::SpawnTriaInput{{{*/ -Input* ControlInput::SpawnTriaInput(int location){ - return values->SpawnTriaInput(location); +Input* ControlInput::SpawnTriaInput(int index1,int index2,int index3){ + return values->SpawnTriaInput(index1,index2,index3); }/*}}}*/ /*FUNCTION ControlInput::SpawnSegInput{{{*/ @@ -235,26 +242,14 @@ values->GetInputValue(pvalue); }/*}}}*/ -/*FUNCTION ControlInput::GetInputValue(IssmDouble* pvalue){{{*/ -void ControlInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){ +/*FUNCTION ControlInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss){{{*/ +void ControlInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss){ values->GetInputValue(pvalue,gauss); }/*}}}*/ -/*FUNCTION ControlInput::GetInputValue(IssmDouble* pvalue){{{*/ -void ControlInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){ - values->GetInputValue(pvalue,gauss); -}/*}}}*/ -/*FUNCTION ControlInput::GetGradientValue(IssmDouble* pvalue,GaussTria* gauss){{{*/ -void ControlInput::GetGradientValue(IssmDouble* pvalue,GaussTria* gauss){ +/*FUNCTION ControlInput::GetGradientValue{{{*/ +void ControlInput::GetGradientValue(IssmDouble* pvalue,Gauss* gauss){ gradient->GetInputValue(pvalue,gauss); }/*}}}*/ -/*FUNCTION ControlInput::GetGradientValue(IssmDouble* pvalue,GaussPenta* gauss){{{*/ -void ControlInput::GetGradientValue(IssmDouble* pvalue,GaussPenta* gauss){ - gradient->GetInputValue(pvalue,gauss); -}/*}}}*/ -/*FUNCTION ControlInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){{{*/ -void ControlInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){ - values->GetInputDerivativeValue(derivativevalues,xyz_list,gauss); -}/*}}}*/ -/*FUNCTION ControlInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){{{*/ -void ControlInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){ +/*FUNCTION ControlInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, Gauss* gauss){{{*/ +void ControlInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, Gauss* gauss){ values->GetInputDerivativeValue(derivativevalues,xyz_list,gauss); }/*}}}*/ Index: /issm/trunk/src/c/classes/Inputs/ControlInput.h =================================================================== --- /issm/trunk/src/c/classes/Inputs/ControlInput.h (revision 17805) +++ /issm/trunk/src/c/classes/Inputs/ControlInput.h (revision 17806) @@ -9,6 +9,6 @@ /*{{{*/ #include "./Input.h" -class GaussTria; -class GaussPenta; +class Gauss; +class Gauss; /*}}}*/ @@ -38,5 +38,5 @@ /*ControlInput management: {{{*/ int InstanceEnum(); - Input* SpawnTriaInput(int location); + Input* SpawnTriaInput(int index1,int index2,int index3); Input* SpawnSegInput(int index1,int index2); Input* PointwiseDivide(Input* inputB){_error_("not implemented yet");}; @@ -47,30 +47,16 @@ /*}}}*/ /*numerics: {{{*/ - void GetGradientValue(IssmDouble* pvalue,GaussTria* gauss); - void GetGradientValue(IssmDouble* pvalue,GaussPenta* gauss); + void GetGradientValue(IssmDouble* pvalue,Gauss* gauss); void SetInput(Input* in_input); void GetInputValue(bool* pvalue); void GetInputValue(int* pvalue); void GetInputValue(IssmDouble* pvalue); - void GetInputValue(IssmDouble* pvalue,GaussSeg* gauss){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss); - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss); - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");}; - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussSeg* gauss){_error_("not implemented yet");}; - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss); - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss); + void GetInputValue(IssmDouble* pvalue,Gauss* gauss); + void GetInputValue(IssmDouble* pvalue,Gauss* gauss,IssmDouble time){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,Gauss* gauss ,int index){_error_("not implemented yet");}; + void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list,Gauss* gauss); void GetInputAverage(IssmDouble* pvalue); void GetInputAllTimeAverages(IssmDouble** pvalues,IssmDouble** ptimes, int* pnumtimes){_error_("not implemented yet");}; void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime){_error_("not implemented yet");}; - void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; - void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; - void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVxStrainRate3dHO(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVyStrainRate3dHO(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; void ChangeEnum(int newenumtype){_error_("not implemented yet");}; void SquareMin(IssmDouble* psquaremin,Parameters* parameters){_error_("not implemented yet");}; @@ -91,4 +77,6 @@ void GetVectorFromInputs(Vector* vector,int* doflist); int GetResultInterpolation(void); + int GetResultNumberOfNodes(void); + void ResultToPatch(IssmDouble* values,int nodesperelement,int sid){_error_("not supported yet");}; void GetGradient(Vector* gradient_vec,int* doflist); void ScaleGradient(IssmDouble scale); Index: /issm/trunk/src/c/classes/Inputs/DatasetInput.cpp =================================================================== --- /issm/trunk/src/c/classes/Inputs/DatasetInput.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Inputs/DatasetInput.cpp (revision 17806) @@ -79,5 +79,5 @@ /*}}}*/ /*FUNCTION DatasetInput::SpawnTriaInput{{{*/ -Input* DatasetInput::SpawnTriaInput(int location){ +Input* DatasetInput::SpawnTriaInput(int index1,int index2,int index3){ /*output*/ @@ -87,5 +87,5 @@ outinput=new DatasetInput(); outinput->enum_type=this->enum_type; - outinput->inputs=dynamic_cast(this->inputs->SpawnTriaInputs(location)); + outinput->inputs=dynamic_cast(this->inputs->SpawnTriaInputs(index1,index2,index3)); outinput->numids=this->numids; outinput->ids=xNew(this->numids); @@ -158,6 +158,6 @@ } /*}}}*/ -/*FUNCTION DatasetInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss,int id){{{*/ -void DatasetInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss,int id){ +/*FUNCTION DatasetInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss,int id){{{*/ +void DatasetInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss,int id){ int offset = -1; @@ -172,16 +172,2 @@ } /*}}}*/ -/*FUNCTION DatasetInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,int id){{{*/ -void DatasetInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,int id){ - - int offset = -1; - _assert_(this->numids == this->inputs->Size()); - - /*Get requested input within dataset*/ - for(int i=0;inumids;i++) if(this->ids[i]==id) offset=i; - if(offset<0) _error_("Could not find input of id "<(this->inputs->GetObjectByOffset(offset)); - input->GetInputValue(pvalue,gauss); -} -/*}}}*/ Index: /issm/trunk/src/c/classes/Inputs/DatasetInput.h =================================================================== --- /issm/trunk/src/c/classes/Inputs/DatasetInput.h (revision 17805) +++ /issm/trunk/src/c/classes/Inputs/DatasetInput.h (revision 17806) @@ -9,6 +9,6 @@ /*{{{*/ #include "./Input.h" -class GaussTria; -class GaussPenta; +class Gauss; +class Gauss; /*}}}*/ @@ -36,5 +36,5 @@ void AddInput(Input* input,int id); int InstanceEnum(); - Input* SpawnTriaInput(int location); + Input* SpawnTriaInput(int index1,int index2,int index3); Input* SpawnSegInput(int index1,int index2); Input* PointwiseDivide(Input* inputB){_error_("not implemented yet");}; @@ -48,24 +48,11 @@ void GetInputValue(int* pvalue){_error_("not implemented yet");}; void GetInputValue(IssmDouble* pvalue){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussSeg* gauss){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index); - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index); - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussSeg* gauss){_error_("not implemented yet");}; - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,Gauss* gauss){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,Gauss* gauss,IssmDouble time){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,Gauss* gauss ,int index); + void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list,Gauss* gauss){_error_("not implemented yet");}; void GetInputAverage(IssmDouble* pvalue){_error_("not implemented yet");}; void GetInputAllTimeAverages(IssmDouble** pvalues,IssmDouble** ptimes, int* pnumtimes){_error_("not implemented yet");}; void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime){_error_("not implemented yet");}; - void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; - void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; - void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVxStrainRate3dHO(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVyStrainRate3dHO(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; void ChangeEnum(int newenumtype){_error_("not implemented yet");}; void SquareMin(IssmDouble* psquaremin,Parameters* parameters){_error_("not implemented yet");}; @@ -85,4 +72,6 @@ void GetVectorFromInputs(Vector* vector,int* doflist){_error_("not implemented yet");}; int GetResultInterpolation(void){_error_("not implemented yet");}; + int GetResultNumberOfNodes(void){_error_("not implemented yet");}; + void ResultToPatch(IssmDouble* values,int nodesperelement,int sid){_error_("not supported yet");}; void GetGradient(Vector* gradient_vec,int* doflist){_error_("not implemented yet");}; void ScaleGradient(IssmDouble scale){_error_("not implemented yet");}; Index: /issm/trunk/src/c/classes/Inputs/DoubleInput.cpp =================================================================== --- /issm/trunk/src/c/classes/Inputs/DoubleInput.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Inputs/DoubleInput.cpp (revision 17806) @@ -40,7 +40,5 @@ void DoubleInput::DeepEcho(void){ - _printf_("DoubleInput:\n"); - _printf_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n"); - _printf_(" value: " << this->value << "\n"); + _printf_(setw(15)<<" DoubleInput "<enum_type)<<" "<value<<"\n"); } /*}}}*/ @@ -72,5 +70,5 @@ /*}}}*/ /*FUNCTION DoubleInput::SpawnTriaInput{{{*/ -Input* DoubleInput::SpawnTriaInput(int location){ +Input* DoubleInput::SpawnTriaInput(int index1,int index2,int index3){ /*output*/ @@ -122,57 +120,6 @@ } /*}}}*/ -/*FUNCTION DoubleInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){{{*/ -void DoubleInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){*pvalue=this->value;} -/*}}}*/ -/*FUNCTION DoubleInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){{{*/ -void DoubleInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){*pvalue=this->value;} -/*}}}*/ -/*FUNCTION DoubleInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){{{*/ -void DoubleInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error_("not supported yet!");} -/*}}}*/ -/*FUNCTION DoubleInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){{{*/ -void DoubleInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error_("not supported yet!");} -/*}}}*/ -/*FUNCTION DoubleInput::GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){{{*/ -void DoubleInput::GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){ - /*Epsilon is zero as vx is constant over the element*/ - for(int i=0;i<3;i++) epsilonvx[i]=0; -} -/*}}}*/ -/*FUNCTION DoubleInput::GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){{{*/ -void DoubleInput::GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){ - /*Epsilon is zero as vy is constant over the element*/ - for(int i=0;i<3;i++) epsilonvy[i]=0; -} -/*}}}*/ -/*FUNCTION DoubleInput::GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){{{*/ -void DoubleInput::GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){ - /*Epsilon is zero as vx is constant over the element*/ - for(int i=0;i<6;i++) epsilonvx[i]=0; -} -/*}}}*/ -/*FUNCTION DoubleInput::GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){{{*/ -void DoubleInput::GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){ - /*Epsilon is zero as vy is constant over the element*/ - for(int i=0;i<6;i++) epsilonvy[i]=0; -} -/*}}}*/ -/*FUNCTION DoubleInput::GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){{{*/ -void DoubleInput::GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){ - /*Epsilon is zero as vz is constant over the element*/ - for(int i=0;i<6;i++) epsilonvz[i]=0; -} -/*}}}*/ -/*FUNCTION DoubleInput::GetVxStrainRate3dHO(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){{{*/ -void DoubleInput::GetVxStrainRate3dHO(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){ - /*Epsilon is zero as vx is constant over the element*/ - for(int i=0;i<5;i++) epsilonvx[i]=0; -} -/*}}}*/ -/*FUNCTION DoubleInput::GetVyStrainRate3dHO(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){{{*/ -void DoubleInput::GetVyStrainRate3dHO(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){ - /*Epsilon is zero as vy is constant over the element*/ - for(int i=0;i<5;i++) epsilonvy[i]=0; -} +/*FUNCTION DoubleInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss){{{*/ +void DoubleInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss){*pvalue=this->value;} /*}}}*/ /*FUNCTION DoubleInput::ChangeEnum{{{*/ Index: /issm/trunk/src/c/classes/Inputs/DoubleInput.h =================================================================== --- /issm/trunk/src/c/classes/Inputs/DoubleInput.h (revision 17805) +++ /issm/trunk/src/c/classes/Inputs/DoubleInput.h (revision 17806) @@ -9,6 +9,6 @@ /*{{{*/ #include "./Input.h" -class GaussTria; -class GaussPenta; +class Gauss; +class Gauss; /*}}}*/ @@ -33,5 +33,5 @@ /*DoubleInput management: {{{*/ int InstanceEnum(); - Input* SpawnTriaInput(int location); + Input* SpawnTriaInput(int index1,int index2,int index3); Input* SpawnSegInput(int index1,int index2); Input* PointwiseDivide(Input* inputB); @@ -39,4 +39,6 @@ Input* PointwiseMax(Input* inputB); int GetResultInterpolation(void){return P0Enum;}; + int GetResultNumberOfNodes(void){return 1;}; + void ResultToPatch(IssmDouble* values,int nodesperelement,int sid){_error_("not supported yet");}; void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");}; void Configure(Parameters* parameters); @@ -46,24 +48,11 @@ void GetInputValue(int* pvalue); void GetInputValue(IssmDouble* pvalue); - void GetInputValue(IssmDouble* pvalue,GaussSeg* gauss){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss); - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss); - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");}; - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussSeg* gauss){_error_("not implemented yet");}; - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss); - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss); + void GetInputValue(IssmDouble* pvalue,Gauss* gauss); + void GetInputValue(IssmDouble* pvalue,Gauss* gauss,IssmDouble time){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,Gauss* gauss ,int index){_error_("not implemented yet");}; + void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list,Gauss* gauss){_error_("not implemented yet");}; void GetInputAverage(IssmDouble* pvalue); void GetInputAllTimeAverages(IssmDouble** pvalues,IssmDouble** ptimes, int* pnumtimes){_error_("not implemented yet");}; void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime){_error_("not implemented yet");}; - void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss); - void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss); - void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss); - void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss); - void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss); - void GetVxStrainRate3dHO(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss); - void GetVyStrainRate3dHO(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss); void ChangeEnum(int newenumtype); void SquareMin(IssmDouble* psquaremin,Parameters* parameters); Index: /issm/trunk/src/c/classes/Inputs/Input.h =================================================================== --- /issm/trunk/src/c/classes/Inputs/Input.h (revision 17805) +++ /issm/trunk/src/c/classes/Inputs/Input.h (revision 17806) @@ -11,8 +11,9 @@ #include "../../shared/shared.h" class Node; -class GaussTria; +class Gauss; +class Gauss; class GaussSeg; class Parameters; -class GaussPenta; +class Gauss; template class Vector; /*}}}*/ @@ -28,24 +29,11 @@ virtual void GetInputValue(int* pvalue)=0; virtual void GetInputValue(IssmDouble* pvalue)=0; - virtual void GetInputValue(IssmDouble* pvalue,GaussSeg* gauss)=0; - virtual void GetInputValue(IssmDouble* pvalue,GaussTria* gauss)=0; - virtual void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss)=0; - virtual void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time)=0; - virtual void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time)=0; - virtual void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index)=0; - virtual void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,int index)=0; - virtual void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussSeg* gauss)=0; - virtual void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss)=0; - virtual void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss)=0; + virtual void GetInputValue(IssmDouble* pvalue,Gauss* gauss)=0; + virtual void GetInputValue(IssmDouble* pvalue,Gauss* gauss,IssmDouble time)=0; + virtual void GetInputValue(IssmDouble* pvalue,Gauss* gauss,int index)=0; + virtual void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, Gauss* gauss)=0; virtual void GetInputAverage(IssmDouble* pvalue)=0; virtual void GetInputAllTimeAverages(IssmDouble** pvalues,IssmDouble** ptimes, int* pnumtimes)=0; virtual void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime)=0; - virtual void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss)=0; - virtual void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss)=0; - virtual void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss)=0; - virtual void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss)=0; - virtual void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss)=0; - virtual void GetVxStrainRate3dHO(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss)=0; - virtual void GetVyStrainRate3dHO(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss)=0; virtual void ChangeEnum(int newenumtype)=0; virtual void Configure(Parameters* parameters)=0; @@ -58,5 +46,5 @@ virtual IssmDouble Max(void)=0; virtual IssmDouble Min(void)=0; - virtual void Set(IssmDouble setvalue)=0; + virtual void Set(IssmDouble setvalue)=0; virtual void Scale(IssmDouble scale_factor)=0; virtual void AXPY(Input* xinput,IssmDouble scalar)=0; @@ -66,10 +54,12 @@ virtual void GetVectorFromInputs(Vector* vector,int* doflist)=0; - virtual Input* SpawnTriaInput(int location)=0; + virtual Input* SpawnTriaInput(int index1,int index2,int index3)=0; virtual Input* SpawnSegInput(int index1,int index2)=0; virtual Input* PointwiseDivide(Input* inputB)=0; virtual Input* PointwiseMax(Input* inputmax)=0; virtual Input* PointwiseMin(Input* inputmin)=0; - virtual int GetResultInterpolation(void)=0; + virtual int GetResultInterpolation(void)=0; + virtual int GetResultNumberOfNodes(void)=0; + virtual void ResultToPatch(IssmDouble* values,int nodesperelement,int sid){_error_("not supported yet");}; }; #endif Index: /issm/trunk/src/c/classes/Inputs/Inputs.cpp =================================================================== --- /issm/trunk/src/c/classes/Inputs/Inputs.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Inputs/Inputs.cpp (revision 17806) @@ -370,5 +370,5 @@ /*}}}*/ /*FUNCTION Inputs::SpawnTriaInputs{{{*/ -Inputs* Inputs::SpawnTriaInputs(int location){ +Inputs* Inputs::SpawnTriaInputs(int index1,int index2,int index3){ /*Intermediary*/ @@ -385,5 +385,5 @@ /*Create new input*/ inputin=dynamic_cast(*object); - inputout=inputin->SpawnTriaInput(location); + inputout=inputin->SpawnTriaInput(index1,index2,index3); /*Add input to new inputs*/ Index: /issm/trunk/src/c/classes/Inputs/Inputs.h =================================================================== --- /issm/trunk/src/c/classes/Inputs/Inputs.h (revision 17805) +++ /issm/trunk/src/c/classes/Inputs/Inputs.h (revision 17806) @@ -28,5 +28,6 @@ void DuplicateInput(int original_enum,int new_enum); Input* GetInput(int enum_name); - Inputs* SpawnTriaInputs(int position); + Inputs* SpawnTriaInputs(int position);//TO BE REMOVED (replaced by the other one) + Inputs* SpawnTriaInputs(int index1,int index2,int index3); Inputs* SpawnSegInputs(int index1,int index2); Inputs* SpawnSegInputs(int position); Index: /issm/trunk/src/c/classes/Inputs/IntInput.cpp =================================================================== --- /issm/trunk/src/c/classes/Inputs/IntInput.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Inputs/IntInput.cpp (revision 17806) @@ -35,7 +35,5 @@ void IntInput::DeepEcho(void){ - _printf_("IntInput:\n"); - _printf_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n"); - _printf_(" value: " << (int)this->value << "\n"); + _printf_(setw(15)<<" IntInput "<enum_type)<<" "<value<<"\n"); } /*}}}*/ @@ -72,5 +70,5 @@ /*}}}*/ /*FUNCTION IntInput::SpawnTriaInput{{{*/ -Input* IntInput::SpawnTriaInput(int location){ +Input* IntInput::SpawnTriaInput(int index1,int index2,int index3){ /*output*/ @@ -114,15 +112,6 @@ } /*}}}*/ -/*FUNCTION IntInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){{{*/ -void IntInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error_("not supported yet!");} -/*}}}*/ -/*FUNCTION IntInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){{{*/ -void IntInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error_("not supported yet!");} -/*}}}*/ -/*FUNCTION IntInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){{{*/ -void IntInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error_("not supported yet!");} -/*}}}*/ -/*FUNCTION IntInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){{{*/ -void IntInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error_("not supported yet!");} +/*FUNCTION IntInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss){{{*/ +void IntInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss){_error_("not supported yet!");} /*}}}*/ /*FUNCTION IntInput::ChangeEnum{{{*/ Index: /issm/trunk/src/c/classes/Inputs/IntInput.h =================================================================== --- /issm/trunk/src/c/classes/Inputs/IntInput.h (revision 17805) +++ /issm/trunk/src/c/classes/Inputs/IntInput.h (revision 17806) @@ -9,6 +9,6 @@ /*{{{*/ #include "./Input.h" -class GaussTria; -class GaussPenta; +class Gauss; +class Gauss; /*}}}*/ @@ -34,5 +34,5 @@ /*IntInput management: {{{*/ int InstanceEnum(); - Input* SpawnTriaInput(int location); + Input* SpawnTriaInput(int index1,int index2,int index3); Input* SpawnSegInput(int index1,int index2); Input* PointwiseDivide(Input* inputB){_error_("not implemented yet");}; @@ -40,4 +40,6 @@ Input* PointwiseMax(Input* inputB){_error_("not implemented yet");}; int GetResultInterpolation(void){return P0Enum;}; + int GetResultNumberOfNodes(void){return 1;}; + void ResultToPatch(IssmDouble* values,int nodesperelement,int sid){_error_("not supported yet");}; void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");}; void Configure(Parameters* parameters); @@ -47,25 +49,11 @@ void GetInputValue(int* pvalue); void GetInputValue(IssmDouble* pvalue); - void GetInputValue(IssmDouble* pvalue,GaussSeg* gauss){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss); - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss); - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");}; - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussSeg* gauss){_error_("not implemented yet");}; - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss); - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss); + void GetInputValue(IssmDouble* pvalue,Gauss* gauss); + void GetInputValue(IssmDouble* pvalue,Gauss* gauss,IssmDouble time){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,Gauss* gauss ,int index){_error_("not implemented yet");}; + void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list,Gauss* gauss){_error_("not implemented yet");}; void GetInputAverage(IssmDouble* pvalue){_error_("not implemented yet");}; void GetInputAllTimeAverages(IssmDouble** pvalues,IssmDouble** ptimes, int* pnumtimes){_error_("not implemented yet");}; void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime){_error_("not implemented yet");}; - - void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; - void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; - void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVxStrainRate3dHO(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVyStrainRate3dHO(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; void ChangeEnum(int newenumtype); void SquareMin(IssmDouble* psquaremin,Parameters* parameters); Index: /issm/trunk/src/c/classes/Inputs/PentaInput.cpp =================================================================== --- /issm/trunk/src/c/classes/Inputs/PentaInput.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Inputs/PentaInput.cpp (revision 17806) @@ -50,7 +50,5 @@ void PentaInput::DeepEcho(void){ - _printf_("PentaInput:\n"); - _printf_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n"); - _printf_(" values: ["); + _printf_(setw(15)<<" PentaInput "<enum_type)<<" ["); for(int i=0;iNumberofNodes();i++) _printf_(" "<values[i]); _printf_("]\n"); @@ -84,39 +82,29 @@ /*}}}*/ /*FUNCTION PentaInput::SpawnTriaInput{{{*/ -Input* PentaInput::SpawnTriaInput(int location){ +Input* PentaInput::SpawnTriaInput(int index1,int index2,int index3){ /*output*/ TriaInput* outinput=NULL; - IssmDouble newvalues[3]; //Assume P1 interpolation only for now - - /*Create arrow of indices depending on location (0=base 1=surface)*/ - int indices[3]; - switch(location){ - case 0: - indices[0] = 0; - indices[1] = 1; - indices[2] = 2; - break; - case 1: - indices[0] = 3; - indices[1] = 4; - indices[2] = 5; - break; - default: - _error_("case "<=0 && indices[i]<6); - - /*Assign value to new input*/ - newvalues[i]=this->values[indices[i]]; - } - - /*Create new Tria input*/ - outinput=new TriaInput(this->enum_type,&newvalues[0],P1Enum); + + if(this->element_type==P0Enum){ + outinput=new TriaInput(this->enum_type,&this->values[0],P0Enum); + } + else{ + /*Assume P1 interpolation only for now*/ + IssmDouble newvalues[3]; + + /*Create array of indices depending on location (0=base 1=surface)*/ + int indices[3]; + indices[0] = index1; + indices[1] = index2; + indices[2] = index3; + + /*Create new input*/ + for(int i=0;i<3;i++){ + _assert_(indices[i]>=0 && indices[i]<6); + newvalues[i]=this->values[indices[i]]; + } + outinput=new TriaInput(this->enum_type,&newvalues[0],P1Enum); + } /*Assign output*/ @@ -137,146 +125,50 @@ } /*}}}*/ +/*FUNCTION PentaInput::GetResultNumberOfNodes{{{*/ +int PentaInput::GetResultNumberOfNodes(void){ + + return this->NumberofNodes();; + +} +/*}}}*/ +/*FUNCTION PentaInput::ResultToPatch{{{*/ +void PentaInput::ResultToPatch(IssmDouble* values,int nodesperelement,int sid){ + + int numnodes = this->NumberofNodes(); + + /*Some checks*/ + _assert_(values); + _assert_(numnodes==nodesperelement); + + /*Fill in arrays*/ + for(int i=0;ivalues[i]; +} +/*}}}*/ /*Object functions*/ -/*FUNCTION PentaInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){{{*/ -void PentaInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){ +/*FUNCTION PentaInput::GetInputValue(IssmDouble* pvalue){{{*/ +void PentaInput::GetInputValue(IssmDouble* pvalue){ + + if(this->element_type==P0Enum){ + pvalue=&values[0]; + } + else _error_("not implemented yet"); +} +/*}}}*/ +/*FUNCTION PentaInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss){{{*/ +void PentaInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss){ /*Call PentaRef function*/ - PentaRef::GetInputValue(pvalue,&values[0],gauss); - -} -/*}}}*/ -/*FUNCTION PentaInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list, GaussPenta* gauss){{{*/ -void PentaInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list, GaussPenta* gauss){ + _assert_(gauss->Enum()==GaussPentaEnum); + PentaRef::GetInputValue(pvalue,&values[0],(GaussPenta*)gauss); + +} +/*}}}*/ +/*FUNCTION PentaInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list, Gauss* gauss){{{*/ +void PentaInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list,Gauss* gauss){ /*Call PentaRef function*/ - PentaRef::GetInputDerivativeValue(p,&values[0],xyz_list,gauss); -} -/*}}}*/ -/*FUNCTION PentaInput::GetVxStrainRate3d{{{*/ -void PentaInput::GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){ - - /*Intermediary*/ - int numnodes=this->NumberofNodes(); - IssmDouble* B=xNew(numnodes*(NDOF3*numnodes)); - IssmDouble* velocity=xNew(numnodes*NDOF3); - - /*Get B matrix: */ - GetBFSstrainrate(B,xyz_list,gauss); - - /*Here, we are computing the strain rate of (vx,0,0)*/ - for(int i=0;ivalues[i]; - velocity[NDOF3*i+1]=0.; - velocity[NDOF3*i+2]=0.; - } - /*Multiply B by velocity, to get strain rate: */ - MatrixMultiply(B,numnodes,NDOF3*numnodes,0,velocity,NDOF3*numnodes,1,0,epsilonvx,0); - - /*Clean-up*/ - xDelete(B); - xDelete(velocity); - -} -/*}}}*/ -/*FUNCTION PentaInput::GetVyStrainRate3d{{{*/ -void PentaInput::GetVyStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){ - - /*Intermediary*/ - int numnodes=this->NumberofNodes(); - IssmDouble* B=xNew(numnodes*(NDOF3*numnodes)); - IssmDouble* velocity=xNew(numnodes*NDOF3); - - /*Get B matrix: */ - GetBFSstrainrate(B,xyz_list,gauss); - - /*Here, we are computing the strain rate of (0,vy,0)*/ - for(int i=0;ivalues[i]; - velocity[NDOF3*i+2]=0.; - } - /*Multiply B by velocity, to get strain rate: */ - MatrixMultiply(B,numnodes,NDOF3*numnodes,0,velocity,NDOF3*numnodes,1,0,epsilonvx,0); - - /*Clean-up*/ - xDelete(B); - xDelete(velocity); -} -/*}}}*/ -/*FUNCTION PentaInput::GetVzStrainRate3d{{{*/ -void PentaInput::GetVzStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){ - - /*Intermediary*/ - int numnodes=this->NumberofNodes(); - IssmDouble* B=xNew(numnodes*(NDOF3*numnodes)); - IssmDouble* velocity=xNew(numnodes*NDOF3); - - /*Get B matrix: */ - GetBFSstrainrate(B,xyz_list,gauss); - - /*Here, we are computing the strain rate of (0,0,vz)*/ - for(int i=0;ivalues[i]; - } - /*Multiply B by velocity, to get strain rate: */ - MatrixMultiply(B,numnodes,NDOF3*numnodes,0,velocity,NDOF3*numnodes,1,0,epsilonvx,0); - - /*Clean-up*/ - xDelete(B); - xDelete(velocity); -} -/*}}}*/ -/*FUNCTION PentaInput::GetVxStrainRate3dHO{{{*/ -void PentaInput::GetVxStrainRate3dHO(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){ - - int i; - const int numnodes=6; - IssmDouble B[5][NDOF2*numnodes]; - IssmDouble velocity[numnodes][NDOF2]; - - /*Get B matrix: */ - GetBHO(&B[0][0], xyz_list, gauss); - - _assert_(this->NumberofNodes()==6); //Check Tria too - - /*Here, we are computing the strain rate of (vx,0)*/ - for(i=0;ivalues[i]; - velocity[i][1]=0.0; - } - - /*Multiply B by velocity, to get strain rate: */ - MatrixMultiply( &B[0][0],5,NDOF2*numnodes,0, - &velocity[0][0],NDOF2*numnodes,1,0, - epsilonvx,0); - -} -/*}}}*/ -/*FUNCTION PentaInput::GetVyStrainRate3dHO{{{*/ -void PentaInput::GetVyStrainRate3dHO(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){ - - int i; - const int numnodes=6; - IssmDouble B[5][NDOF2*numnodes]; - IssmDouble velocity[numnodes][NDOF2]; - - /*Get B matrix: */ - GetBHO(&B[0][0], xyz_list, gauss); - _assert_(this->NumberofNodes()==6); //Check Tria too - - /*Here, we are computing the strain rate of (0,vy)*/ - for(i=0;ivalues[i]; - } - - /*Multiply B by velocity, to get strain rate: */ - MatrixMultiply( &B[0][0],5,NDOF2*numnodes,0, - &velocity[0][0],NDOF2*numnodes,1,0, - epsilonvy,0); - + _assert_(gauss->Enum()==GaussPentaEnum); + PentaRef::GetInputDerivativeValue(p,&values[0],xyz_list,(GaussPenta*)gauss); } /*}}}*/ @@ -438,20 +330,26 @@ IssmDouble thickness; + IssmDouble value=0.; /*Check that input provided is a thickness*/ if (thickness_input->InstanceEnum()!=ThicknessEnum) _error_("Input provided is not a Thickness (enum_type is " << EnumToStringx(thickness_input->InstanceEnum()) << ")"); - /*vertically integrate depending on type:*/ + /*vertically integrate depending on type (and use P1 interpolation from now on)*/ switch(this->element_type){ - case P1Enum:{ - GaussPenta *gauss=new GaussPenta(); - for(int iv=0;iv<3;iv++){ - gauss->GaussVertex(iv); - thickness_input->GetInputValue(&thickness,gauss); - this->values[iv]=0.5*(this->values[iv]+this->values[iv+3]) * thickness; - this->values[iv+3]=this->values[iv]; - } - delete gauss; - return; } + case P1Enum: + case P1bubbleEnum: + case P2Enum: + { + this->element_type=P1Enum; + GaussPenta *gauss=new GaussPenta(); + for(int iv=0;iv<3;iv++){ + gauss->GaussVertex(iv); + thickness_input->GetInputValue(&thickness,gauss); + this->values[iv]=0.5*(this->values[iv]+this->values[iv+3]) * thickness; + this->values[iv+3]=this->values[iv]; + } + delete gauss; + return; + } default: _error_("not supported yet for type "<element_type)); @@ -556,8 +454,6 @@ /*FUNCTION PentaInput::GetVectorFromInputs{{{*/ void PentaInput::GetVectorFromInputs(Vector* vector,int* doflist){ - - const int numnodes=this->NumberofNodes(); - vector->SetValues(numnodes,doflist,this->values,INS_VAL); - + const int numvertices=6; + vector->SetValues(numvertices,doflist,this->values,INS_VAL); } /*}}}*/ /*FUNCTION PentaInput::Configure{{{*/ Index: /issm/trunk/src/c/classes/Inputs/PentaInput.h =================================================================== --- /issm/trunk/src/c/classes/Inputs/PentaInput.h (revision 17805) +++ /issm/trunk/src/c/classes/Inputs/PentaInput.h (revision 17806) @@ -10,6 +10,6 @@ #include "./Input.h" #include "../Elements/PentaRef.h" -class GaussTria; -class GaussPenta; +class Gauss; +class Gauss; /*}}}*/ @@ -34,5 +34,5 @@ /*PentaInput management*/ int InstanceEnum(); - Input* SpawnTriaInput(int location); + Input* SpawnTriaInput(int index1,int index2,int index3); Input* SpawnSegInput(int index1,int index2); Input* PointwiseDivide(Input* inputB); @@ -40,4 +40,6 @@ Input* PointwiseMax(Input* inputB); int GetResultInterpolation(void); + int GetResultNumberOfNodes(void); + void ResultToPatch(IssmDouble* values,int nodesperelement,int sid); void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");}; void Configure(Parameters* parameters); @@ -45,28 +47,13 @@ void GetInputValue(bool* pvalue){_error_("not implemented yet");}; void GetInputValue(int* pvalue){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussSeg* gauss){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss); - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");}; - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussSeg* gauss){_error_("not implemented yet");}; - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss); + void GetInputValue(IssmDouble* pvalue); + void GetInputValue(IssmDouble* pvalue,Gauss* gauss); + void GetInputValue(IssmDouble* pvalue,Gauss* gauss,IssmDouble time){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,Gauss* gauss ,int index){_error_("not implemented yet");}; + void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list,Gauss* gauss); void GetInputAverage(IssmDouble* pvalue); void GetInputAllTimeAverages(IssmDouble** pvalues,IssmDouble** ptimes, int* pnumtimes){_error_("not implemented yet");}; void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime){_error_("not implemented yet");}; - - void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; - void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; - void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss); - void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss); - void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss); - void GetVxStrainRate3dHO(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss); - void GetVyStrainRate3dHO(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss); void ChangeEnum(int newenumtype); - void SquareMin(IssmDouble* psquaremin,Parameters* parameters); void ConstrainMin(IssmDouble minimum); Index: /issm/trunk/src/c/classes/Inputs/SegInput.cpp =================================================================== --- /issm/trunk/src/c/classes/Inputs/SegInput.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Inputs/SegInput.cpp (revision 17806) @@ -50,7 +50,5 @@ void SegInput::DeepEcho(void){ - _printf_("SegInput:\n"); - _printf_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n"); - _printf_(" values: ["); + _printf_(setw(15)<<" SegInput "<enum_type)<<" ["); for(int i=0;iNumberofNodes();i++) _printf_(" "<values[i]); _printf_("]\n"); @@ -98,17 +96,19 @@ } /*}}}*/ -/*FUNCTION SegInput::GetInputValue(IssmDouble* pvalue,GaussSeg* gauss){{{*/ -void SegInput::GetInputValue(IssmDouble* pvalue,GaussSeg* gauss){ +/*FUNCTION SegInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss){{{*/ +void SegInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss){ /*Call SegRef function*/ - SegRef::GetInputValue(pvalue,&values[0],gauss); + _assert_(gauss->Enum()==GaussSegEnum); + SegRef::GetInputValue(pvalue,&values[0],(GaussSeg*)gauss); } /*}}}*/ -/*FUNCTION SegInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list, GaussSeg* gauss){{{*/ -void SegInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list, GaussSeg* gauss){ +/*FUNCTION SegInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list, Gauss* gauss){{{*/ +void SegInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list,Gauss* gauss){ /*Call SegRef function*/ - SegRef::GetInputDerivativeValue(p,&values[0],xyz_list,gauss); + _assert_(gauss->Enum()==GaussSegEnum); + SegRef::GetInputDerivativeValue(p,&values[0],xyz_list,(GaussSeg*)gauss); } /*}}}*/ @@ -118,2 +118,14 @@ } /*}}}*/ +/*FUNCTION SegInput::Min{{{*/ +IssmDouble SegInput::Min(void){ + + const int numnodes=this->NumberofNodes(); + IssmDouble min=values[0]; + + for(int i=1;i +#else +#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" +#endif + +#include "../classes.h" +#include "../../shared/shared.h" + +/*TetraInput constructors and destructor*/ +/*FUNCTION TetraInput::TetraInput(){{{*/ +TetraInput::TetraInput(){ + values = NULL; +} +/*}}}*/ +/*FUNCTION TetraInput::TetraInput(int in_enum_type,IssmDouble* invalues,element_type_in){{{*/ +TetraInput::TetraInput(int in_enum_type,IssmDouble* in_values,int element_type_in) + :TetraRef(1) +{ + + /*Set TetraRef*/ + this->SetElementType(element_type_in,0); + this->element_type=element_type_in; + + /*Set Enum*/ + enum_type=in_enum_type; + + /*Set values*/ + this->values=xNew(this->NumberofNodes()); + for(int i=0;iNumberofNodes();i++) values[i]=in_values[i]; +} +/*}}}*/ +/*FUNCTION TetraInput::~TetraInput(){{{*/ +TetraInput::~TetraInput(){ + xDelete(this->values); +} +/*}}}*/ + +/*Object virtual functions definitions:*/ +/*FUNCTION TetraInput::Echo {{{*/ +void TetraInput::Echo(void){ + this->DeepEcho(); +} +/*}}}*/ +/*FUNCTION TetraInput::DeepEcho{{{*/ +void TetraInput::DeepEcho(void){ + + _printf_(setw(15)<<" TetraInput "<enum_type)<<" ["); + for(int i=0;iNumberofNodes();i++) _printf_(" "<values[i]); + _printf_("] ("<element_type)<<")\n"); +} +/*}}}*/ +/*FUNCTION TetraInput::Id{{{*/ +int TetraInput::Id(void){ return -1; } +/*}}}*/ +/*FUNCTION TetraInput::ObjectEnum{{{*/ +int TetraInput::ObjectEnum(void){ + + return TetraInputEnum; + +} +/*}}}*/ +/*FUNCTION TetraInput::copy{{{*/ +Object* TetraInput::copy() { + + return new TetraInput(this->enum_type,this->values,this->element_type); + +} +/*}}}*/ + +/*TetraInput management*/ +/*FUNCTION TetraInput::InstanceEnum{{{*/ +int TetraInput::InstanceEnum(void){ + + return this->enum_type; + +} +/*}}}*/ +/*FUNCTION TetraInput::GetResultInterpolation{{{*/ +int TetraInput::GetResultInterpolation(void){ + + return P1Enum; + +} +/*}}}*/ +/*FUNCTION TetraInput::GetResultNumberOfNodes{{{*/ +int TetraInput::GetResultNumberOfNodes(void){ + + return this->NumberofNodes(); + +} +/*}}}*/ +/*FUNCTION TetraInput::ResultToPatch{{{*/ +void TetraInput::ResultToPatch(IssmDouble* values,int nodesperelement,int sid){ + + int numnodes = this->NumberofNodes(); + + /*Some checks*/ + _assert_(values); + _assert_(numnodes==nodesperelement); + + /*Fill in arrays*/ + for(int i=0;ivalues[i]; +} +/*}}}*/ + +/*Object functions*/ +/*FUNCTION TetraInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss){{{*/ +void TetraInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss){ + + /*Call TetraRef function*/ + _assert_(gauss->Enum()==GaussTetraEnum); + TetraRef::GetInputValue(pvalue,&values[0],(GaussTetra*)gauss); + +} +/*}}}*/ +/*FUNCTION TetraInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list, Gauss* gauss){{{*/ +void TetraInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list, Gauss* gauss){ + + /*Call TetraRef function*/ + _assert_(gauss->Enum()==GaussTetraEnum); + TetraRef::GetInputDerivativeValue(p,&values[0],xyz_list,(GaussTetra*)gauss); +} +/*}}}*/ +/*FUNCTION TetraInput::ChangeEnum{{{*/ +void TetraInput::ChangeEnum(int newenumtype){ + this->enum_type=newenumtype; +} +/*}}}*/ +/*FUNCTION TetraInput::GetInputAverage{{{*/ +void TetraInput::GetInputAverage(IssmDouble* pvalue){ + + int numnodes = this->NumberofNodes(); + IssmDouble numnodesd = reCast(numnodes); + IssmDouble value = 0.; + + for(int i=0;i(1); + times=xNew(1); + + this->GetInputAverage(&outvalues[0]); + times[0]=0.; /*we don't have a time*/ + + *pvalues=outvalues; + *ptimes=times; + *pnumtimes=numtimes; +} +/*}}}*/ +/*FUNCTION TetraInput::GetInputUpToCurrentTimeAverages{{{*/ +void TetraInput::GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime){ + + IssmDouble* outvalues=NULL; + IssmDouble* times=NULL; + int numtimes; + + /*this is not a transient forcing, so we only have 1 value, steady state: */ + numtimes=1; + outvalues=xNew(1); + times=xNew(1); + + this->GetInputAverage(&outvalues[0]); + times[0]=currenttime; /*we don't have a time*/ + + *pvalues=outvalues; + *ptimes=times; + *pnumtimes=numtimes; +} +/*}}}*/ +/*FUNCTION TetraInput::SpawnTriaInput{{{*/ +Input* TetraInput::SpawnTriaInput(int index1,int index2,int index3){ + + /*output*/ + TriaInput* outinput=NULL; + + if(this->element_type==P0Enum){ + outinput=new TriaInput(this->enum_type,&this->values[0],P0Enum); + } + else{ + /*Assume P1 interpolation only for now*/ + IssmDouble newvalues[3]; + + /*Create array of indices depending on location (0=base 1=surface)*/ + int indices[3]; + indices[0] = index1; + indices[1] = index2; + indices[2] = index3; + + /*Create new input*/ + for(int i=0;i<3;i++){ + _assert_(indices[i]>=0 && indices[i]<4); + newvalues[i]=this->values[indices[i]]; + } + outinput=new TriaInput(this->enum_type,&newvalues[0],P1Enum); + } + + /*Assign output*/ + return outinput; +} +/*}}}*/ + +/*Intermediary*/ +/*FUNCTION TetraInput::SquareMin{{{*/ +void TetraInput::SquareMin(IssmDouble* psquaremin,Parameters* parameters){ + + int numnodes=this->NumberofNodes(); + IssmDouble squaremin; + + /*Now, figure out minimum of valuescopy: */ + squaremin=pow(this->values[0],2); + for(int i=1;ivalues[i],2)values[i],2); + } + /*Assign output pointers:*/ + *psquaremin=squaremin; +} +/*}}}*/ +/*FUNCTION TetraInput::ContrainMin{{{*/ +void TetraInput::ConstrainMin(IssmDouble minimum){ + + int numnodes = this->NumberofNodes(); + for(int i=0;iNumberofNodes(); + + for(int i=0;inorm) norm=fabs(values[i]); + return norm; +} +/*}}}*/ +/*FUNCTION TetraInput::Max{{{*/ +IssmDouble TetraInput::Max(void){ + + int numnodes=this->NumberofNodes(); + IssmDouble max=values[0]; + + for(int i=1;imax) max=values[i]; + } + return max; +} +/*}}}*/ +/*FUNCTION TetraInput::MaxAbs{{{*/ +IssmDouble TetraInput::MaxAbs(void){ + + int numnodes=this->NumberofNodes(); + IssmDouble max=fabs(values[0]); + + for(int i=1;imax) max=fabs(values[i]); + } + return max; +} +/*}}}*/ +/*FUNCTION TetraInput::Min{{{*/ +IssmDouble TetraInput::Min(void){ + + const int numnodes=this->NumberofNodes(); + IssmDouble min=values[0]; + + for(int i=1;iNumberofNodes(); + IssmDouble min=fabs(values[0]); + + for(int i=1;iNumberofNodes(); + for(int i=0;iNumberofNodes(); + for(int i=0;iNumberofNodes(); + TetraInput* xtriainput=NULL; + + /*xinput is of the same type, so cast it: */ + if(xinput->ObjectEnum()!=TetraInputEnum) _error_("Operation not permitted because xinput is of type " << EnumToStringx(xinput->ObjectEnum())); + xtriainput=(TetraInput*)xinput; + if(xtriainput->element_type!=this->element_type) _error_("Operation not permitted because xinput is of type " << EnumToStringx(xinput->ObjectEnum())); + + /*Carry out the AXPY operation depending on type:*/ + for(int i=0;ivalues[i]=this->values[i]+scalar*xtriainput->values[i]; + +} +/*}}}*/ +/*FUNCTION TetraInput::Constrain{{{*/ +void TetraInput::Constrain(IssmDouble cm_min, IssmDouble cm_max){ + + int i; + const int numnodes=this->NumberofNodes(); + + if(!xIsNan(cm_min)) for(i=0;ivalues[i]values[i]=cm_min; + if(!xIsNan(cm_max)) for(i=0;ivalues[i]>cm_max)this->values[i]=cm_max; + +} +/*}}}*/ +/*FUNCTION TetraInput::GetVectorFromInputs{{{*/ +void TetraInput::GetVectorFromInputs(Vector* vector,int* doflist){ + const int numvertices=4; + vector->SetValues(numvertices,doflist,this->values,INS_VAL); +} /*}}}*/ +/*FUNCTION TetraInput::PointwiseMin{{{*/ +Input* TetraInput::PointwiseMin(Input* inputB){ + + /*Ouput*/ + TetraInput* outinput=NULL; + + /*Intermediaries*/ + int i; + TetraInput *xinputB = NULL; + const int numnodes = this->NumberofNodes(); + IssmDouble *minvalues = xNew(numnodes); + + /*Check that inputB is of the same type*/ + if(inputB->ObjectEnum()!=TetraInputEnum) _error_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum())); + xinputB=(TetraInput*)inputB; + if(xinputB->element_type!=this->element_type) _error_("Operation not permitted because inputB is of type " << EnumToStringx(xinputB->element_type)); + + /*Create point wise min*/ + for(i=0;ivalues[i] > xinputB->values[i]) minvalues[i]=xinputB->values[i]; + else minvalues[i]=this->values[i]; + } + + /*Create new Tetra vertex input (copy of current input)*/ + outinput=new TetraInput(this->enum_type,&minvalues[0],this->element_type); + + /*Return output pointer*/ + xDelete(minvalues); + return outinput; + +} +/*}}}*/ +/*FUNCTION TetraInput::PointwiseMax{{{*/ +Input* TetraInput::PointwiseMax(Input* inputB){ + + /*Ouput*/ + TetraInput* outinput=NULL; + + /*Intermediaries*/ + int i; + TetraInput *xinputB = NULL; + const int numnodes = this->NumberofNodes(); + IssmDouble *maxvalues = xNew(numnodes); + + /*Check that inputB is of the same type*/ + if(inputB->ObjectEnum()!=TetraInputEnum) _error_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum())); + xinputB=(TetraInput*)inputB; + if(xinputB->element_type!=this->element_type) _error_("Operation not permitted because inputB is of type " << EnumToStringx(xinputB->element_type)); + + /*Create point wise max*/ + for(i=0;ivalues[i] < xinputB->values[i]) maxvalues[i]=xinputB->values[i]; + else maxvalues[i]=this->values[i]; + } + + /*Create new Tetra vertex input (copy of current input)*/ + outinput=new TetraInput(this->enum_type,&maxvalues[0],this->element_type); + + /*Return output pointer*/ + xDelete(maxvalues); + return outinput; + +} +/*}}}*/ +/*FUNCTION TetraInput::PointwiseDivide{{{*/ +Input* TetraInput::PointwiseDivide(Input* inputB){ + + /*Ouput*/ + TetraInput* outinput=NULL; + + /*Intermediaries*/ + TetraInput *xinputB = NULL; + const int numnodes = this->NumberofNodes(); + + /*Check that inputB is of the same type*/ + if(inputB->ObjectEnum()!=TetraInputEnum) _error_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum())); + xinputB=(TetraInput*)inputB; + if(xinputB->element_type!=this->element_type) _error_("Operation not permitted because inputB is of type " << EnumToStringx(xinputB->element_type)); + + /*Allocate intermediary*/ + IssmDouble* AdotBvalues=xNew(numnodes); + + /*Create point wise division*/ + for(int i=0;ivalues[i]!=0); + AdotBvalues[i]=this->values[i]/xinputB->values[i]; + } + + /*Create new Tetra vertex input (copy of current input)*/ + outinput=new TetraInput(this->enum_type,AdotBvalues,this->element_type); + + /*Return output pointer*/ + xDelete(AdotBvalues); + return outinput; + +} +/*}}}*/ +/*FUNCTION TetraInput::Configure{{{*/ +void TetraInput::Configure(Parameters* parameters){ + /*do nothing: */ +} +/*}}}*/ Index: /issm/trunk/src/c/classes/Inputs/TetraInput.h =================================================================== --- /issm/trunk/src/c/classes/Inputs/TetraInput.h (revision 17806) +++ /issm/trunk/src/c/classes/Inputs/TetraInput.h (revision 17806) @@ -0,0 +1,75 @@ +/*! \file TetraInput.h + * \brief: header file for TetraInput object + */ + +#ifndef _TETRAINPUT_H_ +#define _TETRAINPUT_H_ + +/*Headers:*/ +/*{{{*/ +#include "./Input.h" +#include "../Elements/TetraRef.h" +class Gauss; +class Gauss; +/*}}}*/ + +class TetraInput: public Input,public TetraRef{ + + public: + int enum_type; + IssmDouble* values; + + /*TetraInput constructors, destructors*/ + TetraInput(); + TetraInput(int enum_type,IssmDouble* values,int element_type_in); + ~TetraInput(); + + /*Object virtual functions definitions*/ + void Echo(); + void DeepEcho(); + int Id(); + int ObjectEnum(); + Object *copy(); + + /*TetraInput management:*/ + int InstanceEnum(); + Input* SpawnTriaInput(int index1,int index2,int index3); + Input* SpawnSegInput(int index1,int index2){_error_("not supported yet");}; + Input* PointwiseDivide(Input* inputB); + Input* PointwiseMin(Input* inputB); + Input* PointwiseMax(Input* inputB); + int GetResultInterpolation(void); + int GetResultNumberOfNodes(void); + void ResultToPatch(IssmDouble* values,int nodesperelement,int sid); + void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");}; + void Configure(Parameters* parameters); + + /*numerics*/ + void GetInputValue(bool* pvalue){_error_("not implemented yet");} + void GetInputValue(int* pvalue){_error_("not implemented yet");} + void GetInputValue(IssmDouble* pvalue){_error_("not implemented yet");} + void GetInputValue(IssmDouble* pvalue,Gauss* gauss); + void GetInputValue(IssmDouble* pvalue,Gauss* gauss,IssmDouble time){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,Gauss* gauss,int index){_error_("not implemented yet");}; + void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list,Gauss* gauss); + void GetInputAverage(IssmDouble* pvalue); + void GetInputAllTimeAverages(IssmDouble** pvalues,IssmDouble** ptimes, int* pnumtimes); + void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime); + void ChangeEnum(int newenumtype); + void SquareMin(IssmDouble* psquaremin,Parameters* parameters); + void ConstrainMin(IssmDouble minimum); + void Set(IssmDouble setvalue); + void Scale(IssmDouble scale_factor); + void AXPY(Input* xinput,IssmDouble scalar); + void Constrain(IssmDouble cm_min, IssmDouble cm_max); + IssmDouble InfinityNorm(void); + IssmDouble Max(void); + IssmDouble MaxAbs(void); + IssmDouble Min(void); + IssmDouble MinAbs(void); + void Extrude(void){_error_("not supported yet");}; + void VerticallyIntegrate(Input* thickness_input){_error_("not supported yet");}; + void GetVectorFromInputs(Vector* vector,int* doflist); + +}; +#endif /* _TETRAINPUT_H */ Index: /issm/trunk/src/c/classes/Inputs/TransientInput.cpp =================================================================== --- /issm/trunk/src/c/classes/Inputs/TransientInput.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Inputs/TransientInput.cpp (revision 17806) @@ -39,4 +39,19 @@ } /*}}}*/ +/*FUNCTION TransientInput::TransientInput(int in_enum_type,IssmDouble* timesin,int N){{{*/ +TransientInput::TransientInput(int in_enum_type,IssmDouble* timesin,int N){ + + /*Set Enum*/ + enum_type=in_enum_type; + + /*Allocate values and timesteps, and copy: */ + this->numtimesteps=N; + this->timesteps=xNew(N); + xMemCpy(this->timesteps,timesin,N); + + inputs = new Inputs(); + this->parameters=NULL; +} +/*}}}*/ /*FUNCTION TransientInput::~TransientInput{{{*/ TransientInput::~TransientInput(){ @@ -66,5 +81,5 @@ _printf_("---inputs: \n"); for(i=0;inumtimesteps;i++){ - _printf_(" time: " << this->timesteps[i] << " \n"); + _printf_(" time: " << this->timesteps[i]<<" "); ((Input*)this->inputs->GetObjectByOffset(i))->Echo(); } @@ -108,5 +123,5 @@ /*}}}*/ /*FUNCTION TransientInput::SpawnTriaInput{{{*/ -Input* TransientInput::SpawnTriaInput(int location){ +Input* TransientInput::SpawnTriaInput(int index1,int index2,int index3){ /*output*/ @@ -119,5 +134,5 @@ outinput->timesteps=xNew(this->numtimesteps); xMemCpy(outinput->timesteps,this->timesteps,this->numtimesteps); - outinput->inputs=(Inputs*)this->inputs->SpawnTriaInputs(location); + outinput->inputs=(Inputs*)this->inputs->SpawnTriaInputs(index1,index2,index3); outinput->parameters=this->parameters; @@ -149,6 +164,6 @@ /*Object functions*/ -/*FUNCTION TransientInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){{{*/ -void TransientInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){ +/*FUNCTION TransientInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss){{{*/ +void TransientInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss){ IssmDouble time; @@ -165,10 +180,6 @@ } /*}}}*/ -/*FUNCTION TransientInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){{{*/ -void TransientInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){ - IssmDouble time; - - /*First, recover current time from parameters: */ - this->parameters->FindParam(&time,TimeEnum); +/*FUNCTION TransientInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss,IssmDouble time){{{*/ +void TransientInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss,IssmDouble time){ /*Retrieve interpolated values for this time step: */ @@ -181,30 +192,6 @@ } /*}}}*/ -/*FUNCTION TransientInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){{{*/ -void TransientInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){ - - /*Retrieve interpolated values for this time step: */ - Input* input=GetTimeInput(time); - - /*Call input function*/ - input->GetInputValue(pvalue,gauss); - - delete input; -} -/*}}}*/ -/*FUNCTION TransientInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){{{*/ -void TransientInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){ - - /*Retrieve interpolated values for this time step: */ - Input* input=GetTimeInput(time); - - /*Call input function*/ - input->GetInputValue(pvalue,gauss); - - delete input; -} -/*}}}*/ -/*FUNCTION TransientInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list, GaussTria* gauss){{{*/ -void TransientInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list, GaussTria* gauss){ +/*FUNCTION TransientInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list, Gauss* gauss){{{*/ +void TransientInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list, Gauss* gauss){ IssmDouble time; @@ -220,5 +207,4 @@ delete input; - } /*}}}*/ @@ -342,11 +328,41 @@ } /*}}}*/ +/*FUNCTION TransientInput::AddTimeInput{{{*/ +void TransientInput::AddTimeInput(Input* input){ + + _assert_(this->inputs->Size()numtimesteps); + inputs->AddObject(input); + +} +/*}}}*/ /*FUNCTION TransientInput::GetResultInterpolation{{{*/ -int TransientInput::GetResultInterpolation(void){ - - IssmDouble time; - parameters->FindParam(&time,TimeEnum); - Input* input=GetTimeInput(time); - return input->GetResultInterpolation(); +int TransientInput::GetResultInterpolation(void){ + + IssmDouble time; + int output; + + parameters->FindParam(&time,TimeEnum); + Input* input=GetTimeInput(time); + output = input->GetResultInterpolation(); + + /*Clean up and return*/ + delete input; + return output; + +} +/*}}}*/ +/*FUNCTION TransientInput::GetResultNumberOfNodes{{{*/ +int TransientInput::GetResultNumberOfNodes(void){ + + IssmDouble time; + int output; + + parameters->FindParam(&time,TimeEnum); + Input* input=GetTimeInput(time); + output = input->GetResultNumberOfNodes(); + + /*Clean up and return*/ + delete input; + return output; } Index: /issm/trunk/src/c/classes/Inputs/TransientInput.h =================================================================== --- /issm/trunk/src/c/classes/Inputs/TransientInput.h (revision 17805) +++ /issm/trunk/src/c/classes/Inputs/TransientInput.h (revision 17806) @@ -9,7 +9,7 @@ /*{{{*/ #include "./Input.h" -class GaussTria; +class Gauss; class Parameters; -class GaussPenta; +class Gauss; /*}}}*/ @@ -26,6 +26,8 @@ TransientInput(); TransientInput(int enum_type); + TransientInput(int in_enum_type,IssmDouble* times,int N); ~TransientInput(); void AddTimeInput(Input* input,IssmDouble time); + void AddTimeInput(Input* input); /*}}}*/ /*Object virtual functions definitions:{{{*/ @@ -38,5 +40,5 @@ /*TransientInput management: {{{*/ int InstanceEnum(); - Input* SpawnTriaInput(int location); + Input* SpawnTriaInput(int index1,int index2,int index3); Input* SpawnSegInput(int index1,int index2); Input* PointwiseDivide(Input* forcingB){_error_("not implemented yet");}; @@ -44,4 +46,6 @@ Input* PointwiseMax(Input* forcingB){_error_("not implemented yet");}; int GetResultInterpolation(void); + int GetResultNumberOfNodes(void); + void ResultToPatch(IssmDouble* values,int nodesperelement,int sid){_error_("not supported yet");}; void Configure(Parameters* parameters); /*}}}*/ @@ -50,26 +54,12 @@ void GetInputValue(int* pvalue){_error_("not implemented yet");}; void GetInputValue(IssmDouble* pvalue){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussSeg* gauss){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss); - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss); - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time); - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time); - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");}; - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussSeg* gauss){_error_("not implemented yet");}; - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss); - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,Gauss* gauss); + void GetInputValue(IssmDouble* pvalue,Gauss* gauss,IssmDouble time); + void GetInputValue(IssmDouble* pvalue,Gauss* gauss ,int index){_error_("not implemented yet");}; + void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list,Gauss* gauss); void GetInputAverage(IssmDouble* pvalue); void GetInputAllTimeAverages(IssmDouble** pvalues,IssmDouble** ptimes, int* pnumtimes); void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime); - void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; - void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; - void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVxStrainRate3dHO(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVyStrainRate3dHO(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; void ChangeEnum(int newenumtype); - void SquareMin(IssmDouble* psquaremin,Parameters* parameters); void ConstrainMin(IssmDouble minimum){_error_("not implemented yet");}; Index: /issm/trunk/src/c/classes/Inputs/TriaInput.cpp =================================================================== --- /issm/trunk/src/c/classes/Inputs/TriaInput.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Inputs/TriaInput.cpp (revision 17806) @@ -50,9 +50,7 @@ void TriaInput::DeepEcho(void){ - _printf_("TriaInput:\n"); - _printf_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n"); - _printf_(" values: ["); + _printf_(setw(15)<<" TriaInput "<enum_type)<<" ["); for(int i=0;iNumberofNodes();i++) _printf_(" "<values[i]); - _printf_("]\n"); + _printf_("] ("<element_type)<<")\n"); } /*}}}*/ @@ -84,5 +82,5 @@ /*}}}*/ /*FUNCTION TriaInput::SpawnTriaInput{{{*/ -Input* TriaInput::SpawnTriaInput(int location){ +Input* TriaInput::SpawnTriaInput(int index1,int index2,int index3){ /*output*/ @@ -102,13 +100,19 @@ /*output*/ SegInput* outinput=NULL; - IssmDouble newvalues[2]; //Assume P1 interpolation only for now - - /*Create arrow of indices depending on location (0=base 1=surface)*/ - - newvalues[0]=this->values[index1]; - newvalues[1]=this->values[index2]; - - /*Create new Seg input*/ - outinput=new SegInput(this->enum_type,&newvalues[0],P1Enum); + + if(this->element_type==P0Enum){ + outinput=new SegInput(this->enum_type,&this->values[0],P0Enum); + } + else{ + /*Assume P1 interpolation only for now*/ + IssmDouble newvalues[2]; + + /*Create array of indices depending on location (0=base 1=surface)*/ + newvalues[0]=this->values[index1]; + newvalues[1]=this->values[index2]; + + /*Create new Seg input*/ + outinput=new SegInput(this->enum_type,&newvalues[0],P1Enum); + } /*Assign output*/ @@ -124,71 +128,41 @@ } /*}}}*/ +/*FUNCTION TriaInput::GetResultNumberOfNodes{{{*/ +int TriaInput::GetResultNumberOfNodes(void){ + + return this->NumberofNodes(); + +} +/*}}}*/ +/*FUNCTION TriaInput::ResultToPatch{{{*/ +void TriaInput::ResultToPatch(IssmDouble* values,int nodesperelement,int sid){ + + int numnodes = this->NumberofNodes(); + + /*Some checks*/ + _assert_(values); + _assert_(numnodes==nodesperelement); + + /*Fill in arrays*/ + for(int i=0;ivalues[i]; +} +/*}}}*/ /*Object functions*/ -/*FUNCTION TriaInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){{{*/ -void TriaInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){ +/*FUNCTION TriaInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss){{{*/ +void TriaInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss){ /*Call TriaRef function*/ - TriaRef::GetInputValue(pvalue,&values[0],gauss); - -} -/*}}}*/ -/*FUNCTION TriaInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list, GaussTria* gauss){{{*/ -void TriaInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list, GaussTria* gauss){ + _assert_(gauss->Enum()==GaussTriaEnum); + TriaRef::GetInputValue(pvalue,&values[0],(GaussTria*)gauss); + +} +/*}}}*/ +/*FUNCTION TriaInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list, Gauss* gauss){{{*/ +void TriaInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list, Gauss* gauss){ /*Call TriaRef function*/ - TriaRef::GetInputDerivativeValue(p,&values[0],xyz_list,gauss); -} -/*}}}*/ -/*FUNCTION TriaInput::GetVxStrainRate2d{{{*/ -void TriaInput::GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){ - - /*Intermediary*/ - int numnodes=this->NumberofNodes(); - IssmDouble* B=xNew(numnodes*(NDOF2*numnodes)); - IssmDouble* velocity=xNew(numnodes*NDOF2); - - /*Get B matrix: */ - GetBSSA(&B[0],xyz_list,gauss); - - /*Here, we are computing the strain rate of (vx,0)*/ - for(int i=0;ivalues[i]; - velocity[2*i+1]=0.; - } - /*Get epsilon(vx) = B*velocity*/ - MatrixMultiply(&B[0],numnodes,NDOF2*numnodes,0, - &velocity[0],NDOF2*numnodes,1,0, - epsilonvx,0); - - /*clean up*/ - xDelete(B); - xDelete(velocity); -} -/*}}}*/ -/*FUNCTION TriaInput::GetVyStrainRate2d{{{*/ -void TriaInput::GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){ - - /*Intermediary*/ - int numnodes=this->NumberofNodes(); - IssmDouble* B=xNew(numnodes*(NDOF2*numnodes)); - IssmDouble* velocity=xNew(numnodes*NDOF2); - - /*Get B matrix: */ - GetBSSA(&B[0],xyz_list,gauss); - - /*Here, we are computing the strain rate of (0,vy)*/ - for(int i=0;ivalues[i]; - } - /*Get epsilon(vy) = B*velocity*/ - MatrixMultiply(&B[0],numnodes,NDOF2*numnodes,0, - &velocity[0],NDOF2*numnodes,1,0, - epsilonvy,0); - - /*clean up*/ - xDelete(B); - xDelete(velocity); + _assert_(gauss->Enum()==GaussTriaEnum); + TriaRef::GetInputDerivativeValue(p,&values[0],xyz_list,(GaussTria*)gauss); } /*}}}*/ @@ -377,8 +351,6 @@ /*FUNCTION TriaInput::GetVectorFromInputs{{{*/ void TriaInput::GetVectorFromInputs(Vector* vector,int* doflist){ - - const int numnodes=this->NumberofNodes(); - vector->SetValues(numnodes,doflist,this->values,INS_VAL); - + const int numvertices=3; + vector->SetValues(numvertices,doflist,this->values,INS_VAL); } /*}}}*/ /*FUNCTION TriaInput::PointwiseMin{{{*/ Index: /issm/trunk/src/c/classes/Inputs/TriaInput.h =================================================================== --- /issm/trunk/src/c/classes/Inputs/TriaInput.h (revision 17805) +++ /issm/trunk/src/c/classes/Inputs/TriaInput.h (revision 17806) @@ -10,6 +10,6 @@ #include "./Input.h" #include "../Elements/TriaRef.h" -class GaussTria; -class GaussPenta; +class Gauss; +class Gauss; /*}}}*/ @@ -34,5 +34,5 @@ /*TriaInput management:*/ int InstanceEnum(); - Input* SpawnTriaInput(int location); + Input* SpawnTriaInput(int index1,int index2,int index3); Input* SpawnSegInput(int index1,int index2); Input* PointwiseDivide(Input* inputB); @@ -40,4 +40,6 @@ Input* PointwiseMax(Input* inputB); int GetResultInterpolation(void); + int GetResultNumberOfNodes(void); + void ResultToPatch(IssmDouble* values,int nodesperelement,int sid); void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");}; void Configure(Parameters* parameters); @@ -47,26 +49,12 @@ void GetInputValue(int* pvalue){_error_("not implemented yet");} void GetInputValue(IssmDouble* pvalue){_error_("not implemented yet");} - void GetInputValue(IssmDouble* pvalue,GaussSeg* gauss){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss); - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,int index){_error_("not implemented yet");}; - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussSeg* gauss){_error_("not implemented yet");}; - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss); - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,Gauss* gauss); + void GetInputValue(IssmDouble* pvalue,Gauss* gauss,IssmDouble time){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,Gauss* gauss,int index){_error_("not implemented yet");}; + void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list,Gauss* gauss); void GetInputAverage(IssmDouble* pvalue); void GetInputAllTimeAverages(IssmDouble** pvalues,IssmDouble** ptimes, int* pnumtimes); void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime); - void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss); - void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss); - void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVxStrainRate3dHO(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; - void GetVyStrainRate3dHO(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; void ChangeEnum(int newenumtype); - void SquareMin(IssmDouble* psquaremin,Parameters* parameters); void ConstrainMin(IssmDouble minimum); Index: /issm/trunk/src/c/classes/IoModel.cpp =================================================================== --- /issm/trunk/src/c/classes/IoModel.cpp (revision 17805) +++ /issm/trunk/src/c/classes/IoModel.cpp (revision 17806) @@ -30,5 +30,7 @@ this->my_vertices=NULL; - this->meshtype=-1; + this->domaintype=-1; + this->domaindim=-1; + this->meshelementtype=-1; this->numberofvertices=-1; this->numberofelements=-1; @@ -38,4 +40,5 @@ this->faces=NULL; this->edges=NULL; + this->elementtofaceconnectivity =NULL; this->elementtoedgeconnectivity =NULL; this->singlenodetoelementconnectivity=NULL; @@ -74,5 +77,7 @@ this->my_vertices = NULL; - FetchData(&this->meshtype,MeshTypeEnum); + FetchData(&this->domaintype,DomainTypeEnum); + FetchData(&this->domaindim,DomainDimensionEnum); + FetchData(&this->meshelementtype,MeshElementtypeEnum); FetchData(&this->numberofvertices,MeshNumberofverticesEnum); FetchData(&this->numberofelements,MeshNumberofelementsEnum); @@ -80,4 +85,5 @@ this->faces = NULL; this->edges = NULL; + this->elementtofaceconnectivity = NULL; this->elementtoedgeconnectivity = NULL; this->singlenodetoelementconnectivity = NULL; @@ -125,4 +131,5 @@ xDelete(this->faces); xDelete(this->edges); + xDelete(this->elementtofaceconnectivity); xDelete(this->elementtoedgeconnectivity); xDelete(this->singlenodetoelementconnectivity); @@ -158,11 +165,11 @@ _printf0_(" Enums in marshalled file are not compatible with compiled code \n"); _printf0_(" \n"); + _printf0_(" * If you are running ISSM on your local machine: \n"); + _printf0_(" make sure that all the code is compiled and installed (make install)\n"); _printf0_(" * If you are running ISSM on a remote cluster: \n"); _printf0_(" make sure that you are using the same version of ISSM on your local \n"); _printf0_(" machine and remote cluster (you might need to run svn update) \n"); - _printf0_(" * If you are running ISSM on your local machine: \n"); - _printf0_(" make sure that all the code is compiled (modules and executables) \n"); _printf0_(" * If you are a developer and just added a new Enum: \n"); - _printf0_(" you might need to run ./Synchronize.sh in src/c/EnumDefinitions \n"); + _printf0_(" you might need to run ./Synchronize.sh in src/c/shared/Enum \n"); _printf0_(" and recompile \n"); _printf0_("=========================================================================\n"); @@ -1195,4 +1202,58 @@ } /*}}}*/ +/*FUNCTION IoModel::FetchMultipleData(int** pvector, int* pM,int data_enum){{{*/ +void IoModel::FetchMultipleData(int** pvector, int* pnum_instances,int data_enum){ + + int num_instances; + fpos_t* file_positions=NULL; + + /*output: */ + int* vector=NULL; + + /*intermediary: */ + int integer; + int *codes = NULL; + int code; + + /*recover my_rank:*/ + int my_rank=IssmComm::GetRank(); + + /*Get file pointers to beginning of the data (multiple instances of it): */ + file_positions=this->SetFilePointersToData(&codes,NULL,&num_instances,data_enum); + + if(num_instances){ + + /*Allocate vector :*/ + vector=xNew(num_instances); + + for(int i=0;i(file_positions); + xDelete(codes); + + /*Assign output pointers: */ + *pvector=vector; + *pnum_instances=num_instances; +} +/*}}}*/ /*FUNCTION IoModel::FetchMultipleData(IssmDouble*** pmatrices,int** pmdims,int** pndims, int* pM,int data_enum){{{*/ void IoModel::FetchMultipleData(IssmDouble*** pmatrices,int** pmdims,int** pndims, int* pnumrecords,int data_enum){ @@ -1300,4 +1361,111 @@ } /*}}}*/ +/*FUNCTION IoModel::FetchMultipleData(int*** pmatrices,int** pmdims,int** pndims, int* pM,int data_enum){{{*/ +void IoModel::FetchMultipleData(int*** pmatrices,int** pmdims,int** pndims, int* pnumrecords,int data_enum){ + + int num_instances; + fpos_t* file_positions=NULL; + + /*output: */ + int **matrices = NULL; + int *mdims = NULL; + int *ndims = NULL; + + /*intermediary: */ + int M, N; + IssmPDouble *pmatrix = NULL; + IssmDouble *matrix = NULL; + int *integer_matrix=NULL; + int *codes = NULL; + int code; + + /*recover my_rank:*/ + int my_rank=IssmComm::GetRank(); + + /*Get file pointers to beginning of the data (multiple instances of it): */ + file_positions=this->SetFilePointersToData(&codes,NULL,&num_instances,data_enum); + + if(num_instances){ + + /*Allocate matrices :*/ + matrices=xNew(num_instances); + mdims=xNew(num_instances); + ndims=xNew(num_instances); + + for(int i=0;i(M*N); + integer_matrix=xNew(M*N); + + /*Read matrix on node 0, then broadcast: */ + if(my_rank==0){ + if(fread(pmatrix,M*N*sizeof(IssmPDouble),1,fid)!=1) _error_("could not read matrix "); + } + ISSM_MPI_Bcast(pmatrix,M*N,ISSM_MPI_PDOUBLE,0,IssmComm::GetComm()); + + _assert_(this->independents); + if(this->independents[data_enum]){ + /*this data has already been checked out! So cancel all that we've done here, and return + * the data[data_enum] directly: */ + matrix=this->data[data_enum]; + for (int i=0;i(matrix[i]); + } + else{ + for (int i=0;i(pmatrix); + } + else + integer_matrix=NULL; + + + /*Assign: */ + mdims[i]=M; + matrices[i]=integer_matrix; + ndims[i]=N; + } + } + + /*Free ressources:*/ + xDelete(file_positions); + xDelete(codes); + + /*Assign output pointers: */ + *pmatrices=matrices; + if(pmdims){ + *pmdims=mdims; + } + else{ + xDelete(mdims); + } + if(pndims){ + *pndims=ndims; + } + else{ + xDelete(ndims); + } + *pnumrecords=num_instances; +} +/*}}}*/ /*FUNCTION IoModel::FetchDataToInput(Elements* elements,int vector_enum,IssmDouble default_value){{{*/ void IoModel::FetchDataToInput(Elements* elements,int vector_enum,IssmDouble default_value){ @@ -1318,5 +1486,5 @@ for(int i=0;iSize();i++){ Element* element=dynamic_cast(elements->GetObjectByOffset(i)); - if(!doublearray) element->InputUpdateFromConstant(default_value,vector_enum); + if(!doublearray) element->AddInput(vector_enum,&default_value,P0Enum); else element->InputCreate(doublearray,this,M,N,vector_layout,vector_enum,code);//we need i to index into elements. } Index: /issm/trunk/src/c/classes/IoModel.h =================================================================== --- /issm/trunk/src/c/classes/IoModel.h (revision 17805) +++ /issm/trunk/src/c/classes/IoModel.h (revision 17806) @@ -31,5 +31,7 @@ /*Mesh properties and connectivity tables*/ - int meshtype; + int domaintype; + int domaindim; + int meshelementtype; int numberofvertices; int numberofelements; @@ -40,4 +42,5 @@ int *edges; int *elementtoedgeconnectivity; + int *elementtofaceconnectivity; int *singlenodetoelementconnectivity; int *numbernodetoelementconnectivity; @@ -79,4 +82,6 @@ void FetchMultipleData(char*** pstringarray,int* pnumstrings,int data_enum); void FetchMultipleData(IssmDouble*** pmatrixarray,int** pmdims,int** pndims, int* pnumrecords,int data_enum); + void FetchMultipleData(int*** pmatrices,int** pmdims,int** pndims, int* pnumrecords,int data_enum); + void FetchMultipleData(int** pvector, int* pnum_instances,int data_enum); void FetchData(Option **poption,int data_enum); void FetchData(int num,...); Index: /issm/trunk/src/c/classes/Loads/Friction.cpp =================================================================== --- /issm/trunk/src/c/classes/Loads/Friction.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Loads/Friction.cpp (revision 17806) @@ -18,23 +18,17 @@ /*FUNCTION Friction::Friction() {{{*/ Friction::Friction(){ - this->element_type=NULL; - this->inputs=NULL; - this->matpar=NULL; + this->element=NULL; + this->dim=0; } /*}}}*/ -/*FUNCTION Friction::Friction(const char* element_type, Inputs* inputs,Matpar* matpar,int analysis_type){{{*/ -Friction::Friction(const char* element_type_in,Inputs* inputs_in,Matpar* matpar_in, int in_analysis_type){ +/*FUNCTION Friction::Friction(Element* element,int dim){{{*/ +Friction::Friction(Element* element_in,int dim_in){ - this->analysis_type=in_analysis_type; - this->inputs=inputs_in; - this->element_type=xNew(strlen(element_type_in)+1); - xMemCpy(this->element_type,element_type_in,(strlen(element_type_in)+1)); - - this->matpar=matpar_in; + this->element=element_in; + this->dim=dim_in; } /*}}}*/ /*FUNCTION Friction::~Friction() {{{*/ Friction::~Friction(){ - xDelete(element_type); } /*}}}*/ @@ -44,12 +38,9 @@ void Friction::Echo(void){ _printf_("Friction:\n"); - _printf_(" analysis_type: " << EnumToStringx(analysis_type) << "\n"); - _printf_(" element_type: " << this->element_type << "\n"); - inputs->Echo(); - matpar->Echo(); + _printf_(" dim: " << this->dim<< "\n"); } /*}}}*/ -/*FUNCTION Friction::GetAlpha2(IssmDouble* palpha2, GaussTria* gauss,int vxenum,int vyenum,int vzenum){{{*/ -void Friction::GetAlpha2(IssmDouble* palpha2, GaussTria* gauss,int vxenum,int vyenum,int vzenum){ +/*FUNCTION Friction::GetAlpha2{{{*/ +void Friction::GetAlpha2(IssmDouble* palpha2, Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){ /*This routine calculates the basal friction coefficient @@ -59,5 +50,4 @@ IssmDouble r,s; IssmDouble drag_p, drag_q; - IssmDouble gravity,rho_ice,rho_water; IssmDouble Neff; IssmDouble thickness,bed; @@ -67,14 +57,12 @@ /*Recover parameters: */ - inputs->GetInputValue(&drag_p,FrictionPEnum); - inputs->GetInputValue(&drag_q,FrictionQEnum); - this->GetInputValue(&thickness, gauss,ThicknessEnum); - this->GetInputValue(&bed, gauss,BedEnum); - this->GetInputValue(&drag_coefficient, gauss,FrictionCoefficientEnum); - - /*Get material parameters: */ - gravity=matpar->GetG(); - rho_ice=matpar->GetRhoIce(); - rho_water=matpar->GetRhoWater(); + element->GetInputValue(&drag_p,FrictionPEnum); + element->GetInputValue(&drag_q,FrictionQEnum); + element->GetInputValue(&thickness, gauss,ThicknessEnum); + element->GetInputValue(&bed, gauss,BaseEnum); + element->GetInputValue(&drag_coefficient, gauss,FrictionCoefficientEnum); + IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoWaterEnum); + IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble gravity = element->GetMaterialParameter(ConstantsGEnum); //compute r and q coefficients: */ @@ -84,32 +72,30 @@ //From bed and thickness, compute effective pressure when drag is viscous: Neff=gravity*(rho_ice*thickness+rho_water*bed); + if(Neff<0)Neff=0; - /*If effective pressure becomes negative, sliding becomes unstable (Paterson 4th edition p 148). This is because - the water pressure is so high, the ice sheet elevates over its ice bumps and slides. But the limit behaviour - for friction should be an ice shelf sliding (no basal drag). Therefore, for any effective pressure Neff < 0, we should - replace it by Neff=0 (ie, equival it to an ice shelf)*/ - if (Neff<0)Neff=0; - - if(strcmp(element_type,"1d")==0){ - this->GetInputValue(&vx, gauss,vxenum); - vmag=sqrt(vx*vx); + switch(dim){ + case 1: + vx_input->GetInputValue(&vx,gauss); + vmag=sqrt(vx*vx); + break; + case 2: + vx_input->GetInputValue(&vx,gauss); + vy_input->GetInputValue(&vy,gauss); + vmag=sqrt(vx*vx+vy*vy); + break; + case 3: + vx_input->GetInputValue(&vx,gauss); + vy_input->GetInputValue(&vy,gauss); + vz_input->GetInputValue(&vz,gauss); + vmag=sqrt(vx*vx+vy*vy+vz*vz); + break; + default: + _error_("not supported"); } - else if(strcmp(element_type,"2d")==0){ - this->GetInputValue(&vx, gauss,vxenum); - this->GetInputValue(&vy, gauss,vyenum); - vmag=sqrt(pow(vx,2)+pow(vy,2)); - } - else if (strcmp(element_type,"3d")==0){ - this->GetInputValue(&vx, gauss,vxenum); - this->GetInputValue(&vy, gauss,vyenum); - this->GetInputValue(&vz, gauss,vzenum); - vmag=sqrt(pow(vx,2)+pow(vy,2)+pow(vz,2)); - } - else _error_("element_type "<< element_type << " not supported yet"); /*Checks that s-1>0 if v=0*/ - if(vmag==0 && (s-1)<0) _error_("velocity is 0 and (s-1)=" << (s-1) << "<0, alpha2 is Inf"); + if(vmag==0. && (s-1.)<0.) _error_("velocity is 0 and (s-1)=" << (s-1.) << "<0, alpha2 is Inf"); - alpha2=pow(drag_coefficient,2)*pow(Neff,r)*pow(vmag,(s-1)); + alpha2=drag_coefficient*drag_coefficient*pow(Neff,r)*pow(vmag,(s-1.)); _assert_(!xIsNan(alpha2)); @@ -118,70 +104,6 @@ } /*}}}*/ -/*FUNCTION Friction::GetAlpha2(IssmDouble* palpha2, GaussPenta* gauss,int vxenum,int vyenum,int vzenum){{{*/ -void Friction::GetAlpha2(IssmDouble* palpha2, GaussPenta* gauss,int vxenum,int vyenum,int vzenum){ - - /*This routine calculates the basal friction coefficient - alpha2= drag^2 * Neff ^r * vel ^s, with Neff=rho_ice*g*thickness+rho_ice*g*bed, r=q/p and s=1/p**/ - - /*diverse: */ - IssmDouble r,s; - IssmDouble drag_p, drag_q; - IssmDouble gravity,rho_ice,rho_water; - IssmDouble Neff; - IssmDouble thickness,bed; - IssmDouble vx,vy,vz,vmag; - IssmDouble drag_coefficient; - IssmDouble alpha2; - - /*Recover parameters: */ - inputs->GetInputValue(&drag_p,FrictionPEnum); - inputs->GetInputValue(&drag_q,FrictionQEnum); - this->GetInputValue(&thickness, gauss,ThicknessEnum); - this->GetInputValue(&bed, gauss,BedEnum); - this->GetInputValue(&drag_coefficient, gauss,FrictionCoefficientEnum); - - /*Get material parameters: */ - gravity=matpar->GetG(); - rho_ice=matpar->GetRhoIce(); - rho_water=matpar->GetRhoWater(); - - //compute r and q coefficients: */ - r=drag_q/drag_p; - s=1./drag_p; - - //From bed and thickness, compute effective pressure when drag is viscous: - Neff=gravity*(rho_ice*thickness+rho_water*bed); - - /*If effective pressure becomes negative, sliding becomes unstable (Paterson 4th edition p 148). This is because - the water pressure is so high, the ice sheet elevates over its ice bumps and slides. But the limit behaviour - for friction should be an ice shelf sliding (no basal drag). Therefore, for any effective pressure Neff < 0, we should - replace it by Neff=0 (ie, equival it to an ice shelf)*/ - if (Neff<0)Neff=0; - - if(strcmp(element_type,"2d")==0){ - this->GetInputValue(&vx, gauss,vxenum); - this->GetInputValue(&vy, gauss,vyenum); - vmag=sqrt(pow(vx,2)+pow(vy,2)); - } - else if (strcmp(element_type,"3d")==0){ - this->GetInputValue(&vx, gauss,vxenum); - this->GetInputValue(&vy, gauss,vyenum); - this->GetInputValue(&vz, gauss,vzenum); - vmag=sqrt(pow(vx,2)+pow(vy,2)+pow(vz,2)); - } - else _error_("element_type "<< element_type << " not supported yet"); - - /*Checks that s-1>0 if v=0*/ - if(vmag==0 && (s-1)<0) _error_("velocity is 0 and (s-1)=" << (s-1) << "<0, alpha_complement is Inf"); - - alpha2=pow(drag_coefficient,2)*pow(Neff,r)*pow(vmag,(s-1)); - _assert_(!xIsNan(alpha2)); - - /*Assign output pointers:*/ - *palpha2=alpha2; -} -/*}}}*/ -/*FUNCTION Friction::GetAlphaComplement(IssmDouble* palpha_complement, GaussTria* gauss,int vxenum,int vyenum,int vzenum) {{{*/ -void Friction::GetAlphaComplement(IssmDouble* palpha_complement, GaussTria* gauss,int vxenum,int vyenum,int vzenum){ +/*FUNCTION Friction::GetAlphaComplement(IssmDouble* palpha_complement, Gauss* gauss,int vxenum,int vyenum,int vzenum) {{{*/ +void Friction::GetAlphaComplement(IssmDouble* palpha_complement, Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){ /* FrictionGetAlpha2 computes alpha2= drag^2 * Neff ^r * vel ^s, with Neff=rho_ice*g*thickness+rho_ice*g*bed, r=q/p and s=1/p. @@ -196,18 +118,15 @@ IssmDouble drag_coefficient; IssmDouble bed,thickness; - IssmDouble gravity,rho_ice,rho_water; IssmDouble alpha_complement; /*Recover parameters: */ - inputs->GetInputValue(&drag_p,FrictionPEnum); - inputs->GetInputValue(&drag_q,FrictionQEnum); - this->GetInputValue(&thickness, gauss,ThicknessEnum); - this->GetInputValue(&bed, gauss,BedEnum); - this->GetInputValue(&drag_coefficient, gauss,FrictionCoefficientEnum); - - /*Get material parameters: */ - gravity=matpar->GetG(); - rho_ice=matpar->GetRhoIce(); - rho_water=matpar->GetRhoWater(); + element->GetInputValue(&drag_p,FrictionPEnum); + element->GetInputValue(&drag_q,FrictionQEnum); + element->GetInputValue(&thickness, gauss,ThicknessEnum); + element->GetInputValue(&bed, gauss,BaseEnum); + element->GetInputValue(&drag_coefficient, gauss,FrictionCoefficientEnum); + IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoWaterEnum); + IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); + IssmDouble gravity = element->GetMaterialParameter(ConstantsGEnum); //compute r and q coefficients: */ @@ -217,29 +136,31 @@ //From bed and thickness, compute effective pressure when drag is viscous: Neff=gravity*(rho_ice*thickness+rho_water*bed); - - /*If effective pressure becomes negative, sliding becomes unstable (Paterson 4th edition p 148). This is because - the water pressure is so high, the ice sheet elevates over its ice bumps and slides. But the limit behaviour - for friction should be an ice shelf sliding (no basal drag). Therefore, for any effective pressure Neff < 0, we should - replace it by Neff=0 (ie, equival it to an ice shelf)*/ - if (Neff<0)Neff=0; + if(Neff<0)Neff=0; //We need the velocity magnitude to evaluate the basal stress: - if(strcmp(element_type,"2d")==0){ - this->GetInputValue(&vx, gauss,vxenum); - this->GetInputValue(&vy, gauss,vyenum); - vmag=sqrt(pow(vx,2)+pow(vy,2)); + switch(dim){ + case 1: + vx_input->GetInputValue(&vx,gauss); + vmag=sqrt(vx*vx); + break; + case 2: + vx_input->GetInputValue(&vx,gauss); + vy_input->GetInputValue(&vy,gauss); + vmag=sqrt(vx*vx+vy*vy); + break; + case 3: + vx_input->GetInputValue(&vx,gauss); + vy_input->GetInputValue(&vy,gauss); + vz_input->GetInputValue(&vz,gauss); + vmag=sqrt(vx*vx+vy*vy+vz*vz); + break; + default: + _error_("not supported"); } - else if (strcmp(element_type,"3d")==0){ - this->GetInputValue(&vx, gauss,vxenum); - this->GetInputValue(&vy, gauss,vyenum); - this->GetInputValue(&vz, gauss,vzenum); - vmag=sqrt(pow(vx,2)+pow(vy,2)+pow(vz,2)); - } - else _error_("element_type "<< element_type << " not supported yet"); /*Checks that s-1>0 if v=0*/ - if(vmag==0 && (s-1)<0) _error_("velocity is 0 and (s-1)=" << (s-1) << "<0, alpha_complement is Inf"); + if(vmag==0. && (s-1.)<0.) _error_("velocity is 0 and (s-1)=" << (s-1.) << "<0, alpha2 is Inf"); - alpha_complement=pow(Neff,r)*pow(vmag,(s-1)); _assert_(!xIsNan(alpha_complement)); + alpha_complement=pow(Neff,r)*pow(vmag,(s-1));_assert_(!xIsNan(alpha_complement)); /*Assign output pointers:*/ @@ -247,85 +168,2 @@ } /*}}}*/ -/*FUNCTION Friction::GetAlphaComplement(IssmDouble* palpha_complement, GaussPenta* gauss,int vxenum,int vyenum,int vzenum) {{{*/ -void Friction::GetAlphaComplement(IssmDouble* palpha_complement, GaussPenta* gauss,int vxenum,int vyenum,int vzenum){ - - /* FrictionGetAlpha2 computes alpha2= drag^2 * Neff ^r * vel ^s, with Neff=rho_ice*g*thickness+rho_ice*g*bed, r=q/p and s=1/p. - * FrictionGetAlphaComplement is used in control methods on drag, and it computes: - * alpha_complement= Neff ^r * vel ^s*/ - - /*diverse: */ - IssmDouble r,s; - IssmDouble vx,vy,vz,vmag; - IssmDouble drag_p,drag_q; - IssmDouble Neff; - IssmDouble drag_coefficient; - IssmDouble bed,thickness; - IssmDouble gravity,rho_ice,rho_water; - IssmDouble alpha_complement; - - /*Recover parameters: */ - inputs->GetInputValue(&drag_p,FrictionPEnum); - inputs->GetInputValue(&drag_q,FrictionQEnum); - this->GetInputValue(&thickness, gauss,ThicknessEnum); - this->GetInputValue(&bed, gauss,BedEnum); - this->GetInputValue(&drag_coefficient, gauss,FrictionCoefficientEnum); - - /*Get material parameters: */ - gravity=matpar->GetG(); - rho_ice=matpar->GetRhoIce(); - rho_water=matpar->GetRhoWater(); - - //compute r and q coefficients: */ - r=drag_q/drag_p; - s=1./drag_p; - - //From bed and thickness, compute effective pressure when drag is viscous: - Neff=gravity*(rho_ice*thickness+rho_water*bed); - - /*If effective pressure becomes negative, sliding becomes unstable (Paterson 4th edition p 148). This is because - the water pressure is so high, the ice sheet elevates over its ice bumps and slides. But the limit behaviour - for friction should be an ice shelf sliding (no basal drag). Therefore, for any effective pressure Neff < 0, we should - replace it by Neff=0 (ie, equival it to an ice shelf)*/ - if (Neff<0)Neff=0; - - //We need the velocity magnitude to evaluate the basal stress: - if(strcmp(element_type,"2d")==0){ - this->GetInputValue(&vx, gauss,vxenum); - this->GetInputValue(&vy, gauss,vyenum); - vmag=sqrt(pow(vx,2)+pow(vy,2)); - } - else if (strcmp(element_type,"3d")==0){ - this->GetInputValue(&vx, gauss,vxenum); - this->GetInputValue(&vy, gauss,vyenum); - this->GetInputValue(&vz, gauss,vzenum); - vmag=sqrt(pow(vx,2)+pow(vy,2)+pow(vz,2)); - } - else _error_("element_type "<< element_type << " not supported yet"); - - /*Checks that s-1>0 if v=0*/ - if(vmag==0 && (s-1)<0) _error_("velocity is 0 and (s-1)=" << (s-1) << "<0, alpha_complement is Inf"); - - alpha_complement=pow(Neff,r)*pow(vmag,(s-1)); _assert_(!xIsNan(alpha_complement)); - - /*Assign output pointers:*/ - *palpha_complement=alpha_complement; -} -/*}}}*/ -/*FUNCTION Friction::GetInputValue{{{*/ -void Friction::GetInputValue(IssmDouble* pvalue,GaussTria* gauss,int enum_type){ - - Input* input=inputs->GetInput(enum_type); - if(!input) _error_("input " << EnumToStringx(enum_type) << " not found"); - input->GetInputValue(pvalue,gauss); - -} -/*}}}*/ -/*FUNCTION Friction::GetInputValue{{{*/ -void Friction::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,int enum_type){ - - Input* input=inputs->GetInput(enum_type); - if(!input) _error_("input " << EnumToStringx(enum_type) << " not found"); - input->GetInputValue(pvalue,gauss); - -} -/*}}}*/ Index: /issm/trunk/src/c/classes/Loads/Friction.h =================================================================== --- /issm/trunk/src/c/classes/Loads/Friction.h (revision 17805) +++ /issm/trunk/src/c/classes/Loads/Friction.h (revision 17806) @@ -19,21 +19,15 @@ int analysis_type; - char* element_type; - Inputs* inputs; - Matpar* matpar; + Element* element; + int dim; /*methods: */ Friction(); - Friction(const char* element_type, Inputs* inputs,Matpar* matpar, int analysis_type); + Friction(Element* element_in,int dim_in); ~Friction(); void Echo(void); - void GetAlpha2(IssmDouble* palpha2, GaussTria* gauss,int vxenum,int vyenum,int vzenum); - void GetAlpha2(IssmDouble* palpha2, GaussPenta* gauss,int vxenum,int vyenum,int vzenum); - void GetAlphaComplement(IssmDouble* alpha_complement, GaussTria* gauss,int vxenum,int vyenum,int vzenum); - void GetAlphaComplement(IssmDouble* alpha_complement, GaussPenta* gauss,int vxenum,int vyenum,int vzenum); - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,int enum_type); - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,int enum_type); - + void GetAlpha2(IssmDouble* palpha2, Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input); + void GetAlphaComplement(IssmDouble* alpha_complement,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input); }; Index: /issm/trunk/src/c/classes/Loads/Load.h =================================================================== --- /issm/trunk/src/c/classes/Loads/Load.h (revision 17805) +++ /issm/trunk/src/c/classes/Loads/Load.h (revision 17806) @@ -24,5 +24,4 @@ public: - virtual ~Load(){}; virtual void Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters)=0; Index: /issm/trunk/src/c/classes/Loads/Numericalflux.cpp =================================================================== --- /issm/trunk/src/c/classes/Loads/Numericalflux.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Loads/Numericalflux.cpp (revision 17806) @@ -23,5 +23,4 @@ /*FUNCTION Numericalflux::Numericalflux(){{{*/ Numericalflux::Numericalflux(){ - this->inputs = NULL; this->parameters = NULL; this->helement = NULL; @@ -112,4 +111,5 @@ this->id=numericalflux_id; this->analysis_type=in_analysis_type; + this->flux_type = numericalflux_type; /*Hooks: */ @@ -118,8 +118,4 @@ this->helement =new Hook(numericalflux_elem_ids,1); // take only the first element for now - //intialize and add as many inputs per element as requested: - this->inputs=new Inputs(); - this->inputs->AddInput(new IntInput(NumericalfluxTypeEnum,numericalflux_type)); - //this->parameters: we still can't point to it, it may not even exist. Configure will handle this. this->parameters=NULL; @@ -130,5 +126,4 @@ /*FUNCTION Numericalflux::~Numericalflux(){{{*/ Numericalflux::~Numericalflux(){ - delete inputs; this->parameters=NULL; delete helement; @@ -144,9 +139,9 @@ _printf_(" id: " << id << "\n"); _printf_(" analysis_type: " << EnumToStringx(analysis_type) << "\n"); + _printf_(" flux_type: " << this->flux_type<< "\n"); hnodes->Echo(); hvertices->Echo(); helement->Echo(); _printf_(" parameters: " << parameters << "\n"); - _printf_(" inputs: " << inputs << "\n"); } /*}}}*/ @@ -157,4 +152,5 @@ _printf_(" id: " << id << "\n"); _printf_(" analysis_type: " << EnumToStringx(analysis_type) << "\n"); + _printf_(" flux_type: " << this->flux_type<< "\n"); hnodes->DeepEcho(); hvertices->DeepEcho(); @@ -165,7 +161,4 @@ else _printf_(" NULL\n"); - _printf_(" inputs\n"); - inputs->DeepEcho(); - } /*}}}*/ @@ -192,10 +185,6 @@ numericalflux->id=this->id; numericalflux->analysis_type=this->analysis_type; - if(this->inputs){ - numericalflux->inputs=(Inputs*)this->inputs->Copy(); - } - else{ - numericalflux->inputs=new Inputs(); - } + numericalflux->flux_type=this->flux_type; + /*point parameters: */ numericalflux->parameters=this->parameters; @@ -303,10 +292,8 @@ void Numericalflux::GetNodesSidList(int* sidlist){ - int type; - inputs->GetInputValue(&type,NumericalfluxTypeEnum); _assert_(sidlist); _assert_(nodes); - switch(type){ + switch(this->flux_type){ case InternalEnum: for(int i=0;iSid(); @@ -316,5 +303,5 @@ return; default: - _error_("Numericalflux type " << EnumToStringx(type) << " not supported yet"); + _error_("Numericalflux type " << EnumToStringx(this->flux_type) << " not supported yet"); } } @@ -323,10 +310,8 @@ void Numericalflux::GetNodesLidList(int* lidlist){ - int type; - inputs->GetInputValue(&type,NumericalfluxTypeEnum); _assert_(lidlist); _assert_(nodes); - switch(type){ + switch(this->flux_type){ case InternalEnum: for(int i=0;iLid(); @@ -336,5 +321,5 @@ return; default: - _error_("Numericalflux type " << EnumToStringx(type) << " not supported yet"); + _error_("Numericalflux type " << EnumToStringx(this->flux_type) << " not supported yet"); } } @@ -343,8 +328,5 @@ int Numericalflux::GetNumberOfNodes(void){ - int type; - inputs->GetInputValue(&type,NumericalfluxTypeEnum); - - switch(type){ + switch(this->flux_type){ case InternalEnum: return NUMNODES_INTERNAL; @@ -352,5 +334,5 @@ return NUMNODES_BOUNDARY; default: - _error_("Numericalflux type " << EnumToStringx(type) << " not supported yet"); + _error_("Numericalflux type " << EnumToStringx(this->flux_type) << " not supported yet"); } @@ -444,8 +426,5 @@ ElementMatrix* Numericalflux::CreateKMatrixMasstransport(void){ - int type; - inputs->GetInputValue(&type,NumericalfluxTypeEnum); - - switch(type){ + switch(this->flux_type){ case InternalEnum: return CreateKMatrixMasstransportInternal(); @@ -476,5 +455,5 @@ /*Initialize Element matrix and return if necessary*/ Tria* tria=(Tria*)element; - if(tria->NoIceInElement()) return NULL; + if(!tria->IsIceInElement()) return NULL; ElementMatrix* Ke=new ElementMatrix(nodes,NUMNODES_INTERNAL,this->parameters); @@ -540,5 +519,5 @@ ElementMatrix* Ke = NULL; Tria* tria=(Tria*)element; - if(tria->NoIceInElement()) return NULL; + if(!tria->IsIceInElement()) return NULL; /*Retrieve all inputs and parameters*/ @@ -597,8 +576,5 @@ ElementMatrix* Numericalflux::CreateKMatrixBalancethickness(void){ - int type; - inputs->GetInputValue(&type,NumericalfluxTypeEnum); - - switch(type){ + switch(this->flux_type){ case InternalEnum: return CreateKMatrixBalancethicknessInternal(); @@ -629,5 +605,5 @@ /*Initialize Element matrix and return if necessary*/ Tria* tria=(Tria*)element; - if(tria->NoIceInElement()) return NULL; + if(!tria->IsIceInElement()) return NULL; ElementMatrix* Ke=new ElementMatrix(nodes,NUMNODES_INTERNAL,this->parameters); @@ -692,5 +668,5 @@ ElementMatrix* Ke = NULL; Tria* tria=(Tria*)element; - if(tria->NoIceInElement()) return NULL; + if(!tria->IsIceInElement()) return NULL; /*Retrieve all inputs and parameters*/ @@ -748,8 +724,5 @@ ElementMatrix* Numericalflux::CreateKMatrixAdjointBalancethickness(void){ - int type; - inputs->GetInputValue(&type,NumericalfluxTypeEnum); - - switch(type){ + switch(this->flux_type){ case InternalEnum: return CreateKMatrixAdjointBalancethicknessInternal(); @@ -780,8 +753,5 @@ ElementVector* Numericalflux::CreatePVectorMasstransport(void){ - int type; - inputs->GetInputValue(&type,NumericalfluxTypeEnum); - - switch(type){ + switch(this->flux_type){ case InternalEnum: return CreatePVectorMasstransportInternal(); @@ -818,5 +788,5 @@ ElementVector* pe = NULL; Tria* tria=(Tria*)element; - if(tria->NoIceInElement()) return NULL; + if(!tria->IsIceInElement()) return NULL; /*Retrieve all inputs and parameters*/ @@ -874,8 +844,5 @@ ElementVector* Numericalflux::CreatePVectorBalancethickness(void){ - int type; - inputs->GetInputValue(&type,NumericalfluxTypeEnum); - - switch(type){ + switch(this->flux_type){ case InternalEnum: return CreatePVectorBalancethicknessInternal(); @@ -912,5 +879,5 @@ ElementVector* pe = NULL; Tria* tria=(Tria*)element; - if(tria->NoIceInElement()) return NULL; + if(!tria->IsIceInElement()) return NULL; /*Retrieve all inputs and parameters*/ Index: /issm/trunk/src/c/classes/Loads/Numericalflux.h =================================================================== --- /issm/trunk/src/c/classes/Loads/Numericalflux.h (revision 17805) +++ /issm/trunk/src/c/classes/Loads/Numericalflux.h (revision 17806) @@ -10,5 +10,4 @@ class Hook; class Parameters; -class Inputs; class IoModel; class Element; @@ -22,4 +21,5 @@ int id; int analysis_type; + int flux_type; /*Hooks*/ @@ -33,5 +33,4 @@ Node **nodes; Parameters *parameters; - Inputs *inputs; /*Numericalflux constructors,destructors {{{*/ @@ -54,5 +53,4 @@ void InputUpdateFromConstant(int constant, int name){/*Do nothing*/}; void InputUpdateFromConstant(bool constant, int name){_error_("Not implemented yet!");} - void InputUpdateFromSolution(IssmDouble* solution){_error_("Not implemented yet!");} void InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");}; /*}}}*/ Index: /issm/trunk/src/c/classes/Loads/Pengrid.cpp =================================================================== --- /issm/trunk/src/c/classes/Loads/Pengrid.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Loads/Pengrid.cpp (revision 17806) @@ -13,4 +13,5 @@ #include "../classes.h" #include "shared/shared.h" +#include "../../analyses/analyses.h" /*}}}*/ @@ -21,5 +22,4 @@ /*FUNCTION Pengrid::Pengrid(){{{*/ Pengrid::Pengrid(){ - this->inputs=NULL; this->parameters=NULL; this->hnode=NULL; @@ -62,7 +62,4 @@ this->hmatpar=new Hook(&pengrid_matpar_id,1); - //initialize inputs: none needed - this->inputs=new Inputs(); - //this->parameters: we still can't point to it, it may not even exist. Configure will handle this. this->parameters=NULL; @@ -79,5 +76,4 @@ /*FUNCTION Pengrid::~Pengrid(){{{*/ Pengrid::~Pengrid(){ - delete inputs; delete hnode; delete helement; @@ -106,6 +102,4 @@ _printf_(" parameters\n"); parameters->DeepEcho(); - _printf_(" inputs\n"); - inputs->DeepEcho(); } /*}}}*/ @@ -129,10 +123,5 @@ pengrid->id=this->id; pengrid->analysis_type=this->analysis_type; - if(this->inputs){ - pengrid->inputs=(Inputs*)this->inputs->Copy(); - } - else{ - pengrid->inputs=new Inputs(); - } + /*point parameters: */ pengrid->parameters=this->parameters; @@ -192,6 +181,21 @@ void Pengrid::CreatePVector(Vector* pf){ - /*No loads applied, do nothing: */ - return; + ElementVector* pe=NULL; + int analysis_type; + this->parameters->FindParam(&analysis_type,AnalysisTypeEnum); + + switch(analysis_type){ + + case HydrologyDCInefficientAnalysisEnum: + pe = CreatePVectorHydrologyDCInefficient(); + break; + default: + /*No loads applied, do nothing: */ + return; + } + if(pe){ + pe->AddToGlobal(pf); + delete pe; + } } @@ -230,5 +234,4 @@ switch(analysis_type){ - #ifdef _HAVE_THERMAL_ case ThermalAnalysisEnum: Ke=PenaltyCreateKMatrixThermal(kmax); @@ -237,15 +240,7 @@ Ke=PenaltyCreateKMatrixMelting(kmax); break; - #endif - #ifdef _HAVE_HYDROLOGY_ case HydrologyDCInefficientAnalysisEnum: Ke=PenaltyCreateKMatrixHydrologyDCInefficient(kmax); break; - #endif - #ifdef _HAVE_DAMAGE_ - case DamageEvolutionAnalysisEnum: - Ke=PenaltyCreateKMatrixDamageEvolution(kmax); - break; - #endif default: _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet"); @@ -268,5 +263,4 @@ switch(analysis_type){ - #ifdef _HAVE_THERMAL_ case ThermalAnalysisEnum: pe=PenaltyCreatePVectorThermal(kmax); @@ -277,16 +271,7 @@ case StressbalanceAnalysisEnum: case AdjointHorizAnalysisEnum: break; - #endif - #ifdef _HAVE_HYDROLOGY_ case HydrologyDCInefficientAnalysisEnum: pe=PenaltyCreatePVectorHydrologyDCInefficient(kmax); break; - #endif - #ifdef _HAVE_DAMAGE_ - case DamageEvolutionAnalysisEnum: - pe=PenaltyCreatePVectorDamageEvolution(kmax); - break; - #endif - default: _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet"); @@ -381,11 +366,5 @@ /*FUNCTION Pengrid::InputUpdateFromConstant(IssmDouble constant, int name) {{{*/ void Pengrid::InputUpdateFromConstant(IssmDouble constant, int name){ - switch(name){ - - case MeltingOffsetEnum: - inputs->AddInput(new DoubleInput(name,constant)); - return; - - } + /*Nothing*/ } /*}}}*/ @@ -407,9 +386,4 @@ } /*}}}*/ -/*FUNCTION Pengrid::InputUpdateFromSolution{{{*/ -void Pengrid::InputUpdateFromSolution(IssmDouble* solution){ - /*Nothing updated yet*/ -} -/*}}}*/ /*Pengrid management:*/ @@ -426,5 +400,4 @@ return; } - #ifdef _HAVE_THERMAL_ else if (analysis_type==ThermalAnalysisEnum){ ConstraintActivateThermal(punstable); @@ -434,18 +407,8 @@ return; } - #endif - #ifdef _HAVE_HYDROLOGY_ else if (analysis_type==HydrologyDCInefficientAnalysisEnum){ ConstraintActivateHydrologyDCInefficient(punstable); return; } - #endif - #ifdef _HAVE_DAMAGE_ - else if (analysis_type==DamageEvolutionAnalysisEnum){ - ConstraintActivateDamageEvolution(punstable); - return; - } - #endif - else{ _error_("analysis: " << EnumToStringx(analysis_type) << " not supported yet"); @@ -454,5 +417,4 @@ } /*}}}*/ -#ifdef _HAVE_THERMAL_ /*FUNCTION Pengrid::ConstraintActivateThermal {{{*/ void Pengrid::ConstraintActivateThermal(int* punstable){ @@ -531,5 +493,5 @@ ElementMatrix* Ke=new ElementMatrix(&node,1,this->parameters); - /*Retrieve all inputs and parameters*/ + /*Retrieve all parameters*/ penta->GetInputValue(&pressure,node,PressureEnum); penta->GetInputValue(&temperature,node,TemperatureEnum); @@ -582,8 +544,8 @@ ElementVector* pe=new ElementVector(&node,NUMVERTICES,this->parameters); - /*Retrieve all inputs and parameters*/ + /*Retrieve all parameters*/ penta->GetInputValue(&pressure,node,PressureEnum); penta->GetInputValue(&temperature,node,TemperatureEnum); - inputs->GetInputValue(&melting_offset,MeltingOffsetEnum); + parameters->FindParam(&melting_offset,MeltingOffsetEnum); parameters->FindParam(&dt,TimesteppingTimeStepEnum); parameters->FindParam(&penalty_factor,ThermalPenaltyFactorEnum); @@ -621,5 +583,5 @@ ElementVector* pe=new ElementVector(&node,1,this->parameters); - /*Retrieve all inputs and parameters*/ + /*Retrieve all parameters*/ penta->GetInputValue(&pressure,node,PressureEnum); parameters->FindParam(&penalty_factor,ThermalPenaltyFactorEnum); @@ -634,15 +596,15 @@ } /*}}}*/ -#endif -#ifdef _HAVE_HYDROLOGY_ /*FUNCTION Pengrid::ConstraintActivateHydrologyDCInefficient{{{*/ void Pengrid::ConstraintActivateHydrologyDCInefficient(int* punstable){ // The penalty is stable if it doesn't change during two consecutive iterations. - int unstable = 0; + int unstable=0; int new_active; + int penalty_lock; IssmDouble pressure; IssmDouble h; IssmDouble h_max; + HydrologyDCInefficientAnalysis* inefanalysis = NULL; /*check that pengrid is not a clone (penalty to be added only once)*/ @@ -652,103 +614,25 @@ return; } - - /*Get sediment water head h*/ - element->GetInputValue(&h,node,SedimentHeadEnum); - element->GetHydrologyDCInefficientHmax(&h_max,node); - if (h>h_max) - new_active=1; - else - new_active=0; - - if(this->active==new_active) - unstable=0; - else - unstable=1; - - /*Set penalty flag*/ - this->active=new_active; - - /*Assign output pointers:*/ - *punstable=unstable; -} -/*}}}*/ -/*FUNCTION Pengrid::PenaltyCreateKMatrixHydrologyDCInefficient {{{*/ -ElementMatrix* Pengrid::PenaltyCreateKMatrixHydrologyDCInefficient(IssmDouble kmax){ - - IssmDouble penalty_factor; - - /*Retrieve parameters*/ - parameters->FindParam(&penalty_factor,HydrologydcPenaltyFactorEnum); - - /*Initialize Element matrix and return if necessary*/ - if(!this->active) return NULL; - ElementMatrix* Ke=new ElementMatrix(&node,NUMVERTICES,this->parameters); - - Ke->values[0]=kmax*pow(10.,penalty_factor); - - /*Clean up and return*/ - return Ke; -} -/*}}}*/ -/*FUNCTION Pengrid::PenaltyCreatePVectorHydrologyDCInefficient {{{*/ -ElementVector* Pengrid::PenaltyCreatePVectorHydrologyDCInefficient(IssmDouble kmax){ - - IssmDouble h_max; - IssmDouble penalty_factor; - - /*Initialize Element matrix and return if necessary*/ - if(!this->active) return NULL; - ElementVector* pe=new ElementVector(&node,1,this->parameters); - - /*Retrieve parameters*/ - parameters->FindParam(&penalty_factor,HydrologydcPenaltyFactorEnum); - - /*Get h_max and compute penalty*/ - element->GetHydrologyDCInefficientHmax(&h_max,node); - pe->values[0]=kmax*pow(10.,penalty_factor)*h_max; - - /*Clean up and return*/ - return pe; -} -/*}}}*/ -#endif -#ifdef _HAVE_DAMAGE_ -/*FUNCTION Pengrid::ConstraintActivateDamageEvolution {{{*/ -void Pengrid::ConstraintActivateDamageEvolution(int* punstable){ - - // The penalty is stable if it doesn't change during to successive iterations. - IssmDouble max_damage; - IssmDouble damage; - int new_active; - int unstable=0; - int penalty_lock; - - /*check that pengrid is not a clone (penalty to be added only once)*/ - if (node->IsClone()){ + if(!element->IsOnBase()){ unstable=0; + active=0; *punstable=unstable; return; } - //First recover damage using the element: */ - element->GetMaterialInputValue(&damage,node,DamageDbarEnum); - - //Recover our data: - parameters->FindParam(&penalty_lock,DamagePenaltyLockEnum); - parameters->FindParam(&max_damage,DamageMaxDamageEnum); - - //Figure out if damage>max_damage, in which case, this penalty needs to be activated. - //Would need to do the same for damage<0 if penalties are used. For now, ConstraintStatex - //is not called in solutionsequence_damage_nonlinear, so no penalties are applied. - - if (damage>max_damage){ - new_active=1; + /*Get sediment water head h*/ + inefanalysis = new HydrologyDCInefficientAnalysis(); + element->GetInputValue(&h,node,SedimentHeadEnum); + inefanalysis->GetHydrologyDCInefficientHmax(&h_max,element,node); + parameters->FindParam(&penalty_lock,HydrologydcPenaltyLockEnum); + + if (h>h_max){ + new_active=1; } else{ - new_active=0; - } - - //Figure out stability of this penalty - if (active==new_active){ + new_active=0; + } + + if(this->active==new_active){ unstable=0; } @@ -762,19 +646,21 @@ if(zigzag_counter>penalty_lock){ unstable=0; - active=1; + active=0; } } - - //Set penalty flag - active=new_active; - - //*Assign output pointers:*/ + /*Set penalty flag*/ + this->active=new_active; + + /*Assign output pointers:*/ + delete inefanalysis; *punstable=unstable; } /*}}}*/ -/*FUNCTION Pengrid::PenaltyCreateKMatrixDamageEvolution {{{*/ -ElementMatrix* Pengrid::PenaltyCreateKMatrixDamageEvolution(IssmDouble kmax){ - +/*FUNCTION Pengrid::PenaltyCreateKMatrixHydrologyDCInefficient {{{*/ +ElementMatrix* Pengrid::PenaltyCreateKMatrixHydrologyDCInefficient(IssmDouble kmax){ IssmDouble penalty_factor; + + /*Retrieve parameters*/ + parameters->FindParam(&penalty_factor,HydrologydcPenaltyFactorEnum); /*Initialize Element matrix and return if necessary*/ @@ -782,7 +668,4 @@ ElementMatrix* Ke=new ElementMatrix(&node,NUMVERTICES,this->parameters); - /*recover parameters: */ - parameters->FindParam(&penalty_factor,DamagePenaltyFactorEnum); - Ke->values[0]=kmax*pow(10.,penalty_factor); @@ -791,27 +674,46 @@ } /*}}}*/ -/*FUNCTION Pengrid::PenaltyCreatePVectorDamageEvolution {{{*/ -ElementVector* Pengrid::PenaltyCreatePVectorDamageEvolution(IssmDouble kmax){ - +/*FUNCTION Pengrid::PenaltyCreatePVectorHydrologyDCInefficient {{{*/ +ElementVector* Pengrid::PenaltyCreatePVectorHydrologyDCInefficient(IssmDouble kmax){ + + IssmDouble h_max; IssmDouble penalty_factor; - IssmDouble max_damage; + HydrologyDCInefficientAnalysis* inefanalysis = NULL; /*Initialize Element matrix and return if necessary*/ if(!this->active) return NULL; ElementVector* pe=new ElementVector(&node,1,this->parameters); - - //Recover our data: - parameters->FindParam(&penalty_factor,DamagePenaltyFactorEnum); - parameters->FindParam(&max_damage,DamageMaxDamageEnum); - - //right hand side penalizes to max_damage - pe->values[0]=kmax*pow(10.,penalty_factor)*max_damage; + inefanalysis = new HydrologyDCInefficientAnalysis(); + + /*Retrieve parameters*/ + parameters->FindParam(&penalty_factor,HydrologydcPenaltyFactorEnum); + + /*Get h_max and compute penalty*/ + inefanalysis->GetHydrologyDCInefficientHmax(&h_max,element,node); + + pe->values[0]=kmax*pow(10.,penalty_factor)*h_max; + + /*Clean up and return*/ + delete inefanalysis; + return pe; +} +/*}}}*/ +/*FUNCTION Pengrid::CreatePVectorHydrologyDCInefficient {{{*/ +ElementVector* Pengrid::CreatePVectorHydrologyDCInefficient(void){ + + IssmDouble moulin_load,dt; + + /*Initialize Element matrix*/ + ElementVector* pe=new ElementVector(&node,1,this->parameters); + + this->element->GetInputValue(&moulin_load,node,HydrologydcBasalMoulinInputEnum); + parameters->FindParam(&dt,TimesteppingTimeStepEnum); + + if(dt!=0.0) pe->values[0]=moulin_load*dt; /*Clean up and return*/ return pe; -} -/*}}}*/ -#endif - + } +/*}}}*/ /*FUNCTION Pengrid::ResetConstraint {{{*/ void Pengrid::ResetConstraint(void){ Index: /issm/trunk/src/c/classes/Loads/Pengrid.h =================================================================== --- /issm/trunk/src/c/classes/Loads/Pengrid.h (revision 17805) +++ /issm/trunk/src/c/classes/Loads/Pengrid.h (revision 17806) @@ -23,6 +23,6 @@ private: - int id; - int analysis_type; + int id; + int analysis_type; /*Hooks*/ @@ -37,5 +37,4 @@ Parameters* parameters; //pointer to solution parameters - Inputs* inputs; /*internals: */ @@ -64,5 +63,4 @@ void InputUpdateFromConstant(int constant, int name); void InputUpdateFromConstant(bool constant, int name); - void InputUpdateFromSolution(IssmDouble* solution); void InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");}; /*}}}*/ @@ -84,5 +82,4 @@ /*}}}*/ /*Pengrid management {{{*/ - #ifdef _HAVE_THERMAL_ ElementMatrix* PenaltyCreateKMatrixThermal(IssmDouble kmax); ElementMatrix* PenaltyCreateKMatrixMelting(IssmDouble kmax); @@ -90,17 +87,9 @@ ElementVector* PenaltyCreatePVectorMelting(IssmDouble kmax); void ConstraintActivateThermal(int* punstable); - #endif - #ifdef _HAVE_DAMAGE_ - ElementMatrix* PenaltyCreateKMatrixDamageEvolution(IssmDouble kmax); - ElementVector* PenaltyCreatePVectorDamageEvolution(IssmDouble kmax); - void ConstraintActivateDamageEvolution(int* punstable); - #endif - - #ifdef _HAVE_HYDROLOGY_ ElementMatrix* PenaltyCreateKMatrixHydrologyDCInefficient(IssmDouble kmax); ElementVector* PenaltyCreatePVectorHydrologyDCInefficient(IssmDouble kmax); void ConstraintActivateHydrologyDCInefficient(int* punstable); - #endif void ConstraintActivate(int* punstable); + ElementVector* CreatePVectorHydrologyDCInefficient(void); void ResetConstraint(void); /*}}}*/ Index: /issm/trunk/src/c/classes/Loads/Penpair.h =================================================================== --- /issm/trunk/src/c/classes/Loads/Penpair.h (revision 17805) +++ /issm/trunk/src/c/classes/Loads/Penpair.h (revision 17806) @@ -44,5 +44,4 @@ void InputUpdateFromConstant(int constant, int name); void InputUpdateFromConstant(bool constant, int name); - void InputUpdateFromSolution(IssmDouble* solution){_error_("Not implemented yet!");} void InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");}; /*}}}*/ Index: /issm/trunk/src/c/classes/Loads/Riftfront.cpp =================================================================== --- /issm/trunk/src/c/classes/Loads/Riftfront.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Loads/Riftfront.cpp (revision 17806) @@ -22,5 +22,4 @@ /*FUNCTION Riftfront::Riftfront(){{{*/ Riftfront::Riftfront(){ - this->inputs=NULL; this->parameters=NULL; this->hnodes=NULL; @@ -90,18 +89,10 @@ this->state=reCast(*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+11)); - //intialize inputs, and add as many inputs per element as requested: - this->inputs=new Inputs(); - - riftfront_type=SegmentRiftfrontEnum; - riftfront_fill = reCast(*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+7)); - riftfront_friction=*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+8); - riftfront_fractionincrement=*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+10); - riftfront_shelf=reCast(iomodel->Data(MaskGroundediceLevelsetEnum)[node1-1]<0.); - - this->inputs->AddInput(new IntInput(RiftfrontTypeEnum,riftfront_type)); - this->inputs->AddInput(new IntInput(FillEnum,riftfront_fill)); - this->inputs->AddInput(new DoubleInput(FrictionEnum,riftfront_friction)); - this->inputs->AddInput(new DoubleInput(FractionIncrementEnum,riftfront_fractionincrement)); - this->inputs->AddInput(new BoolInput(SegmentOnIceShelfEnum,riftfront_shelf)); + //intialize properties + this->type=SegmentRiftfrontEnum; + this->fill = reCast(*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+7)); + this->friction=*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+8); + this->fractionincrement=*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+10); + this->shelf=reCast(iomodel->Data(MaskGroundediceLevelsetEnum)[node1-1]<0.); //parameters and hooked fields: we still can't point to them, they may not even exist. Configure will handle this. @@ -115,7 +106,5 @@ /*FUNCTION Riftfront::~Riftfront(){{{*/ Riftfront::~Riftfront(){ - delete inputs; this->parameters=NULL; - delete hnodes; delete helements; @@ -127,13 +116,4 @@ /*FUNCTION Riftfront::Echo {{{*/ void Riftfront::Echo(void){ - - Input* input=NULL; - int fill; - IssmDouble friction,fractionincrement; - - /*recover some inputs first: */ - input=(Input*)this->inputs->GetInput(FillEnum); input->GetInputValue(&fill); - input=(Input*)this->inputs->GetInput(FrictionEnum); input->GetInputValue(&friction); - input=(Input*)this->inputs->GetInput(FractionIncrementEnum); input->GetInputValue(&fractionincrement); _printf_("Riftfront:\n"); @@ -144,5 +124,4 @@ _printf_(" hmatpar: " << hmatpar << "\n"); _printf_(" parameters: " << parameters << "\n"); - _printf_(" inputs: " << inputs << "\n"); _printf_(" internal parameters: \n"); _printf_(" normal: " << normal[0] << "|" << normal[1] << "\n"); @@ -173,6 +152,4 @@ _printf_(" parameters\n"); if(parameters)parameters->DeepEcho(); - _printf_(" inputs\n"); - if(inputs)inputs->DeepEcho(); } /*}}}*/ @@ -197,10 +174,10 @@ riftfront->id=this->id; riftfront->analysis_type=this->analysis_type; - if(this->inputs){ - riftfront->inputs=(Inputs*)this->inputs->Copy(); - } - else{ - riftfront->inputs=new Inputs(); - } + riftfront->type=this->type; + riftfront->fill=this->fill; + riftfront->friction=this->friction; + riftfront->fractionincrement=this->fractionincrement; + riftfront->shelf=this->shelf; + /*point parameters: */ riftfront->parameters=this->parameters; @@ -237,11 +214,4 @@ /*FUNCTION Riftfront::InputUpdateFromConstant(bool constant,int name) {{{*/ void Riftfront::InputUpdateFromConstant(bool constant,int name){ - - /*Check that name is a Riftfront input*/ - if (!IsInput(name)) return; - - /*update input*/ - this->inputs->AddInput(new BoolInput(name,constant)); - } /*}}}*/ @@ -249,10 +219,4 @@ void Riftfront::InputUpdateFromConstant(IssmDouble constant,int name){ - /*Check that name is a Riftfront input*/ - if (!IsInput(name)) return; - - /*update input*/ - this->inputs->AddInput(new DoubleInput(name,constant)); - } /*}}}*/ @@ -260,10 +224,5 @@ void Riftfront::InputUpdateFromVector(IssmDouble* vector, int name, int type){ - /*Check that name is a Riftfront input*/ - if (!IsInput(name)) return; - - /*update input*/ _error_("not implemented yet"); - //this->inputs->AddInput(new DoubleInput(name,constant)); } @@ -458,5 +417,4 @@ IssmDouble h[2]; IssmDouble penalty_offset; - IssmDouble friction; /*Objects: */ @@ -475,5 +433,4 @@ /*Get some parameters: */ this->parameters->FindParam(&penalty_offset,StressbalancePenaltyFactorEnum); - this->inputs->GetInputValue(&friction,FrictionEnum); tria1->GetInputValue(&h[0],nodes[0],ThicknessEnum); tria2->GetInputValue(&h[1],nodes[1],ThicknessEnum); @@ -547,6 +504,4 @@ IssmDouble pressure_melange; IssmDouble pressure_water; - int fill; - bool shelf; /*Objects: */ @@ -564,6 +519,4 @@ /*Get some inputs: */ - this->inputs->GetInputValue(&fill,FillEnum); - this->inputs->GetInputValue(&shelf,SegmentOnIceShelfEnum); rho_ice=matpar->GetRhoIce(); rho_water=matpar->GetRhoWater(); @@ -573,6 +526,6 @@ if (h[0]!=h[1])_error_("different thicknesses not supported for rift fronts"); thickness=h[0]; - tria1->GetInputValue(&b[0],nodes[0],BedEnum); - tria2->GetInputValue(&b[1],nodes[1],BedEnum); + tria1->GetInputValue(&b[0],nodes[0],BaseEnum); + tria2->GetInputValue(&b[1],nodes[1],BaseEnum); if (b[0]!=b[1])_error_("different beds not supported for rift fronts"); bed=b[0]; @@ -636,5 +589,5 @@ IssmDouble penetration; - int activate; + bool activate; int unstable; IssmDouble vx1; @@ -642,5 +595,4 @@ IssmDouble vx2; IssmDouble vy2; - IssmDouble fractionincrement; /*Objects: */ @@ -671,7 +623,4 @@ return 1; } - - /*recover parameters: */ - this->inputs->GetInputValue(&fractionincrement,FractionIncrementEnum); /*First recover velocity: */ @@ -685,6 +634,6 @@ /*activation: */ - if(penetration<0)activate=1; - else activate=0; + if(penetration<0)activate=true; + else activate=false; /*Here, we try to avoid zigzaging. When a penalty activates and deactivates for more than penalty_lock times, @@ -734,15 +683,2 @@ } /*}}}*/ -/*FUNCTION Riftfront::IsInput{{{*/ -bool Riftfront::IsInput(int name){ - if ( - name==ConvergedEnum || - name==ThicknessEnum || - name==SurfaceEnum || - name==BedEnum - ){ - return true; - } - else return false; -} -/*}}}*/ Index: /issm/trunk/src/c/classes/Loads/Riftfront.h =================================================================== --- /issm/trunk/src/c/classes/Loads/Riftfront.h (revision 17805) +++ /issm/trunk/src/c/classes/Loads/Riftfront.h (revision 17806) @@ -11,5 +11,4 @@ class Hook; class Parameters; -class Inputs; class IoModel; /*}}}*/ @@ -20,4 +19,11 @@ int id; int analysis_type; + + /*properties*/ + int type; + int fill; + IssmDouble friction; + IssmDouble fractionincrement; + bool shelf; /*hooks: */ @@ -44,5 +50,4 @@ Parameters *parameters; //pointer to solution parameters - Inputs *inputs; /*Riftfrontconstructors,destructors: {{{*/ @@ -65,6 +70,5 @@ void InputUpdateFromConstant(int constant, int name){_error_("Not implemented yet!");} void InputUpdateFromConstant(bool constant, int name); - void InputUpdateFromSolution(IssmDouble* solution){_error_("Not implemented yet!");} - void InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");}; + void InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");}; /*}}}*/ /*Load virtual functions definitions: {{{*/ @@ -90,5 +94,4 @@ void FreezeConstraints(void); bool IsFrozen(void); - bool IsInput(int name); /*}}}*/ }; Index: /issm/trunk/src/c/classes/Materials/Material.h =================================================================== --- /issm/trunk/src/c/classes/Materials/Material.h (revision 17805) +++ /issm/trunk/src/c/classes/Materials/Material.h (revision 17806) @@ -12,4 +12,5 @@ #include "../../datastructures/datastructures.h" #include "../Update.h" +class Element; class Elements; /*}}}*/ @@ -18,16 +19,12 @@ public: - Inputs* inputs; - virtual ~Material(){}; + virtual ~Material(){}; /*WARNING: input should not be public but it is an easy way to update B from T (using UpdateFromSolution) from Pentas*/ /*Numerics*/ - virtual void InputDuplicate(int original_enum,int new_enum)=0; + virtual Material* copy2(Element* element)=0; virtual void Configure(Elements* elements)=0; - virtual void GetVectorFromInputs(Vector* vector,int input_enum)=0; - virtual void GetViscosity2d(IssmDouble* pviscosity, IssmDouble* pepsilon)=0; - virtual void GetViscosity2dvertical(IssmDouble* pviscosity, IssmDouble* pepsilon)=0; - virtual void GetViscosity3d(IssmDouble* pviscosity3d, IssmDouble* pepsilon)=0; - virtual void GetViscosity3dFS(IssmDouble* pviscosity3d, IssmDouble* epsilon)=0; + virtual void GetViscosity(IssmDouble* pviscosity,IssmDouble epseff)=0; + virtual void GetViscosityBar(IssmDouble* pviscosity,IssmDouble epseff)=0; virtual void GetViscosityComplement(IssmDouble* pviscosity_complement, IssmDouble* pepsilon)=0; virtual void GetViscosityDComplement(IssmDouble* pviscosity_complement, IssmDouble* pepsilon)=0; @@ -36,4 +33,5 @@ virtual void GetViscosity2dDerivativeEpsSquare(IssmDouble* pmu_prime, IssmDouble* pepsilon)=0; virtual IssmDouble GetA()=0; + virtual IssmDouble GetAbar()=0; virtual IssmDouble GetB()=0; virtual IssmDouble GetBbar()=0; @@ -41,4 +39,5 @@ virtual IssmDouble GetD()=0; virtual IssmDouble GetDbar()=0; + virtual bool IsDamage()=0; }; Index: /issm/trunk/src/c/classes/Materials/Materials.cpp =================================================================== --- /issm/trunk/src/c/classes/Materials/Materials.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Materials/Materials.cpp (revision 17806) @@ -47,10 +47,2 @@ } /*}}}*/ -/*FUNCTION Materials::InputDuplicate{{{*/ -void Materials::InputDuplicate(int input_enum,int output_enum){ - - for(int i=0;iSize();i++){ - Material* material=(Material*)this->GetObjectByOffset(i); - material->InputDuplicate(input_enum,output_enum); - } -} Index: /issm/trunk/src/c/classes/Materials/Materials.h =================================================================== --- /issm/trunk/src/c/classes/Materials/Materials.h (revision 17805) +++ /issm/trunk/src/c/classes/Materials/Materials.h (revision 17806) @@ -24,5 +24,4 @@ /*numerics*/ void Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters); - void InputDuplicate(int input_enum,int output_enum); }; Index: /issm/trunk/src/c/classes/Materials/Matice.cpp =================================================================== --- /issm/trunk/src/c/classes/Materials/Matice.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Materials/Matice.cpp (revision 17806) @@ -29,6 +29,7 @@ /*FUNCTION Matice::Matice(){{{*/ Matice::Matice(){ - this->inputs=NULL; this->helement=NULL; + this->element=NULL; + this->isdamaged=NULL; return; } @@ -42,14 +43,16 @@ /*Initialize id*/ this->mid=matice_mid; - - /*Initialize inputs*/ - this->inputs=new Inputs(); - - /*Initialize inputs from IoModel*/ - this->InputUpdateFromIoModel(index,iomodel); /*Hooks: */ matice_eid=index+1; this->helement=new Hook(&matice_eid,1); + this->element=NULL; + + /*Other perporties*/ + int materialtype; + iomodel->Constant(&materialtype,MaterialsEnum); + if(materialtype==MatdamageiceEnum) this->isdamaged = true; + else if(materialtype==MaticeEnum) this->isdamaged = false; + else _error_("Material type not recognized"); return; @@ -60,5 +63,4 @@ Matice::~Matice(){ delete helement; - delete inputs; return; } @@ -71,6 +73,4 @@ _printf_("Matice:\n"); _printf_(" mid: " << mid << "\n"); - _printf_(" inputs:\n"); - inputs->Echo(); _printf_(" element:\n"); helement->Echo(); @@ -82,6 +82,4 @@ _printf_("Matice:\n"); _printf_(" mid: " << mid << "\n"); - _printf_(" inputs:\n"); - inputs->DeepEcho(); _printf_(" element:\n"); helement->Echo(); @@ -98,5 +96,5 @@ } /*}}}*/ -/*FUNCTION Matice::copy {{{*/ +/*FUNCTION Matice::copy() {{{*/ Object* Matice::copy() { @@ -110,6 +108,22 @@ matice->mid=this->mid; matice->helement=(Hook*)this->helement->copy(); - if(this->inputs) matice->inputs=(Inputs*)this->inputs->Copy(); - else matice->inputs=new Inputs(); + matice->element =(Element*)this->helement->delivers(); + + return matice; +} +/*}}}*/ +/*FUNCTION Matice::copy2(Element* element) {{{*/ +Material* Matice::copy2(Element* element_in) { + + /*Output*/ + Matice* matice=NULL; + + /*Initialize output*/ + matice=new Matice(); + + /*copy fields: */ + matice->mid=this->mid; + matice->helement=(Hook*)this->helement->copy(); + matice->element =element_in; return matice; @@ -124,4 +138,5 @@ * datasets, using internal ids and offsets hidden in hooks: */ helement->configure((DataSet*)elementsin); + this->element = (Element*)helement->delivers(); } /*}}}*/ @@ -139,5 +154,19 @@ IssmDouble B,n; - inputs->GetInputAverage(&B,MaterialsRheologyBEnum); + element->inputs->GetInputAverage(&B,MaterialsRheologyBEnum); + n=this->GetN(); + + return pow(B,-n); +} +/*}}}*/ +/*FUNCTION Matice::GetAbar {{{*/ +IssmDouble Matice::GetAbar(){ + /* + * A = 1/B^n + */ + + IssmDouble B,n; + + element->inputs->GetInputAverage(&B,MaterialsRheologyBbarEnum); n=this->GetN(); @@ -151,5 +180,5 @@ IssmDouble B; - inputs->GetInputAverage(&B,MaterialsRheologyBEnum); + element->inputs->GetInputAverage(&B,MaterialsRheologyBEnum); return B; } @@ -161,5 +190,5 @@ IssmDouble Bbar; - inputs->GetInputAverage(&Bbar,MaterialsRheologyBbarEnum); + element->inputs->GetInputAverage(&Bbar,MaterialsRheologyBbarEnum); return Bbar; } @@ -171,5 +200,5 @@ IssmDouble n; - inputs->GetInputAverage(&n,MaterialsRheologyNEnum); + element->inputs->GetInputAverage(&n,MaterialsRheologyNEnum); return n; } @@ -178,8 +207,8 @@ IssmDouble Matice::GetD(){ + _assert_(this->isdamaged); /*Output*/ IssmDouble D; - - inputs->GetInputAverage(&D,DamageDEnum); + if(this->isdamaged)element->inputs->GetInputAverage(&D,DamageDEnum); return D; } @@ -188,53 +217,28 @@ IssmDouble Matice::GetDbar(){ + _assert_(this->isdamaged); /*Output*/ IssmDouble Dbar; - inputs->GetInputAverage(&Dbar,DamageDbarEnum); + if(this->isdamaged)element->inputs->GetInputAverage(&Dbar,DamageDbarEnum); return Dbar; } /*}}}*/ -/*FUNCTION Matice::GetVectorFromInputs{{{*/ -void Matice::GetVectorFromInputs(Vector* vector,int input_enum){ - - /*Intermediaries*/ - Element *element= NULL; - - /*Recover element*/ - element=(Element*)helement->delivers(); - - /*Check that input_enum is a material input*/ - if (!IsInput(input_enum)) return; - - switch(element->ObjectEnum()){ - - case TriaEnum:{ - - /*Prepare index list*/ - int vertexpidlist[3]; - ((Tria*)element)->GetVertexPidList(&vertexpidlist[0]); - - /*Get input (either in element or material)*/ - Input* input=inputs->GetInput(input_enum); - if(!input) _error_("Input " << EnumToStringx(input_enum) << " not found in material"); - - /*We found the enum. Use its values to fill into the vector, using the vertices ids: */ - input->GetVectorFromInputs(vector,&vertexpidlist[0]);} - break; - - default: _error_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet"); - } -} -/*}}}*/ -/*FUNCTION Matice::GetViscosity2d {{{*/ -void Matice::GetViscosity2d(IssmDouble* pviscosity, IssmDouble* epsilon){ +/*FUNCTION Matice::IsDamage() {{{*/ +bool Matice::IsDamage(){ + + return this->isdamaged; +} +/*}}}*/ +/*FUNCTION Matice::GetViscosity {{{*/ +void Matice::GetViscosity(IssmDouble* pviscosity,IssmDouble eps_eff){ /*From a string tensor and a material object, return viscosity, using Glen's flow law. - (1-D) B - viscosity= ------------------------------------------------------------------- - 2[ exx^2+eyy^2+exx*eyy+exy^2+exz^2+eyz^2 ]^[(n-1)/2n] - - where viscosity is the viscotiy, B the flow law parameter , (u,v) the velocity - vector, and n the flow law exponent. - - If epsilon is NULL, it means this is the first time SystemMatrices is being run, and we + (1-D) B + viscosity= ------------------------- + 2 eps_eff ^[(n-1)/n] + + where viscosity is the viscotiy, B the flow law parameter , eps_eff is the effective strain rate + and n the flow law exponent. + + If eps_eff = 0 , it means this is the first time SystemMatrices is being run, and we return 10^14, initial viscosity. */ @@ -243,40 +247,30 @@ IssmDouble viscosity; - /*input strain rate: */ - IssmDouble exx,eyy,exy; - /*Intermediary: */ - IssmDouble A,e; - IssmDouble B,D,n; + IssmDouble B,D=0.,n; /*Get B and n*/ - B=GetBbar(); - n=GetN(); - D=GetDbar(); - - if (n==1){ - /*Viscous behaviour! viscosity=B: */ - viscosity=(1-D)*B/2; - } - else{ - if((epsilon[0]==0) && (epsilon[1]==0) && (epsilon[2]==0)){ - viscosity=0.5*pow(10.,14); - } + B=GetB(); _assert_(B>0.); + n=GetN(); _assert_(n>0.); + if(this->isdamaged){ + D=GetD(); + _assert_(D>=0. && D<1.); + } + + if (n==1.){ + /*Linear Viscous behavior (Newtonian fluid) viscosity=B/2: */ + viscosity=(1.-D)*B/2.; + } + else{ + + /*if no strain rate, return maximum viscosity*/ + if(eps_eff==0.){ + viscosity = 1.e+14/2.; + //viscosity = B; + //viscosity=2.5*pow(10.,17); + } + else{ - /*Retrive strain rate components: */ - exx=*(epsilon+0); - eyy=*(epsilon+1); - exy=*(epsilon+2); - - /*Build viscosity: viscosity=B/(2*A^e) */ - A=pow(exx,2)+pow(eyy,2)+pow(exy,2)+exx*eyy; - if(A==0){ - /*Maxiviscositym viscosity for 0 shear areas: */ - viscosity=2.5*pow(10.,17); - } - else{ - e=(n-1)/(2*n); - viscosity=(1-D)*B/(2*pow(A,e)); - } + viscosity=(1.-D)*B/(2.*pow(eps_eff,(n-1.)/n)); } } @@ -284,7 +278,4 @@ /*Checks in debugging mode*/ if(viscosity<=0) _error_("Negative viscosity"); - _assert_(B>0); - _assert_(n>0); - _assert_(D>=0 && D<1); /*Return: */ @@ -292,15 +283,15 @@ } /*}}}*/ -/*FUNCTION Matice::GetViscosity2dvertical {{{*/ -void Matice::GetViscosity2dvertical(IssmDouble* pviscosity, IssmDouble* epsilon){ +/*FUNCTION Matice::GetViscosityBar {{{*/ +void Matice::GetViscosityBar(IssmDouble* pviscosity,IssmDouble eps_eff){ /*From a string tensor and a material object, return viscosity, using Glen's flow law. - (1-D) B - viscosity= -------------------------------------- - 2[ exx^2+eyy^2+ 2exy^2]^[(n-1)/2n] - - where viscosity is the viscotiy, B the flow law parameter , (u,v) the velocity - vector, and n the flow law exponent. - - If epsilon is NULL, it means this is the first time SystemMatrices is being run, and we + (1-D) B + viscosity= ------------------------- + 2 eps_eff ^[(n-1)/n] + + where viscosity is the viscotiy, B the flow law parameter , eps_eff is the effective strain rate + and n the flow law exponent. + + If eps_eff = 0 , it means this is the first time SystemMatrices is being run, and we return 10^14, initial viscosity. */ @@ -309,40 +300,29 @@ IssmDouble viscosity; - /*input strain rate: */ - IssmDouble exx,eyy,exy; - /*Intermediary: */ - IssmDouble A,e; - IssmDouble B,D,n; + IssmDouble B,D=0.,n; /*Get B and n*/ - B=GetB(); - n=GetN(); - D=GetD(); - - if (n==1){ - /*Viscous behaviour! viscosity=B: */ - viscosity=(1-D)*B/2; - } - else{ - if((epsilon[0]==0) && (epsilon[1]==0) && (epsilon[2]==0)){ - viscosity=0.5*pow(10.,14); - } + B=GetBbar(); _assert_(B>0.); + n=GetN(); _assert_(n>0.); + if(this->isdamaged){ + D=GetDbar(); + _assert_(D>=0. && D<1.); + } + + if (n==1.){ + /*Linear Viscous behavior (Newtonian fluid) viscosity=B/2: */ + viscosity=(1.-D)*B/2.; + } + else{ + + /*if no strain rate, return maximum viscosity*/ + if(eps_eff==0.){ + viscosity = 1.e+14/2.; + //viscosity=2.5*pow(10.,17); + } + else{ - /*Retrive strain rate components: */ - exx=epsilon[0]; - eyy=epsilon[1]; - exy=epsilon[2]; - - /*Build viscosity: viscosity=B/(2*A^e) */ - A=exx*exx+eyy*eyy+2.*exy*exy; - if(A==0.){ - /*Maxiviscositym viscosity for 0 shear areas: */ - viscosity=2.5*2.e+17; - } - else{ - e=(n-1.)/(2.*n); - viscosity=(1.-D)*B/(2.*pow(A,e)); - } + viscosity=(1.-D)*B/(2.*pow(eps_eff,(n-1.)/n)); } } @@ -350,157 +330,7 @@ /*Checks in debugging mode*/ if(viscosity<=0) _error_("Negative viscosity"); - _assert_(B>0); - _assert_(n>0); - _assert_(D>=0 && D<1); /*Return: */ *pviscosity=viscosity; -} -/*}}}*/ -/*FUNCTION Matice::GetViscosity3d {{{*/ -void Matice::GetViscosity3d(IssmDouble* pviscosity3d, IssmDouble* epsilon){ - - /*Return viscosity accounting for steady state power law creep [Thomas and SSA, 1982]: - * - * (1-D)*B - * viscosity3d= ------------------------------------------------------------------- - * 2[ exx^2+eyy^2+exx*eyy+exy^2+exz^2+eyz^2 ]^[(n-1)/2n] - * - * where mu is the viscotiy, B the flow law parameter , (u,v) the velocity - * vector, and n the flow law exponent. - * - * If epsilon is NULL, it means this is the first time Emg is being run, and we - * return g, initial viscosity. - */ - - /*output: */ - IssmDouble viscosity3d; - - /*input strain rate: */ - IssmDouble exx,eyy,exy,exz,eyz; - - /*Intermediaries: */ - IssmDouble A,e; - IssmDouble B,D,n; - - /*Get B and n*/ - B=GetB(); - D=GetD(); - n=GetN(); - - if (n==1){ - /*Viscous behaviour! viscosity3d=B: */ - viscosity3d=(1-D)*B/2; - } - else{ - if((epsilon[0]==0) && (epsilon[1]==0) && (epsilon[2]==0) && - (epsilon[3]==0) && (epsilon[4]==0)){ - viscosity3d=0.5*pow(10.,14); - } - else{ - - /*Retrive strain rate components: */ - exx=*(epsilon+0); - eyy=*(epsilon+1); - exy=*(epsilon+2); - exz=*(epsilon+3); - eyz=*(epsilon+4); - - /*Build viscosity: viscosity3d=2*B/(2*A^e) */ - A=pow(exx,2)+pow(eyy,2)+pow(exy,2)+pow(exz,2)+pow(eyz,2)+exx*eyy; - if(A==0){ - /*Maxiviscosity3dm viscosity for 0 shear areas: */ - viscosity3d=2.25*pow(10.,17); - } - else{ - e=(n-1)/2/n; - - viscosity3d=(1-D)*B/(2*pow(A,e)); - } - } - } - - /*Checks in debugging mode*/ - if(viscosity3d<=0) _error_("Negative viscosity"); - _assert_(B>0); - _assert_(n>0); - _assert_(D>=0 && D<1); - - /*Assign output pointers:*/ - *pviscosity3d=viscosity3d; -} -/*}}}*/ -/*FUNCTION Matice::GetViscosity3dFS {{{*/ -void Matice::GetViscosity3dFS(IssmDouble* pviscosity3d, IssmDouble* epsilon){ - /*Return viscosity accounting for steady state power law creep [Thomas and SSA, 1982]: - * - * (1-D)*B - * viscosity3d= ------------------------------------------------------------------- - * 2[ exx^2+eyy^2+exx*eyy+exy^2+exz^2+eyz^2 ]^[(n-1)/2n] - * - * where mu is the viscotiy, B the flow law parameter , (u,v) the velocity - * vector, and n the flow law exponent. - * - * If epsilon is NULL, it means this is the first time Emg is being run, and we - * return g, initial viscosity. - */ - - /*output: */ - IssmDouble viscosity3d; - - /*input strain rate: */ - IssmDouble exx,eyy,exy,exz,eyz,ezz; - - /*Intermediaries: */ - IssmDouble A,e; - IssmDouble B,D,n; - IssmDouble eps0; - - /*Get B and n*/ - eps0=pow(10.,-27); - B=GetB(); - D=GetD(); - n=GetN(); - - if (n==1){ - /*Viscous behaviour! viscosity3d=B: */ - viscosity3d=(1-D)*B/2; - } - else{ - if((epsilon[0]==0) && (epsilon[1]==0) && (epsilon[2]==0) && - (epsilon[3]==0) && (epsilon[4]==0) && (epsilon[5]==0)){ - viscosity3d=0.5*pow(10.,14); - } - else{ - - /*Retrive strain rate components: */ - exx=*(epsilon+0); - eyy=*(epsilon+1); - ezz=*(epsilon+2); //not used - exy=*(epsilon+3); - exz=*(epsilon+4); - eyz=*(epsilon+5); - - /*Build viscosity: viscosity3d=B/(2*A^e) */ - A=pow(exx,2)+pow(eyy,2)+pow(exy,2)+pow(exz,2)+pow(eyz,2)+exx*eyy+pow(eps0,2); - if(A==0){ - /*Maxiviscosity3dm viscosity for 0 shear areas: */ - viscosity3d=2.25*pow(10.,17); - } - else{ - e=(n-1)/2/n; - viscosity3d=(1-D)*B/(2*pow(A,e)); - } - } - } - - /*Checks in debugging mode*/ - if(viscosity3d<=0) _error_("Negative viscosity"); - _assert_(B>0); - _assert_(n>0); - _assert_(D>=0 && D<1); - - /*Assign output pointers:*/ - *pviscosity3d=viscosity3d; } /*}}}*/ @@ -525,8 +355,11 @@ /*Intermediary value A and exponent e: */ IssmDouble A,e; - IssmDouble D,n; + IssmDouble D=0.,n; /*Get D and n*/ - D=GetDbar(); + if(this->isdamaged){ + D=GetDbar(); /* GetD()? */ + _assert_(D>=0. && D<1.); + } n=GetN(); @@ -627,7 +460,4 @@ IssmDouble exx,eyy,exy,exz,eyz; - /*Get visocisty and n*/ - GetViscosity3d(&mu,epsilon); - n=GetN(); if((epsilon[0]==0) && (epsilon[1]==0) && (epsilon[2]==0) && @@ -636,4 +466,5 @@ } else{ + /*Retrive strain rate components: */ exx=epsilon[0]; @@ -644,5 +475,7 @@ eff2 = exx*exx + eyy*eyy + exx*eyy + exy*exy + exz*exz + eyz*eyz; - mu_prime=(1-n)/(2*n) * mu/eff2; + GetViscosity(&mu,sqrt(eff2)); + n=GetN(); + mu_prime=(1.-n)/(2.*n) * mu/eff2; } @@ -660,8 +493,4 @@ /*input strain rate: */ IssmDouble exx,eyy,exy,exz,eyz,ezz; - - /*Get visocisty and n*/ - GetViscosity3d(&mu,epsilon); - n=GetN(); if((epsilon[0]==0) && (epsilon[1]==0) && (epsilon[2]==0) && @@ -679,4 +508,6 @@ eff2 = exx*exx + eyy*eyy + exx*eyy + exy*exy + exz*exz + eyz*eyz; + GetViscosity(&mu,sqrt(eff2)); + n=GetN(); mu_prime=(1-n)/(2*n) * mu/eff2; } @@ -695,8 +526,4 @@ /*input strain rate: */ IssmDouble exx,eyy,exy; - - /*Get visocisty and n*/ - GetViscosity2d(&mu,epsilon); - n=GetN(); if((epsilon[0]==0) && (epsilon[1]==0) && (epsilon[2]==0)){ @@ -710,5 +537,7 @@ eff2 = exx*exx + eyy*eyy + exx*eyy + exy*exy ; - mu_prime=(1-n)/(2*n) * mu/eff2; + GetViscosityBar(&mu,sqrt(eff2)); + n=GetN(); + mu_prime=(1.-n)/(2.*n)*mu/eff2; } @@ -717,104 +546,11 @@ } /*}}}*/ -/*FUNCTION Matice::InputDuplicate{{{*/ -void Matice::InputDuplicate(int original_enum,int new_enum){ - - /*Call inputs method*/ - if (IsInput(original_enum)) inputs->DuplicateInput(original_enum,new_enum); - -} -/*}}}*/ /*FUNCTION Matice::InputUpdateFromVector(IssmDouble* vector, int name, int type) {{{*/ void Matice::InputUpdateFromVector(IssmDouble* vector, int name, int type){ - /*Intermediaries*/ - Element *element = NULL; - - /*Recover element*/ - element=(Element*)helement->delivers(); - - /*Check that name is an element input*/ - if (!IsInput(name)) return; - - switch(type){ - - case VertexEnum: - - switch(element->ObjectEnum()){ - - case TriaEnum: { - IssmDouble values[3]; - for (int i=0;i<3;i++) values[i]=vector[((Tria*)element)->vertices[i]->Pid()]; - this->inputs->AddInput(new TriaInput(name,values,P1Enum)); - return; - } - #ifdef _HAVE_3D_ - case PentaEnum: { - IssmDouble valuesp[6]; - for (int i=0;i<6;i++) valuesp[i]=vector[((Penta*)element)->vertices[i]->Sid()]; //use sid list, to index into serial oriented vector - this->inputs->AddInput(new PentaInput(name,valuesp,P1Enum)); - return; - } - #endif - default: _error_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet"); - } - default: _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet"); - } } /*}}}*/ /*FUNCTION Matice::InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type) {{{*/ void Matice::InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){ - - /*Intermediaries*/ - Element *element = NULL; - Parameters *parameters = NULL; - int meshtype; - - /*Recover element*/ - element=(Element*)helement->delivers(); - - /*Check that name is an element input*/ - if (!IsInput(name)) return; - - switch(type){ - - case VertexEnum: - - switch(element->ObjectEnum()){ - - case TriaEnum: { - IssmDouble values[3]; - for (int i=0;i<3;i++) values[i]=vector[((Tria*)element)->vertices[i]->Sid()]; //index into serial oriented vector - this->inputs->AddInput(new TriaInput(name,values,P1Enum)); - /*Special case for rheology B in 2D: Pourave land for this solution{{{*/ - if(name==MaterialsRheologyBEnum){ - /*Are we in 2D?:*/ - if(element->ObjectEnum()==TriaEnum){ - parameters=((Tria*)(element))->parameters; - } - else{ - parameters=((Penta*)(element))->parameters; - } - parameters->FindParam(&meshtype,MeshTypeEnum); - if(meshtype==Mesh2DhorizontalEnum){ - /*Duplicate rheology input: */ - this->inputs->AddInput(new TriaInput(MaterialsRheologyBbarEnum,values,P1Enum)); - } - } - /*}}}*/ - return; - } - #ifdef _HAVE_3D_ - case PentaEnum:{ - IssmDouble valuesp[6]; - for (int i=0;i<6;i++) valuesp[i]=vector[((Penta*)element)->vertices[i]->Sid()]; //use sid list, to index into serial oriented vector - this->inputs->AddInput(new PentaInput(name,valuesp,P1Enum)); - return; - } - # endif - default: _error_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet"); - } - default: _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet"); - } } @@ -840,178 +576,2 @@ } /*}}}*/ -/*FUNCTION Matice::InputUpdateFromSolution{{{*/ -void Matice::InputUpdateFromSolution(IssmDouble* solution){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION Matice::InputUpdateFromIoModel{{{*/ -void Matice::InputUpdateFromIoModel(int index, IoModel* iomodel){ - - int i,j; - bool control_analysis; - int num_control_type; - - /*Fetch parameters: */ - iomodel->Constant(&control_analysis,InversionIscontrolEnum); - if(control_analysis) iomodel->Constant(&num_control_type,InversionNumControlParametersEnum); - - if(iomodel->meshtype==Mesh2DhorizontalEnum){ - - /*Intermediaries*/ - const int num_vertices = 3; //Tria has 3 vertices - IssmDouble nodeinputs[num_vertices]; - IssmDouble cmmininputs[num_vertices]; - IssmDouble cmmaxinputs[num_vertices]; - - /*Get B*/ - if (iomodel->Data(MaterialsRheologyBEnum)) { - for(i=0;iData(MaterialsRheologyBEnum)[iomodel->elements[num_vertices*index+i]-1]; - this->inputs->AddInput(new TriaInput(MaterialsRheologyBbarEnum,nodeinputs,P1Enum)); - } - - /*Get n*/ - if (iomodel->Data(MaterialsRheologyNEnum)) { - for(i=0;iData(MaterialsRheologyNEnum)[index]; - this->inputs->AddInput(new TriaInput(MaterialsRheologyNEnum,nodeinputs,P1Enum)); - } - - /*Get D:*/ - if (iomodel->Data(DamageDEnum)) { - for(i=0;iData(DamageDEnum)[iomodel->elements[num_vertices*index+i]-1]; - this->inputs->AddInput(new TriaInput(DamageDbarEnum,nodeinputs,P1Enum)); - } - - /*Control Inputs*/ - #ifdef _HAVE_CONTROL_ - if (control_analysis && iomodel->Data(InversionControlParametersEnum)){ - for(i=0;i(iomodel->Data(InversionControlParametersEnum)[i])){ - case MaterialsRheologyBbarEnum: - if (iomodel->Data(MaterialsRheologyBEnum)){ - _assert_(iomodel->Data(MaterialsRheologyBEnum));_assert_(iomodel->Data(InversionMinParametersEnum)); _assert_(iomodel->Data(InversionMaxParametersEnum)); - for(j=0;jData(MaterialsRheologyBEnum)[iomodel->elements[num_vertices*index+j]-1]; - for(j=0;jData(InversionMinParametersEnum)[(iomodel->elements[num_vertices*index+j]-1)*num_control_type+i]; - for(j=0;jData(InversionMaxParametersEnum)[(iomodel->elements[num_vertices*index+j]-1)*num_control_type+i]; - this->inputs->AddInput(new ControlInput(MaterialsRheologyBbarEnum,TriaInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); - } - break; - case DamageDbarEnum: - if (iomodel->Data(DamageDEnum)){ - _assert_(iomodel->Data(DamageDEnum));_assert_(iomodel->Data(InversionMinParametersEnum)); _assert_(iomodel->Data(InversionMaxParametersEnum)); - for(j=0;jData(DamageDEnum)[iomodel->elements[num_vertices*index+j]-1]; - for(j=0;jData(InversionMinParametersEnum)[(iomodel->elements[num_vertices*index+j]-1)*num_control_type+i]; - for(j=0;jData(InversionMaxParametersEnum)[(iomodel->elements[num_vertices*index+j]-1)*num_control_type+i]; - this->inputs->AddInput(new ControlInput(DamageDbarEnum,TriaInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); - } - break; - } - } - } - #endif - } - else if(iomodel->meshtype==Mesh2DverticalEnum){ - - /*Intermediaries*/ - const int num_vertices = 3; //Tria has 3 vertices - IssmDouble nodeinputs[num_vertices]; - IssmDouble cmmininputs[num_vertices]; - IssmDouble cmmaxinputs[num_vertices]; - - /*Get B*/ - if (iomodel->Data(MaterialsRheologyBEnum)) { - for(i=0;iData(MaterialsRheologyBEnum)[iomodel->elements[num_vertices*index+i]-1]; - this->inputs->AddInput(new TriaInput(MaterialsRheologyBEnum,nodeinputs,P1Enum)); - } - - /*Get n*/ - if (iomodel->Data(MaterialsRheologyNEnum)) { - for(i=0;iData(MaterialsRheologyNEnum)[index]; - this->inputs->AddInput(new TriaInput(MaterialsRheologyNEnum,nodeinputs,P1Enum)); - } - - /*Get D:*/ - if (iomodel->Data(DamageDEnum)) { - for(i=0;iData(DamageDEnum)[iomodel->elements[num_vertices*index+i]-1]; - this->inputs->AddInput(new TriaInput(DamageDEnum,nodeinputs,P1Enum)); - } - } - #ifdef _HAVE_3D_ - else if(iomodel->meshtype==Mesh3DEnum){ - - /*Intermediaries*/ - const int num_vertices = 6; //Penta has 6 vertices - IssmDouble nodeinputs[num_vertices]; - IssmDouble cmmininputs[num_vertices]; - IssmDouble cmmaxinputs[num_vertices]; - - /*Get B*/ - if (iomodel->Data(MaterialsRheologyBEnum)) { - for(i=0;iData(MaterialsRheologyBEnum)[iomodel->elements[num_vertices*index+i]-1]; - this->inputs->AddInput(new PentaInput(MaterialsRheologyBEnum,nodeinputs,P1Enum)); - } - - /*Get n*/ - if (iomodel->Data(MaterialsRheologyNEnum)) { - for(i=0;iData(MaterialsRheologyNEnum)[index]; - this->inputs->AddInput(new PentaInput(MaterialsRheologyNEnum,nodeinputs,P1Enum)); - } - - /*Get D*/ - if (iomodel->Data(DamageDEnum)) { - for(i=0;iData(DamageDEnum)[iomodel->elements[num_vertices*index+i]-1]; - this->inputs->AddInput(new PentaInput(DamageDEnum,nodeinputs,P1Enum)); - } - - /*Control Inputs*/ - #ifdef _HAVE_CONTROL_ - if (control_analysis && iomodel->Data(InversionControlParametersEnum)){ - for(i=0;i(iomodel->Data(InversionControlParametersEnum)[i])){ - case MaterialsRheologyBbarEnum: - if (iomodel->Data(MaterialsRheologyBEnum)){ - _assert_(iomodel->Data(MaterialsRheologyBEnum));_assert_(iomodel->Data(InversionMinParametersEnum)); _assert_(iomodel->Data(InversionMaxParametersEnum)); - for(j=0;jData(MaterialsRheologyBEnum)[iomodel->elements[num_vertices*index+j]-1]; - for(j=0;jData(InversionMinParametersEnum)[(iomodel->elements[num_vertices*index+j]-1)*num_control_type+i]; - for(j=0;jData(InversionMaxParametersEnum)[(iomodel->elements[num_vertices*index+j]-1)*num_control_type+i]; - this->inputs->AddInput(new ControlInput(MaterialsRheologyBEnum,PentaInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); - } - break; - case DamageDbarEnum: - if (iomodel->Data(DamageDEnum)){ - _assert_(iomodel->Data(DamageDEnum));_assert_(iomodel->Data(InversionMinParametersEnum)); _assert_(iomodel->Data(InversionMaxParametersEnum)); - for(j=0;jData(DamageDEnum)[iomodel->elements[num_vertices*index+j]-1]; - for(j=0;jData(InversionMinParametersEnum)[(iomodel->elements[num_vertices*index+j]-1)*num_control_type+i]; - for(j=0;jData(InversionMaxParametersEnum)[(iomodel->elements[num_vertices*index+j]-1)*num_control_type+i]; - this->inputs->AddInput(new ControlInput(DamageDEnum,PentaInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); - } - break; - - } - } - } - #endif - } - #endif - else{ - _error_("Mesh type not supported yet!"); - } - - return; -} -/*}}}*/ -/*FUNCTION Matice::IsInput{{{*/ -bool Matice::IsInput(int name){ - if ( - name==MaterialsRheologyBEnum || - name==MaterialsRheologyBbarEnum || - name==MaterialsRheologyNEnum || - name==QmuMaterialsRheologyBEnum || - name==DamageDEnum || - name==DamageDbarEnum - - ){ - return true; - } - else return false; -} -/*}}}*/ Index: /issm/trunk/src/c/classes/Materials/Matice.h =================================================================== --- /issm/trunk/src/c/classes/Materials/Matice.h (revision 17805) +++ /issm/trunk/src/c/classes/Materials/Matice.h (revision 17806) @@ -12,4 +12,5 @@ class IoModel; class Elements; +class Element; class Loads; class Nodes; @@ -22,6 +23,8 @@ private: - int mid; - Hook *helement; + int mid; + bool isdamaged; + Hook *helement; + Element *element; public: @@ -45,16 +48,12 @@ void InputUpdateFromConstant(int constant, int name); void InputUpdateFromConstant(bool constant, int name); - void InputUpdateFromSolution(IssmDouble* solution); - void InputUpdateFromIoModel(int index, IoModel* iomodel); + void InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented");}; /*}}}*/ /*Material virtual functions resolution: {{{*/ - void InputDuplicate(int original_enum,int new_enum); void Configure(Elements* elements); - void GetVectorFromInputs(Vector* vector,int input_enum); + Material* copy2(Element* element); void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters); - void GetViscosity2d(IssmDouble* pviscosity, IssmDouble* pepsilon); - void GetViscosity2dvertical(IssmDouble* pviscosity, IssmDouble* pepsilon); - void GetViscosity3d(IssmDouble* pviscosity3d, IssmDouble* pepsilon); - void GetViscosity3dFS(IssmDouble* pviscosity3d, IssmDouble* epsilon); + void GetViscosity(IssmDouble* pviscosity, IssmDouble eps_eff); + void GetViscosityBar(IssmDouble* pviscosity, IssmDouble eps_eff); void GetViscosityComplement(IssmDouble* pviscosity_complement, IssmDouble* pepsilon); void GetViscosityDComplement(IssmDouble*, IssmDouble*); @@ -63,4 +62,5 @@ void GetViscosity2dDerivativeEpsSquare(IssmDouble* pmu_prime, IssmDouble* pepsilon); IssmDouble GetA(); + IssmDouble GetAbar(); IssmDouble GetB(); IssmDouble GetBbar(); @@ -68,5 +68,5 @@ IssmDouble GetDbar(); IssmDouble GetN(); - bool IsInput(int name); + bool IsDamage(); /*}}}*/ }; Index: /issm/trunk/src/c/classes/Materials/Matpar.cpp =================================================================== --- /issm/trunk/src/c/classes/Materials/Matpar.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Materials/Matpar.cpp (revision 17806) @@ -23,7 +23,7 @@ bool ispdd; bool isefficientlayer; - int hydrology_model; + int hydrology_model,smb_model; iomodel->Constant(&hydrology_model,HydrologyModelEnum); - iomodel->Constant(&ispdd,SurfaceforcingsIspddEnum); + iomodel->Constant(&smb_model,SurfaceforcingsEnum); this->mid = matpar_mid; @@ -34,4 +34,5 @@ iomodel->Constant(&this->heatcapacity,MaterialsHeatcapacityEnum); iomodel->Constant(&this->thermalconductivity,MaterialsThermalconductivityEnum); + iomodel->Constant(&this->temperateiceconductivity,MaterialsTemperateiceconductivityEnum); iomodel->Constant(&this->latentheat,MaterialsLatentheatEnum); iomodel->Constant(&this->beta,MaterialsBetaEnum); @@ -42,7 +43,20 @@ iomodel->Constant(&this->g,ConstantsGEnum); - if(ispdd){ - iomodel->Constant(&this->desfac,SurfaceforcingsDesfacEnum); - iomodel->Constant(&this->s0p,SurfaceforcingsS0pEnum); + switch(smb_model){ + case SMBEnum: + /*Nothing to add*/ + break; + case SMBpddEnum: + iomodel->Constant(&this->desfac,SurfaceforcingsDesfacEnum); + iomodel->Constant(&this->s0p,SurfaceforcingsS0pEnum); + break; + case SMBgradientsEnum: + /*Nothing to add*/ + break; + case SMBhenningEnum: + /*Nothing to add*/ + break; + default: + _error_("Surface mass balance model "<Constant(&this->sediment_porosity,HydrologydcSedimentPorosityEnum); iomodel->Constant(&this->sediment_thickness,HydrologydcSedimentThicknessEnum); - iomodel->Constant(&this->sediment_transmitivity,HydrologydcSedimentTransmitivityEnum); iomodel->Constant(&this->water_compressibility,HydrologydcWaterCompressibilityEnum); iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum); @@ -65,6 +78,7 @@ iomodel->Constant(&this->epl_compressibility,HydrologydcEplCompressibilityEnum); iomodel->Constant(&this->epl_porosity,HydrologydcEplPorosityEnum); - iomodel->Constant(&this->epl_thickness,HydrologydcEplThicknessEnum); - iomodel->Constant(&this->epl_transmitivity,HydrologydcEplTransmitivityEnum); + iomodel->Constant(&this->epl_init_thickness,HydrologydcEplInitialThicknessEnum); + iomodel->Constant(&this->epl_max_thickness,HydrologydcEplMaxThicknessEnum); + iomodel->Constant(&this->epl_conductivity,HydrologydcEplConductivityEnum); } } @@ -78,6 +92,4 @@ iomodel->Constant(&this->mantle_shear_modulus,MaterialsMantleShearModulusEnum); iomodel->Constant(&this->mantle_density,MaterialsMantleDensityEnum); - - this->inputs=NULL; /*not used here*/ } /*}}}*/ @@ -100,4 +112,5 @@ _printf_(" heatcapacity: " << heatcapacity << "\n"); _printf_(" thermalconductivity: " << thermalconductivity << "\n"); + _printf_(" temperateiceconductivity: " << temperateiceconductivity << "\n"); _printf_(" latentheat: " << latentheat << "\n"); _printf_(" beta: " << beta << "\n"); @@ -169,6 +182,9 @@ this->heatcapacity=constant; break; - case MaterialsThermalconductivityEnum: + case MaterialsThermalconductivityEnum: this->thermalconductivity=constant; + break; + case MaterialsTemperateiceconductivityEnum: + this->temperateiceconductivity=constant; break; case MaterialsLatentheatEnum: @@ -193,5 +209,5 @@ this->g=constant; break; - case SurfaceforcingsDesfacEnum: + case SurfaceforcingsDesfacEnum: this->desfac=constant; break; @@ -215,23 +231,47 @@ } /*}}}*/ -/*FUNCTION Matpar::InputUpdateFromSolution{{{*/ -void Matpar::InputUpdateFromSolution(IssmDouble* solution){ - /*Nothing updated yet*/ -} -/*}}}*/ /*Matpar management: */ -/*FUNCTION Matpar::InputDuplicate{{{*/ -void Matpar::InputDuplicate(int original_enum,int new_enum){ - - /*Call inputs method*/ - if (IsInput(original_enum)) inputs->DuplicateInput(original_enum,new_enum); - -} -/*}}}*/ /*FUNCTION Matpar::Configure {{{*/ void Matpar::Configure(Elements* elementsin){ /*nothing done yet!*/ + +} +/*}}}*/ +/*FUNCTION Matpar::Configure {{{*/ +IssmDouble Matpar::GetMaterialParameter(int enum_in){ + + switch(enum_in){ + case MaterialsRhoIceEnum: return this->rho_ice; + case MaterialsRhoWaterEnum: return this->rho_water; + case MaterialsRhoFreshwaterEnum: return this->rho_freshwater; + case MaterialsMuWaterEnum: return this->mu_water; + case MaterialsHeatcapacityEnum: return this->heatcapacity; + case MaterialsThermalconductivityEnum: return this->thermalconductivity; + case MaterialsTemperateiceconductivityEnum: return this->temperateiceconductivity; + case MaterialsLatentheatEnum: return this->latentheat; + case MaterialsBetaEnum: return this->beta; + case MaterialsMeltingpointEnum: return this->meltingpoint; + case ConstantsReferencetemperatureEnum: return this->referencetemperature; + case MaterialsMixedLayerCapacityEnum: return this->mixed_layer_capacity; + case MaterialsThermalExchangeVelocityEnum: return this->thermal_exchange_velocity; + case HydrologydcSedimentPorosityEnum: return this->sediment_porosity; + case HydrologydcSedimentThicknessEnum: return this->sediment_thickness; + case HydrologydcSedimentCompressibilityEnum: return this->sediment_compressibility; + case HydrologydcEplPorosityEnum: return this->epl_porosity; + case HydrologydcEplCompressibilityEnum: return this->epl_compressibility; + case HydrologydcEplConductivityEnum: return this->epl_conductivity; + case HydrologydcEplInitialThicknessEnum: return this->epl_init_thickness; + case HydrologydcEplMaxThicknessEnum: return this->epl_max_thickness; + case HydrologydcWaterCompressibilityEnum: return this->water_compressibility; + case HydrologyshreveCREnum: return this->hydro_CR; + case HydrologyshreveKnEnum: return this->hydro_kn; + case HydrologyshreveNEnum: return this->hydro_n; + case HydrologyshrevePEnum: return this->hydro_p; + case HydrologyshreveQEnum: return this->hydro_q; + case ConstantsGEnum: return this->g; + default: _error_("Enum "<rho_freshwater* this->g* this->sediment_porosity* this->sediment_thickness* - ( this->water_compressibility+( this->sediment_compressibility/ this->sediment_porosity)); -} -/*}}}*/ -/*FUNCTION Matpar::GetEplStoring {{{*/ -IssmDouble Matpar::GetEplStoring(){ - return this->rho_freshwater* this->g* this->epl_porosity* this->epl_thickness* - ( this->water_compressibility+( this->epl_compressibility/ this->epl_porosity)); -} -/*}}}*/ -/*FUNCTION Matpar::GetSedimentTransitivity {{{*/ -IssmDouble Matpar::GetSedimentTransmitivity(){ - return sediment_transmitivity; -} + return this->rho_freshwater * this->g * this->sediment_porosity * this->sediment_thickness * + (this->water_compressibility + (this->sediment_compressibility / this->sediment_porosity)); +} +/*}}}*/ +/*FUNCTION Matpar::GetEplSpecificStoring {{{*/ +IssmDouble Matpar::GetEplSpecificStoring(){ + return this->rho_freshwater * this->g * this->epl_porosity * + (this->water_compressibility + (this->epl_compressibility / this->epl_porosity)); +} /*}}}*/ /*FUNCTION Matpar::GetSedimentThickness {{{*/ @@ -359,8 +399,18 @@ return sediment_thickness; } -/*}}}*/ -/*FUNCTION Matpar::GetEplTransitivity {{{*/ -IssmDouble Matpar::GetEplTransmitivity(){ - return epl_transmitivity; +/*}}}*/ +/*FUNCTION Matpar::GetEplInitialThickness {{{*/ +IssmDouble Matpar::GetEplInitialThickness(){ + return epl_init_thickness; +} +/*}}}*/ +/*FUNCTION Matpar::GetEplMaxThickness {{{*/ +IssmDouble Matpar::GetEplMaxThickness(){ + return epl_max_thickness; +} +/*}}}*/ +/*FUNCTION Matpar::GetEplConductivity {{{*/ +IssmDouble Matpar::GetEplConductivity(){ + return epl_conductivity; } /*}}}*/ @@ -377,35 +427,54 @@ /*FUNCTION Matpar::GetEnthalpyDiffusionParameter{{{*/ IssmDouble Matpar::GetEnthalpyDiffusionParameter(IssmDouble enthalpy,IssmDouble pressure){ - /*if (enthalpy<=PureIceEnthalpy(pressure)) + if (enthalpy1, then the whole ice column is cold or temperate, respectively. - */ - IssmDouble kappa, kappa0, kappa1; - if (enthalpy0!=enthalpy1){ - IssmDouble lambda=(PureIceEnthalpy(pressure0)-enthalpy0)/(enthalpy1-enthalpy0); - if ((lambda>=0.) && (lambda<=1.)){ - kappa0=GetEnthalpyDiffusionParameter(enthalpy0,pressure0); - kappa1=GetEnthalpyDiffusionParameter(enthalpy1,pressure1); - kappa=lambda*kappa0+(1.-lambda)*kappa1; +IssmDouble Matpar::GetEnthalpyDiffusionParameterVolume(int numvertices,IssmDouble* enthalpy,IssmDouble* pressure){ + + int iv; + IssmDouble lambda; // fraction of cold ice + IssmDouble kappa,kappa_c,kappa_t; //enthalpy conductivities + IssmDouble Hc,Ht; + IssmDouble* PIE = xNew(numvertices); + IssmDouble* dHpmp = xNew(numvertices); + + for(iv=0; iv=0)); + + if(allequalsign){ + kappa=GetEnthalpyDiffusionParameter(enthalpy[0], pressure[0]); + } + else { + /* return harmonic mean of thermal conductivities, weighted by fraction of cold/temperate ice, + cf Patankar 1980, pp44 */ + kappa_c=GetEnthalpyDiffusionParameter(PureIceEnthalpy(0.)-1.,0.); + kappa_t=GetEnthalpyDiffusionParameter(PureIceEnthalpy(0.)+1.,0.); + Hc=0.; Ht=0.; + for(iv=0; iv0.); + lambda = Hc/(Hc+Ht); + kappa = 1./(lambda/kappa_c + (1.-lambda)/kappa_t); + } + + /*Clean up and return*/ + xDelete(PIE); + xDelete(dHpmp); return kappa; } @@ -448,5 +517,4 @@ } /*}}}*/ - /*FUNCTION Matpar::GetLithosphereShearModulus {{{*/ IssmDouble Matpar::GetLithosphereShearModulus(){ @@ -469,7 +537,2 @@ } /*}}}*/ -/*FUNCTION Matpar::IsInput{{{*/ -bool Matpar::IsInput(int name){ - return false; -} -/*}}}*/ Index: /issm/trunk/src/c/classes/Materials/Matpar.h =================================================================== --- /issm/trunk/src/c/classes/Materials/Matpar.h (revision 17805) +++ /issm/trunk/src/c/classes/Materials/Matpar.h (revision 17806) @@ -15,5 +15,5 @@ private: - int mid; + int mid; IssmDouble rho_ice; IssmDouble rho_water; @@ -22,4 +22,5 @@ IssmDouble heatcapacity; IssmDouble thermalconductivity; + IssmDouble temperateiceconductivity; IssmDouble latentheat; IssmDouble beta; @@ -43,11 +44,11 @@ IssmDouble sediment_porosity; IssmDouble sediment_thickness; - IssmDouble sediment_transmitivity; IssmDouble water_compressibility; IssmDouble epl_compressibility; - IssmDouble epl_porosity; - IssmDouble epl_thickness; - IssmDouble epl_transmitivity; + IssmDouble epl_porosity; + IssmDouble epl_init_thickness; + IssmDouble epl_max_thickness; + IssmDouble epl_conductivity; /*gia: */ @@ -76,15 +77,11 @@ void InputUpdateFromConstant(int constant, int name); void InputUpdateFromConstant(bool constant, int name); - void InputUpdateFromSolution(IssmDouble* solution); - void InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");}; + void InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented");}; /*}}}*/ /*Material virtual functions resolution: {{{*/ - void InputDuplicate(int original_enum,int new_enum); + Material* copy2(Element* element){_error_("not implemented");}; void Configure(Elements* elements); - void GetVectorFromInputs(Vector* vector,int input_enum){return;} - void GetViscosity2d(IssmDouble* pviscosity, IssmDouble* pepsilon){_error_("not supported");}; - void GetViscosity2dvertical(IssmDouble* pviscosity, IssmDouble* pepsilon){_error_("not supported");}; - void GetViscosity3d(IssmDouble* pviscosity3d, IssmDouble* pepsilon){_error_("not supported");}; - void GetViscosity3dFS(IssmDouble* pviscosity3d, IssmDouble* epsilon){_error_("not supported");}; + void GetViscosity(IssmDouble* pviscosity,IssmDouble eps_eff){_error_("not supported");}; + void GetViscosityBar(IssmDouble* pviscosity,IssmDouble eps_eff){_error_("not supported");}; void GetViscosityComplement(IssmDouble* pviscosity_complement, IssmDouble* pepsilon){_error_("not supported");}; void GetViscosityDComplement(IssmDouble* pviscosity_complement, IssmDouble* pepsilon){_error_("not supported");}; @@ -93,4 +90,5 @@ void GetViscosity2dDerivativeEpsSquare(IssmDouble* pmu_prime, IssmDouble* pepsilon){_error_("not supported");}; IssmDouble GetA(){_error_("not supported");}; + IssmDouble GetAbar(){_error_("not supported");}; IssmDouble GetB(){_error_("not supported");}; IssmDouble GetBbar(){_error_("not supported");}; @@ -98,4 +96,5 @@ IssmDouble GetD(){_error_("not supported");}; IssmDouble GetDbar(){_error_("not supported");}; + bool IsDamage(){_error_("not supported");}; /*}}}*/ /*Numerics: {{{*/ @@ -109,4 +108,5 @@ IssmDouble GetHeatCapacity(); IssmDouble GetThermalConductivity(); + IssmDouble GetTemperateIceConductivity(); IssmDouble GetLatentHeat(); IssmDouble GetBeta(); @@ -119,21 +119,22 @@ IssmDouble GetHydrologyN(); IssmDouble GetSedimentStoring(); - IssmDouble GetEplStoring(); - IssmDouble GetSedimentTransmitivity(); + IssmDouble GetEplSpecificStoring(); IssmDouble GetSedimentThickness(); - IssmDouble GetEplTransmitivity(); + IssmDouble GetEplConductivity(); + IssmDouble GetEplInitialThickness(); + IssmDouble GetEplMaxThickness(); IssmDouble TMeltingPoint(IssmDouble pressure); IssmDouble PureIceEnthalpy(IssmDouble pressure); IssmDouble GetEnthalpyDiffusionParameter(IssmDouble enthalpy,IssmDouble pressure); - IssmDouble GetEnthalpyDiffusionParameterVolume(IssmDouble enthalpy0, IssmDouble enthalpy1, IssmDouble pressure0, IssmDouble pressure1); + IssmDouble GetEnthalpyDiffusionParameterVolume(int numvertices,IssmDouble* enthalpy,IssmDouble* pressure); IssmDouble GetLithosphereShearModulus(); IssmDouble GetLithosphereDensity(); IssmDouble GetMantleShearModulus(); IssmDouble GetMantleDensity(); - void EnthalpyToThermal(IssmDouble* ptemperature,IssmDouble* pwaterfraction,IssmDouble enthalpy,IssmDouble pressure); - void ThermalToEnthalpy(IssmDouble* penthalpy,IssmDouble temperature,IssmDouble waterfraction,IssmDouble pressure); + void EnthalpyToThermal(IssmDouble* ptemperature,IssmDouble* pwaterfraction,IssmDouble enthalpy,IssmDouble pressure); + void ThermalToEnthalpy(IssmDouble* penthalpy,IssmDouble temperature,IssmDouble waterfraction,IssmDouble pressure); IssmDouble GetDesFac(); IssmDouble GetS0p(); - bool IsInput(int name); + IssmDouble GetMaterialParameter(int in_enum); /*}}}*/ Index: /issm/trunk/src/c/classes/Misfit.h =================================================================== --- /issm/trunk/src/c/classes/Misfit.h (revision 17806) +++ /issm/trunk/src/c/classes/Misfit.h (revision 17806) @@ -0,0 +1,159 @@ +/*!\file Misfit.h + * \brief: header file for Misfit object + */ + +#ifndef _MISFIT_H_ +#define _MISFIT_H_ + +/*Headers:*/ +/*{{{*/ +#include "./Definition.h" +#include "../datastructures/datastructures.h" +#include "./Elements/Element.h" +#include "./Elements/Elements.h" +#include "./FemModel.h" +#include "../modules/SurfaceAreax/SurfaceAreax.h" +#include "../classes/Params/Parameters.h" +/*}}}*/ + +class Misfit: public Object, public Definition{ + + public: + + char* name; + int model_enum; + int observation_enum; + int weights_enum; + char* timeinterpolation; + + IssmDouble misfit; //value carried over in time. + int lock; // if lock is on, we just return the value stored in "misfit". this is used so we don't compute misfit past the final_time + + /*Misfit constructors, destructors :*/ + /*FUNCTION Misfit() {{{*/ + Misfit(){ + + this->name = NULL; + this->model_enum = UNDEF; + this->observation_enum = UNDEF; + this->weights_enum = UNDEF; + this->timeinterpolation=NULL; + this->misfit=0; + this->lock=0; + + } + /*}}}*/ + /*FUNCTION Misfit(char* in_name, int in_model_enum, int in_observation_enum char* in_timeinterpolation, int in_weights_enum) {{{*/ + Misfit(char* in_name, int in_model_enum, int in_observation_enum, char* in_timeinterpolation, int in_weights_enum){ + + this->name = xNew(strlen(in_name)+1); + xMemCpy(this->name,in_name,strlen(in_name)+1); + + this->timeinterpolation = xNew(strlen(in_timeinterpolation)+1); + xMemCpy(this->timeinterpolation,in_timeinterpolation,strlen(in_timeinterpolation)+1); + + this->model_enum=in_model_enum; + this->observation_enum=in_observation_enum; + this->weights_enum=in_weights_enum; + + this->misfit=0; + this->lock=0; + } + /*}}}*/ + /*FUNCTION ~Misfit() {{{*/ + ~Misfit(){ + if(this->name)xDelete(this->name); + if(this->timeinterpolation)xDelete(this->timeinterpolation); + this->misfit=0; + this->lock=0; + } + /*}}}*/ + /*Object virtual function resolutoin: */ + /*FUNCTION Echo(){{{*/ + void Echo(void){ + _printf_(" Misfit: " << name << "\n"); + _printf_(" model_enum: " << model_enum << " " << EnumToStringx(model_enum) << "\n"); + _printf_(" observation_enum: " << observation_enum << " " << EnumToStringx(observation_enum) << "\n"); + _printf_(" weights_enum: " << weights_enum << " " << EnumToStringx(weights_enum) << "\n"); + _printf_(" timeinterpolation: " << timeinterpolation << "\n"); + } + /*}}}*/ + /*FUNCTION DeepEcho(){{{*/ + void DeepEcho(void){ + this->Echo(); + } + /*}}}*/ + /*FUNCTION Id(){{{*/ + int Id(void){ + return -1; + } + /*}}}*/ + /*FUNCTION ObjectEnum{{{*/ + int ObjectEnum(void){ + return MisfitEnum; + } + /*}}}*/ + /*FUNCTION copy {{{*/ + Object* copy() { + return new Misfit(this->name,this->model_enum,this->observation_enum,this->timeinterpolation,this->weights_enum); + } + /*}}}*/ + /*Definition virtual function resolutoin: */ + /*FUNCTION char* Name() {{{*/ + char* Name(){ + + char* name2=xNew(strlen(this->name)+1); + xMemCpy(name2,this->name,strlen(this->name)+1); + + return name2; + } + /*}}}*/ + /*FUNCTION IssmDouble Response(FemModel* femmodel) {{{*/ + IssmDouble Response(FemModel* femmodel){ + + int i; + IssmDouble misfit_t=0.; + IssmDouble all_misfit_t=0.; + IssmDouble dt; + IssmDouble area_t=0.; + IssmDouble all_area_t; + IssmDouble time,starttime,finaltime; + + femmodel->parameters->FindParam(&starttime,TimesteppingStartTimeEnum); + femmodel->parameters->FindParam(&finaltime,TimesteppingFinalTimeEnum); + femmodel->parameters->FindParam(&time,TimeEnum); + + /*If we are locked, return time average: */ + if(this->lock)return misfit/(time-starttime); + + + for(i=0;ielements->Size();i++){ + Element* element=(Element*)femmodel->elements->GetObjectByOffset(i); + misfit_t+=element->Misfit(model_enum,observation_enum,weights_enum); + area_t+=element->MisfitArea(weights_enum); + } + + ISSM_MPI_Allreduce ( (void*)&misfit_t,(void*)&all_misfit_t,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,IssmComm::GetComm()); + ISSM_MPI_Allreduce ( (void*)&area_t,(void*)&all_area_t,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,IssmComm::GetComm()); + area_t=all_area_t; + misfit_t=all_misfit_t; + + /*Divide by surface area if not nill!: */ + if (area_t!=0) misfit_t=misfit_t/area_t; + + /*Recover delta_t: */ + femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum); + + /*Add this time's contribution to curent misfit: */ + misfit+=dt*misfit_t; + + /*Do we lock? i.e. are we at final_time? :*/ + if(time==finaltime)this->lock=1; + + /*What we return is the value of misfit / time: */ + return misfit/(time-starttime); + } + /*}}}*/ +}; + +#endif /* _MISFIT_H_ */ Index: /issm/trunk/src/c/classes/Node.cpp =================================================================== --- /issm/trunk/src/c/classes/Node.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Node.cpp (revision 17806) @@ -43,5 +43,5 @@ Analysis* analysis = EnumToAnalysis(analysis_enum); - int numdofs = analysis->DofsPerNode(&doftypes,iomodel->meshtype,in_approximation); + int numdofs = analysis->DofsPerNode(&doftypes,iomodel->domaintype,in_approximation); indexing.Init(numdofs,doftypes); xDelete(doftypes); @@ -54,5 +54,4 @@ /*Stressbalance Horiz*/ - #ifdef _HAVE_STRESSBALANCE_ if(analysis_enum==StressbalanceAnalysisEnum){ @@ -62,22 +61,22 @@ _assert_(sqrt( coord_system[0][0]*coord_system[0][0] + coord_system[1][0]*coord_system[1][0]) >1.e-4); - if(iomodel->meshtype==Mesh3DEnum){ + if(iomodel->domaintype!=Domain2DhorizontalEnum){ /*We have a 3d mesh, we may have collapsed elements, hence dead nodes. Freeze them out: */ - _assert_(iomodel->Data(MeshVertexonbedEnum)); + _assert_(iomodel->Data(MeshVertexonbaseEnum)); _assert_(iomodel->Data(FlowequationVertexEquationEnum)); - if(in_approximation==SSAApproximationEnum && !reCast(iomodel->Data(MeshVertexonbedEnum)[io_index])){ + if(in_approximation==SSAApproximationEnum && !reCast(iomodel->Data(MeshVertexonbaseEnum)[io_index])){ this->Deactivate(); } - if(in_approximation==L1L2ApproximationEnum && !reCast(iomodel->Data(MeshVertexonbedEnum)[io_index])){ + if(in_approximation==L1L2ApproximationEnum && !reCast(iomodel->Data(MeshVertexonbaseEnum)[io_index])){ this->Deactivate(); } if(in_approximation==SSAHOApproximationEnum && reCast(iomodel->Data(FlowequationBorderSSAEnum)[io_index])){ - if(!reCast(iomodel->Data(MeshVertexonbedEnum)[io_index])){ + if(!reCast(iomodel->Data(MeshVertexonbaseEnum)[io_index])){ this->Deactivate(); } } if(in_approximation==SSAFSApproximationEnum && reCast(iomodel->Data(FlowequationBorderSSAEnum)[io_index])){ - if(!reCast(iomodel->Data(MeshVertexonbedEnum)[io_index])){ - for(k=1;k<=2;k++) this->FreezeDof(k); + if(!reCast(iomodel->Data(MeshVertexonbaseEnum)[io_index])){ + for(k=0;k<=1;k++) this->FreezeDof(k); } } @@ -88,5 +87,4 @@ } } - #endif /*2d solutions in 3d, we need to constrain all the nodes that are not on base*/ @@ -99,10 +97,12 @@ analysis_enum==HydrologyDCInefficientAnalysisEnum || analysis_enum==DamageEvolutionAnalysisEnum || - analysis_enum==HydrologyDCEfficientAnalysisEnum + analysis_enum==HydrologyDCEfficientAnalysisEnum || + analysis_enum==LevelsetAnalysisEnum || + analysis_enum==ExtrapolationAnalysisEnum ){ - if(iomodel->meshtype==Mesh3DEnum || iomodel->meshtype==Mesh2DverticalEnum){ + if(iomodel->domaintype!=Domain2DhorizontalEnum){ /*On a 3d mesh, we may have collapsed elements, hence dead nodes. Freeze them out: */ - _assert_(iomodel->Data(MeshVertexonbedEnum)); - if(!(reCast(iomodel->Data(MeshVertexonbedEnum)[io_index]))){ + _assert_(iomodel->Data(MeshVertexonbaseEnum)); + if(!(reCast(iomodel->Data(MeshVertexonbaseEnum)[io_index]))){ this->Deactivate(); } @@ -110,8 +110,7 @@ } if( - analysis_enum==FreeSurfaceTopAnalysisEnum || - analysis_enum==L2ProjectionTopAnalysisEnum + analysis_enum==FreeSurfaceTopAnalysisEnum ){ - if(iomodel->meshtype==Mesh3DEnum || iomodel->meshtype==Mesh2DverticalEnum){ + if(iomodel->domaintype!=Domain2DhorizontalEnum){ /*On a 3d mesh, we may have collapsed elements, hence dead nodes. Freeze them out: */ _assert_(iomodel->Data(MeshVertexonsurfaceEnum)); @@ -363,5 +362,4 @@ } /*}}}*/ -#ifdef _HAVE_STRESSBALANCE_ /*FUNCTION Node::GetCoordinateSystem{{{*/ void Node::GetCoordinateSystem(IssmDouble* coord_system_out){ @@ -372,5 +370,4 @@ } /*}}}*/ -#endif /*FUNCTION Node::InAnalysis{{{*/ bool Node::InAnalysis(int in_analysis_enum){ @@ -386,6 +383,6 @@ /*Dof should be added in the s set, describing which * dofs are constrained to a certain value (dirichlet boundary condition*/ - DofInSSet(dof-1); - this->indexing.svalues[dof-1]=value; + DofInSSet(dof); + this->indexing.svalues[dof]=value; } /*}}}*/ @@ -408,6 +405,6 @@ /*Dof should be added to the f-set, and taken out of the s-set:*/ - DofInFSet(dof-1); - this->indexing.svalues[dof-1]=0.; + DofInFSet(dof); + this->indexing.svalues[dof]=0.; } /*}}}*/ @@ -459,4 +456,5 @@ /*Put dof for this node into the f set (ie, this dof will NOT be constrained * to a fixed value during computations. */ + _assert_(dofindexing.gsize); if(this->indexing.f_set[dof] == 0){ @@ -470,5 +468,5 @@ void Node::FreezeDof(int dof){ - DofInSSet(dof-1); //with 0 displacement for this dof. + DofInSSet(dof); //with 0 displacement for this dof. } @@ -901,275 +899,2 @@ } /*}}}*/ -#ifdef _HAVE_STRESSBALANCE_ -void TransformInvStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes,int numnodes,int cs_enum){/*{{{*/ - - int* cs_array=NULL; - - /*All nodes have the same Coordinate System*/ - cs_array=xNew(numnodes); - for(int i=0;i(cs_array); -} -/*}}}*/ -void TransformInvStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes,int numnodes,int* cs_array){/*{{{*/ - - int i,j; - int numdofs = 0; - IssmDouble *transform = NULL; - IssmDouble *values = NULL; - - /*Get total number of dofs*/ - for(i=0;i(Ke->nrows*Ke->ncols); - for(i=0;inrows;i++) for(j=0;jncols;j++) values[i*Ke->ncols+j]=Ke->values[i*Ke->ncols+j]; - - /*Get Coordinate Systems transform matrix*/ - CoordinateSystemTransform(&transform,nodes,numnodes,cs_array); - - /*Transform matrix: R*Ke*R^T */ - TripleMultiply(transform,numdofs,numdofs,0, - values,Ke->nrows,Ke->ncols,0, - transform,numdofs,numdofs,1, - &Ke->values[0],0); - - /*Free Matrix*/ - xDelete(transform); - xDelete(values); -} -/*}}}*/ -void TransformLoadVectorCoord(ElementVector* pe,Node** nodes,int numnodes,int cs_enum){/*{{{*/ - - int* cs_array=NULL; - - /*All nodes have the same Coordinate System*/ - cs_array=xNew(numnodes); - for(int i=0;i(cs_array); -} -/*}}}*/ -void TransformLoadVectorCoord(ElementVector* pe,Node** nodes,int numnodes,int* cs_array){/*{{{*/ - - int i; - int numdofs = 0; - IssmDouble *transform = NULL; - IssmDouble *values = NULL; - - /*Get total number of dofs*/ - for(i=0;i(pe->nrows); - for(i=0;inrows;i++) values[i]=pe->values[i]; - - /*Get Coordinate Systems transform matrix*/ - CoordinateSystemTransform(&transform,nodes,numnodes,cs_array); - - /*Transform matrix: R^T*pe */ - MatrixMultiply(transform,numdofs,numdofs,1, - values,pe->nrows,1,0, - &pe->values[0],0); - - /*Free Matrices*/ - xDelete(transform); - xDelete(values); -} -/*}}}*/ -void TransformSolutionCoord(IssmDouble* solution,Node** nodes,int numnodes,int cs_enum){/*{{{*/ - - int* cs_array=NULL; - - /*All nodes have the same Coordinate System*/ - cs_array=xNew(numnodes); - for(int i=0;i(cs_array); -} -/*}}}*/ -void TransformSolutionCoord(IssmDouble* solution,Node** nodes,int numnodes,int* cs_array){/*{{{*/ - - int i; - int numdofs = 0; - IssmDouble *transform = NULL; - IssmDouble *values = NULL; - - /*Get total number of dofs*/ - for(i=0;i(numdofs); - for(i=0;i(transform); - xDelete(values); -} -/*}}}*/ -void TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes,int numnodes,int cs_enum){/*{{{*/ - - int* cs_array=NULL; - - /*All nodes have the same Coordinate System*/ - cs_array=xNew(numnodes); - for(int i=0;i(cs_array); -} -/*}}}*/ -void TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes,int numnodes,int* cs_array){/*{{{*/ - - int numdofs = 0; - IssmDouble *transform = NULL; - IssmDouble *values = NULL; - - /*Get total number of dofs*/ - for(int i=0;i(Ke->nrows*Ke->ncols); - for(int i=0;inrows*Ke->ncols;i++) values[i]=Ke->values[i]; - - /*Get Coordinate Systems transform matrix*/ - CoordinateSystemTransform(&transform,nodes,numnodes,cs_array); - - /*Transform matrix: R^T*Ke*R */ - TripleMultiply(transform,numdofs,numdofs,1, - values,Ke->nrows,Ke->ncols,0, - transform,numdofs,numdofs,0, - &Ke->values[0],0); - - /*Free Matrix*/ - xDelete(transform); - xDelete(values); -} -/*}}}*/ -void CoordinateSystemTransform(IssmDouble** ptransform,Node** nodes,int numnodes,int* cs_array){/*{{{*/ - - int i,counter; - int numdofs = 0; - IssmDouble norm; - IssmDouble *transform = NULL; - IssmDouble coord_system[3][3]; - - /*Some checks in debugging mode*/ - _assert_(numnodes && nodes); - - /*Get total number of dofs*/ - for(i=0;i(numdofs*numdofs); - for(i=0;iGetCoordinateSystem(&coord_system[0][0]); - switch(cs_array[i]){ - case PressureEnum: - /*DO NOT change anything*/ - transform[(numdofs)*(counter) + counter] = 1.; - counter+=1; - break; - case XYEnum: - /*We remove the z component, we need to renormalize x and y: x=[x1 x2 0] y=[-x2 x1 0]*/ - norm = sqrt( coord_system[0][0]*coord_system[0][0] + coord_system[1][0]*coord_system[1][0]); _assert_(norm>1.e-4); - transform[(numdofs)*(counter+0) + counter+0] = coord_system[0][0]/norm; - transform[(numdofs)*(counter+0) + counter+1] = - coord_system[1][0]/norm; - transform[(numdofs)*(counter+1) + counter+0] = coord_system[1][0]/norm; - transform[(numdofs)*(counter+1) + counter+1] = coord_system[0][0]/norm; - counter+=2; - break; - case XYZEnum: - /*The 3 coordinates are changed (x,y,z)*/ - transform[(numdofs)*(counter+0) + counter+0] = coord_system[0][0]; - transform[(numdofs)*(counter+0) + counter+1] = coord_system[0][1]; - transform[(numdofs)*(counter+0) + counter+2] = coord_system[0][2]; - transform[(numdofs)*(counter+1) + counter+0] = coord_system[1][0]; - transform[(numdofs)*(counter+1) + counter+1] = coord_system[1][1]; - transform[(numdofs)*(counter+1) + counter+2] = coord_system[1][2]; - transform[(numdofs)*(counter+2) + counter+0] = coord_system[2][0]; - transform[(numdofs)*(counter+2) + counter+1] = coord_system[2][1]; - transform[(numdofs)*(counter+2) + counter+2] = coord_system[2][2]; - counter+=3; - break; - default: - _error_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet"); - } - } - - /*Assign output pointer*/ - *ptransform=transform; -} -/*}}}*/ -#endif Index: /issm/trunk/src/c/classes/Node.h =================================================================== --- /issm/trunk/src/c/classes/Node.h (revision 17805) +++ /issm/trunk/src/c/classes/Node.h (revision 17806) @@ -56,7 +56,5 @@ int Sid(void); int Lid(void); -#ifdef _HAVE_STRESSBALANCE_ void GetCoordinateSystem(IssmDouble* coord_system_out); -#endif bool InAnalysis(int analysis_enum); int GetApproximation(); @@ -91,15 +89,4 @@ int* GetGlobalDofList(Node** nodes,int numnodes,int setenum,int approximation); int GetNumberOfDofs(Node** nodes,int numnodes,int setenum,int approximation); -#ifdef _HAVE_STRESSBALANCE_ -void TransformInvStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes,int numnodes,int cs_enum); -void TransformInvStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes,int numnodes,int* cs_array); -void TransformLoadVectorCoord(ElementVector* pe,Node** nodes,int numnodes,int cs_enum); -void TransformLoadVectorCoord(ElementVector* pe,Node** nodes,int numnodes,int* cs_array); -void TransformSolutionCoord(IssmDouble* solution,Node** nodes,int numnodes,int cs_enum); -void TransformSolutionCoord(IssmDouble* solution,Node** nodes,int numnodes,int* cs_array); -void TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes,int numnodes,int cs_enum); -void TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes,int numnodes,int* cs_array); -void CoordinateSystemTransform(IssmDouble** ptransform,Node** nodes,int numnodes,int* cs_array); -#endif #endif /* _NODE_H_ */ Index: /issm/trunk/src/c/classes/Params/BoolParam.cpp =================================================================== --- /issm/trunk/src/c/classes/Params/BoolParam.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Params/BoolParam.cpp (revision 17806) @@ -42,8 +42,5 @@ /*FUNCTION BoolParam::DeepEcho{{{*/ void BoolParam::DeepEcho(void){ - - _printf_("BoolParam:\n"); - _printf_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n"); - _printf_(" value: " <<(this->value?"true":"false") << "\n"); + _printf_(setw(22)<<" BoolParam "<enum_type)<<" "<<(value?"true":"false")<<"\n"); } /*}}}*/ Index: /issm/trunk/src/c/classes/Params/DataSetParam.cpp =================================================================== --- /issm/trunk/src/c/classes/Params/DataSetParam.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Params/DataSetParam.cpp (revision 17806) @@ -44,7 +44,7 @@ void DataSetParam::DeepEcho(void){ - _printf_("DataSetParam:\n"); - _printf_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n"); + _printf_(setw(22)<<" DataSetParam "<enum_type)<<" ----- begin\n"); this->value->Echo(); + _printf_(setw(22)<<" DataSetParam "<enum_type)<<" ----- end\n"); } /*}}}*/ Index: /issm/trunk/src/c/classes/Params/DataSetParam.h =================================================================== --- /issm/trunk/src/c/classes/Params/DataSetParam.h (revision 17805) +++ /issm/trunk/src/c/classes/Params/DataSetParam.h (revision 17806) @@ -22,7 +22,8 @@ private: int enum_type; + + public: DataSet* value; - public: /*DataSetParam constructors, destructors: {{{*/ DataSetParam(); Index: /issm/trunk/src/c/classes/Params/DoubleParam.cpp =================================================================== --- /issm/trunk/src/c/classes/Params/DoubleParam.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Params/DoubleParam.cpp (revision 17806) @@ -40,7 +40,5 @@ void DoubleParam::DeepEcho(void){ - _printf_("DoubleParam:\n"); - _printf_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n"); - _printf_(" value: " << this->value << "\n"); + _printf_(setw(22)<<" DoubleParam "<enum_type)<<" "<value<<"\n"); } /*}}}*/ Index: /issm/trunk/src/c/classes/Params/DoubleVecParam.cpp =================================================================== --- /issm/trunk/src/c/classes/Params/DoubleVecParam.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Params/DoubleVecParam.cpp (revision 17806) @@ -42,7 +42,5 @@ void DoubleVecParam::Echo(void){ - _printf_("DoubleVecParam:\n"); - _printf_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n"); - _printf_(" vector size: " << this->M << "\n"); + _printf_(setw(22)<<" DoubleVecParam "<enum_type)<<" size: "<M<<"\n"); } @@ -50,13 +48,7 @@ /*FUNCTION DoubleVecParam::DeepEcho{{{*/ void DoubleVecParam::DeepEcho(void){ - - int i; - - _printf_("DoubleVecParam:\n"); - _printf_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n"); - _printf_(" vector size: " << this->M << "\n"); - for(i=0;iM;i++){ - _printf_(i << " " << this->values[i] << "\n"); - } + _printf_(setw(22)<<" DoubleVecParam "<enum_type)<<" "<<"["); + for(int i=0;iM;i++) _printf_(" "<< this->values[i]); + _printf_("\n"); } /*}}}*/ Index: /issm/trunk/src/c/classes/Params/FileParam.cpp =================================================================== --- /issm/trunk/src/c/classes/Params/FileParam.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Params/FileParam.cpp (revision 17806) @@ -43,7 +43,5 @@ void FileParam::DeepEcho(void){ - _printf_("FileParam:\n"); - _printf_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n"); - _printf_(" value: " << this->value << "\n"); + _printf_(setw(22)<<" FileParam "<enum_type)<<" "<value<<"\n"); } /*}}}*/ Index: /issm/trunk/src/c/classes/Params/IntParam.cpp =================================================================== --- /issm/trunk/src/c/classes/Params/IntParam.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Params/IntParam.cpp (revision 17806) @@ -43,7 +43,5 @@ void IntParam::DeepEcho(void){ - _printf_("IntParam:\n"); - _printf_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n"); - _printf_(" value: " << this->value << "\n"); + _printf_(setw(22)<<" IntParam "<enum_type)<<" "<value<<"\n"); } /*}}}*/ Index: /issm/trunk/src/c/classes/Params/Parameters.cpp =================================================================== --- /issm/trunk/src/c/classes/Params/Parameters.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Params/Parameters.cpp (revision 17806) @@ -21,4 +21,5 @@ #include "./BoolParam.h" #include "./DoubleMatParam.h" +#include "./DataSetParam.h" #include "./DoubleParam.h" #include "./DoubleVecParam.h" @@ -472,4 +473,16 @@ if(param) param->SetValue(fid); //already exists, just set it. else this->AddObject(new FileParam(enum_type,fid)); //just add the new parameter. +} +/*}}}*/ +/*FUNCTION Parameters::SetParam(DataSet* dataset, int enum_type);{{{*/ +void Parameters::SetParam(DataSet* dataset,int enum_type){ + + Param* param=NULL; + + /*first, figure out if the param has already been created: */ + param=dynamic_cast(this->FindParamObject(enum_type)); + + if(param) param->SetValue(dataset); //already exists, just set it. + else this->AddObject(new DataSetParam(enum_type,dataset)); //just add the new parameter. } /*}}}*/ Index: /issm/trunk/src/c/classes/Params/Parameters.h =================================================================== --- /issm/trunk/src/c/classes/Params/Parameters.h (revision 17805) +++ /issm/trunk/src/c/classes/Params/Parameters.h (revision 17806) @@ -52,4 +52,5 @@ void SetParam(Matrix* mat,int enum_type); void SetParam(FILE* fid,int enum_type); + void SetParam(DataSet* dataset,int enum_type); Object* FindParamObject(int enum_type); Index: /issm/trunk/src/c/classes/Params/StringArrayParam.cpp =================================================================== --- /issm/trunk/src/c/classes/Params/StringArrayParam.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Params/StringArrayParam.cpp (revision 17806) @@ -67,13 +67,7 @@ void StringArrayParam::DeepEcho(void){ - int i; - char* string=NULL; - - _printf_("StringArrayParam:\n"); - _printf_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n"); - for(i=0;inumstrings;i++){ - string=this->value[i]; - _printf_(" " << i << ": " << string << "\n"); - } + _printf_(setw(22)<<" StringArrayParam "<enum_type)<<" {"); + for(int i=0;inumstrings;i++) _printf_(" '"<value[i]<<"'"); + _printf_("}\n"); } /*}}}*/ Index: /issm/trunk/src/c/classes/Params/StringParam.cpp =================================================================== --- /issm/trunk/src/c/classes/Params/StringParam.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Params/StringParam.cpp (revision 17806) @@ -44,7 +44,5 @@ /*FUNCTION StringParam::DeepEcho{{{*/ void StringParam::DeepEcho(void){ - _printf_("StringParam:\n"); - _printf_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n"); - _printf_(" value: " << this->value << "\n"); + _printf_(setw(22)<<" StringParam "<enum_type)<<" "<value<<"\n"); } /*}}}*/ Index: /issm/trunk/src/c/classes/Update.h =================================================================== --- /issm/trunk/src/c/classes/Update.h (revision 17805) +++ /issm/trunk/src/c/classes/Update.h (revision 17806) @@ -22,5 +22,4 @@ virtual void InputUpdateFromConstant(int constant, int name)=0; virtual void InputUpdateFromConstant(bool constant, int name)=0; - virtual void InputUpdateFromSolution(IssmDouble* solution)=0; virtual void InputUpdateFromIoModel(int index, IoModel* iomodel)=0; Index: /issm/trunk/src/c/classes/Vertex.cpp =================================================================== --- /issm/trunk/src/c/classes/Vertex.cpp (revision 17805) +++ /issm/trunk/src/c/classes/Vertex.cpp (revision 17806) @@ -32,14 +32,14 @@ this->y = iomodel->Data(MeshYEnum)[i]; this->z = iomodel->Data(MeshZEnum)[i]; - this->meshtype = iomodel->meshtype; - - _assert_(iomodel->Data(BedEnum) && iomodel->Data(ThicknessEnum) && iomodel->numbernodetoelementconnectivity); - switch(iomodel->meshtype){ - case Mesh3DEnum: - case Mesh2DhorizontalEnum: - this->sigma = (iomodel->Data(MeshZEnum)[i]-iomodel->Data(BedEnum)[i])/(iomodel->Data(ThicknessEnum)[i]); + this->domaintype = iomodel->domaintype; + + _assert_(iomodel->Data(BaseEnum) && iomodel->Data(ThicknessEnum) && iomodel->numbernodetoelementconnectivity); + switch(iomodel->domaintype){ + case Domain3DEnum: + case Domain2DhorizontalEnum: + this->sigma = (iomodel->Data(MeshZEnum)[i]-iomodel->Data(BaseEnum)[i])/(iomodel->Data(ThicknessEnum)[i]); break; - case Mesh2DverticalEnum: - this->sigma = (iomodel->Data(MeshYEnum)[i]-iomodel->Data(BedEnum)[i])/(iomodel->Data(ThicknessEnum)[i]); + case Domain2DverticalEnum: + this->sigma = (iomodel->Data(MeshYEnum)[i]-iomodel->Data(BaseEnum)[i])/(iomodel->Data(ThicknessEnum)[i]); break; } @@ -132,17 +132,24 @@ /*sigma remains constant. z=bed+sigma*thickness*/ - if(this->meshtype==Mesh2DverticalEnum){ - oldy = this->y; - newy = bed[this->pid]+sigma*(surface[this->pid] - bed[this->pid]); - vely = (newy-oldy)/dt; - this->y = newy; - vy->SetValue(this->pid,vely,INS_VAL); - } - else{ - oldz = this->z; - newz = bed[this->pid]+sigma*(surface[this->pid] - bed[this->pid]); - velz = (newz-oldz)/dt; - this->z = newz; - vz->SetValue(this->pid,velz,INS_VAL); + switch(this->domaintype){ + case Domain2DhorizontalEnum: + /*Nothing*/ + return; + case Domain2DverticalEnum: + oldy = this->y; + newy = bed[this->pid]+sigma*(surface[this->pid] - bed[this->pid]); + vely = (newy-oldy)/dt; + this->y = newy; + vy->SetValue(this->pid,vely,INS_VAL); + return; + case Domain3DEnum: + oldz = this->z; + newz = bed[this->pid]+sigma*(surface[this->pid] - bed[this->pid]); + velz = (newz-oldz)/dt; + this->z = newz; + vz->SetValue(this->pid,velz,INS_VAL); + return; + default: + _error_("not implemented"); } } Index: /issm/trunk/src/c/classes/Vertex.h =================================================================== --- /issm/trunk/src/c/classes/Vertex.h (revision 17805) +++ /issm/trunk/src/c/classes/Vertex.h (revision 17806) @@ -21,5 +21,5 @@ public: bool clone; - int meshtype; + int domaintype; int id; // random index int sid; // "serial" id (rank of this vertex if the dataset was on 1 cpu) Index: /issm/trunk/src/c/classes/classes.h =================================================================== --- /issm/trunk/src/c/classes/classes.h (revision 17805) +++ /issm/trunk/src/c/classes/classes.h (revision 17806) @@ -18,4 +18,5 @@ #include "./Segment.h" #include "./Massfluxatgate.h" +#include "./Misfit.h" /*Constraints: */ @@ -44,4 +45,6 @@ #include "./Elements/Tria.h" #include "./Elements/TriaRef.h" +#include "./Elements/Tetra.h" +#include "./Elements/TetraRef.h" #include "./Elements/ElementHook.h" @@ -58,4 +61,5 @@ #include "./Inputs/DoubleInput.h" #include "./Inputs/IntInput.h" +#include "./Inputs/TetraInput.h" #include "./Inputs/PentaInput.h" #include "./Inputs/TriaInput.h" Index: /issm/trunk/src/c/classes/gauss/Gauss.h =================================================================== --- /issm/trunk/src/c/classes/gauss/Gauss.h (revision 17806) +++ /issm/trunk/src/c/classes/gauss/Gauss.h (revision 17806) @@ -0,0 +1,24 @@ +/*!\file Gauss.h + * \brief: header file for vvirtual Gauss object + */ + +#ifndef _GAUSS_H_ +#define _GAUSS_H_ + +class Gauss{ + + public: + IssmDouble weight; + + virtual ~Gauss(){}; + virtual int begin(void)=0; + virtual int end(void)=0; + virtual void Echo(void)=0; + virtual int Enum(void)=0; + virtual void GaussPoint(int ig)=0; + virtual void GaussVertex(int iv)=0; + virtual void GaussNode(int finitelement,int iv)=0; + virtual void SynchronizeGaussBase(Gauss* gauss)=0; + +}; +#endif Index: /issm/trunk/src/c/classes/gauss/GaussPenta.cpp =================================================================== --- /issm/trunk/src/c/classes/gauss/GaussPenta.cpp (revision 17805) +++ /issm/trunk/src/c/classes/gauss/GaussPenta.cpp (revision 17806) @@ -495,4 +495,9 @@ } /*}}}*/ +/*FUNCTION GaussPenta::Enum{{{*/ +int GaussPenta::Enum(void){ + return GaussPentaEnum; +} +/*}}}*/ /*FUNCTION GaussPenta::GaussPoint{{{*/ void GaussPenta::GaussPoint(int ig){ @@ -582,4 +587,22 @@ } break; + case P1xP3Enum: + switch(iv){ + case 0 : coord1=1.; coord2=0.; coord3=0.; coord4=-1.; break; + case 1 : coord1=0.; coord2=1.; coord3=0.; coord4=-1.; break; + case 2 : coord1=0.; coord2=0.; coord3=1.; coord4=-1.; break; + case 3 : coord1=1.; coord2=0.; coord3=0.; coord4=+1.; break; + case 4 : coord1=0.; coord2=1.; coord3=0.; coord4=+1.; break; + case 5 : coord1=0.; coord2=0.; coord3=1.; coord4=+1.; break; + + case 6 : coord1=1.; coord2=0.; coord3=0.; coord4=-1./3.; break; + case 7 : coord1=0.; coord2=1.; coord3=0.; coord4=-1./3.; break; + case 8 : coord1=0.; coord2=0.; coord3=1.; coord4=-1./3.; break; + case 9 : coord1=1.; coord2=0.; coord3=0.; coord4=+1./3.; break; + case 10: coord1=0.; coord2=1.; coord3=0.; coord4=+1./3.; break; + case 11: coord1=0.; coord2=0.; coord3=1.; coord4=+1./3.; break; + default: _error_("node index should be in [0 11]"); + } + break; case P2xP1Enum: switch(iv){ @@ -631,5 +654,48 @@ case 13: coord1=.5; coord2=0.; coord3=.5; coord4=+1.;break; case 14: coord1=.5; coord2=.5; coord3=0.; coord4=+1.;break; - default: _error_("node index should be in [0 14]"); + + case 15: coord1=0.; coord2=.5; coord3=.5; coord4=0.;break; + case 16: coord1=.5; coord2=0.; coord3=.5; coord4=0.;break; + case 17: coord1=.5; coord2=.5; coord3=0.; coord4=0.;break; + default: _error_("node index should be in [0 17]"); + } + break; + case P2xP4Enum: + switch(iv){ + case 0: coord1=1.; coord2=0.; coord3=0.; coord4=-1.; break; + case 1: coord1=0.; coord2=1.; coord3=0.; coord4=-1.; break; + case 2: coord1=0.; coord2=0.; coord3=1.; coord4=-1.; break; + case 3: coord1=1.; coord2=0.; coord3=0.; coord4=+1.; break; + case 4: coord1=0.; coord2=1.; coord3=0.; coord4=+1.; break; + case 5: coord1=0.; coord2=0.; coord3=1.; coord4=+1.; break; + + case 6: coord1=1.; coord2=0.; coord3=0.; coord4=0.; break; + case 7: coord1=0.; coord2=1.; coord3=0.; coord4=0.; break; + case 8: coord1=0.; coord2=0.; coord3=1.; coord4=0.; break; + + case 9: coord1=0.; coord2=.5; coord3=.5; coord4=-1.;break; + case 10: coord1=.5; coord2=0.; coord3=.5; coord4=-1.;break; + case 11: coord1=.5; coord2=.5; coord3=0.; coord4=-1.;break; + case 12: coord1=0.; coord2=.5; coord3=.5; coord4=+1.;break; + case 13: coord1=.5; coord2=0.; coord3=.5; coord4=+1.;break; + case 14: coord1=.5; coord2=.5; coord3=0.; coord4=+1.;break; + + case 15: coord1=1.; coord2=0.; coord3=0.; coord4=-.5; break; + case 16: coord1=0.; coord2=1.; coord3=0.; coord4=-.5; break; + case 17: coord1=0.; coord2=0.; coord3=1.; coord4=-.5; break; + case 18: coord1=1.; coord2=0.; coord3=0.; coord4=+.5; break; + case 19: coord1=0.; coord2=1.; coord3=0.; coord4=+.5; break; + case 20: coord1=0.; coord2=0.; coord3=1.; coord4=+.5; break; + + case 21: coord1=0.; coord2=.5; coord3=.5; coord4=-.5;break; + case 22: coord1=.5; coord2=0.; coord3=.5; coord4=-.5;break; + case 23: coord1=.5; coord2=.5; coord3=0.; coord4=-.5;break; + case 24: coord1=0.; coord2=.5; coord3=.5; coord4=0.;break; + case 25: coord1=.5; coord2=0.; coord3=.5; coord4=0.;break; + case 26: coord1=.5; coord2=.5; coord3=0.; coord4=0.;break; + case 27: coord1=0.; coord2=.5; coord3=.5; coord4=+.5;break; + case 28: coord1=.5; coord2=0.; coord3=.5; coord4=+.5;break; + case 29: coord1=.5; coord2=.5; coord3=0.; coord4=+.5;break; + default: _error_("node index should be in [0 29]"); } break; @@ -669,6 +735,9 @@ } /*}}}*/ -/*FUNCTION GaussPenta::SynchronizeGaussTria{{{*/ -void GaussPenta::SynchronizeGaussTria(GaussTria* gauss_tria){ +/*FUNCTION GaussPenta::SynchronizeGaussBase{{{*/ +void GaussPenta::SynchronizeGaussBase(Gauss* gauss){ + + _assert_(gauss->Enum()==GaussTriaEnum); + GaussTria* gauss_tria = dynamic_cast(gauss); gauss_tria->coord1=this->coord1; Index: /issm/trunk/src/c/classes/gauss/GaussPenta.h =================================================================== --- /issm/trunk/src/c/classes/gauss/GaussPenta.h (revision 17805) +++ /issm/trunk/src/c/classes/gauss/GaussPenta.h (revision 17806) @@ -8,7 +8,8 @@ /*Headers:*/ #include "../../shared/Numerics/types.h" +#include "./Gauss.h" class GaussTria; -class GaussPenta{ +class GaussPenta: public Gauss{ private: @@ -21,5 +22,4 @@ public: - IssmDouble weight; IssmDouble coord1; IssmDouble coord2; @@ -43,9 +43,10 @@ int end(void); void Echo(void); + int Enum(void); void GaussPoint(int ig); void GaussVertex(int iv); void GaussNode(int finitelement,int iv); void GaussFaceTria(int index1, int index2, int index3, int order); - void SynchronizeGaussTria(GaussTria* gauss_tria); + void SynchronizeGaussBase(Gauss* gauss); }; #endif Index: /issm/trunk/src/c/classes/gauss/GaussSeg.cpp =================================================================== --- /issm/trunk/src/c/classes/gauss/GaussSeg.cpp (revision 17805) +++ /issm/trunk/src/c/classes/gauss/GaussSeg.cpp (revision 17806) @@ -12,4 +12,16 @@ /*GaussSeg constructors and destructors:*/ +/*FUNCTION GaussSeg::GaussSeg() {{{*/ +GaussSeg::GaussSeg(){ + + numgauss=-1; + + weights=NULL; + coords1=NULL; + + weight=UNDEF; + coord1=UNDEF; +} +/*}}}*/ /*FUNCTION GaussSeg::GaussSeg(int order) {{{*/ GaussSeg::GaussSeg(int order){ @@ -34,4 +46,22 @@ xDelete(pcoords1); xDelete(pweights); + + /*Initialize static fields as undefinite*/ + weight=UNDEF; + coord1=UNDEF; +} +/*}}}*/ +/*FUNCTION GaussSeg::GaussSeg(IssmDouble position) {{{*/ +GaussSeg::GaussSeg(IssmDouble position){ + + /*Get gauss points*/ + this->numgauss = 1; + this->coords1=xNew(numgauss); + this->weights=xNew(numgauss); + + /*cast : */ + _assert_(position>=-1. && position<=+1.); + this->coords1[0]=position; + this->weights[0]=1.; /*Initialize static fields as undefinite*/ @@ -70,4 +100,9 @@ } /*}}}*/ +/*FUNCTION GaussSeg::Enum{{{*/ +int GaussSeg::Enum(void){ + return GaussSegEnum; +} +/*}}}*/ /*FUNCTION GaussSeg::GaussPoint{{{*/ void GaussSeg::GaussPoint(int ig){ @@ -79,4 +114,38 @@ weight=weights[ig]; coord1=coords1[ig]; +} +/*}}}*/ +/*FUNCTION GaussSeg::GaussVertex{{{*/ +void GaussSeg::GaussVertex(int iv){ + + /*in debugging mode: check that the default constructor has been called*/ + _assert_(numgauss==-1); + + /*update static arrays*/ + switch(iv){ + case 0: coord1=-1.; break; + case 1: coord1=+1.; break; + default: _error_("vertex index should be in [0 1]"); + } +} +/*}}}*/ +/*FUNCTION GaussSeg::GaussNode{{{*/ +void GaussSeg::GaussNode(int finiteelement,int iv){ + + /*in debugging mode: check that the default constructor has been called*/ + _assert_(numgauss==-1); + + /*update static arrays*/ + switch(finiteelement){ + case P1Enum: case P1DGEnum: + switch(iv){ + case 0: coord1=-1.; break; + case 1: coord1=+1.; break; + default: _error_("node index should be in [0 1]"); + } + break; + default: _error_("Finite element "< +#include "./GaussTetra.h" +#include "../../shared/io/Print/Print.h" +#include "../../shared/Exceptions/exceptions.h" +#include "../../shared/MemOps/MemOps.h" +#include "../../shared/Enum/Enum.h" +#include "../../shared/Numerics/GaussPoints.h" +#include "../../shared/Numerics/constants.h" + +/*GaussTetra constructors and destructors:*/ +/*FUNCTION GaussTetra::GaussTetra() {{{*/ +GaussTetra::GaussTetra(){ + + numgauss=-1; + + weights=NULL; + coords1=NULL; + coords2=NULL; + coords3=NULL; + coords4=NULL; + + weight=UNDEF; + coord1=UNDEF; + coord2=UNDEF; + coord3=UNDEF; + coord4=UNDEF; +} +/*}}}*/ +/*FUNCTION GaussTetra::GaussTetra(int order) {{{*/ +GaussTetra::GaussTetra(int order){ + /*Get gauss points*/ + GaussLegendreTetra(&numgauss,&coords1,&coords2,&coords3,&coords4,&weights,order); + for(int i=0;iweights[i]=this->weights[i]/6.; //FIXME: double check that + + /*Initialize static fields as undefinite*/ + weight=UNDEF; + coord1=UNDEF; + coord2=UNDEF; + coord3=UNDEF; +} +/*}}}*/ +/*FUNCTION GaussTetra::GaussTetra(int index1,int index2,int index3,int order) {{{*/ +GaussTetra::GaussTetra(int index1,int index2,int index3,int order){ + + /*Basal Tria*/ + if(index1==0 && index2==1 && index3==2){ + GaussLegendreTria(&numgauss,&coords1,&coords2,&coords3,&weights,order); + coords4=xNew(numgauss); + for(int i=0;i(numgauss); + for(int i=0;i(numgauss); + for(int i=0;i(numgauss); + for(int i=0;i(weights); + xDelete(coords1); + xDelete(coords2); + xDelete(coords3); + xDelete(coords4); +} +/*}}}*/ + +/*Methods*/ +/*FUNCTION GaussTetra::Echo{{{*/ +void GaussTetra::Echo(void){ + + _printf_("GaussTetra:\n"); + _printf_(" numgauss: " << numgauss << "\n"); + + if (weights){ + _printf_(" weights = ["); + for(int i=0;i=0 && ig< numgauss); + + /*update static arrays*/ + weight=weights[ig]; + coord1=coords1[ig]; + coord2=coords2[ig]; + coord3=coords3[ig]; + coord4=coords4[ig]; + +} +/*}}}*/ +/*FUNCTION GaussTetra::GaussVertex{{{*/ +void GaussTetra::GaussVertex(int iv){ + + /*in debugging mode: check that the default constructor has been called*/ + _assert_(numgauss==-1); + + /*update static arrays*/ + switch(iv){ + case 0: coord1=1.; coord2=0.; coord3=0.; coord4=0.; break; + case 1: coord1=0.; coord2=1.; coord3=0.; coord4=0.; break; + case 2: coord1=0.; coord2=0.; coord3=1.; coord4=0.; break; + case 3: coord1=0.; coord2=0.; coord3=0.; coord4=1.; break; + default: _error_("vertex index should be in [0 3]"); + + } + +} +/*}}}*/ +/*FUNCTION GaussTetra::GaussNode{{{*/ +void GaussTetra::GaussNode(int finiteelement,int iv){ + + /*in debugging mode: check that the default constructor has been called*/ + _assert_(numgauss==-1); + + /*update static arrays*/ + switch(finiteelement){ + case P1Enum: case P1DGEnum: + switch(iv){ + case 0: coord1=1.; coord2=0.; coord3=0.; coord4=0.; break; + case 1: coord1=0.; coord2=1.; coord3=0.; coord4=0.; break; + case 2: coord1=0.; coord2=0.; coord3=1.; coord4=0.; break; + case 3: coord1=0.; coord2=0.; coord3=0.; coord4=1.; break; + default: _error_("node index should be in [0 3]"); + } + break; + case P1bubbleEnum: case P1bubblecondensedEnum: + switch(iv){ + case 0: coord1=1.; coord2=0.; coord3=0.; coord4=0.; break; + case 1: coord1=0.; coord2=1.; coord3=0.; coord4=0.; break; + case 2: coord1=0.; coord2=0.; coord3=1.; coord4=0.; break; + case 3: coord1=0.; coord2=0.; coord3=0.; coord4=1.; break; + case 4: coord1=1./4.; coord2=1./4.; coord3=1./4.; coord4=1./4.; break; + default: _error_("node index should be in [0 4]"); + } + break; + case P2Enum: + switch(iv){ + case 0: coord1=1.; coord2=0.; coord3=0.; coord4=0.; break; + case 1: coord1=0.; coord2=1.; coord3=0.; coord4=0.; break; + case 2: coord1=0.; coord2=0.; coord3=1.; coord4=0.; break; + case 3: coord1=0.; coord2=0.; coord3=0.; coord4=1.; break; + + case 4: coord1=0.; coord2=.5; coord3=.5; coord4=0.; break; + case 5: coord1=.5; coord2=0.; coord3=.5; coord4=0.; break; + case 6: coord1=.5; coord2=.5; coord3=0.; coord4=0.; break; + case 7: coord1=.5; coord2=0.; coord3=0.; coord4=.5; break; + case 8: coord1=0.; coord2=.5; coord3=0.; coord4=.5; break; + case 9: coord1=0.; coord2=0.; coord3=.5; coord4=.5; break; + default: _error_("node index should be in [0 9]"); + } + break; + default: _error_("Finite element "<0); + _assert_(weights); + _assert_(coords1); + _assert_(coords2); + _assert_(coords3); + _assert_(coords4); + + /*return first gauss index*/ + return 0; +} +/*}}}*/ +/*FUNCTION GaussTetra::end{{{*/ +int GaussTetra::end(void){ + + /*Check that this has been initialized*/ + _assert_(numgauss>0); + _assert_(weights); + _assert_(coords1); + _assert_(coords2); + _assert_(coords3); + _assert_(coords4); + + /*return last gauss index +1*/ + return numgauss; +} +/*}}}*/ +/*FUNCTION GaussTetra::SynchronizeGaussBase{{{*/ +void GaussTetra::SynchronizeGaussBase(Gauss* gauss){ + + _error_("not supported"); +} +/*}}}*/ Index: /issm/trunk/src/c/classes/gauss/GaussTetra.h =================================================================== --- /issm/trunk/src/c/classes/gauss/GaussTetra.h (revision 17806) +++ /issm/trunk/src/c/classes/gauss/GaussTetra.h (revision 17806) @@ -0,0 +1,46 @@ +/*!\file GaussTetra.h + * \brief: header file for node object + */ + +#ifndef _GAUSSTETRA_H_ +#define _GAUSSTETRA_H_ + +/*Headers:*/ +#include "../../shared/Numerics/types.h" +#include "./Gauss.h" + +class GaussTetra: public Gauss{ + + private: + int numgauss; + IssmDouble* weights; + IssmDouble* coords1; + IssmDouble* coords2; + IssmDouble* coords3; + IssmDouble* coords4; + + public: + IssmDouble coord1; + IssmDouble coord2; + IssmDouble coord3; + IssmDouble coord4; + + public: + + /*GaussTetra constructors, destructors*/ + GaussTetra(); + GaussTetra(int order); + GaussTetra(int index1,int index2,int index3,int order); + ~GaussTetra(); + + /*Methods*/ + int begin(void); + int end(void); + void Echo(void); + int Enum(void); + void GaussPoint(int ig); + void GaussVertex(int iv); + void GaussNode(int finitelement,int iv); + void SynchronizeGaussBase(Gauss* gauss); +}; +#endif Index: /issm/trunk/src/c/classes/gauss/GaussTria.cpp =================================================================== --- /issm/trunk/src/c/classes/gauss/GaussTria.cpp (revision 17805) +++ /issm/trunk/src/c/classes/gauss/GaussTria.cpp (revision 17806) @@ -339,4 +339,9 @@ _printf_(" coord3 = " << coord3 << "\n"); +} +/*}}}*/ +/*FUNCTION GaussTria::Enum{{{*/ +int GaussTria::Enum(void){ + return GaussTriaEnum; } /*}}}*/ @@ -498,2 +503,8 @@ } /*}}}*/ +/*FUNCTION GaussTria::SynchronizeGaussBase{{{*/ +void GaussTria::SynchronizeGaussBase(Gauss* gauss){ + + _error_("not supported"); +} +/*}}}*/ Index: /issm/trunk/src/c/classes/gauss/GaussTria.h =================================================================== --- /issm/trunk/src/c/classes/gauss/GaussTria.h (revision 17805) +++ /issm/trunk/src/c/classes/gauss/GaussTria.h (revision 17806) @@ -8,6 +8,7 @@ /*Headers:*/ #include "../../shared/Numerics/types.h" +#include "./Gauss.h" -class GaussTria{ +class GaussTria: public Gauss{ private: @@ -19,5 +20,4 @@ public: - IssmDouble weight; IssmDouble coord1; IssmDouble coord2; @@ -38,4 +38,5 @@ int end(void); void Echo(void); + int Enum(void); void GaussFromCoords(IssmDouble x1,IssmDouble y1,IssmDouble* xyz_list); void GaussPoint(int ig); @@ -43,4 +44,5 @@ void GaussNode(int finitelement,int iv); void GaussEdgeCenter(int index1,int index2); + void SynchronizeGaussBase(Gauss* gauss); }; #endif /* _GAUSSTRIA_H_ */ Index: /issm/trunk/src/c/classes/gauss/gaussobjects.h =================================================================== --- /issm/trunk/src/c/classes/gauss/gaussobjects.h (revision 17805) +++ /issm/trunk/src/c/classes/gauss/gaussobjects.h (revision 17806) @@ -6,6 +6,8 @@ #define ALL_GAUSS_OBJECTS_H_ +#include "./Gauss.h" #include "./GaussSeg.h" #include "./GaussTria.h" +#include "./GaussTetra.h" #include "./GaussPenta.h" Index: /issm/trunk/src/c/classes/kriging/Observations.cpp =================================================================== --- /issm/trunk/src/c/classes/kriging/Observations.cpp (revision 17805) +++ /issm/trunk/src/c/classes/kriging/Observations.cpp (revision 17806) @@ -158,15 +158,14 @@ /*Assign output pointer*/ - if(index>=0){ + if(nobs || hmin==radius){ observation=dynamic_cast(this->GetObjectByOffset(index)); - *px=observation->x; - *py=observation->y; - *pobs=observation->value; + *px = observation->x; + *py = observation->y; + *pobs = observation->value; } else{ - - *px=UNDEF; - *py=UNDEF; - *pobs=UNDEF; + *px = UNDEF; + *py = UNDEF; + *pobs = UNDEF; } xDelete(indices); @@ -180,8 +179,10 @@ for(int i=0;iClosestObservation(&xi,&yi,&obs,x[i],y[i],radius); - if(xi==UNDEF && yi==UNDEF) + if(xi==UNDEF && yi==UNDEF){ distances[i]=UNDEF; - else + } + else{ distances[i]=sqrt( (x[i]-xi)*(x[i]-xi) + (y[i]-yi)*(y[i]-yi) ); + } } }/*}}}*/ @@ -202,5 +203,5 @@ /*If radius is not provided or is 0, return all observations*/ - if(radius==0) radius=this->quadtree->root->length; + if(radius==0.) radius=this->quadtree->root->length*2.; /*Compute radius square*/ @@ -214,10 +215,10 @@ } nobs = 0; - for (i=0;i(this->GetObjectByOffset(tempindices[i])); h2 = (observation->x-x_interp)*(observation->x-x_interp) + (observation->y-y_interp)*(observation->y-y_interp); if(nobs==maxdata && h2>radius2) continue; - if(nobs<=maxdata){ + if(nobs(this->GetObjectByOffset(indices[i])); observation->WriteXYObs(&x[i],&y[i],&obs[i]); @@ -353,13 +354,8 @@ IssmPDouble prediction,error; IssmPDouble numerator,denominator,ratio; - IssmPDouble *x = NULL; - IssmPDouble *y = NULL; - IssmPDouble *obs = NULL; - IssmPDouble *Gamma = NULL; - IssmPDouble *GinvG0 = NULL; - IssmPDouble *Ginv1 = NULL; - IssmPDouble *GinvZ = NULL; - IssmPDouble *gamma0 = NULL; - IssmPDouble *ones = NULL; + IssmPDouble *x = NULL; + IssmPDouble *y = NULL; + IssmPDouble *obs = NULL; + IssmPDouble *Lambda = NULL; /*Some checks*/ @@ -381,41 +377,40 @@ /*Allocate intermediary matrix and vectors*/ - Gamma = xNew(n_obs*n_obs); - gamma0 = xNew(n_obs); - ones = xNew(n_obs); - + IssmPDouble* A = xNew((n_obs+1)*(n_obs+1)); + IssmPDouble* B = xNew(n_obs+1); + + IssmDouble unbias = variogram->Covariance(0.,0.); /*First: Create semivariogram matrix for observations*/ for(i=0;iSemiVariogram(x[i]-x[j],y[i]-y[j]); - Gamma[i*n_obs+j] = variogram->Covariance(x[i]-x[j],y[i]-y[j]); - Gamma[j*n_obs+i] = Gamma[i*n_obs+j]; - } - } - for(i=0;iCovariance(x[i]-x[j],y[i]-y[j]); + A[j*(n_obs+1)+i] = A[i*(n_obs+1)+j]; + } + A[i*(n_obs+1)+n_obs] = unbias; + //A[i*(n_obs+1)+n_obs] = 1.; + } + for(i=0;iSemiVariogram(x[i]-x_interp,y[i]-y_interp); - for(i=0;iCovariance(x[i]-x_interp,y[i]-y_interp); + for(i=0;iCovariance(x[i]-x_interp,y[i]-y_interp); + B[n_obs] = unbias; + //B[n_obs] = 1.; /*Solve the three linear systems*/ #if _HAVE_GSL_ - DenseGslSolve(&GinvG0,Gamma,gamma0,n_obs); // Gamma^-1 gamma0 - DenseGslSolve(&Ginv1, Gamma,ones,n_obs); // Gamma^-1 ones - DenseGslSolve(&GinvZ, Gamma,obs,n_obs); // Gamma^-1 Z + DenseGslSolve(&Lambda,A,B,n_obs+1); // Gamma^-1 Z #else _error_("GSL is required"); #endif - /*Prepare predictor*/ - numerator=-1.; denominator=0.; - for(i=0;iCovariance(0.,0.)*(1. - Lambda[n_obs]);; + for(i=0;i(y); xDelete(obs); - xDelete(Gamma); - xDelete(gamma0); - xDelete(ones); - xDelete(GinvG0); - xDelete(Ginv1); - xDelete(GinvZ); + xDelete(A); + xDelete(B); + xDelete(Lambda); }/*}}}*/ @@ -465,7 +457,4 @@ _assert_(maxdata>0); _assert_(pprediction); - - /*If radius is not provided or is 0, return all observations*/ - if(radius==0) radius=this->quadtree->root->length; /*Get list of observations for current point*/ @@ -505,4 +494,6 @@ Green[i*n_obs+j] = Green[j*n_obs+i]; } + /*Zero diagonal (should be done already, but just in case)*/ + Green[i*n_obs+i] = 0.; } Index: /issm/trunk/src/c/classes/kriging/Quadtree.cpp =================================================================== --- /issm/trunk/src/c/classes/kriging/Quadtree.cpp (revision 17805) +++ /issm/trunk/src/c/classes/kriging/Quadtree.cpp (revision 17806) @@ -237,10 +237,10 @@ /*We found the closest observation, now average observation (do not change xi and yi to avoid round off errors*/ - box->obs[index]->x = (box->obs[index]->weight*box->obs[index]->x + x)/(box->obs[index]->weight+1); - box->obs[index]->y = (box->obs[index]->weight*box->obs[index]->y + y)/(box->obs[index]->weight+1); - box->obs[index]->xi= int((box->obs[index]->weight*double(box->obs[index]->xi) + double(xi))/(box->obs[index]->weight+1)); - box->obs[index]->yi= int((box->obs[index]->weight*double(box->obs[index]->yi) + double(yi))/(box->obs[index]->weight+1)); - box->obs[index]->value = (box->obs[index]->weight*box->obs[index]->value + value)/(box->obs[index]->weight+1); - box->obs[index]->weight += 1; + box->obs[index]->x = (box->obs[index]->weight*box->obs[index]->x + x)/(box->obs[index]->weight+1.); + box->obs[index]->y = (box->obs[index]->weight*box->obs[index]->y + y)/(box->obs[index]->weight+1.); + box->obs[index]->xi= int((box->obs[index]->weight*double(box->obs[index]->xi) + double(xi))/(box->obs[index]->weight+1.)); + box->obs[index]->yi= int((box->obs[index]->weight*double(box->obs[index]->yi) + double(yi))/(box->obs[index]->weight+1.)); + box->obs[index]->value = (box->obs[index]->weight*box->obs[index]->value + value)/(box->obs[index]->weight+1.); + box->obs[index]->weight += 1.; } else{ Index: /issm/trunk/src/c/classes/matrix/ElementMatrix.cpp =================================================================== --- /issm/trunk/src/c/classes/matrix/ElementMatrix.cpp (revision 17805) +++ /issm/trunk/src/c/classes/matrix/ElementMatrix.cpp (revision 17806) @@ -268,7 +268,8 @@ for(i=0;irow_fsize;i++){ for(j=0;jrow_fsize;j++){ - *(localvalues+this->row_fsize*i+j)=*(this->values+this->ncols*this->row_flocaldoflist[i]+this->row_flocaldoflist[j]); + localvalues[this->row_fsize*i+j]=this->values[this->ncols*this->row_flocaldoflist[i]+this->row_flocaldoflist[j]]; } } + /*add local values into global matrix, using the fglobaldoflist: */ Kff->SetValues(this->row_fsize,this->row_fglobaldoflist,this->row_fsize,this->row_fglobaldoflist,localvalues,ADD_VAL); @@ -283,5 +284,5 @@ for(i=0;irow_fsize;i++){ for(j=0;jrow_ssize;j++){ - *(localvalues+this->row_ssize*i+j)=*(this->values+this->ncols*this->row_flocaldoflist[i]+this->row_slocaldoflist[j]); + localvalues[this->row_ssize*i+j]=this->values[this->ncols*this->row_flocaldoflist[i]+this->row_slocaldoflist[j]]; } } Index: /issm/trunk/src/c/cores/AnalysisConfiguration.cpp =================================================================== --- /issm/trunk/src/c/cores/AnalysisConfiguration.cpp (revision 17805) +++ /issm/trunk/src/c/cores/AnalysisConfiguration.cpp (revision 17806) @@ -26,5 +26,5 @@ case StressbalanceSolutionEnum: - numanalyses=4; + numanalyses=6; analyses=xNew(numanalyses); analyses[0]=StressbalanceAnalysisEnum; @@ -32,4 +32,6 @@ analyses[2]=StressbalanceSIAAnalysisEnum; analyses[3]=L2ProjectionBaseAnalysisEnum; + analyses[4]=ExtrudeFromBaseAnalysisEnum; + analyses[5]=DepthAverageAnalysisEnum; break; @@ -55,5 +57,5 @@ case HydrologySolutionEnum: - numanalyses=4; + numanalyses=5; analyses=xNew(numanalyses); analyses[0]=HydrologyShreveAnalysisEnum; @@ -61,4 +63,5 @@ analyses[2]=HydrologyDCEfficientAnalysisEnum; analyses[3]=L2ProjectionBaseAnalysisEnum; + analyses[4]=L2ProjectionEPLAnalysisEnum; break; @@ -114,5 +117,5 @@ case TransientSolutionEnum: - numanalyses=12; + numanalyses=20; analyses=xNew(numanalyses); analyses[ 0]=StressbalanceAnalysisEnum; @@ -128,4 +131,12 @@ analyses[10]=ExtrudeFromBaseAnalysisEnum; analyses[11]=ExtrudeFromTopAnalysisEnum; + analyses[12]=LevelsetAnalysisEnum; + analyses[13]=ExtrapolationAnalysisEnum; + analyses[14]=LsfReinitializationAnalysisEnum; + analyses[15]=DamageEvolutionAnalysisEnum; + analyses[16]=HydrologyShreveAnalysisEnum; + analyses[17]=HydrologyDCInefficientAnalysisEnum; + analyses[18]=HydrologyDCEfficientAnalysisEnum; + analyses[19]=L2ProjectionEPLAnalysisEnum; break; Index: /issm/trunk/src/c/cores/CorePointerFromSolutionEnum.cpp =================================================================== --- /issm/trunk/src/c/cores/CorePointerFromSolutionEnum.cpp (revision 17805) +++ /issm/trunk/src/c/cores/CorePointerFromSolutionEnum.cpp (revision 17806) @@ -24,96 +24,46 @@ case StressbalanceSolutionEnum: - #ifdef _HAVE_STRESSBALANCE_ solutioncore=&stressbalance_core; - #else - _error_("ISSM was not compiled with stressbalance capabilities. Exiting"); - #endif break; case SteadystateSolutionEnum: - #ifdef _HAVE_STEADYSTATE_ solutioncore=&steadystate_core; - #else - _error_("ISSM was not compiled with steady state capabilities. Exiting"); - #endif break; case ThermalSolutionEnum: - #ifdef _HAVE_THERMAL_ solutioncore=&thermal_core; - #else - _error_("ISSM was not compiled with thermal capabilities. Exiting"); - #endif break; case BalancethicknessSolutionEnum: - #ifdef _HAVE_BALANCED_ solutioncore=&balancethickness_core; - #else - _error_("ISSM was not compiled with balanced capabilities. Exiting"); - #endif break; case BalancethicknessSoftSolutionEnum: - #ifdef _HAVE_BALANCED_ solutioncore=&dummy_core; - #else - _error_("ISSM was not compiled with balanced capabilities. Exiting"); - #endif break; case BalancevelocitySolutionEnum: - #ifdef _HAVE_BALANCED_ solutioncore=&balancevelocity_core; - #else - _error_("ISSM was not compiled with balanced capabilities. Exiting"); - #endif break; case HydrologySolutionEnum: - #ifdef _HAVE_HYDROLOGY_ solutioncore=&hydrology_core; - #else - _error_("ISSM was not compiled with hydrology capabilities. Exiting"); - #endif break; case SurfaceSlopeSolutionEnum: - #ifdef _HAVE_SLOPE_ solutioncore=&surfaceslope_core; - #else - _error_("ISSM was not compiled with slope capabilities. Exiting"); - #endif break; case BedSlopeSolutionEnum: - #ifdef _HAVE_SLOPE_ solutioncore=&bedslope_core; - #else - _error_("ISSM was not compiled with slope capabilities. Exiting"); - #endif break; case TransientSolutionEnum: - #ifdef _HAVE_TRANSIENT_ solutioncore=&transient_core; - #else - _error_("ISSM was not compiled with transient capabilities. Exiting"); - #endif break; case MasstransportSolutionEnum: - #ifdef _HAVE_MASSTRANSPORT_ solutioncore=&masstransport_core; - #else - _error_("ISSM was not compiled with masstransport capabilities. Exiting"); - #endif break; - case GiaSolutionEnum: - #ifdef _HAVE_GIA_ + #if _HAVE_GIA_ solutioncore=&gia_core; #else - _error_("ISSM was not compiled with gia capabilities. Exiting"); + _error_("ISSM not compiled with Gia capability"); #endif break; case DamageEvolutionSolutionEnum: - #ifdef _HAVE_DAMAGE_ solutioncore=&damage_core; - #else - _error_("ISSM was not compiled with damage evolution capabilities. Exiting"); - #endif break; - default: _error_("solution type: " << EnumToStringx(solutiontype) << " not supported yet!"); @@ -124,4 +74,3 @@ _assert_(psolutioncore); *psolutioncore=solutioncore; - } Index: /issm/trunk/src/c/cores/WrapperCorePointerFromSolutionEnum.cpp =================================================================== --- /issm/trunk/src/c/cores/WrapperCorePointerFromSolutionEnum.cpp (revision 17805) +++ /issm/trunk/src/c/cores/WrapperCorePointerFromSolutionEnum.cpp (revision 17806) @@ -42,10 +42,6 @@ } else if(control_analysis){ - #ifdef _HAVE_CONTROL_ if(tao_analysis) solutioncore=controltao_core; else solutioncore=control_core; - #else - _error_("ISSM was not compiled with control support, cannot carry out control analysis!"); - #endif } else CorePointerFromSolutionEnum(&solutioncore,parameters,solutiontype); /*This means we retrieve a core solution that is not a wrapper*/ Index: /issm/trunk/src/c/cores/bedslope_core.cpp =================================================================== --- /issm/trunk/src/c/cores/bedslope_core.cpp (revision 17805) +++ /issm/trunk/src/c/cores/bedslope_core.cpp (revision 17806) @@ -14,9 +14,9 @@ /*parameters: */ bool save_results; - int meshtype; + int domaintype; /*Recover some parameters: */ femmodel->parameters->FindParam(&save_results,SaveResultsEnum); - femmodel->parameters->FindParam(&meshtype,MeshTypeEnum); + femmodel->parameters->FindParam(&domaintype,DomainTypeEnum); if(VerboseSolution()) _printf0_(" computing slope\n"); @@ -28,5 +28,5 @@ solutionsequence_linear(femmodel); - if(meshtype!=Mesh2DverticalEnum){ + if(domaintype!=Domain2DverticalEnum){ femmodel->parameters->SetParam(BedSlopeYEnum,InputToL2ProjectEnum); solutionsequence_linear(femmodel); @@ -35,5 +35,5 @@ if(save_results){ if(VerboseSolution()) _printf0_(" saving results\n"); - if(meshtype!=Mesh2DverticalEnum){ + if(domaintype!=Domain2DverticalEnum){ int outputs[2] = {BedSlopeXEnum,BedSlopeYEnum}; femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],2); Index: /issm/trunk/src/c/cores/cores.h =================================================================== --- /issm/trunk/src/c/cores/cores.h (revision 17805) +++ /issm/trunk/src/c/cores/cores.h (revision 17806) @@ -24,4 +24,5 @@ void thermal_core(FemModel* femmodel); void surfaceslope_core(FemModel* femmodel); +void levelsetfunctionslope_core(FemModel* femmodel); void bedslope_core(FemModel* femmodel); void meshdeformation_core(FemModel* femmodel); @@ -29,4 +30,5 @@ void controltao_core(FemModel* femmodel); void masstransport_core(FemModel* femmodel); +void depthaverage_core(FemModel* femmodel); void extrudefrombase_core(FemModel* femmodel); void extrudefromtop_core(FemModel* femmodel); Index: /issm/trunk/src/c/cores/damage_core.cpp =================================================================== --- /issm/trunk/src/c/cores/damage_core.cpp (revision 17805) +++ /issm/trunk/src/c/cores/damage_core.cpp (revision 17806) @@ -14,8 +14,9 @@ /*intermediary*/ bool save_results; - bool dakota_analysis = false; + bool dakota_analysis = false; int solution_type; + int numoutputs = 0; + char **requested_outputs = NULL; - if(VerboseSolution()) _printf0_(" computing damage\n"); //first recover parameters common to all solutions @@ -23,4 +24,6 @@ femmodel->parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum); femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum); + femmodel->parameters->FindParam(&numoutputs,DamageEvolutionNumRequestedOutputsEnum); + if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,DamageEvolutionRequestedOutputsEnum); if(dakota_analysis && solution_type!=TransientSolutionEnum){ @@ -29,4 +32,5 @@ } + if(VerboseSolution()) _printf0_(" computing damage\n"); femmodel->SetCurrentConfiguration(DamageEvolutionAnalysisEnum); solutionsequence_linear(femmodel); @@ -34,6 +38,13 @@ if(save_results){ if(VerboseSolution()) _printf0_(" saving results\n"); - int outputs = DamageDEnum; - femmodel->RequestedOutputsx(&femmodel->results,&outputs,1); + femmodel->RequestedOutputsx(&femmodel->results,requested_outputs,numoutputs); + } + + /*Free resources:*/ + if(numoutputs){ + for(int i=0;i(requested_outputs[i]); + } + xDelete(requested_outputs); } } Index: /issm/trunk/src/c/cores/depthaverage_core.cpp =================================================================== --- /issm/trunk/src/c/cores/depthaverage_core.cpp (revision 17806) +++ /issm/trunk/src/c/cores/depthaverage_core.cpp (revision 17806) @@ -0,0 +1,20 @@ +/*!\file: depthaverage_core.cpp + * \brief: core of the extrusion solution + */ + +#include "./cores.h" +#include "../toolkits/toolkits.h" +#include "../classes/classes.h" +#include "../shared/shared.h" +#include "../solutionsequences/solutionsequences.h" +#include "../modules/modules.h" + +void depthaverage_core(FemModel* femmodel){ + + if(VerboseSolution()) _printf0_("depth averaging...\n"); + + /*Call on core computations: */ + femmodel->SetCurrentConfiguration(DepthAverageAnalysisEnum); + solutionsequence_linear(femmodel); + +} Index: /issm/trunk/src/c/cores/gia_core.cpp =================================================================== --- /issm/trunk/src/c/cores/gia_core.cpp (revision 17805) +++ /issm/trunk/src/c/cores/gia_core.cpp (revision 17806) @@ -50,5 +50,5 @@ if(save_results){ if(VerboseSolution()) _printf0_(" saving results\n"); - const int outputs[2] = {GiaWEnum,GiadWdtEnum}; + int outputs[2] = {GiaWEnum,GiadWdtEnum}; femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],2); } Index: /issm/trunk/src/c/cores/hydrology_core.cpp =================================================================== --- /issm/trunk/src/c/cores/hydrology_core.cpp (revision 17805) +++ /issm/trunk/src/c/cores/hydrology_core.cpp (revision 17806) @@ -12,21 +12,12 @@ void hydrology_core(FemModel* femmodel){ - int i; - /*intermediary*/ - int step,nsteps; - int output_frequency,hydrology_model; + int hydrology_model; bool save_results; bool modify_loads=true; bool isefficientlayer; - IssmDouble starttime,final_time; - IssmDouble time,dt; /*first recover parameters common to all solutions*/ - femmodel->parameters->FindParam(&starttime,TimesteppingStartTimeEnum); - femmodel->parameters->FindParam(&final_time,TimesteppingFinalTimeEnum); - femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum); femmodel->parameters->FindParam(&save_results,SaveResultsEnum); - femmodel->parameters->FindParam(&output_frequency,SettingsOutputFrequencyEnum); femmodel->parameters->FindParam(&hydrology_model,HydrologyModelEnum); @@ -37,69 +28,52 @@ } - /*Compute number of time steps: */ - if((dt==0)|| (final_time==0)){ - dt=0; - nsteps=1; + /*Using the Shreve based Model*/ + if (hydrology_model==HydrologyshreveEnum){ + if(VerboseSolution()) _printf0_(" computing water column\n"); + femmodel->SetCurrentConfiguration(HydrologyShreveAnalysisEnum); + solutionsequence_nonlinear(femmodel,modify_loads); + + /*transfer water column thickness to old water column thickness: */ + + InputDuplicatex(femmodel,WatercolumnEnum,WaterColumnOldEnum); + + if(save_results){ + if(VerboseSolution()) _printf0_(" saving results \n"); + int outputs[3] = {WatercolumnEnum,HydrologyWaterVxEnum,HydrologyWaterVyEnum}; + femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],3); + + /*unload results*/ + if(VerboseSolution()) _printf0_(" saving temporary results\n"); + OutputResultsx(femmodel); + } } - else nsteps=reCast((final_time-starttime)/dt); - /*initialize: */ - step=0; - time=starttime; - - /*Loop through time: */ - for(i=0;iparameters->SetParam(time,TimeEnum); - femmodel->parameters->SetParam(step,StepEnum); - - if (hydrology_model==HydrologyshreveEnum){ - if(VerboseSolution()) _printf0_(" computing water column\n"); - femmodel->SetCurrentConfiguration(HydrologyShreveAnalysisEnum); - solutionsequence_nonlinear(femmodel,modify_loads); - - /*transfer water column thickness to old water column thickness: */ - - InputDuplicatex(femmodel,WatercolumnEnum,WaterColumnOldEnum); - - if(save_results && ((i+1)%output_frequency==0 || (i+1)==nsteps)){ - if(VerboseSolution()) _printf0_(" saving results \n"); - int outputs[3] = {WatercolumnEnum,HydrologyWaterVxEnum,HydrologyWaterVyEnum}; + /*Using the double continuum model*/ + else if (hydrology_model==HydrologydcEnum){ + InputDuplicatex(femmodel,SedimentHeadEnum,SedimentHeadOldEnum); + femmodel->parameters->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum); + if (isefficientlayer){ + InputDuplicatex(femmodel,EplHeadEnum,EplHeadOldEnum); + InputDuplicatex(femmodel,HydrologydcEplThicknessEnum,HydrologydcEplThicknessOldEnum); + } + + /*Proceed now to heads computations*/ + if(VerboseSolution()) _printf0_(" computing water head\n"); + solutionsequence_hydro_nonlinear(femmodel); + if(save_results){ + if(VerboseSolution()) _printf0_(" saving results \n"); + if(isefficientlayer){ + int outputs[9] = {SedimentHeadEnum,SedimentHeadResidualEnum,EplHeadEnum,HydrologydcMaskEplactiveNodeEnum,HydrologydcMaskEplactiveEltEnum,EplHeadSlopeXEnum,EplHeadSlopeYEnum,HydrologydcEplThicknessEnum,EffectivePressureEnum}; + femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],9); + } + else{ + int outputs[3] = {SedimentHeadEnum,SedimentHeadResidualEnum,EffectivePressureEnum}; femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],3); - - /*unload results*/ - if(VerboseSolution()) _printf0_(" saving temporary results\n"); - OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results); } + /*unload results*/ + if(VerboseSolution()) _printf0_(" saving temporary results\n"); + OutputResultsx(femmodel); } - - else if (hydrology_model==HydrologydcEnum){ - InputDuplicatex(femmodel,SedimentHeadEnum,SedimentHeadOldEnum); - femmodel->parameters->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum); - if (isefficientlayer){ - InputDuplicatex(femmodel,EplHeadEnum,EplHeadOldEnum); - } - - if(VerboseSolution()) _printf0_(" computing water head\n"); - solutionsequence_hydro_nonlinear(femmodel); - if(save_results && ((i+1)%output_frequency==0 || (i+1)==nsteps)){ - if(VerboseSolution()) _printf0_(" saving results \n"); - if(isefficientlayer){ - int outputs[4] = {SedimentHeadEnum,SedimentHeadResidualEnum,EplHeadEnum,HydrologydcMaskEplactiveEnum}; - femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],4); - } - else{ - int outputs[2] = {SedimentHeadEnum,SedimentHeadResidualEnum}; - femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],2); - } - /*unload results*/ - if(VerboseSolution()) _printf0_(" saving temporary results\n"); - OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results); - } - } - } } + Index: /issm/trunk/src/c/cores/levelsetfunctionslope_core.cpp =================================================================== --- /issm/trunk/src/c/cores/levelsetfunctionslope_core.cpp (revision 17806) +++ /issm/trunk/src/c/cores/levelsetfunctionslope_core.cpp (revision 17806) @@ -0,0 +1,52 @@ +/*!\file: levelsetfunctionslope_core.cpp + * \brief: core of the slope solution + */ + +#include "./cores.h" +#include "../toolkits/toolkits.h" +#include "../classes/classes.h" +#include "../shared/shared.h" +#include "../solutionsequences/solutionsequences.h" +#include "../modules/modules.h" + +void levelsetfunctionslope_core(FemModel* femmodel){ + + /*parameters: */ + bool save_results; + int domaintype; + + /*Recover some parameters: */ + femmodel->parameters->FindParam(&save_results,SaveResultsEnum); + femmodel->parameters->FindParam(&domaintype,DomainTypeEnum); + + if(VerboseSolution()) _printf0_("computing slope of levelset function...\n"); + + /*Call on core computations: */ + femmodel->SetCurrentConfiguration(L2ProjectionBaseAnalysisEnum); + + femmodel->parameters->SetParam(LevelsetfunctionSlopeXEnum,InputToL2ProjectEnum); + solutionsequence_linear(femmodel); + + if(domaintype!=Domain2DverticalEnum){ + femmodel->parameters->SetParam(LevelsetfunctionSlopeYEnum,InputToL2ProjectEnum); + solutionsequence_linear(femmodel); + } + if(domaintype==Domain2DverticalEnum){ + femmodel->parameters->SetParam(LevelsetfunctionSlopeXEnum,InputToExtrudeEnum); + extrudefrombase_core(femmodel); + } + + if(save_results){ + if(VerboseSolution()) _printf0_("saving results:\n"); + if(domaintype!=Domain2DverticalEnum){ + int outputs[2] = {LevelsetfunctionSlopeXEnum,LevelsetfunctionSlopeYEnum}; + femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],2); + + } + else{ + int outputs = LevelsetfunctionSlopeXEnum; + femmodel->RequestedOutputsx(&femmodel->results,&outputs,1); + } + } + +} Index: /issm/trunk/src/c/cores/masstransport_core.cpp =================================================================== --- /issm/trunk/src/c/cores/masstransport_core.cpp (revision 17805) +++ /issm/trunk/src/c/cores/masstransport_core.cpp (revision 17806) @@ -14,5 +14,5 @@ /*parameters: */ int i; - int numoutputs,meshtype; + int numoutputs,domaintype; bool save_results; bool issmbgradients,ispdd,isdelta18o,isFS,isfreesurface,dakota_analysis; @@ -25,12 +25,9 @@ /*recover parameters: */ femmodel->parameters->FindParam(&save_results,SaveResultsEnum); - femmodel->parameters->FindParam(&issmbgradients,SurfaceforcingsIssmbgradientsEnum); - femmodel->parameters->FindParam(&ispdd,SurfaceforcingsIspddEnum); - femmodel->parameters->FindParam(&isdelta18o,SurfaceforcingsIsdelta18oEnum); femmodel->parameters->FindParam(&isFS,FlowequationIsFSEnum); femmodel->parameters->FindParam(&isfreesurface,MasstransportIsfreesurfaceEnum); femmodel->parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum); femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum); - femmodel->parameters->FindParam(&meshtype,MeshTypeEnum); + femmodel->parameters->FindParam(&domaintype,DomainTypeEnum); femmodel->parameters->FindParam(&numoutputs,MasstransportNumRequestedOutputsEnum); if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,MasstransportRequestedOutputsEnum); @@ -40,31 +37,22 @@ InputDuplicatex(femmodel,QmuSurfaceEnum,SurfaceEnum); InputDuplicatex(femmodel,QmuThicknessEnum,ThicknessEnum); - InputDuplicatex(femmodel,QmuBedEnum,BedEnum); + InputDuplicatex(femmodel,QmuBaseEnum,BaseEnum); } - if(issmbgradients){ - if(VerboseSolution())_printf_(" call smb gradients module\n\n"); - SmbGradientsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); - } - if(ispdd){ - if(isdelta18o){ - if(VerboseSolution()) _printf0_(" call Delta18oParametrization module\n"); - Delta18oParameterizationx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); - } - if(VerboseSolution()) _printf0_(" call positive degree day module\n"); - PositiveDegreeDayx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); - } + /*Calculate new Surface Mass Balance (SMB)*/ + SurfaceMassBalancex(femmodel); + /*Transport mass or free surface*/ if(isFS && isfreesurface){ if(VerboseSolution()) _printf0_(" call free surface computational core\n"); femmodel->SetCurrentConfiguration(FreeSurfaceBaseAnalysisEnum); solutionsequence_linear(femmodel); - if(meshtype==Mesh2DverticalEnum){ - femmodel->parameters->SetParam(BedEnum,InputToExtrudeEnum); + if(domaintype!=Domain2DhorizontalEnum){ + femmodel->parameters->SetParam(BaseEnum,InputToExtrudeEnum); extrudefrombase_core(femmodel); } femmodel->SetCurrentConfiguration(FreeSurfaceTopAnalysisEnum); solutionsequence_linear(femmodel); - if(meshtype==Mesh2DverticalEnum){ + if(domaintype!=Domain2DhorizontalEnum){ femmodel->parameters->SetParam(SurfaceEnum,InputToExtrudeEnum); extrudefromtop_core(femmodel); @@ -74,4 +62,12 @@ if(VerboseSolution()) _printf0_(" call computational core\n"); solutionsequence_linear(femmodel); + if(domaintype==Domain2DverticalEnum){ + femmodel->parameters->SetParam(ThicknessEnum,InputToExtrudeEnum); + extrudefrombase_core(femmodel); + femmodel->parameters->SetParam(BaseEnum,InputToExtrudeEnum); + extrudefrombase_core(femmodel); + femmodel->parameters->SetParam(SurfaceEnum,InputToExtrudeEnum); + extrudefrombase_core(femmodel); + } } @@ -84,4 +80,4 @@ /*Free ressources:*/ - if(numoutputs){for(int i=0;i(string);} xDelete(requested_outputs);} + if(numoutputs){for(int i=0;i(requested_outputs[i]);} xDelete(requested_outputs);} } Index: /issm/trunk/src/c/cores/steadystate_core.cpp =================================================================== --- /issm/trunk/src/c/cores/steadystate_core.cpp (revision 17805) +++ /issm/trunk/src/c/cores/steadystate_core.cpp (revision 17806) @@ -50,11 +50,7 @@ if(VerboseSolution()) _printf0_(" computing temperature and velocity for step: " << step << "\n"); - #ifdef _HAVE_THERMAL_ thermal_core(femmodel); if(!isenthalpy)femmodel->SetCurrentConfiguration(ThermalAnalysisEnum);/*Could be MeltingAnalysis...*/ GetSolutionFromInputsx(&tg,femmodel); - #else - _error_("ISSM was not compiled with thermal capabilities. Exiting"); - #endif if(VerboseSolution()) _printf0_(" computing new velocity\n"); @@ -87,5 +83,5 @@ delete tg; delete ug; - if(numoutputs){ for (i=0;i(string);} xDelete(requested_outputs);} + if(numoutputs){for(int i=0;i(requested_outputs[i]);} xDelete(requested_outputs);} } bool steadystateconvergence(Vector* tg,Vector* tg_old,Vector* ug,Vector* ug_old,IssmDouble reltol){ Index: /issm/trunk/src/c/cores/stressbalance_core.cpp =================================================================== --- /issm/trunk/src/c/cores/stressbalance_core.cpp (revision 17805) +++ /issm/trunk/src/c/cores/stressbalance_core.cpp (revision 17806) @@ -6,4 +6,5 @@ #include "../toolkits/toolkits.h" #include "../classes/classes.h" +#include "../analyses/analyses.h" #include "../shared/shared.h" #include "../modules/modules.h" @@ -13,18 +14,15 @@ /*parameters: */ - bool dakota_analysis; - int meshtype; - bool isSIA,isSSA,isL1L2,isHO,isFS; - bool conserve_loads = true; - bool save_results; - int newton; - int solution_type; - int numoutputs = 0; - char** requested_outputs = NULL; - int i; - + bool dakota_analysis; + int domaintype; + bool isSIA,isSSA,isL1L2,isHO,isFS; + bool save_results; + int solution_type; + int numoutputs = 0; + char **requested_outputs = NULL; + Analysis *analysis = NULL; /* recover parameters:*/ - femmodel->parameters->FindParam(&meshtype,MeshTypeEnum); + femmodel->parameters->FindParam(&domaintype,DomainTypeEnum); femmodel->parameters->FindParam(&isSIA,FlowequationIsSIAEnum); femmodel->parameters->FindParam(&isSSA,FlowequationIsSSAEnum); @@ -32,5 +30,4 @@ femmodel->parameters->FindParam(&isHO,FlowequationIsHOEnum); femmodel->parameters->FindParam(&isFS,FlowequationIsFSEnum); - femmodel->parameters->FindParam(&newton,StressbalanceIsnewtonEnum); femmodel->parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum); femmodel->parameters->FindParam(&save_results,SaveResultsEnum); @@ -43,46 +40,44 @@ InputDuplicatex(femmodel,QmuVxEnum,VxEnum); InputDuplicatex(femmodel,QmuVyEnum,VyEnum); - InputDuplicatex(femmodel,QmuVzEnum,VzEnum); + if(domaintype==Domain3DEnum) InputDuplicatex(femmodel,QmuVzEnum,VzEnum); if(isFS) InputDuplicatex(femmodel,QmuPressureEnum,PressureEnum); } - /*Compute slopes: */ - if(isSIA) surfaceslope_core(femmodel); + /*Compute slopes if necessary */ + if(isSIA || (isFS && domaintype==Domain2DverticalEnum)) surfaceslope_core(femmodel); if(isFS){ bedslope_core(femmodel); femmodel->SetCurrentConfiguration(StressbalanceAnalysisEnum); - ResetCoordinateSystemx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); + ResetFSBasalBoundaryConditionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); } + /*Compute SIA velocities*/ if(isSIA){ - if(VerboseSolution()) _printf0_(" computing SIA velocities\n"); /*Take the last velocity into account so that the velocity on the SSA domain is not zero*/ if(isSSA || isL1L2 || isHO ) ResetBoundaryConditions(femmodel,StressbalanceSIAAnalysisEnum); - femmodel->SetCurrentConfiguration(StressbalanceSIAAnalysisEnum); - solutionsequence_linear(femmodel); + + analysis = new StressbalanceSIAAnalysis(); + analysis->Core(femmodel); + delete analysis; + + /*Reset velocities for other ice flow models*/ if(isSSA || isL1L2 || isHO) ResetBoundaryConditions(femmodel,StressbalanceAnalysisEnum); } - if ((isSSA || isHO || isL1L2) ^ isFS){ // ^ = xor - if(VerboseSolution()) _printf0_(" computing velocities\n"); - - femmodel->SetCurrentConfiguration(StressbalanceAnalysisEnum); - if(newton>0) - solutionsequence_newton(femmodel); - else - solutionsequence_nonlinear(femmodel,conserve_loads); + /*Compute stressbalance for SSA L1L2 HO and FS*/ + if(isSSA || isL1L2 || isHO || isFS){ + analysis = new StressbalanceAnalysis(); + analysis->Core(femmodel); + delete analysis; } - if ((isSSA || isL1L2 || isHO) && isFS){ - if(VerboseSolution()) _printf0_(" computing coupling betweem lower order models and full-FS\n"); - solutionsequence_FScoupling_nonlinear(femmodel,conserve_loads); + /*Compute vertical velocities*/ + if (domaintype==Domain3DEnum && (isSIA || isSSA || isL1L2 || isHO)){ + analysis = new StressbalanceVerticalAnalysis(); + analysis->Core(femmodel); + delete analysis; } - if (meshtype==Mesh3DEnum && (isSIA || isSSA || isL1L2 || isHO)){ - if(VerboseSolution()) _printf0_(" computing vertical velocities\n"); - femmodel->SetCurrentConfiguration(StressbalanceVerticalAnalysisEnum); - solutionsequence_linear(femmodel); - } if(save_results){ @@ -94,4 +89,4 @@ /*Free ressources:*/ - if(numoutputs){ for (i=0;i(string);} xDelete(requested_outputs);} + if(numoutputs){for(int i=0;i(requested_outputs[i]);} xDelete(requested_outputs);} } Index: /issm/trunk/src/c/cores/surfaceslope_core.cpp =================================================================== --- /issm/trunk/src/c/cores/surfaceslope_core.cpp (revision 17805) +++ /issm/trunk/src/c/cores/surfaceslope_core.cpp (revision 17806) @@ -14,9 +14,9 @@ /*parameters: */ bool save_results; - int meshtype; + int domaintype; /*Recover some parameters: */ femmodel->parameters->FindParam(&save_results,SaveResultsEnum); - femmodel->parameters->FindParam(&meshtype,MeshTypeEnum); + femmodel->parameters->FindParam(&domaintype,DomainTypeEnum); if(VerboseSolution()) _printf0_("computing slope...\n"); @@ -28,12 +28,16 @@ solutionsequence_linear(femmodel); - if(meshtype!=Mesh2DverticalEnum){ + if(domaintype!=Domain2DverticalEnum){ femmodel->parameters->SetParam(SurfaceSlopeYEnum,InputToL2ProjectEnum); solutionsequence_linear(femmodel); + } + if(domaintype==Domain2DverticalEnum){ + femmodel->parameters->SetParam(SurfaceSlopeXEnum,InputToExtrudeEnum); + extrudefrombase_core(femmodel); } if(save_results){ if(VerboseSolution()) _printf0_("saving results:\n"); - if(meshtype!=Mesh2DverticalEnum){ + if(domaintype!=Domain2DverticalEnum){ int outputs[2] = {SurfaceSlopeXEnum,SurfaceSlopeYEnum}; femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],2); Index: /issm/trunk/src/c/cores/thermal_core.cpp =================================================================== --- /issm/trunk/src/c/cores/thermal_core.cpp (revision 17805) +++ /issm/trunk/src/c/cores/thermal_core.cpp (revision 17806) @@ -6,4 +6,5 @@ #include "../toolkits/toolkits.h" #include "../classes/classes.h" +#include "../analyses/analyses.h" #include "../shared/shared.h" #include "../modules/modules.h" @@ -17,4 +18,5 @@ int solution_type,numoutputs; char** requested_outputs = NULL; + EnthalpyAnalysis * enthalpy_analysis = NULL; /*first recover parameters common to all solutions*/ @@ -46,6 +48,10 @@ InputDuplicatex(femmodel,EnthalpyEnum,EnthalpyPicardEnum); - /*Post process*/ - if(solution_type!=SteadystateSolutionEnum) PostprocessingEnthalpyx(femmodel); + if(solution_type!=SteadystateSolutionEnum){ + /*Post process*/ + enthalpy_analysis = new EnthalpyAnalysis(); + enthalpy_analysis->PostProcessing(femmodel); + delete enthalpy_analysis; + } } else{ @@ -63,3 +69,7 @@ femmodel->RequestedOutputsx(&femmodel->results,requested_outputs,numoutputs); } + + /*Free ressources:*/ + if(numoutputs){for(int i=0;i(requested_outputs[i]);} xDelete(requested_outputs);} + } Index: /issm/trunk/src/c/cores/transient_core.cpp =================================================================== --- /issm/trunk/src/c/cores/transient_core.cpp (revision 17805) +++ /issm/trunk/src/c/cores/transient_core.cpp (revision 17806) @@ -22,10 +22,11 @@ int i; IssmDouble starttime,finaltime,dt,yts; - bool isstressbalance,ismasstransport,isFS,isthermal,isgroundingline,isdelta18o,isgia; + bool isstressbalance,ismasstransport,isFS,isthermal,isgroundingline,isgia,islevelset,isdamageevolution,ishydrology; bool save_results,dakota_analysis; bool time_adapt=false; int output_frequency; - int meshtype,groundingline_migration; + int domaintype,groundingline_migration,smb_model; int numoutputs = 0; + Analysis *analysis = NULL; char** requested_outputs = NULL; @@ -36,5 +37,5 @@ //first recover parameters common to all solutions - femmodel->parameters->FindParam(&meshtype,MeshTypeEnum); + femmodel->parameters->FindParam(&domaintype,DomainTypeEnum); femmodel->parameters->FindParam(&starttime,TimesteppingStartTimeEnum); femmodel->parameters->FindParam(&finaltime,TimesteppingFinalTimeEnum); @@ -49,9 +50,11 @@ femmodel->parameters->FindParam(&isgia,TransientIsgiaEnum); femmodel->parameters->FindParam(&isgroundingline,TransientIsgroundinglineEnum); + femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum); + femmodel->parameters->FindParam(&isdamageevolution,TransientIsdamageevolutionEnum); + femmodel->parameters->FindParam(&ishydrology,TransientIshydrologyEnum); femmodel->parameters->FindParam(&isFS,FlowequationIsFSEnum); if(isgroundingline) femmodel->parameters->FindParam(&groundingline_migration,GroundinglineMigrationEnum); femmodel->parameters->FindParam(&numoutputs,TransientNumRequestedOutputsEnum); if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,TransientRequestedOutputsEnum); - femmodel->parameters->FindParam(&isdelta18o,SurfaceforcingsIsdelta18oEnum); /*initialize: */ @@ -64,5 +67,5 @@ InputDuplicatex(femmodel,QmuVxEnum,VxEnum); InputDuplicatex(femmodel,QmuVyEnum,VyEnum); - if(meshtype==Mesh3DEnum){ + if(domaintype==Domain3DEnum){ InputDuplicatex(femmodel,QmuVzEnum,VzEnum); if(isFS)InputDuplicatex(femmodel,QmuPressureEnum,PressureEnum); @@ -72,9 +75,9 @@ InputDuplicatex(femmodel,QmuThicknessEnum,ThicknessEnum); InputDuplicatex(femmodel,QmuSurfaceEnum,SurfaceEnum); - InputDuplicatex(femmodel,QmuBedEnum,BedEnum); + InputDuplicatex(femmodel,QmuBaseEnum,BaseEnum); InputDuplicatex(femmodel,QmuMaskIceLevelsetEnum,MaskIceLevelsetEnum); } if(isgroundingline) InputDuplicatex(femmodel,QmuMaskGroundediceLevelsetEnum,MaskGroundediceLevelsetEnum); - if(isthermal && meshtype==Mesh3DEnum){ + if(isthermal && domaintype==Domain3DEnum){ //Update Vertex Position after updating Thickness and Bed femmodel->SetCurrentConfiguration(MasstransportAnalysisEnum); @@ -93,5 +96,4 @@ while(time < finaltime - (yts*DBL_EPSILON)){ //make sure we run up to finaltime. - /*Increment*/ if(time_adapt){ @@ -106,5 +108,5 @@ if(VerboseSolution()) _printf0_("iteration " << step << "/" << floor((finaltime-time)/dt)+step << " time [yr]: " << time/yts << " (time step: " << dt/yts << ")\n"); - if(step%output_frequency==0 || time==finaltime) + if(step%output_frequency==0 || (time >= finaltime - (yts*DBL_EPSILON)) || step==1) save_results=true; else @@ -112,20 +114,50 @@ femmodel->parameters->SetParam(save_results,SaveResultsEnum); - if(isthermal && meshtype==Mesh3DEnum){ - if(VerboseSolution()) _printf0_(" computing temperatures\n"); - #ifdef _HAVE_THERMAL_ + if(isthermal && domaintype==Domain3DEnum){ + if(VerboseSolution()) _printf0_(" computing thermal regime\n"); thermal_core(femmodel); - #else - _error_("ISSM was not compiled with thermal capabilities. Exiting"); - #endif + } + + if(ishydrology){ + if(VerboseSolution()) _printf0_(" computing water heads\n"); + hydrology_core(femmodel); } if(isstressbalance){ if(VerboseSolution()) _printf0_(" computing new velocity\n"); - #ifdef _HAVE_STRESSBALANCE_ stressbalance_core(femmodel); - #else - _error_("ISSM was not compiled with stressbalance capabilities. Exiting"); - #endif + } + + if(isdamageevolution){ + if(VerboseSolution()) _printf0_(" computing damage\n"); + damage_core(femmodel); + } + + if(islevelset){ + if(VerboseSolution()) _printf0_(" computing movement of ice boundaries\n"); + /* smoothen slope of lsf for computation of normal on ice domain*/ + levelsetfunctionslope_core(femmodel); + + /* extrapolate velocities onto domain with no ice */ + Analysis* extanalysis = new ExtrapolationAnalysis(); + const int nvars=2; + int vars[nvars] = {VxEnum, VyEnum}; + for(int iv=0;ivparameters->SetParam(vars[iv],ExtrapolationVariableEnum); + extanalysis->Core(femmodel); + } + delete extanalysis; + + /* solve level set equation */ + analysis = new LevelsetAnalysis(); + analysis->Core(femmodel); + delete analysis; + + /* update vertices included for next calculation */ + GetMaskOfIceVerticesLSMx(femmodel); + + /* add computation domain mask to outputs */ + int outputs[1] = {IceMaskNodeActivationEnum}; + femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],1); } @@ -136,14 +168,17 @@ femmodel->UpdateVertexPositionsx(); } - + if(isgroundingline){ if(VerboseSolution()) _printf0_(" computing new grounding line position\n"); - #ifdef _HAVE_GROUNDINGLINE_ GroundinglineMigrationx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); - #else - _error_("ISSM was not compiled with grounding line migration capabilities. Exiting"); - #endif + + if(groundingline_migration==ContactEnum){ + femmodel->parameters->SetParam(MaskGroundediceLevelsetEnum,InputToExtrudeEnum); + extrudefrombase_core(femmodel); + femmodel->parameters->SetParam(BaseEnum,InputToExtrudeEnum); + extrudefrombase_core(femmodel); + } if(save_results){ - int outputs[3] = {SurfaceEnum,BedEnum,MaskGroundediceLevelsetEnum}; + int outputs[3] = {SurfaceEnum,BaseEnum,MaskGroundediceLevelsetEnum}; femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],3); } @@ -156,21 +191,17 @@ _error_("ISSM was not compiled with gia capabilities. Exiting"); #endif - } /*unload results*/ + if(VerboseSolution()) _printf0_(" computing requested outputs\n"); + femmodel->RequestedOutputsx(&femmodel->results,requested_outputs,numoutputs,save_results); + if(isgroundingline && (groundingline_migration==SubelementMigrationEnum || groundingline_migration==SubelementMigration2Enum)){ + int outputs[1] = {MaskGroundediceLevelsetEnum}; + femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],1,save_results); + } + if(save_results){ - if(VerboseSolution()) _printf0_(" saving transient results\n"); - femmodel->RequestedOutputsx(&femmodel->results,requested_outputs,numoutputs); - if(isdelta18o){ - int outputs[2] = {SurfaceforcingsMonthlytemperaturesEnum,SurfaceforcingsPrecipitationEnum}; - femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],2); - } - if(isgroundingline && (groundingline_migration==SubelementMigrationEnum || groundingline_migration==SubelementMigration2Enum)){ - int outputs[1] = {MaskGroundediceLevelsetEnum}; - femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],1); - } if(VerboseSolution()) _printf0_(" saving temporary results\n"); - OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results); + OutputResultsx(femmodel); } } @@ -179,4 +210,4 @@ /*Free ressources:*/ - if(numoutputs){ for (i=0;i(string);} xDelete(requested_outputs);} + if(numoutputs){for(int i=0;i(requested_outputs[i]);} xDelete(requested_outputs);} } Index: /issm/trunk/src/c/main/issm.cpp =================================================================== --- /issm/trunk/src/c/main/issm.cpp (revision 17805) +++ /issm/trunk/src/c/main/issm.cpp (revision 17806) @@ -20,5 +20,5 @@ /*Output results: */ - femmodel->OutputResults(); + OutputResultsx(femmodel); /*Wrap up: */ Index: /issm/trunk/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp =================================================================== --- /issm/trunk/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp (revision 17805) +++ /issm/trunk/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp (revision 17806) @@ -26,9 +26,7 @@ /*Rift penalties first*/ - #ifdef _HAVE_RIFTS_ if(RiftIsPresent(femmodel->loads,analysis_type)){ RiftConstraintsState(&converged,&num_unstable_constraints,femmodel->loads,min_mechanical_constraints,analysis_type); } - #endif /*Deal with pengrid*/ Index: /issm/trunk/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp =================================================================== --- /issm/trunk/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp (revision 17805) +++ /issm/trunk/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp (revision 17806) @@ -10,6 +10,6 @@ void CreateJacobianMatrixx(Matrix** pJff,FemModel* femmodel,IssmDouble kmax){ - int i,connectivity; - int configuration_type; + int i; + int configuration_type,analysisenum; Element *element = NULL; Load *load = NULL; @@ -21,5 +21,6 @@ /*Recover some parameters*/ femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum); - femmodel->parameters->FindParam(&connectivity,MeshAverageVertexConnectivityEnum); + femmodel->parameters->FindParam(&analysisenum,AnalysisTypeEnum); + Analysis* analysis = EnumToAnalysis(analysisenum); /*Initialize Jacobian Matrix*/ @@ -29,5 +30,7 @@ for(i=0;ielements->Size();i++){ element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); - element->CreateJacobianMatrix(Jff); + ElementMatrix* Je = analysis->CreateJacobianMatrix(element); + if(Je) Je->AddToGlobal(Jff); + delete Je; } for (i=0;iloads->Size();i++){ @@ -39,4 +42,5 @@ /*Assign output pointer*/ + delete analysis; *pJff=Jff; Index: /issm/trunk/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.h =================================================================== --- /issm/trunk/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.h (revision 17805) +++ /issm/trunk/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.h (revision 17806) @@ -6,4 +6,5 @@ #include "../../classes/classes.h" +#include "../../analyses/analyses.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp =================================================================== --- /issm/trunk/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp (revision 17805) +++ /issm/trunk/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp (revision 17806) @@ -11,7 +11,5 @@ /*intermediary: */ int gsize; - Element* element = NULL; - - int configuration_type; + int configuration,analysisenum; /*output: */ @@ -21,9 +19,10 @@ /*retrive parameters: */ - femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum); + femmodel->parameters->FindParam(&configuration,ConfigurationTypeEnum); + femmodel->parameters->FindParam(&analysisenum,AnalysisTypeEnum); /*Get size of vector: */ - gsize=femmodel->nodes->NumberOfDofs(configuration_type,GsetEnum); - if(gsize==0) _error_("Allocating a Vec of size 0 as gsize=0 for configuration: " << EnumToStringx(configuration_type)); + gsize=femmodel->nodes->NumberOfDofs(configuration,GsetEnum); + if(gsize==0) _error_("Allocating a Vec of size 0 as gsize=0 for configuration "<elements->Size();i++){ - element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); - element->GetSolutionFromInputs(solution); + Element* element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); + analysis->GetSolutionFromInputs(solution,element); } + delete analysis; /*Assemble vector: */ Index: /issm/trunk/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.h =================================================================== --- /issm/trunk/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.h (revision 17805) +++ /issm/trunk/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.h (revision 17806) @@ -7,4 +7,5 @@ #include "../../classes/classes.h" +#include "../../analyses/analyses.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp =================================================================== --- /issm/trunk/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp (revision 17805) +++ /issm/trunk/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp (revision 17806) @@ -21,10 +21,4 @@ Element* element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); element->GetVectorFromInputs(vector,name); - } - - /*Look up in materials*/ - for(i=0;imaterials->Size();i++){ - Material* material=(Material*)femmodel->materials->GetObjectByOffset(i); - material->GetVectorFromInputs(vector,name); } } Index: /issm/trunk/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp =================================================================== --- /issm/trunk/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (revision 17805) +++ /issm/trunk/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (revision 17806) @@ -23,19 +23,24 @@ if(migration_style==NoneEnum) return; - if(migration_style!=AgressiveMigrationEnum && - migration_style!=SoftMigrationEnum && - migration_style!=SubelementMigrationEnum && - migration_style!=SubelementMigration2Enum) - _error_("Grounding line migration "<* vertexgrounded = NULL; + Vector* vertexfloating = NULL; + IssmDouble* serial_vertexgrounded = NULL; + IssmDouble* serial_vertexfloating = NULL; + IssmDouble* phi = NULL; + + /*Initialize vector with number of vertices*/ + int numberofvertices = vertices->NumberOfVertices(); + vertexgrounded = new Vector(numberofvertices); + vertexfloating = new Vector(numberofvertices); + phi = xNew(numberofvertices); + + /*Fill vector vertices_potentially_floating: */ + for(int i=0;iSize();i++){ + Element* element=dynamic_cast(elements->GetObjectByOffset(i)); + element->FSContactMigration(vertexgrounded,vertexfloating); + } + + /*Assemble vector and serialize */ + vertexgrounded->Assemble(); + vertexfloating->Assemble(); + serial_vertexgrounded=vertexgrounded->ToMPISerial(); + serial_vertexfloating=vertexfloating->ToMPISerial(); + + /*find vertices on GL */ + for(int i=0;i(serial_vertexgrounded); + xDelete(serial_vertexfloating); + + return phi; +} +/*}}}*/ /*FUNCTION PotentialUngrounding {{{*/ IssmDouble* PotentialUngrounding(Elements* elements,Vertices* vertices,Parameters* parameters){ Index: /issm/trunk/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.h =================================================================== --- /issm/trunk/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.h (revision 17805) +++ /issm/trunk/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.h (revision 17806) @@ -13,4 +13,5 @@ /* local prototypes: */ void GroundinglineMigrationx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters); +IssmDouble* ContactFSLevelset(Elements* elements,Vertices* vertices); IssmDouble* PotentialUngrounding(Elements* elements,Vertices* vertices,Parameters* parameters); IssmDouble* PropagateFloatingiceToGroundedNeighbors(Elements* elements,Nodes* nodes,Vertices* vertices,Parameters* parameters,IssmDouble* vertices_potentially_ungrounding); Index: /issm/trunk/src/c/modules/InputDuplicatex/InputDuplicatex.cpp =================================================================== --- /issm/trunk/src/c/modules/InputDuplicatex/InputDuplicatex.cpp (revision 17805) +++ /issm/trunk/src/c/modules/InputDuplicatex/InputDuplicatex.cpp (revision 17806) @@ -9,5 +9,4 @@ void InputDuplicatex(FemModel* femmodel,int original_enum, int new_enum){ - /*Go through elemnets, and ask to reinitialie the input: */ for(int i=0;ielements->Size();i++){ @@ -15,8 +14,3 @@ element->InputDuplicate(original_enum,new_enum); } - for(int i=0;imaterials->Size();i++){ - Material* material=(Material*)femmodel->materials->GetObjectByOffset(i); - material->InputDuplicate(original_enum,new_enum); - } - } Index: /issm/trunk/src/c/modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.cpp =================================================================== --- /issm/trunk/src/c/modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.cpp (revision 17805) +++ /issm/trunk/src/c/modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.cpp (revision 17806) @@ -21,7 +21,13 @@ void InputUpdateFromSolutionx(FemModel* femmodel,IssmDouble* solution){ + /*retrive parameters: */ + int analysisenum; + femmodel->parameters->FindParam(&analysisenum,AnalysisTypeEnum); + + Analysis* analysis = EnumToAnalysis(analysisenum); for(int i=0;ielements->Size();i++){ Element* element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); - element->InputUpdateFromSolution(solution); + analysis->InputUpdateFromSolution(solution,element); } + delete analysis; } Index: /issm/trunk/src/c/modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.h =================================================================== --- /issm/trunk/src/c/modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.h (revision 17805) +++ /issm/trunk/src/c/modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.h (revision 17806) @@ -7,4 +7,5 @@ #include "../../classes/classes.h" +#include "../../analyses/analyses.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp =================================================================== --- /issm/trunk/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp (revision 17805) +++ /issm/trunk/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp (revision 17806) @@ -107,18 +107,18 @@ /*Get indices i and j that form a square around the currant triangle*/ if (yflip){ - i1=max(0, (int)floor((y_tria_max-y_grid_max)/yposting)-1); - i2=min(nlines, (int)ceil((y_tria_min-y_grid_max)/yposting)); + i1=max(0, (int)floor((y_tria_max-y_grid_max)/yposting)-1); + i2=min(nlines-1,(int)ceil((y_tria_min-y_grid_max)/yposting)); } else{ - i1=max(0, (int)floor((y_tria_min-y_grid_min)/yposting)-1); - i2=min(nlines, (int)ceil((y_tria_max-y_grid_min)/yposting)); + i1=max(0, (int)floor((y_tria_min-y_grid_min)/yposting)-1); + i2=min(nlines-1,(int)ceil((y_tria_max-y_grid_min)/yposting)); } if (xflip){ - j1=max(0, (int)floor((x_tria_max-x_grid_max)/xposting)-1); - j2=min(ncols, (int)ceil((x_tria_min-x_grid_max)/xposting)); + j1=max(0, (int)floor((x_tria_max-x_grid_max)/xposting)-1); + j2=min(ncols-1,(int)ceil((x_tria_min-x_grid_max)/xposting)); } else{ - j1=max(0, (int)floor((x_tria_min-x_grid_min)/xposting)-1); - j2=min(ncols, (int)ceil((x_tria_max-x_grid_min)/xposting)); + j1=max(0, (int)floor((x_tria_min-x_grid_min)/xposting)-1); + j2=min(ncols-1,(int)ceil((x_tria_max-x_grid_min)/xposting)); } Index: /issm/trunk/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp =================================================================== --- /issm/trunk/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 17805) +++ /issm/trunk/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 17806) @@ -33,5 +33,7 @@ /*intermediary: */ - int i,j,count,elementnbv; + bool isnan; + int i,j,count,elementnbv,numfacevertices; + int* faceverticesid = NULL; IssmDouble value; IssmDouble *times = NULL; @@ -39,7 +41,8 @@ bool spcpresent = false; - /*P2 finite elements*/ - int v1,v2; + /*Higher-order finite elements*/ + int v1,v2,v3,v4; bool *my_edges = NULL; + bool *my_faces = NULL; switch(finite_element){ @@ -48,8 +51,8 @@ break; case P1bubbleEnum: - switch(iomodel->meshtype){ - case Mesh2DhorizontalEnum: elementnbv = 3; break; - case Mesh2DverticalEnum: elementnbv = 3; break; - case Mesh3DEnum: elementnbv = 6; break; + switch(iomodel->meshelementtype){ + case TriaEnum: elementnbv = 3; break; + case TetraEnum: elementnbv = 4; break; + case PentaEnum: elementnbv = 6; break; default: _error_("mesh type not supported yet"); } @@ -61,4 +64,7 @@ EdgesPartitioning(&my_edges,iomodel); break; + case P1xP3Enum: + EdgesPartitioning(&my_edges,iomodel); + break; case P2xP1Enum: EdgesPartitioning(&my_edges,iomodel); @@ -66,4 +72,11 @@ case P2Enum: EdgesPartitioning(&my_edges,iomodel); + if(iomodel->meshelementtype==PentaEnum){ + FacesPartitioning(&my_faces,iomodel); + } + break; + case P2xP4Enum: + EdgesPartitioning(&my_edges,iomodel); + FacesPartitioning(&my_faces,iomodel); break; default: @@ -101,4 +114,90 @@ dof,(spcdata[v1]+spcdata[v2])/2.,analysis_type)); count++; + } + } + } + if(iomodel->meshelementtype==PentaEnum){ + for(i=0;inumberoffaces;i++){ + if(iomodel->faces[i*6+5]==2){/*Vertical quads*/ + if(my_faces[i]){ + FaceGetVertexIndices(iomodel,&numfacevertices,&faceverticesid,i); + isnan=0; + for(j=0;j(spcdata[faceverticesid[j]-1])) isnan=1; + } + if(isnan==0){ + value=0; + for(j=0;jAddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+i+1, + dof,value,analysis_type)); + count++; + } + xDelete(faceverticesid); + } + } + } + } + break; + case P2xP4Enum: + for(i=0;inumberofvertices;i++){ + if((iomodel->my_vertices[i])){ + if (!xIsNan(spcdata[i])){ + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,dof,spcdata[i],analysis_type)); + count++; + } + } + } + for(i=0;inumberofedges;i++){ + if(iomodel->edges[i*3+2]==2){/*Vertical edges*/ + if(my_edges[i]){ + v1 = iomodel->edges[3*i+0]-1; + v2 = iomodel->edges[3*i+1]-1; + if(!xIsNan(spcdata[v1]) && !xIsNan(spcdata[v2])){ + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+iomodel->numberofvertices+3*i+1, + dof,1./2.*spcdata[v1]+1./2.*spcdata[v2],analysis_type)); + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+2,iomodel->nodecounter+iomodel->numberofvertices+3*i+2, + dof,1./2.*spcdata[v1]+1./2.*spcdata[v2],analysis_type)); + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+3,iomodel->nodecounter+iomodel->numberofvertices+3*i+3, + dof,1./2.*spcdata[v1]+1./2.*spcdata[v2],analysis_type)); + count=count+3; + } + } + } + if(iomodel->edges[i*3+2]==1){/*Horizontal edges*/ + if(my_edges[i]){ + v1 = iomodel->edges[3*i+0]-1; + v2 = iomodel->edges[3*i+1]-1; + if(!xIsNan(spcdata[v1]) && !xIsNan(spcdata[v2])){ + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+iomodel->numberofvertices+3*i+1, + dof,1./2.*spcdata[v1]+1./2.*spcdata[v2],analysis_type)); + count=count+1; + } + } + } + } + for(i=0;inumberoffaces;i++){ + if(iomodel->faces[i*6+5]==2){/*Vertical quads*/ + if(my_faces[i]){ + FaceGetVertexIndices(iomodel,&numfacevertices,&faceverticesid,i); + isnan=0; + for(j=0;j(spcdata[faceverticesid[j]-1])) isnan=1; + } + if(isnan==0){ + value=0; + for(j=0;jAddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*i+1, + dof,value,analysis_type)); + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+2,iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*i+2, + dof,value,analysis_type)); + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+3,iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*i+3, + dof,value,analysis_type)); + count=count+3; + } + xDelete(faceverticesid); } } @@ -160,4 +259,29 @@ } break; + case P1xP3Enum: + for(i=0;inumberofvertices;i++){ + if((iomodel->my_vertices[i])){ + if (!xIsNan(spcdata[i])){ + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,dof,spcdata[i],analysis_type)); + count++; + } + } + } + for(i=0;inumberofedges;i++){ + if(iomodel->edges[i*3+2]==2){ + if(my_edges[i]){ + v1 = iomodel->edges[3*i+0]-1; + v2 = iomodel->edges[3*i+1]-1; + if(!xIsNan(spcdata[v1]) && !xIsNan(spcdata[v2])){ + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+iomodel->numberofvertices+2*i+1, + dof,2./3.*spcdata[v1]+1./3.*spcdata[v2],analysis_type)); + constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+2,iomodel->nodecounter+iomodel->numberofvertices+2*i+2, + dof,1./3.*spcdata[v1]+2./3.*spcdata[v2],analysis_type)); + count=count+2; + } + } + } + } + break; case P2xP1Enum: for(i=0;inumberofvertices;i++){ @@ -346,3 +470,4 @@ xDelete(values); xDelete(my_edges); + xDelete(my_faces); } Index: /issm/trunk/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.h =================================================================== --- /issm/trunk/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.h (revision 17805) +++ /issm/trunk/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.h (revision 17806) @@ -8,6 +8,6 @@ /* local prototypes: */ -void IoModelToConstraintsx(Constraints* constraints,IoModel* iomodel,int vector_enum,int analysis_type,int finite_element,int dof=1); -void IoModelToConstraintsx(Constraints* constraints,IoModel* iomodel,IssmDouble* spcdata,int M,int N,int analysis_type,int finite_element,int dof=1); +void IoModelToConstraintsx(Constraints* constraints,IoModel* iomodel,int vector_enum,int analysis_type,int finite_element,int dof=0); +void IoModelToConstraintsx(Constraints* constraints,IoModel* iomodel,IssmDouble* spcdata,int M,int N,int analysis_type,int finite_element,int dof=0); #endif /* _IOMODELTOELEMENTINPUTX_H */ Index: /issm/trunk/src/c/modules/Krigingx/pKrigingx.cpp =================================================================== --- /issm/trunk/src/c/modules/Krigingx/pKrigingx.cpp (revision 17805) +++ /issm/trunk/src/c/modules/Krigingx/pKrigingx.cpp (revision 17806) @@ -22,4 +22,5 @@ /*Intermediaries*/ int mindata,maxdata; + double dmindata,dmaxdata; double radius; char *output = NULL; @@ -39,6 +40,7 @@ ISSM_MPI_Barrier(ISSM_MPI_COMM_WORLD); start=ISSM_MPI_Wtime(); options->Get(&radius,"searchradius",0.); - options->Get(&mindata,"mindata",1); - options->Get(&maxdata,"maxdata",50); + + options->Get(&dmindata,"mindata",1.); mindata=int(dmindata);//FIXME (Options come as double but we want to retrive integers) + options->Get(&dmaxdata,"maxdata",50.); maxdata=int(dmaxdata);//FIXME (Options come as double but we want to retrive integers) /*Process observation dataset*/ @@ -106,4 +108,17 @@ xDelete(predictions); predictions=sumpredictions; } + else if(strcmp(output,"distance")==0){ + + /*partition loop across threads: */ + for(int idx=my_rank;idxDistances(&predictions[idx],&x_interp[idx],&y_interp[idx],1,radius); + } + _printf0_(" interpolation progress: "<(n_interp); + ISSM_MPI_Allreduce(predictions,sumpredictions,n_interp,ISSM_MPI_PDOUBLE,ISSM_MPI_SUM,IssmComm::GetComm()); + xDelete(predictions); predictions=sumpredictions; + } else if(strcmp(output,"idw")==0){ double power; Index: /issm/trunk/src/c/modules/MeshPartitionx/MeshPartitionx.h =================================================================== --- /issm/trunk/src/c/modules/MeshPartitionx/MeshPartitionx.h (revision 17805) +++ /issm/trunk/src/c/modules/MeshPartitionx/MeshPartitionx.h (revision 17806) @@ -11,5 +11,5 @@ template int MeshPartitionx(int** pepart, int** pnpart, int numberofelements,int numberofnodes,int* elements, - int numberofelements2d,int numberofnodes2d,doubletype* elements2d,int numlayers,int elements_width, int meshtype,int num_procs){ + int numberofelements2d,int numberofnodes2d,doubletype* elements2d,int numlayers,int elements_width, int meshelementtype,int num_procs){ int noerr=1; @@ -31,6 +31,7 @@ int edgecut=1; - switch(meshtype){ - case Mesh2DhorizontalEnum: + switch(meshelementtype){ + case TriaEnum: + case TetraEnum: epart=xNew(numberofelements); npart=xNew(numberofnodes); @@ -57,30 +58,5 @@ else _error_("At least one processor is required"); break; - case Mesh2DverticalEnum: - epart=xNew(numberofelements); - npart=xNew(numberofnodes); - index=xNew(elements_width*numberofelements); - for (i=0;i1){ -#ifdef _HAVE_METIS_ - METIS_PartMeshNodalPatch(&numberofelements,&numberofnodes, index, &etype, &numflag, &num_procs, &edgecut, epart, npart); -#else - _error_("metis has not beed installed. Cannot run with more than 1 cpu"); -#endif - } - else if (num_procs==1){ - /*METIS does not know how to deal with one cpu only!*/ - for (i=0;inumberofelements;i++){ @@ -51,7 +51,4 @@ element=(Element*)elements->GetObjectByOffset(counter); element->InputUpdateFromIoModel(i,iomodel); //we need i to index into elements. - - material=(Material*)materials->GetObjectByOffset(counter); - material->InputUpdateFromIoModel(i,iomodel); //we need i to index into elements. counter++; } Index: /issm/trunk/src/c/modules/ModelProcessorx/CreateEdges.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/CreateEdges.cpp (revision 17805) +++ /issm/trunk/src/c/modules/ModelProcessorx/CreateEdges.cpp (revision 17806) @@ -23,38 +23,42 @@ /*Mesh dependent variables*/ - if(iomodel->meshtype==Mesh2DhorizontalEnum){ - elementnbv = 3; - elementnbe = 3; - elementedges = xNew(elementnbe*2); - elementedges_markers = xNew(elementnbe); - elementedges[2*0+0] = 1; elementedges[2*0+1] = 2; elementedges_markers[0] = 1; - elementedges[2*1+0] = 2; elementedges[2*1+1] = 0; elementedges_markers[1] = 1; - elementedges[2*2+0] = 0; elementedges[2*2+1] = 1; elementedges_markers[2] = 1; - } - else if(iomodel->meshtype==Mesh2DverticalEnum){ - elementnbv = 3; - elementnbe = 3; - elementedges = xNew(elementnbe*2); - elementedges_markers = xNew(elementnbe); - elementedges[2*0+0] = 1; elementedges[2*0+1] = 2; elementedges_markers[0] = 1; - elementedges[2*1+0] = 2; elementedges[2*1+1] = 0; elementedges_markers[1] = 1; - elementedges[2*2+0] = 0; elementedges[2*2+1] = 1; elementedges_markers[2] = 1; - } - else if(iomodel->meshtype==Mesh3DEnum){ - elementnbv = 6; - elementnbe = 9; - elementedges = xNew(elementnbe*2); - elementedges_markers = xNew(elementnbe); - elementedges[2*0+0] = 0; elementedges[2*0+1] = 3; elementedges_markers[0] = 2; - elementedges[2*1+0] = 1; elementedges[2*1+1] = 4; elementedges_markers[1] = 2; - elementedges[2*2+0] = 2; elementedges[2*2+1] = 5; elementedges_markers[2] = 2; - elementedges[2*3+0] = 1; elementedges[2*3+1] = 2; elementedges_markers[3] = 1; - elementedges[2*4+0] = 2; elementedges[2*4+1] = 0; elementedges_markers[4] = 1; - elementedges[2*5+0] = 0; elementedges[2*5+1] = 1; elementedges_markers[5] = 1; - elementedges[2*6+0] = 4; elementedges[2*6+1] = 5; elementedges_markers[6] = 3; - elementedges[2*7+0] = 5; elementedges[2*7+1] = 3; elementedges_markers[7] = 3; - elementedges[2*8+0] = 3; elementedges[2*8+1] = 4; elementedges_markers[8] = 3; - } - else{ + switch(iomodel->meshelementtype){ + case TriaEnum: + elementnbv = 3; + elementnbe = 3; + elementedges = xNew(elementnbe*2); + elementedges_markers = xNew(elementnbe); + elementedges[2*0+0] = 1; elementedges[2*0+1] = 2; elementedges_markers[0] = 1; + elementedges[2*1+0] = 2; elementedges[2*1+1] = 0; elementedges_markers[1] = 1; + elementedges[2*2+0] = 0; elementedges[2*2+1] = 1; elementedges_markers[2] = 1; + break; + case TetraEnum: + elementnbv = 4; + elementnbe = 6; + elementedges = xNew(elementnbe*2); + elementedges_markers = xNew(elementnbe); + elementedges[2*0+0] = 1; elementedges[2*0+1] = 2; elementedges_markers[0] = 1; + elementedges[2*1+0] = 2; elementedges[2*1+1] = 0; elementedges_markers[1] = 1; + elementedges[2*2+0] = 0; elementedges[2*2+1] = 1; elementedges_markers[2] = 1; + elementedges[2*3+0] = 0; elementedges[2*3+1] = 3; elementedges_markers[3] = 1; + elementedges[2*4+0] = 1; elementedges[2*4+1] = 3; elementedges_markers[4] = 1; + elementedges[2*5+0] = 2; elementedges[2*5+1] = 3; elementedges_markers[5] = 1; + break; + case PentaEnum: + elementnbv = 6; + elementnbe = 9; + elementedges = xNew(elementnbe*2); + elementedges_markers = xNew(elementnbe); + elementedges[2*0+0] = 0; elementedges[2*0+1] = 3; elementedges_markers[0] = 2; + elementedges[2*1+0] = 1; elementedges[2*1+1] = 4; elementedges_markers[1] = 2; + elementedges[2*2+0] = 2; elementedges[2*2+1] = 5; elementedges_markers[2] = 2; + elementedges[2*3+0] = 1; elementedges[2*3+1] = 2; elementedges_markers[3] = 1; + elementedges[2*4+0] = 2; elementedges[2*4+1] = 0; elementedges_markers[4] = 1; + elementedges[2*5+0] = 0; elementedges[2*5+1] = 1; elementedges_markers[5] = 1; + elementedges[2*6+0] = 4; elementedges[2*6+1] = 5; elementedges_markers[6] = 1; + elementedges[2*7+0] = 5; elementedges[2*7+1] = 3; elementedges_markers[7] = 1; + elementedges[2*8+0] = 3; elementedges[2*8+1] = 4; elementedges_markers[8] = 1; + break; + default: _error_("mesh dimension not supported yet"); } Index: /issm/trunk/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (revision 17805) +++ /issm/trunk/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (revision 17806) @@ -26,18 +26,16 @@ /*Create elements*/ if(control_analysis)iomodel->FetchData(3,InversionControlParametersEnum,InversionMinParametersEnum,InversionMaxParametersEnum); - switch(iomodel->meshtype){ - case Mesh2DhorizontalEnum: - materials->InputDuplicate(MaterialsRheologyBbarEnum,QmuMaterialsRheologyBEnum); + switch(iomodel->meshelementtype){ + case TriaEnum: for(i=0;inumberofelements;i++){ if(iomodel->my_elements[i]) elements->AddObject(new Tria(i+1,i,i,iomodel,nummodels)); } break; - case Mesh2DverticalEnum: + case TetraEnum: for(i=0;inumberofelements;i++){ - if(iomodel->my_elements[i]) elements->AddObject(new Tria(i+1,i,i,iomodel,nummodels)); + if(iomodel->my_elements[i]) elements->AddObject(new Tetra(i+1,i,i,iomodel,nummodels)); } break; - #ifdef _HAVE_3D_ - case Mesh3DEnum: + case PentaEnum: iomodel->FetchData(2,MeshUpperelementsEnum,MeshLowerelementsEnum); for(i=0;inumberofelements;i++){ @@ -45,5 +43,4 @@ } break; - #endif default: _error_("Mesh not supported yet"); @@ -53,19 +50,35 @@ switch(materials_type){ case MaticeEnum: - iomodel->FetchData(3,MaterialsRheologyBEnum,MaterialsRheologyNEnum,DamageDEnum); + iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum); + iomodel->FetchDataToInput(elements,MaterialsRheologyNEnum); for (i=0;inumberofelements;i++) if(iomodel->my_elements[i]) materials->AddObject(new Matice(i+1,i,iomodel)); - if(dakota_analysis){ - switch(iomodel->meshtype){ - case Mesh2DhorizontalEnum: - materials->InputDuplicate(MaterialsRheologyBbarEnum,QmuMaterialsRheologyBEnum); - break; - #ifdef _HAVE_3D_ - case Mesh3DEnum: - materials->InputDuplicate(MaterialsRheologyBEnum,QmuMaterialsRheologyBEnum); - break; - #endif - default: - _error_("Mesh not supported yet"); - } + switch(iomodel->domaindim){ + case 2: + elements->InputDuplicate(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum); + if(dakota_analysis) elements->InputDuplicate(MaterialsRheologyBbarEnum,QmuMaterialsRheologyBEnum); + break; + case 3: + if(dakota_analysis) elements->InputDuplicate(MaterialsRheologyBEnum,QmuMaterialsRheologyBEnum); + break; + default: + _error_("Mesh not supported yet"); + } + break; + case MatdamageiceEnum: + iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum); + iomodel->FetchDataToInput(elements,MaterialsRheologyNEnum); + iomodel->FetchDataToInput(elements,DamageDEnum); + for (i=0;inumberofelements;i++) if(iomodel->my_elements[i]) materials->AddObject(new Matice(i+1,i,iomodel)); + switch(iomodel->domaindim){ + case 2: + elements->InputDuplicate(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum); + elements->InputDuplicate(DamageDEnum,DamageDbarEnum); + if(dakota_analysis) elements->InputDuplicate(MaterialsRheologyBbarEnum,QmuMaterialsRheologyBEnum); + break; + case 3: + if(dakota_analysis) elements->InputDuplicate(MaterialsRheologyBEnum,QmuMaterialsRheologyBEnum); + break; + default: + _error_("Mesh not supported yet"); } break; @@ -85,5 +98,5 @@ /*Fetch data:*/ - iomodel->FetchData(6,MeshXEnum,MeshYEnum,MeshZEnum,BedEnum,ThicknessEnum,MaskIceLevelsetEnum); + iomodel->FetchData(6,MeshXEnum,MeshYEnum,MeshZEnum,BaseEnum,ThicknessEnum,MaskIceLevelsetEnum); CreateNumberNodeToElementConnectivity(iomodel); @@ -93,4 +106,4 @@ /*Free data: */ - iomodel->DeleteData(6,MeshXEnum,MeshYEnum,MeshZEnum,BedEnum,ThicknessEnum,MaskIceLevelsetEnum); + iomodel->DeleteData(6,MeshXEnum,MeshYEnum,MeshZEnum,BaseEnum,ThicknessEnum,MaskIceLevelsetEnum); } Index: /issm/trunk/src/c/modules/ModelProcessorx/CreateFaces.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/CreateFaces.cpp (revision 17805) +++ /issm/trunk/src/c/modules/ModelProcessorx/CreateFaces.cpp (revision 17806) @@ -5,14 +5,26 @@ #include "../../classes/classes.h" #include "../../shared/shared.h" - -void CreateFaces(IoModel* iomodel){ +#include "./ModelProcessorx.h" + +void CreateFaces(IoModel* iomodel){/*{{{*/ /*If faces are already present, exit*/ if(iomodel->faces) return; - /*Check Iomodel properties*/ - if(iomodel->meshtype!=Mesh2DhorizontalEnum) _error_("only 2d model are supported"); + /*Some checks*/ if(iomodel->numberofvertices<3) _error_("not enough elements in mesh"); _assert_(iomodel->elements); + + /*Check Iomodel properties*/ + if(iomodel->domaintype==Domain2DhorizontalEnum || iomodel->domaintype==Domain2DverticalEnum){ + /*Keep going*/ + } + else if(iomodel->domaintype==Domain3DEnum){ + CreateFaces3d(iomodel); + return; + } + else{ + _error_("mesh dimension not supported yet"); + } /*Intermediaries*/ @@ -31,5 +43,5 @@ /*Initialize chain*/ int* head_minv = xNew(iomodel->numberofvertices); - int* next_edge = xNew(maxnbf); + int* next_face = xNew(maxnbf); for(i=0;inumberofvertices;i++) head_minv[i]=-1; @@ -57,5 +69,5 @@ /*Go through all processed faces connected to v1 and check whether we have seen this edge yet*/ _assert_(v1>=0 && v1numberofvertices); - for(int e=head_minv[v1]; e!=-1; e=next_edge[e]){ + for(int e=head_minv[v1]; e!=-1; e=next_face[e]){ if(facestemp[e*4+1]==v2){ exist = true; @@ -76,5 +88,5 @@ /*Update chain*/ - next_edge[nbf] = head_minv[v1]; + next_face[nbf] = head_minv[v1]; head_minv[v1] = nbf; @@ -87,5 +99,5 @@ /*Clean up*/ xDelete(head_minv); - xDelete(next_edge); + xDelete(next_face); /*Create final faces*/ @@ -109,3 +121,191 @@ iomodel->faces = faces; iomodel->numberoffaces = nbf; -} +}/*}}}*/ +void CreateFaces3d(IoModel* iomodel){/*{{{*/ + + /*Intermediaries*/ + bool exist; + int i,j,k,v0,cols; + int maxnbf,nbf,elementnbf,elementnbv,facemaxnbv; + int *elementfaces = NULL; + int *elementfaces_markers = NULL; + + /*Maximum number of faces*/ + maxnbf = 5*iomodel->numberofelements; + + /*Initialize intermediaries*/ + int* facestemp = xNew(maxnbf*6); /*format: [vertex1 vertex2 vertex3 element1 element2 marker] */ + for(i=0;i(iomodel->numberofvertices); + int* next_face = xNew(maxnbf); + for(i=0;inumberofvertices;i++) head_minv[i]=-1; + + /*Mesh specific face indexing per element*/ + if(iomodel->meshelementtype==PentaEnum){ + elementnbv = 6; /*Number of vertices per element*/ + elementnbf = 5; /*Number of faces per element*/ + facemaxnbv = 4; /*Maximum number of vertices per face*/ + cols = facemaxnbv + 1; + elementfaces = xNew(elementnbf*cols); + elementfaces_markers = xNew(elementnbf); + /*2 triangles*/ + elementfaces_markers[0] = 1; + elementfaces_markers[1] = 1; + elementfaces[cols*0+0] = 3; elementfaces[cols*0+1] = 0; elementfaces[cols*0+2] = 1; elementfaces[cols*0+3] = 2; + elementfaces[cols*1+0] = 3; elementfaces[cols*1+1] = 3; elementfaces[cols*1+2] = 4; elementfaces[cols*1+3] = 5; + /*3 quads*/ + elementfaces_markers[2] = 2; + elementfaces_markers[3] = 2; + elementfaces_markers[4] = 2; + elementfaces[cols*2+0] = 4; elementfaces[cols*2+1] = 1; elementfaces[cols*2+2] = 2; elementfaces[cols*2+3] = 5; elementfaces[cols*2+4] = 4; + elementfaces[cols*3+0] = 4; elementfaces[cols*3+1] = 2; elementfaces[cols*3+2] = 0; elementfaces[cols*3+3] = 3; elementfaces[cols*3+4] = 5; + elementfaces[cols*4+0] = 4; elementfaces[cols*4+1] = 0; elementfaces[cols*4+2] = 1; elementfaces[cols*4+3] = 4; elementfaces[cols*4+4] = 3; + } + else{ + _error_("mesh dimension not supported yet"); + } + int *element_face_connectivity = xNew(iomodel->numberofelements*elementnbf); /*format: [face1 face2 ...] */ + + /*Initialize number of faces and list of vertex indices*/ + nbf = 0; + int* v = xNew(facemaxnbv); + + for(i=0;inumberofelements;i++){ + for(j=0;jelements[i*elementnbv + elementfaces[cols*j+k+1]] - 1; + } + + /*Sort list of vertices*/ + HeapSort(v,elementfaces[cols*j+0]); + v0 = v[0]; + + /*This face a priori has not been processed yet*/ + exist = false; + + /*Go through all processed faces connected to v1 and check whether we have seen this edge yet*/ + _assert_(v0>=0 && v0numberofvertices); + for(int e=head_minv[v0]; e!=-1; e=next_face[e]){ + if(facestemp[e*6+1]==v[1]+1 && facestemp[e*6+2]==v[2]+1){ + exist = true; + facestemp[e*6+4]=i+1; + element_face_connectivity[i*elementnbf+j]=e; + break; + } + } + + /*If this face is new, add it to the lists*/ + if(!exist){ + _assert_(nbf(head_minv); + xDelete(next_face); + xDelete(v); + xDelete(elementfaces); + xDelete(elementfaces_markers); + + /*Create final faces (now that we have the correct size)*/ + int* faces = xNew(nbf*6); /*vertex1 vertex2 vertex3 element1 element2 marker*/ + xMemCpy(faces,facestemp,nbf*6); + xDelete(facestemp); + + /*Assign output pointers*/ + iomodel->faces = faces; + iomodel->numberoffaces = nbf; + iomodel->elementtofaceconnectivity = element_face_connectivity; +}/*}}}*/ +void FaceGetVertexIndices(IoModel* iomodel,int* pnumvertices,int** pverticesid,int facenumber){/*{{{*/ + + int numbervertices; + if(iomodel->domaintype==Domain3DEnum){ + if((iomodel->faces[6*facenumber+5])==1){ + numbervertices=3; + } + else if((iomodel->faces[6*facenumber+5])==2){ + numbervertices=4; + } + else _error_("face marker not supported yet "); + } + else _error_("mesh type not supported yet"); + + int* facevertices = xNew(numbervertices); + if(numbervertices==3){ + for(int i=0;i<3;i++) facevertices[i]=iomodel->faces[6*facenumber+i]-1; + } + else if(numbervertices==4){ + int i,j,k,cols,faceid; + int maxnbf,nbf,elementnbf,elementnbv,facemaxnbv; + int *elementfaces = NULL; + int *elementfaces_markers = NULL; + int elementid=iomodel->faces[6*facenumber+3]; + int counter=0; + + /*Recreate element properties*/ + elementnbv = 6; /*Number of vertices per element*/ + elementnbf = 5; /*Number of faces per element*/ + facemaxnbv = 4; /*Maximum number of vertices per face*/ + cols = facemaxnbv + 1; + elementfaces = xNew(elementnbf*cols); + elementfaces_markers = xNew(elementnbf); + /*2 triangles*/ + elementfaces_markers[0] = 1; + elementfaces_markers[1] = 1; + elementfaces[cols*0+0] = 3; elementfaces[cols*0+1] = 0; elementfaces[cols*0+2] = 1; elementfaces[cols*0+3] = 2; + elementfaces[cols*1+0] = 3; elementfaces[cols*1+1] = 3; elementfaces[cols*1+2] = 4; elementfaces[cols*1+3] = 5; + /*3 quads*/ + elementfaces_markers[2] = 2; + elementfaces_markers[3] = 2; + elementfaces_markers[4] = 2; + elementfaces[cols*2+0] = 4; elementfaces[cols*2+1] = 1; elementfaces[cols*2+2] = 2; elementfaces[cols*2+3] = 5; elementfaces[cols*2+4] = 4; + elementfaces[cols*3+0] = 4; elementfaces[cols*3+1] = 2; elementfaces[cols*3+2] = 0; elementfaces[cols*3+3] = 3; elementfaces[cols*3+4] = 5; + elementfaces[cols*4+0] = 4; elementfaces[cols*4+1] = 0; elementfaces[cols*4+2] = 1; elementfaces[cols*4+3] = 4; elementfaces[cols*4+4] = 3; + + for(faceid=2;faceid<5;faceid++){ + counter=0; + for(j=0;j<3;j++){ + for(k=1;k<5;k++){ + if(iomodel->elements[(elementid-1)*6+elementfaces[cols*faceid+k]] == iomodel->faces[6*facenumber+j]) counter++; + } + } + if(counter==3) break; + } + if(counter!=3) _error_("face not found in element"); + + for(j=0;j<4;j++){ + facevertices[j]=iomodel->elements[(elementid-1)*6+elementfaces[cols*faceid+j+1]]; + } + + /*Delete*/ + xDelete(elementfaces); + xDelete(elementfaces_markers); + } + + /*Output results*/ + *pverticesid=facevertices; + *pnumvertices=numbervertices; +}/*}}}*/ Index: /issm/trunk/src/c/modules/ModelProcessorx/CreateNodes.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/CreateNodes.cpp (revision 17805) +++ /issm/trunk/src/c/modules/ModelProcessorx/CreateNodes.cpp (revision 17806) @@ -12,5 +12,8 @@ /*Intermediaries*/ - int i,j,counter,lid=0; + int i,j,counter,vnodes,lid=0; + int numberoffaces; + int id0 = iomodel->nodecounter; + bool *my_faces = NULL; bool *my_edges = NULL; bool *my_nodes = NULL; @@ -21,5 +24,5 @@ for(i=0;inumberofvertices;i++){ if(iomodel->my_vertices[i]){ - nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,lid++,i,iomodel,analysis,approximation)); + nodes->AddObject(new Node(id0+i+1,i,lid++,i,iomodel,analysis,approximation)); } } @@ -31,5 +34,5 @@ for(j=0;j<3;j++){ if(my_nodes[3*i+j]){ - nodes->AddObject(new Node(iomodel->nodecounter+3*i+j+1,iomodel->nodecounter+3*i+j,lid++,iomodel->elements[+3*i+j]-1,iomodel,analysis,approximation)); + nodes->AddObject(new Node(id0+3*i+j+1,id0+3*i+j,lid++,iomodel->elements[+3*i+j]-1,iomodel,analysis,approximation)); } @@ -41,10 +44,10 @@ for(i=0;inumberofvertices;i++){ if(iomodel->my_vertices[i]){ - nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,lid++,i,iomodel,analysis,approximation)); + nodes->AddObject(new Node(id0+i+1,i,lid++,i,iomodel,analysis,approximation)); } } for(i=0;inumberofelements;i++){ if(iomodel->my_elements[i]){ - nodes->AddObject(new Node(iomodel->nodecounter+iomodel->numberofvertices+i+1,iomodel->numberofvertices+i,lid++,0,iomodel,analysis,approximation)); + nodes->AddObject(new Node(id0+iomodel->numberofvertices+i+1,iomodel->numberofvertices+i,lid++,0,iomodel,analysis,approximation)); } } @@ -54,10 +57,10 @@ for(i=0;inumberofvertices;i++){ if(iomodel->my_vertices[i]){ - nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,lid++,i,iomodel,analysis,approximation)); + nodes->AddObject(new Node(id0+i+1,i,lid++,i,iomodel,analysis,approximation)); } } for(i=0;inumberofelements;i++){ if(iomodel->my_elements[i]){ - node = new Node(iomodel->nodecounter+iomodel->numberofvertices+i+1,iomodel->numberofvertices+i,lid++,0,iomodel,analysis,approximation); + node = new Node(id0+iomodel->numberofvertices+i+1,iomodel->numberofvertices+i,lid++,0,iomodel,analysis,approximation); node->Deactivate(); nodes->AddObject(node); @@ -70,5 +73,5 @@ for(i=0;inumberofvertices;i++){ if(iomodel->my_vertices[i]){ - nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,lid++,i,iomodel,analysis,approximation)); + nodes->AddObject(new Node(id0+i+1,i,lid++,i,iomodel,analysis,approximation)); } } @@ -78,5 +81,5 @@ if(iomodel->edges[i*3+2]==2){ if(my_edges[i]){ - node = new Node(iomodel->nodecounter+iomodel->numberofvertices+i+1,counter+1,lid++,0,iomodel,analysis,approximation); + node = new Node(id0+iomodel->numberofvertices+i+1,counter+1,lid++,0,iomodel,analysis,approximation); nodes->AddObject(node); } @@ -85,9 +88,32 @@ } break; + + case P1xP3Enum: + EdgesPartitioning(&my_edges,iomodel); + for(i=0;inumberofvertices;i++){ + if(iomodel->my_vertices[i]){ + nodes->AddObject(new Node(id0+i+1,i,lid++,i,iomodel,analysis,approximation)); + } + } + + counter = iomodel->numberofvertices; + for(i=0;inumberofedges;i++){ + if(iomodel->edges[i*3+2]==2){ + if(my_edges[i]){ + node = new Node(id0+iomodel->numberofvertices+2*i+1,counter+1,lid++,0,iomodel,analysis,approximation); + nodes->AddObject(node); + node = new Node(id0+iomodel->numberofvertices+2*i+2,counter+2,lid++,0,iomodel,analysis,approximation); + nodes->AddObject(node); + } + counter=counter+2; + } + } + break; + case P2xP1Enum: EdgesPartitioning(&my_edges,iomodel); for(i=0;inumberofvertices;i++){ if(iomodel->my_vertices[i]){ - nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,lid++,i,iomodel,analysis,approximation)); + nodes->AddObject(new Node(id0+i+1,i,lid++,i,iomodel,analysis,approximation)); } } @@ -97,5 +123,5 @@ if(iomodel->edges[i*3+2]!=2){ if(my_edges[i]){ - node = new Node(iomodel->nodecounter+iomodel->numberofvertices+i+1,counter+1,lid++,0,iomodel,analysis,approximation); + node = new Node(id0+iomodel->numberofvertices+i+1,counter+1,lid++,0,iomodel,analysis,approximation); nodes->AddObject(node); } @@ -109,10 +135,81 @@ for(i=0;inumberofvertices;i++){ if(iomodel->my_vertices[i]){ - nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,lid++,i,iomodel,analysis,approximation)); + nodes->AddObject(new Node(id0+i+1,i,lid++,i,iomodel,analysis,approximation)); } } for(i=0;inumberofedges;i++){ if(my_edges[i]){ - nodes->AddObject(new Node(iomodel->nodecounter+iomodel->numberofvertices+i+1,iomodel->numberofvertices+i,lid++,0,iomodel,analysis,approximation)); + nodes->AddObject(new Node(id0+iomodel->numberofvertices+i+1,iomodel->numberofvertices+i,lid++,0,iomodel,analysis,approximation)); + } + } + id0 = id0+iomodel->numberofvertices+iomodel->numberofedges; + if(iomodel->meshelementtype==PentaEnum){ + FacesPartitioning(&my_faces,iomodel); + for(i=0;inumberoffaces;i++){ + if(iomodel->faces[i*6+5]==2){/*Vertical quads*/ + if(my_faces[i]){ + node = new Node(id0+i+1,iomodel->numberofvertices+iomodel->numberofedges+i,lid++,0,iomodel,analysis,approximation); + nodes->AddObject(node); + } + } + else if(iomodel->faces[i*6+5]==1){/*Triangular base/top*/ + /*Nothing*/ + } + else{ + _error_("not supported"); + } + } + } + break; + case P2xP4Enum: + EdgesPartitioning(&my_edges,iomodel); + FacesPartitioning(&my_faces,iomodel); + for(i=0;inumberofvertices;i++){ + if(iomodel->my_vertices[i]){ + nodes->AddObject(new Node(id0+i+1,i,lid++,i,iomodel,analysis,approximation)); + } + } + counter = iomodel->numberofvertices; + for(i=0;inumberofedges;i++){ + if(iomodel->edges[i*3+2]==2){/*Vertical edges*/ + if(my_edges[i]){ + node = new Node(id0+iomodel->numberofvertices+3*i+1,counter+1,lid++,0,iomodel,analysis,approximation); + nodes->AddObject(node); + node = new Node(id0+iomodel->numberofvertices+3*i+2,counter+2,lid++,0,iomodel,analysis,approximation); + nodes->AddObject(node); + node = new Node(id0+iomodel->numberofvertices+3*i+3,counter+3,lid++,0,iomodel,analysis,approximation); + nodes->AddObject(node); + } + counter=counter+3; + } + else if(iomodel->edges[i*3+2]==1){/*Horizontal edges*/ + if(my_edges[i]){ + node = new Node(id0+iomodel->numberofvertices+3*i+1,counter+1,lid++,0,iomodel,analysis,approximation); + nodes->AddObject(node); + } + counter=counter+1; + } + else{ + _error_("not supported"); + } + } + id0 = id0+iomodel->numberofvertices+3*iomodel->numberofedges; + for(i=0;inumberoffaces;i++){ + if(iomodel->faces[i*6+5]==2){/*Vertical quads*/ + if(my_faces[i]){ + node = new Node(id0+3*i+1,counter+1,lid++,0,iomodel,analysis,approximation); + nodes->AddObject(node); + node = new Node(id0+3*i+2,counter+2,lid++,0,iomodel,analysis,approximation); + nodes->AddObject(node); + node = new Node(id0+3*i+3,counter+3,lid++,0,iomodel,analysis,approximation); + nodes->AddObject(node); + } + counter=counter+3; + } + else if(iomodel->faces[i*6+5]==1){/*Triangular base/top*/ + /*Nothing*/ + } + else{ + _error_("not supported"); } } @@ -125,11 +222,12 @@ for(i=0;inumberofvertices;i++){ if(iomodel->my_vertices[i]){ - nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,lid++,i,iomodel,analysis,FSvelocityEnum)); - } - } - /*P1 pressure*/ - for(i=0;inumberofvertices;i++){ - if(iomodel->my_vertices[i]){ - nodes->AddObject(new Node(iomodel->nodecounter+iomodel->numberofvertices+i+1,iomodel->numberofvertices+i,lid++,i,iomodel,analysis,FSpressureEnum)); + nodes->AddObject(new Node(id0+i+1,i,lid++,i,iomodel,analysis,FSvelocityEnum)); + } + } + /*P1 pressure*/ + vnodes = id0+iomodel->numberofvertices; + for(i=0;inumberofvertices;i++){ + if(iomodel->my_vertices[i]){ + nodes->AddObject(new Node(vnodes+i+1,iomodel->numberofvertices+i,lid++,i,iomodel,analysis,FSpressureEnum)); } } @@ -140,11 +238,12 @@ for(i=0;inumberofvertices;i++){ if(iomodel->my_vertices[i]){ - nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,lid++,i,iomodel,analysis,FSvelocityEnum)); - } - } - /*P1 pressure*/ - for(i=0;inumberofvertices;i++){ - if(iomodel->my_vertices[i]){ - nodes->AddObject(new Node(iomodel->nodecounter+iomodel->numberofvertices+i+1,iomodel->numberofvertices+i,lid++,i,iomodel,analysis,FSpressureEnum)); + nodes->AddObject(new Node(id0+i+1,i,lid++,i,iomodel,analysis,FSvelocityEnum)); + } + } + /*P1 pressure*/ + vnodes = id0+iomodel->numberofvertices; + for(i=0;inumberofvertices;i++){ + if(iomodel->my_vertices[i]){ + nodes->AddObject(new Node(vnodes+i+1,iomodel->numberofvertices+i,lid++,i,iomodel,analysis,FSpressureEnum)); } } @@ -155,10 +254,10 @@ for(i=0;inumberofvertices;i++){ if(iomodel->my_vertices[i]){ - nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,lid++,i,iomodel,analysis,FSvelocityEnum)); + nodes->AddObject(new Node(id0+i+1,i,lid++,i,iomodel,analysis,FSvelocityEnum)); } } for(i=0;inumberofelements;i++){ if(iomodel->my_elements[i]){ - node = new Node(iomodel->nodecounter+iomodel->numberofvertices+i+1,iomodel->numberofvertices+i,lid++,0,iomodel,analysis,FSvelocityEnum); + node = new Node(id0+iomodel->numberofvertices+i+1,iomodel->numberofvertices+i,lid++,0,iomodel,analysis,FSvelocityEnum); node->Deactivate(); nodes->AddObject(node); @@ -166,7 +265,8 @@ } /*P1 pressure*/ - for(i=0;inumberofvertices;i++){ - if(iomodel->my_vertices[i]){ - nodes->AddObject(new Node(iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofelements+i+1,iomodel->numberofvertices+iomodel->numberofelements+i,lid++,i,iomodel,analysis,FSpressureEnum)); + vnodes = id0+iomodel->numberofvertices+iomodel->numberofelements; + for(i=0;inumberofvertices;i++){ + if(iomodel->my_vertices[i]){ + nodes->AddObject(new Node(vnodes+i+1,iomodel->numberofvertices+iomodel->numberofelements+i,lid++,i,iomodel,analysis,FSpressureEnum)); } } @@ -177,20 +277,22 @@ for(i=0;inumberofvertices;i++){ if(iomodel->my_vertices[i]){ - nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,lid++,i,iomodel,analysis,FSvelocityEnum)); + nodes->AddObject(new Node(id0+i+1,i,lid++,i,iomodel,analysis,FSvelocityEnum)); } } for(i=0;inumberofelements;i++){ if(iomodel->my_elements[i]){ - nodes->AddObject(new Node(iomodel->nodecounter+iomodel->numberofvertices+i+1,iomodel->numberofvertices+i,lid++,0,iomodel,analysis,FSvelocityEnum)); - } - } - /*P1 pressure*/ - for(i=0;inumberofvertices;i++){ - if(iomodel->my_vertices[i]){ - nodes->AddObject(new Node(iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofelements+i+1,iomodel->numberofvertices+iomodel->numberofelements+i,lid++,i,iomodel,analysis,FSpressureEnum)); + nodes->AddObject(new Node(id0+iomodel->numberofvertices+i+1,iomodel->numberofvertices+i,lid++,0,iomodel,analysis,FSvelocityEnum)); + } + } + /*P1 pressure*/ + vnodes = id0+iomodel->numberofvertices+iomodel->numberofelements; + for(i=0;inumberofvertices;i++){ + if(iomodel->my_vertices[i]){ + nodes->AddObject(new Node(vnodes+i+1,iomodel->numberofvertices+iomodel->numberofelements+i,lid++,i,iomodel,analysis,FSpressureEnum)); } } break; case TaylorHoodEnum: + case XTaylorHoodEnum: _assert_(approximation==FSApproximationEnum); /*P2 velocity*/ @@ -198,18 +300,107 @@ for(i=0;inumberofvertices;i++){ if(iomodel->my_vertices[i]){ - nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,lid++,i,iomodel,analysis,FSvelocityEnum)); + nodes->AddObject(new Node(id0+i+1,i,lid++,i,iomodel,analysis,FSvelocityEnum)); } } for(i=0;inumberofedges;i++){ if(my_edges[i]){ - nodes->AddObject(new Node(iomodel->nodecounter+iomodel->numberofvertices+i+1,iomodel->numberofvertices+i,lid++,0,iomodel,analysis,FSvelocityEnum)); - } - } - - /*P1 pressure*/ - for(i=0;inumberofvertices;i++){ - if(iomodel->my_vertices[i]){ - nodes->AddObject(new Node(iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+i+1,iomodel->numberofvertices+iomodel->numberofedges+i,lid++,i,iomodel,analysis,FSpressureEnum)); - } + nodes->AddObject(new Node(id0+iomodel->numberofvertices+i+1,iomodel->numberofvertices+i,lid++,0,iomodel,analysis,FSvelocityEnum)); + } + } + id0 = id0+iomodel->numberofvertices+iomodel->numberofedges; + if(iomodel->meshelementtype==PentaEnum){ + FacesPartitioning(&my_faces,iomodel); + for(i=0;inumberoffaces;i++){ + if(iomodel->faces[i*6+5]==2){/*Vertical quads*/ + if(my_faces[i]){ + node = new Node(id0+i+1,iomodel->numberofvertices+iomodel->numberofedges+i,lid++,0,iomodel,analysis,FSvelocityEnum); + nodes->AddObject(node); + } + } + else if(iomodel->faces[i*6+5]==1){/*Triangular base/top*/ + /*Nothing*/ + } + else{ + _error_("not supported"); + } + } + } + + /*P1 pressure*/ + if(iomodel->meshelementtype==PentaEnum){ + numberoffaces=iomodel->numberoffaces; + } + else{ + numberoffaces=0; + } + vnodes = id0+numberoffaces; + for(i=0;inumberofvertices;i++){ + if(iomodel->my_vertices[i]){ + nodes->AddObject(new Node(vnodes+i+1,iomodel->numberofvertices+iomodel->numberofedges+numberoffaces+i,lid++,i,iomodel,analysis,FSpressureEnum)); + } + } + break; + case OneLayerP4zEnum: + _assert_(approximation==FSApproximationEnum); + EdgesPartitioning(&my_edges,iomodel); + FacesPartitioning(&my_faces,iomodel); + /*P2xP4 velocity*/ + for(i=0;inumberofvertices;i++){ + if(iomodel->my_vertices[i]){ + nodes->AddObject(new Node(id0+i+1,i,lid++,i,iomodel,analysis,FSvelocityEnum)); + } + } + counter = iomodel->numberofvertices; + for(i=0;inumberofedges;i++){ + if(iomodel->edges[i*3+2]==2){/*Vertical edges*/ + if(my_edges[i]){ + node = new Node(id0+iomodel->numberofvertices+3*i+1,counter+1,lid++,0,iomodel,analysis,FSvelocityEnum); + nodes->AddObject(node); + node = new Node(id0+iomodel->numberofvertices+3*i+2,counter+2,lid++,0,iomodel,analysis,FSvelocityEnum); + nodes->AddObject(node); + node = new Node(id0+iomodel->numberofvertices+3*i+3,counter+3,lid++,0,iomodel,analysis,FSvelocityEnum); + nodes->AddObject(node); + } + counter=counter+3; + } + else if(iomodel->edges[i*3+2]==1){/*Horizontal edges*/ + if(my_edges[i]){ + node = new Node(id0+iomodel->numberofvertices+3*i+1,counter+1,lid++,0,iomodel,analysis,FSvelocityEnum); + nodes->AddObject(node); + } + counter=counter+1; + } + else{ + _error_("not supported"); + } + } + id0 = id0+iomodel->numberofvertices+3*iomodel->numberofedges; + for(i=0;inumberoffaces;i++){ + if(iomodel->faces[i*6+5]==2){/*Vertical quads*/ + if(my_faces[i]){ + node = new Node(id0+3*i+1,counter+1,lid++,0,iomodel,analysis,FSvelocityEnum); + nodes->AddObject(node); + node = new Node(id0+3*i+2,counter+2,lid++,0,iomodel,analysis,FSvelocityEnum); + nodes->AddObject(node); + node = new Node(id0+3*i+3,counter+3,lid++,0,iomodel,analysis,FSvelocityEnum); + nodes->AddObject(node); + } + counter=counter+3; + } + else if(iomodel->faces[i*6+5]==1){/*Triangular base/top*/ + /*Nothing*/ + } + else{ + _error_("not supported"); + } + } + + /*P1 pressure*/ + vnodes = id0+3*iomodel->numberoffaces; + for(i=0;inumberofvertices;i++){ + if(iomodel->my_vertices[i]){ + nodes->AddObject(new Node(vnodes+i+1,counter+1,lid++,i,iomodel,analysis,FSpressureEnum)); + } + counter++; } break; @@ -220,4 +411,5 @@ /*Clean up*/ + xDelete(my_faces); xDelete(my_edges); xDelete(my_nodes); Index: /issm/trunk/src/c/modules/ModelProcessorx/CreateNumberNodeToElementConnectivity.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/CreateNumberNodeToElementConnectivity.cpp (revision 17805) +++ /issm/trunk/src/c/modules/ModelProcessorx/CreateNumberNodeToElementConnectivity.cpp (revision 17806) @@ -36,8 +36,8 @@ /*Get element width*/ - switch(iomodel->meshtype){ - case Mesh2DhorizontalEnum: elementswidth=3; break; - case Mesh2DverticalEnum: elementswidth=3; break; - case Mesh3DEnum: elementswidth=6; break; + switch(iomodel->meshelementtype){ + case TriaEnum: elementswidth=3; break; + case TetraEnum: elementswidth=4; break; + case PentaEnum: elementswidth=6; break; default: _error_("mesh not supported yet"); } Index: /issm/trunk/src/c/modules/ModelProcessorx/CreateOutputDefinitions.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/CreateOutputDefinitions.cpp (revision 17805) +++ /issm/trunk/src/c/modules/ModelProcessorx/CreateOutputDefinitions.cpp (revision 17806) @@ -8,15 +8,11 @@ #include "./ModelProcessorx.h" -void CreateOutputDefinitions(Parameters* parameters,IoModel* iomodel){ +void CreateOutputDefinitions(Elements* elements, Parameters* parameters,IoModel* iomodel){ int i,j; - DataSet *output_definitions = NULL; - int *output_definition_enums = NULL; + DataSet* output_definitions = NULL; + int* output_definition_enums = NULL; int num_output_definitions; - int numgates; - char **gatenames = NULL; - IssmDouble **gatesegments = NULL; - int *gatesegments_M = NULL; /*Create output_definitions dataset: */ @@ -28,5 +24,13 @@ if (output_definition_enums[i]==MassfluxatgateEnum){ + /*Deal with mass flux gates:{{{ */ + + /*massfluxatgate variables: */ + int numgates; + char **gatenames = NULL; + IssmDouble **gatesegments = NULL; + int *gatesegments_M = NULL; + /*Fetch segments and names: */ @@ -47,4 +51,68 @@ /*}}}*/ } + else if (output_definition_enums[i]==MisfitEnum){ + /*Deal with misfits: {{{*/ + + /*misfit variables: */ + int nummisfits; + char** misfit_name_s = NULL; + int* misfit_model_enum_s = NULL; + IssmDouble** misfit_observation_s = NULL; + int* misfit_observation_enum_s = NULL; + int* misfit_observation_M_s = NULL; + int* misfit_observation_N_s = NULL; + char** misfit_timeinterpolation_s = NULL; + IssmDouble** misfit_weights_s = NULL; + int* misfit_weights_M_s = NULL; + int* misfit_weights_N_s = NULL; + int* misfit_weights_enum_s= NULL; + + /*Fetch name, model_enum, observation, observation_enum, etc ... (see src/m/classes/misfit.m): */ + iomodel->FetchMultipleData(&misfit_name_s,&nummisfits,MisfitNameEnum); + iomodel->FetchMultipleData(&misfit_model_enum_s,&nummisfits,MisfitModelEnumEnum); + iomodel->FetchMultipleData(&misfit_observation_s,&misfit_observation_M_s,&misfit_observation_N_s,&nummisfits,MisfitObservationEnum); + iomodel->FetchMultipleData(&misfit_observation_enum_s,&nummisfits,MisfitObservationEnumEnum); + iomodel->FetchMultipleData(&misfit_timeinterpolation_s,&nummisfits,MisfitTimeinterpolationEnum); + iomodel->FetchMultipleData(&misfit_weights_s,&misfit_weights_M_s,&misfit_weights_N_s,&nummisfits,MisfitWeightsEnum); + iomodel->FetchMultipleData(&misfit_weights_enum_s,&nummisfits,MisfitWeightsEnumEnum); + + for(j=0;jAddObject(new Misfit(misfit_name_s[j],misfit_model_enum_s[j],misfit_observation_enum_s[j],misfit_timeinterpolation_s[j],misfit_weights_enum_s[j])); + + /*Now, for this particular misfit object, make sure we plug into the elements: the observation, and the weights.*/ + for(i=0;iSize();i++){ + Element* element=dynamic_cast(elements->GetObjectByOffset(i)); + element->InputCreate(misfit_observation_s[j], iomodel,misfit_observation_M_s[j],misfit_observation_N_s[j],1,misfit_observation_enum_s[j],7); + element->InputCreate(misfit_weights_s[j], iomodel,misfit_weights_M_s[j],misfit_weights_N_s[j],1,misfit_weights_enum_s[j],7); + } + + } + + /*Free ressources:*/ + for(j=0;j(string); + string = misfit_timeinterpolation_s[j]; xDelete(string); + matrix = misfit_observation_s[j]; xDelete(matrix); + matrix = misfit_weights_s[j]; xDelete(matrix); + } + xDelete(misfit_name_s); + xDelete(misfit_model_enum_s); + xDelete(misfit_observation_s); + xDelete(misfit_observation_enum_s); + xDelete(misfit_observation_M_s); + xDelete(misfit_observation_N_s); + xDelete(misfit_timeinterpolation_s); + xDelete(misfit_weights_s); + xDelete(misfit_weights_M_s); + xDelete(misfit_weights_N_s); + xDelete(misfit_weights_enum_s); + /*}}}*/ + } + else _error_("output definition enum " << output_definition_enums[i] << "not supported yet!"); } Index: /issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 17805) +++ /issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 17806) @@ -19,5 +19,5 @@ int i,j,m,k; - int numoutputs,meshtype; + int numoutputs,domaintype,materialtype,smb_model; char** requestedoutputs = NULL; IssmDouble time; @@ -41,5 +41,7 @@ /*Copy some constants from iomodel */ - parameters->AddObject(iomodel->CopyConstantObject(MeshTypeEnum)); + parameters->AddObject(iomodel->CopyConstantObject(DomainTypeEnum)); + parameters->AddObject(iomodel->CopyConstantObject(DomainDimensionEnum)); + parameters->AddObject(iomodel->CopyConstantObject(MeshElementtypeEnum)); parameters->AddObject(iomodel->CopyConstantObject(SettingsOutputFrequencyEnum)); parameters->AddObject(iomodel->CopyConstantObject(SteadystateReltolEnum)); @@ -51,10 +53,4 @@ parameters->AddObject(iomodel->CopyConstantObject(TimesteppingTimeStepEnum)); parameters->AddObject(iomodel->CopyConstantObject(TimesteppingCflCoefficientEnum)); - parameters->AddObject(iomodel->CopyConstantObject(MasstransportIsfreesurfaceEnum)); - parameters->AddObject(iomodel->CopyConstantObject(MasstransportHydrostaticAdjustmentEnum)); - parameters->AddObject(iomodel->CopyConstantObject(MasstransportStabilizationEnum)); - parameters->AddObject(iomodel->CopyConstantObject(MasstransportMinThicknessEnum)); - parameters->AddObject(iomodel->CopyConstantObject(MasstransportPenaltyFactorEnum)); - parameters->AddObject(iomodel->CopyConstantObject(ThermalPenaltyFactorEnum)); parameters->AddObject(iomodel->CopyConstantObject(SettingsLowmemEnum)); parameters->AddObject(iomodel->CopyConstantObject(DebugProfilingEnum)); @@ -63,11 +59,8 @@ parameters->AddObject(iomodel->CopyConstantObject(BalancethicknessStabilizationEnum)); parameters->AddObject(iomodel->CopyConstantObject(GroundinglineMeltingRateEnum)); - parameters->AddObject(iomodel->CopyConstantObject(ThermalMaxiterEnum)); - parameters->AddObject(iomodel->CopyConstantObject(ThermalStabilizationEnum)); - parameters->AddObject(iomodel->CopyConstantObject(ThermalPenaltyThresholdEnum)); - parameters->AddObject(iomodel->CopyConstantObject(ThermalPenaltyLockEnum)); parameters->AddObject(iomodel->CopyConstantObject(SettingsWaitonlockEnum)); parameters->AddObject(iomodel->CopyConstantObject(MeshNumberofelementsEnum)); parameters->AddObject(iomodel->CopyConstantObject(MeshNumberofverticesEnum)); + parameters->AddObject(iomodel->CopyConstantObject(SettingsResultsOnNodesEnum)); parameters->AddObject(iomodel->CopyConstantObject(SettingsIoGatherEnum)); parameters->AddObject(iomodel->CopyConstantObject(GroundinglineMigrationEnum)); @@ -77,6 +70,7 @@ parameters->AddObject(iomodel->CopyConstantObject(TransientIsgroundinglineEnum)); parameters->AddObject(iomodel->CopyConstantObject(TransientIsgiaEnum)); - parameters->AddObject(iomodel->CopyConstantObject(ThermalIsenthalpyEnum)); - parameters->AddObject(iomodel->CopyConstantObject(ThermalIsdynamicbasalspcEnum)); + parameters->AddObject(iomodel->CopyConstantObject(TransientIslevelsetEnum)); + parameters->AddObject(iomodel->CopyConstantObject(TransientIsdamageevolutionEnum)); + parameters->AddObject(iomodel->CopyConstantObject(TransientIshydrologyEnum)); parameters->AddObject(iomodel->CopyConstantObject(MaterialsRheologyLawEnum)); parameters->AddObject(iomodel->CopyConstantObject(AutodiffIsautodiffEnum)); @@ -84,7 +78,4 @@ parameters->AddObject(iomodel->CopyConstantObject(InversionIscontrolEnum)); parameters->AddObject(iomodel->CopyConstantObject(InversionTaoEnum)); - parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsIspddEnum)); - parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsIsdelta18oEnum)); - parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsIssmbgradientsEnum)); parameters->AddObject(iomodel->CopyConstantObject(GiaCrossSectionShapeEnum)); @@ -96,31 +87,43 @@ parameters->AddObject(iomodel->CopyConstantObject(StressbalanceReltolEnum)); parameters->AddObject(iomodel->CopyConstantObject(StressbalanceAbstolEnum)); - if(iomodel->meshtype==Mesh3DEnum) + if(iomodel->domaintype==Domain3DEnum) parameters->AddObject(iomodel->CopyConstantObject(MeshNumberoflayersEnum)); - iomodel->Constant(&ispdd,SurfaceforcingsIspddEnum); - if(ispdd){ - - parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsDesfacEnum)); - parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsS0pEnum)); - - iomodel->Constant(&isdelta18o,SurfaceforcingsIsdelta18oEnum); - if(isdelta18o){ - IssmDouble *temp = NULL; - IssmDouble yts; - int N,M; - - iomodel->Constant(&yts,ConstantsYtsEnum); - - iomodel->FetchData(&temp,&N,&M,SurfaceforcingsDelta18oEnum); _assert_(N==2); - for(i=0;iAddObject(new TransientParam(SurfaceforcingsDelta18oEnum,&temp[0],&temp[M],M)); - iomodel->DeleteData(temp,SurfaceforcingsDelta18oEnum); - - iomodel->FetchData(&temp,&N,&M,SurfaceforcingsDelta18oSurfaceEnum); _assert_(N==2); - for(i=0;iAddObject(new TransientParam(SurfaceforcingsDelta18oSurfaceEnum,&temp[0],&temp[M],M)); - iomodel->DeleteData(temp,SurfaceforcingsDelta18oSurfaceEnum); - } + /*Surface mass balance parameters*/ + parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsEnum)); + iomodel->Constant(&smb_model,SurfaceforcingsEnum); + switch(smb_model){ + case SMBEnum: + /*Nothing to add to parameters*/ + break; + case SMBpddEnum: + parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsIsdelta18oEnum)); + parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsDesfacEnum)); + parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsS0pEnum)); + iomodel->Constant(&isdelta18o,SurfaceforcingsIsdelta18oEnum); + if(isdelta18o){ + IssmDouble *temp = NULL; + IssmDouble yts; + int N,M; + iomodel->Constant(&yts,ConstantsYtsEnum); + iomodel->FetchData(&temp,&N,&M,SurfaceforcingsDelta18oEnum); _assert_(N==2); + for(i=0;iAddObject(new TransientParam(SurfaceforcingsDelta18oEnum,&temp[0],&temp[M],M)); + iomodel->DeleteData(temp,SurfaceforcingsDelta18oEnum); + + iomodel->FetchData(&temp,&N,&M,SurfaceforcingsDelta18oSurfaceEnum); _assert_(N==2); + for(i=0;iAddObject(new TransientParam(SurfaceforcingsDelta18oSurfaceEnum,&temp[0],&temp[M],M)); + iomodel->DeleteData(temp,SurfaceforcingsDelta18oSurfaceEnum); + } + break; + case SMBgradientsEnum: + /*Nothing to add to parameters*/ + break; + case SMBhenningEnum: + /*Nothing to add to parameters*/ + break; + default: + _error_("Surface mass balance model "<Constant(&time,TimesteppingStartTimeEnum); - parameters->AddObject(new DoubleParam(TimeEnum,time)); //start at time 0 by default for all solutions FIXME: to be deleted - parameters->AddObject(new IntParam(StepEnum,1)); //start at time 0 by default for all solutions FIXME: to be deleted + parameters->AddObject(new DoubleParam(TimeEnum,time)); + parameters->AddObject(new IntParam(StepEnum,1)); /*By default, save all results*/ @@ -146,13 +149,11 @@ iomodel->DeleteData(&requestedoutputs,numoutputs,SteadystateRequestedOutputsEnum); - iomodel->FetchData(&requestedoutputs,&numoutputs,MasstransportRequestedOutputsEnum); - parameters->AddObject(new IntParam(MasstransportNumRequestedOutputsEnum,numoutputs)); - if(numoutputs)parameters->AddObject(new StringArrayParam(MasstransportRequestedOutputsEnum,requestedoutputs,numoutputs)); - iomodel->DeleteData(&requestedoutputs,numoutputs,MasstransportRequestedOutputsEnum); - - iomodel->FetchData(&requestedoutputs,&numoutputs,ThermalRequestedOutputsEnum); - parameters->AddObject(new IntParam(ThermalNumRequestedOutputsEnum,numoutputs)); - if(numoutputs)parameters->AddObject(new StringArrayParam(ThermalRequestedOutputsEnum,requestedoutputs,numoutputs)); - iomodel->DeleteData(&requestedoutputs,numoutputs,ThermalRequestedOutputsEnum); + iomodel->Constant(&materialtype,MaterialsEnum); + if(materialtype==MatdamageiceEnum){ + iomodel->FetchData(&requestedoutputs,&numoutputs,DamageEvolutionRequestedOutputsEnum); + parameters->AddObject(new IntParam(DamageEvolutionNumRequestedOutputsEnum,numoutputs)); + if(numoutputs)parameters->AddObject(new StringArrayParam(DamageEvolutionRequestedOutputsEnum,requestedoutputs,numoutputs)); + iomodel->DeleteData(&requestedoutputs,numoutputs,DamageEvolutionRequestedOutputsEnum); + } /*Deal with mass flux segments: {{{*/ @@ -218,11 +219,7 @@ /*}}}*/ - /*Output definitions dataset: */ - CreateOutputDefinitions(parameters,iomodel); - + /*Before returning, create parameters in case we are running Qmu or control types runs: */ - #ifdef _HAVE_CONTROL_ CreateParametersControl(parameters,iomodel,solution_type); - #endif #ifdef _HAVE_DAKOTA_ Index: /issm/trunk/src/c/modules/ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp (revision 17805) +++ /issm/trunk/src/c/modules/ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp (revision 17806) @@ -30,9 +30,9 @@ /*Get element width (3 or 6)*/ - if(iomodel->meshtype==Mesh2DhorizontalEnum){ - elementswidth=3; - } - else{ - elementswidth=6; + switch(iomodel->domaintype){ + case Domain2DhorizontalEnum: elementswidth=3; break; + case Domain2DverticalEnum : elementswidth=3; break; + case Domain3DEnum : elementswidth=6; break; + default: _error_("mesh type "<domaintype)<<" not supported yet"); } Index: /issm/trunk/src/c/modules/ModelProcessorx/EdgesPartitioning.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/EdgesPartitioning.cpp (revision 17805) +++ /issm/trunk/src/c/modules/ModelProcessorx/EdgesPartitioning.cpp (revision 17806) @@ -18,16 +18,11 @@ /*Mesh dependent variables*/ - if(iomodel->meshtype==Mesh2DhorizontalEnum){ - elementnbe = 3; + switch(iomodel->meshelementtype){ + case TriaEnum: elementnbe = 3; break; + case TetraEnum: elementnbe = 6; break; + case PentaEnum: elementnbe = 9; break; + default: _error_("mesh dimension not supported yet"); } - else if(iomodel->meshtype==Mesh2DverticalEnum){ - elementnbe = 3; - } - else if(iomodel->meshtype==Mesh3DEnum){ - elementnbe = 9; - } - else{ - _error_("mesh dimension not supported yet"); - } + /*output: */ bool* my_edges=xNewZeroInit(iomodel->numberofedges); Index: /issm/trunk/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp (revision 17805) +++ /issm/trunk/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp (revision 17806) @@ -17,5 +17,5 @@ void ElementsAndVerticesPartitioning(bool** pmy_elements, int** pmy_vertices, IoModel* iomodel){ - int i; + int i,j; const int RIFTINFOSIZE = 12; @@ -51,6 +51,6 @@ /*Number of vertices per elements, needed to correctly retrieve data: */ /*Determine parallel partitioning of elements: we use Metis for now. First load the data, then partition*/ - switch(iomodel->meshtype){ - case Mesh2DhorizontalEnum: + switch(iomodel->meshelementtype){ + case TriaEnum: elements_width=3; numberofelements2d = 0; @@ -58,12 +58,12 @@ numlayers = 0; break; - case Mesh2DverticalEnum: - elements_width=3; + case TetraEnum: + elements_width=4; numberofelements2d = 0; numberofvertices2d = 0; numlayers = 0; break; - case Mesh3DEnum: - elements_width=6; //penta elements + case PentaEnum: + elements_width=6; iomodel->FetchData(&elements2d,NULL,NULL,MeshElements2dEnum); iomodel->Constant(&numberofelements2d,MeshNumberofelements2dEnum); @@ -75,5 +75,5 @@ } - MeshPartitionx(&epart,&npart,iomodel->numberofelements,iomodel->numberofvertices,iomodel->elements,numberofelements2d,numberofvertices2d,elements2d,numlayers,elements_width,iomodel->meshtype,num_procs); + MeshPartitionx(&epart,&npart,iomodel->numberofelements,iomodel->numberofvertices,iomodel->elements,numberofelements2d,numberofvertices2d,elements2d,numlayers,elements_width,iomodel->meshelementtype,num_procs); /*Free elements2d: */ @@ -96,23 +96,15 @@ /*Start figuring out, out of the partition, which elements belong to this cpu: */ - for (i=0;inumberofelements;i++){ + for(i=0;inumberofelements;i++){ /*!All elements have been partitioned above, only deal with elements for this cpu: */ if(my_rank==epart[i]){ - my_elements[i]=true; - /*Now that we are here, we can also start building the list of vertices belonging to this cpu partition: we use *the element index to do this. For each element n, we know index[n][0:2] holds the indices (matlab indexing) into the vertices coordinates. If we start plugging 1 into my_vertices for each index[n][i] (i=0:2), then my_vertices will hold which vertices belong to this partition*/ - my_vertices[iomodel->elements[elements_width*i+0]-1]=1; - my_vertices[iomodel->elements[elements_width*i+1]-1]=1; - my_vertices[iomodel->elements[elements_width*i+2]-1]=1; - - if(elements_width==6){ - my_vertices[iomodel->elements[elements_width*i+3]-1]=1; - my_vertices[iomodel->elements[elements_width*i+4]-1]=1; - my_vertices[iomodel->elements[elements_width*i+5]-1]=1; + for(j=0;jelements[elements_width*i+j]-1]=1; } } Index: /issm/trunk/src/c/modules/ModelProcessorx/FacesPartitioning.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/FacesPartitioning.cpp (revision 17805) +++ /issm/trunk/src/c/modules/ModelProcessorx/FacesPartitioning.cpp (revision 17806) @@ -11,29 +11,34 @@ /*Intermediaries*/ - int el1,el2; - bool my_face; - - /*Check Iomodel properties*/ - if(iomodel->meshtype!=Mesh2DhorizontalEnum) _error_("only 2d model are supported"); + int elementnbf; /*Get faces and elements*/ CreateFaces(iomodel); + _assert_(iomodel->elementtofaceconnectivity); + /*Mesh dependent variables*/ + if(iomodel->domaintype==Domain2DhorizontalEnum){ + elementnbf = 3; + } + else if(iomodel->domaintype==Domain2DverticalEnum){ + elementnbf = 3; + } + else if(iomodel->domaintype==Domain3DEnum){ + elementnbf = 5; + } + else{ + _error_("mesh dimension not supported yet"); + } /*output: */ - bool* my_faces=xNew(iomodel->numberoffaces); + bool* my_faces=xNewZeroInit(iomodel->numberoffaces); - for(int i=0;inumberoffaces;i++){ - - /*Get left and right elements*/ - el1=iomodel->faces[4*i+2]-1; //faces are [node1 node2 elem1 elem2] - el2=iomodel->faces[4*i+3]-1; //faces are [node1 node2 elem1 elem2] - - /*Check whether we should include this face (el2 is -2 for boundary faces)*/ - my_face = iomodel->my_elements[el1]; - if(!my_face && el2>=0){ - my_face = iomodel->my_elements[el2]; + for(int i=0;inumberofelements;i++){ + if(iomodel->my_elements[i]){ + for(int j=0;jelementtofaceconnectivity[i*elementnbf+j] >= 0); + _assert_(iomodel->elementtofaceconnectivity[i*elementnbf+j] < iomodel->numberoffaces); + my_faces[iomodel->elementtofaceconnectivity[i*elementnbf+j]] = true; + } } - - my_faces[i] = my_face; } Index: /issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.cpp (revision 17805) +++ /issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.cpp (revision 17806) @@ -16,5 +16,5 @@ int i,analysis_enum,verbose; - bool isthermal,ismasstransport,isstressbalance,isgroundingline,isenthalpy; + bool isthermal,ismasstransport,isstressbalance,isgroundingline,isenthalpy,islevelset,isdamage,ishydrology; /*Initialize datasets*/ @@ -34,7 +34,10 @@ iomodel->Constant(&isthermal,TransientIsthermalEnum); iomodel->Constant(&isenthalpy,ThermalIsenthalpyEnum); + iomodel->Constant(&islevelset,TransientIslevelsetEnum); iomodel->Constant(&ismasstransport,TransientIsmasstransportEnum); iomodel->Constant(&isstressbalance,TransientIsstressbalanceEnum); iomodel->Constant(&isgroundingline,TransientIsgroundinglineEnum); + iomodel->Constant(&isdamage,TransientIsdamageevolutionEnum); + iomodel->Constant(&ishydrology,TransientIshydrologyEnum); SetVerbosityLevel(verbose); @@ -57,7 +60,7 @@ /*Hack for trasient runs (FIXME: to be improved)*/ - if(solution_enum==TransientSolutionEnum && analysis_enum==ThermalAnalysisEnum && iomodel->meshtype==Mesh2DhorizontalEnum) continue; - if(solution_enum==TransientSolutionEnum && analysis_enum==MeltingAnalysisEnum && iomodel->meshtype==Mesh2DhorizontalEnum) continue; - if(solution_enum==TransientSolutionEnum && analysis_enum==EnthalpyAnalysisEnum && iomodel->meshtype==Mesh2DhorizontalEnum) continue; + if(solution_enum==TransientSolutionEnum && analysis_enum==ThermalAnalysisEnum && iomodel->domaintype==Domain2DhorizontalEnum) continue; + if(solution_enum==TransientSolutionEnum && analysis_enum==MeltingAnalysisEnum && iomodel->domaintype==Domain2DhorizontalEnum) continue; + if(solution_enum==TransientSolutionEnum && analysis_enum==EnthalpyAnalysisEnum && iomodel->domaintype==Domain2DhorizontalEnum) continue; if(solution_enum==TransientSolutionEnum && analysis_enum==ThermalAnalysisEnum && isthermal==false) continue; if(solution_enum==TransientSolutionEnum && analysis_enum==MeltingAnalysisEnum && isthermal==false) continue; @@ -73,4 +76,11 @@ if(solution_enum==SteadystateSolutionEnum && analysis_enum==MeltingAnalysisEnum && isenthalpy==true) continue; if(solution_enum==SteadystateSolutionEnum && analysis_enum==EnthalpyAnalysisEnum && isenthalpy==false) continue; + if(solution_enum==TransientSolutionEnum && analysis_enum==LevelsetAnalysisEnum && islevelset==false) continue; + if(solution_enum==TransientSolutionEnum && analysis_enum==ExtrapolationAnalysisEnum && islevelset==false) continue; + if(solution_enum==TransientSolutionEnum && analysis_enum==LsfReinitializationAnalysisEnum && islevelset==false) continue; + if(solution_enum==TransientSolutionEnum && analysis_enum==HydrologyShreveAnalysisEnum && ishydrology==false) continue; + if(solution_enum==TransientSolutionEnum && analysis_enum==HydrologyDCEfficientAnalysisEnum && ishydrology==false) continue; + if(solution_enum==TransientSolutionEnum && analysis_enum==HydrologyDCInefficientAnalysisEnum && ishydrology==false) continue; + if(solution_enum==TransientSolutionEnum && analysis_enum==DamageEvolutionAnalysisEnum && isdamage==false) continue; if(VerboseMProcessor()) _printf0_(" creating datasets for analysis " << EnumToStringx(analysis_enum) << "\n"); @@ -93,15 +103,14 @@ /*Solution specific updates*/ - #ifdef _HAVE_CONTROL_ UpdateElementsAndMaterialsControl(elements,materials,iomodel); - #endif #ifdef _HAVE_DAKOTA_ UpdateElementsAndMaterialsDakota(elements,materials,iomodel); #endif - #ifdef _HAVE_TRANSIENT_ if(solution_enum==TransientSolutionEnum){ UpdateElementsTransient(elements,parameters,iomodel,analysis_enum); } - #endif + + /*Output definitions dataset: */ + CreateOutputDefinitions(elements,parameters,iomodel); /* Sort datasets: Index: /issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.h =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.h (revision 17805) +++ /issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.h (revision 17806) @@ -17,5 +17,5 @@ void CreateParametersControl(Parameters* parameters,IoModel* iomodel,int solution_type); void CreateParametersDakota(Parameters* parameters,IoModel* iomodel,char* rootpath); -void CreateOutputDefinitions(Parameters* parameters,IoModel* iomodel); +void CreateOutputDefinitions(Elements* elements, Parameters* parameters,IoModel* iomodel); void UpdateElementsAndMaterialsControl(Elements* elements,Materials* materials, IoModel* iomodel); void UpdateElementsAndMaterialsDakota(Elements* elements,Materials* materials, IoModel* iomodel); @@ -30,6 +30,8 @@ /*Mesh properties*/ +void CreateEdges(IoModel* iomodel); void CreateFaces(IoModel* iomodel); -void CreateEdges(IoModel* iomodel); +void CreateFaces3d(IoModel* iomodel); +void FaceGetVertexIndices(IoModel* iomodel,int* pnumvertices,int** pverticesid,int facenumber); /*Connectivity*/ Index: /issm/trunk/src/c/modules/ModelProcessorx/NodesPartitioning.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/NodesPartitioning.cpp (revision 17805) +++ /issm/trunk/src/c/modules/ModelProcessorx/NodesPartitioning.cpp (revision 17806) @@ -65,5 +65,5 @@ /*First: add all the nodes of all the elements belonging to this cpu*/ - if(iomodel->meshtype==Mesh2DhorizontalEnum){ + if(iomodel->domaintype==Domain2DhorizontalEnum){ for (i=0;inumberofelements;i++){ if (my_elements[i]){ Index: /issm/trunk/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp (revision 17805) +++ /issm/trunk/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp (revision 17806) @@ -15,5 +15,5 @@ if(isgroundingline){ - iomodel->FetchDataToInput(elements,BathymetryEnum); + iomodel->FetchDataToInput(elements,BedEnum); } } Index: /issm/trunk/src/c/modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.cpp =================================================================== --- /issm/trunk/src/c/modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.cpp (revision 17805) +++ /issm/trunk/src/c/modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.cpp (revision 17806) @@ -15,5 +15,5 @@ /*Ok, go find the output definitions dataset in the parameters, where our responses are hiding: */ - femmodel->parameters->FindParam(&output_definitions,OutputdefinitionEnum); _assert_(output_definitions); + output_definitions=((DataSetParam*)femmodel->parameters->FindParamObject(OutputdefinitionEnum))->value; /*Now, go through the output definitions, and retrieve the object which corresponds to our requested response, output_string: */ @@ -24,12 +24,17 @@ char* name = definition->Name(); if (strcmp(name,output_string)==0){ + /*This is the object that we have been chasing for. compute the response and return: */ return_value=definition->Response(femmodel); - delete output_definitions; + + /*cleanup: */ xDelete(name); + + /*return:*/ return return_value; } xDelete(name); } + /*If we are here, did not find the definition for this response, not good!: */ _error_("Could not find the response for output definition " << output_string << " because could not find the definition itself!"); Index: /issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.cpp =================================================================== --- /issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.cpp (revision 17805) +++ /issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.cpp (revision 17806) @@ -15,5 +15,5 @@ #include "../../classes/classes.h" -void OutputResultsx(Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Results* results){ +void OutputResultsx(FemModel* femmodel){ int my_rank; @@ -27,5 +27,5 @@ /*retrieve parameters: */ - parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum); + femmodel->parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum); /*recover my_rank:*/ @@ -40,18 +40,18 @@ *therefore, we need to include the solutiontype into the filename: */ if(my_rank==0){ - parameters->FindParam(&solutiontype,SolutionTypeEnum); + femmodel->parameters->FindParam(&solutiontype,SolutionTypeEnum); EnumToStringx(&solutiontypestring,solutiontype); - results->AddResult(new GenericExternalResult(results->Size()+1,SolutionTypeEnum,solutiontypestring,1,0)); + femmodel->results->AddResult(new GenericExternalResult(femmodel->results->Size()+1,SolutionTypeEnum,solutiontypestring,1)); xDelete(solutiontypestring); } /*Now, open file for writing, if not already done: */ - if(!parameters->Exist(OutputFilePointerEnum)){ + if(!femmodel->parameters->Exist(OutputFilePointerEnum)){ /*We don't have a file pointer. Retrieve the output file name and open it for writing:*/ - parameters->FindParam(&outputfilename,OutputFileNameEnum); + femmodel->parameters->FindParam(&outputfilename,OutputFileNameEnum); /*What strategy? : */ - parameters->FindParam(&io_gather,SettingsIoGatherEnum); + femmodel->parameters->FindParam(&io_gather,SettingsIoGatherEnum); if(io_gather){ @@ -61,5 +61,5 @@ else{ /*We are opening different files for output on all cpus. Append the rank to the filename, and open: */ - parameters->FindParam(&fid,OutputFilePointerEnum); + femmodel->parameters->FindParam(&fid,OutputFilePointerEnum); sprintf(cpu_outputfilename,"%s.%i",outputfilename,my_rank); fid=pfopen(cpu_outputfilename ,"wb"); @@ -68,15 +68,15 @@ /*Add file pointer in parameters for further calls to OutputResultsx: */ - parameters->SetParam(fid,OutputFilePointerEnum); + femmodel->parameters->SetParam(fid,OutputFilePointerEnum); } /*Write results to disk: */ - results->Write(parameters); + femmodel->results->Write(femmodel->parameters); /*Delete and reinitialize results, in parallel: */ - results->clear(); + femmodel->results->clear(); /*Close output file? :*/ - /*WARNING: issm.cpp is taking care of it for now (quick fix) + /*FIXME WARNING: issm.cpp is taking care of it for now (quick fix) if((step==1) && (time==0)){ if(io_gather){ Index: /issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.h =================================================================== --- /issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.h (revision 17805) +++ /issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.h (revision 17806) @@ -14,5 +14,5 @@ #include "../../classes/classes.h" -void OutputResultsx(Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, Results* results); +void OutputResultsx(FemModel* femmodel); #endif /* _OUTPUTRESULTS_H */ Index: /issm/trunk/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp =================================================================== --- /issm/trunk/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp (revision 17805) +++ /issm/trunk/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp (revision 17806) @@ -24,9 +24,7 @@ /*Deal with rift first*/ - #ifdef _HAVE_RIFTS_ if(RiftIsPresent(femmodel->loads,analysis_type)){ _error_("rift constraints reset not supported yet!"); } - #endif /*Reset pengrid to inactive mode*/ Index: /issm/trunk/src/c/modules/ResetFSBasalBoundaryConditionx/ResetFSBasalBoundaryConditionx.cpp =================================================================== --- /issm/trunk/src/c/modules/ResetFSBasalBoundaryConditionx/ResetFSBasalBoundaryConditionx.cpp (revision 17806) +++ /issm/trunk/src/c/modules/ResetFSBasalBoundaryConditionx/ResetFSBasalBoundaryConditionx.cpp (revision 17806) @@ -0,0 +1,18 @@ +/*!\file ResetFSBasalBoundaryConditionx + * \brief: reset coordinate system for full-FS: tangential to the bedrock + */ + +#include "./ResetFSBasalBoundaryConditionx.h" +#include "../../shared/shared.h" +#include "../../toolkits/toolkits.h" + +void ResetFSBasalBoundaryConditionx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads,Materials* materials,Parameters* parameters){ + + Element *element = NULL; + + for (int i=0;iSize();i++){ + element=dynamic_cast(elements->GetObjectByOffset(i)); + element->ResetFSBasalBoundaryCondition(); + } + +} Index: /issm/trunk/src/c/modules/ResetFSBasalBoundaryConditionx/ResetFSBasalBoundaryConditionx.h =================================================================== --- /issm/trunk/src/c/modules/ResetFSBasalBoundaryConditionx/ResetFSBasalBoundaryConditionx.h (revision 17806) +++ /issm/trunk/src/c/modules/ResetFSBasalBoundaryConditionx/ResetFSBasalBoundaryConditionx.h (revision 17806) @@ -0,0 +1,13 @@ +/*!\file: ResetFSBasalBoundaryConditionx.h + * \brief header file for reset coordinate system module + */ + +#ifndef _RESETFSBASALBOUNDARYCONDITIONX_H +#define _RESETFSBASALBOUNDARYCONDITIONX_H + +#include "../../classes/classes.h" + +/* local prototypes: */ +void ResetFSBasalBoundaryConditionx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads,Materials* materials, Parameters* parameters); + +#endif /* _RESETFSBASALBOUNDARYCONDITIONX_H */ Index: /issm/trunk/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp =================================================================== --- /issm/trunk/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp (revision 17806) +++ /issm/trunk/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp (revision 17806) @@ -0,0 +1,130 @@ +/*!\file GetMaskOfIceVerticesLSMx + * \brief: Return a mask for all the vertices determining whether the node should be active or not. + */ + +#include "./SetActiveNodesLSMx.h" + +#include "../../classes/classes.h" +#include "../../shared/shared.h" +#include "../../toolkits/toolkits.h" +#include "../modules.h" + +void SetActiveNodesLSMx(FemModel* femmodel){/*{{{*/ + /* activate/deactivate nodes for levelset method according to IceMaskNodeActivation */ + + /* intermediaries */ + bool solvein2d=false; + int i,in,domaintype,analysis_type; + Elements* elements = femmodel->elements; + + /* find parameters */ + femmodel->parameters->FindParam(&domaintype,DomainTypeEnum); + + for(i=0;iSize();i++){ + Element *element = dynamic_cast(elements->GetObjectByOffset(i)); + int numnodes = element->GetNumberOfNodes(); + IssmDouble *mask = xNew(numnodes); + // include switch for elements with multiple different sets of nodes + switch(element->GetElementType()){ + case MINIEnum:case TaylorHoodEnum:{ + Input* input=element->GetInput(IceMaskNodeActivationEnum); + if(!input) _error_("Input " << EnumToStringx(IceMaskNodeActivationEnum) << " not found in element"); + + /* Start looping on the number of vertices: */ + Gauss* gauss=element->NewGauss(); + for(int iv=0;ivNumberofNodesVelocity();iv++){ + gauss->GaussNode(element->VelocityInterpolation(),iv); + input->GetInputValue(&mask[iv],gauss); + } + for(int iv=0;ivNumberofNodesPressure();iv++){ + gauss->GaussNode(element->PressureInterpolation(),iv); + input->GetInputValue(&mask[element->NumberofNodesVelocity()+iv],gauss); + } + delete gauss; + break; + } + default: + element->GetInputListOnNodes(&mask[0],IceMaskNodeActivationEnum); + break; + } + + /* if solving 2d problem on vertically extende mesh, solve on basal layer only*/ + if(domaintype!=Domain2DhorizontalEnum){ + femmodel->parameters->FindParam(&analysis_type,AnalysisTypeEnum); + if( + analysis_type==FreeSurfaceBaseAnalysisEnum || + analysis_type==MasstransportAnalysisEnum || + analysis_type==MeltingAnalysisEnum || + analysis_type==L2ProjectionBaseAnalysisEnum || + analysis_type==BalancethicknessAnalysisEnum || + analysis_type==HydrologyDCInefficientAnalysisEnum || + analysis_type==DamageEvolutionAnalysisEnum || + analysis_type==HydrologyDCEfficientAnalysisEnum || + analysis_type==LevelsetAnalysisEnum || + analysis_type==ExtrapolationAnalysisEnum + ){ solvein2d=true;} + + if(analysis_type==StressbalanceAnalysisEnum){ + bool isSIA,isSSA; + femmodel->parameters->FindParam(&isSIA,FlowequationIsSIAEnum); + femmodel->parameters->FindParam(&isSSA,FlowequationIsSSAEnum); + if(isSIA || isSSA) + solvein2d=true; + } + + if(solvein2d){ + IssmDouble *mask_isonbase = xNew(numnodes); + element->GetInputListOnNodes(&mask_isonbase[0],MeshVertexonbaseEnum); + for(in=0;in(mask_isonbase); + } + } + + for(in=0;inGetNode(in); + if(mask[in]==1.){ + node->Activate(); + } + else { + node->Deactivate(); + } + } + + xDelete(mask); + } +}/*}}}*/ +void GetMaskOfIceVerticesLSMx(FemModel* femmodel){/*{{{*/ + + /* Intermediaries */ + int i; + + /*Initialize vector with number of vertices*/ + int numvertices=femmodel->vertices->NumberOfVertices(); + Vector* vec_mask_ice=new Vector(numvertices); //vertices that have ice at next time step + /*Fill vector with values: */ + for(i=0;ielements->Size();i++){ + Element* element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); + SetMaskOfIceElement(vec_mask_ice, element); + } + + /*Assemble vector and serialize */ + vec_mask_ice->Assemble(); + IssmDouble* mask_ice=vec_mask_ice->ToMPISerial(); + InputUpdateFromVectorx(femmodel,mask_ice,IceMaskNodeActivationEnum,VertexSIdEnum); + + /*Clean up and return*/ + delete vec_mask_ice; + delete mask_ice; + +}/*}}}*/ +void SetMaskOfIceElement(Vector* vec_mask_ice, Element* element){/*{{{*/ + + /* Intermediaries */ + int numvertices = element->GetNumberOfVertices(); + + if(element->IsIceInElement()){ + for(int i = 0;iSetValue(element->vertices[i]->Sid(),1.,INS_VAL); + } + } +}/*}}}*/ Index: /issm/trunk/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.h =================================================================== --- /issm/trunk/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.h (revision 17806) +++ /issm/trunk/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.h (revision 17806) @@ -0,0 +1,13 @@ +/*!\file: SetActiveNodesLSMx.h + * \brief header file for updating single point constraints for next time step + */ + +#ifndef _SETACTIVENODESLSMX_H +#define _SETACTIVENODESLSMX_H + +#include "../../classes/classes.h" + +void SetActiveNodesLSMx(FemModel* femmodel); +void GetMaskOfIceVerticesLSMx(FemModel* femmodel); +void SetMaskOfIceElement(Vector* vec_mask_ice, Element* element); +#endif /* _UPDATESPCSX_H */ Index: /issm/trunk/src/c/modules/SurfaceAreax/SurfaceAreax.h =================================================================== --- /issm/trunk/src/c/modules/SurfaceAreax/SurfaceAreax.h (revision 17805) +++ /issm/trunk/src/c/modules/SurfaceAreax/SurfaceAreax.h (revision 17806) @@ -6,5 +6,6 @@ #define _SURFACEAREAX_H -#include "../../classes/classes.h" +#include "../../shared/shared.h" +class FemModel; /* local prototypes: */ Index: /issm/trunk/src/c/modules/SurfaceMassBalancex/SurfaceMassBalancex.cpp =================================================================== --- /issm/trunk/src/c/modules/SurfaceMassBalancex/SurfaceMassBalancex.cpp (revision 17806) +++ /issm/trunk/src/c/modules/SurfaceMassBalancex/SurfaceMassBalancex.cpp (revision 17806) @@ -0,0 +1,228 @@ +/*!\file SurfaceMassBalancex + * \brief: calculates SMB + */ + +#include "./SurfaceMassBalancex.h" +#include "../../shared/shared.h" +#include "../../toolkits/toolkits.h" + +void SurfaceMassBalancex(FemModel* femmodel){/*{{{*/ + + /*Intermediaties*/ + int smb_model; + bool isdelta18o; + + /*First, get SMB model from parameters*/ + femmodel->parameters->FindParam(&smb_model,SurfaceforcingsEnum); + + /*branch to correct module*/ + switch(smb_model){ + case SMBEnum: + /*Nothing to be done*/ + break; + case SMBpddEnum: + femmodel->parameters->FindParam(&isdelta18o,SurfaceforcingsIsdelta18oEnum); + if(isdelta18o){ + if(VerboseSolution()) _printf0_(" call Delta18oParametrization module\n"); + Delta18oParameterizationx(femmodel); + } + if(VerboseSolution()) _printf0_(" call positive degree day module\n"); + PositiveDegreeDayx(femmodel); + break; + case SMBgradientsEnum: + if(VerboseSolution())_printf_(" call smb gradients module\n"); + SmbGradientsx(femmodel); + break; + case SMBhenningEnum: + if(VerboseSolution())_printf_(" call smb Henning module\n"); + SmbHenningx(femmodel); + break; + default: + _error_("Surface mass balance model "<elements->Size();i++){ + Element* element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); + element->SmbGradients(); + } + +}/*}}}*/ +void Delta18oParameterizationx(FemModel* femmodel){/*{{{*/ + + for(int i=0;ielements->Size();i++){ + Element* element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); + element->Delta18oParameterization(); + } + +}/*}}}*/ +void PositiveDegreeDayx(FemModel* femmodel){/*{{{*/ + + // void PositiveDegreeDayx(hd,vTempsea,vPrec,agd,Tsurf,ni){ + // note "v" prefix means 12 monthly means, ie time dimension + // INPUT parameters: ni: working size of arrays + // INPUT: surface elevation (m): hd(NA) + // monthly mean surface sealevel temperature (degrees C): vTempsea(NA + // ,NTIME) + // monthly mean precip rate (m/yr water equivalent): vPrec(NA,NTIME) + // OUTPUT: mass-balance (m/yr ice): agd(NA) + // mean annual surface temperature (degrees C): Tsurf(NA) + + int i, it, jj, itm; + IssmDouble DT = 0.02, sigfac, snormfac; + IssmDouble signorm = 5.5; // signorm : sigma of the temperature distribution for a normal day + IssmDouble siglim; // sigma limit for the integration which is equal to 2.5 sigmanorm + IssmDouble signormc = signorm - 0.5; // sigma of the temperature distribution for cloudy day + IssmDouble siglimc, siglim0, siglim0c; + IssmDouble tstep, tsint, tint, tstepc; + int NPDMAX = 1504, NPDCMAX = 1454; + //IssmDouble pdds[NPDMAX]={0}; + //IssmDouble pds[NPDCMAX]={0}; + IssmDouble pddt, pd ; // pd : snow/precip fraction, precipitation falling as snow + IssmDouble PDup, PDCUT = 2.0; // PDcut: rain/snow cutoff temperature (C) + IssmDouble tstar; // monthly mean surface temp + + IssmDouble *pdds = NULL; + IssmDouble *pds = NULL; + Element *element = NULL; + + pdds=xNew(NPDMAX+1); + pds=xNew(NPDCMAX+1); + + /* initialize PDD (creation of a lookup table)*/ + tstep = 0.1; + tsint = tstep*0.5; + sigfac = -1.0/(2.0*pow(signorm,2)); + snormfac = 1.0/(signorm*sqrt(2.0*acos(-1.0))); + siglim = 2.5*signorm; + siglimc = 2.5*signormc; + siglim0 = siglim/DT + 0.5; + siglim0c = siglimc/DT + 0.5; + PDup = siglimc+PDCUT; + + itm = reCast((2*siglim/DT + 1.5)); + + if(itm >= NPDMAX) _error_("increase NPDMAX in massBalance.cpp"); + for(it = 0; it < itm; it++){ + // tstar = REAL(it)*DT-siglim; + tstar = it*DT-siglim; + tint = tsint; + pddt = 0.; + for ( jj = 0; jj < 600; jj++){ + if (tint > (tstar+siglim)){break;} + pddt = pddt + tint*exp(sigfac*(pow((tint-tstar),2)))*tstep; + tint = tint+tstep; + } + pdds[it] = pddt*snormfac; + } + pdds[itm+1] = siglim + DT; + + //*********compute PD(T) : snow/precip fraction. precipitation falling as snow + tstepc = 0.1; + tsint = PDCUT-tstepc*0.5; + signormc = signorm - 0.5; + sigfac = -1.0/(2.0*pow(signormc,2)); + snormfac = 1.0/(signormc*sqrt(2.0*acos(-1.0))); + siglimc = 2.5*signormc ; + itm = reCast((PDCUT+2.*siglimc)/DT + 1.5); + if(itm >= NPDCMAX) _error_("increase NPDCMAX in p35com"); + for(it = 0; it < itm; it++ ){ + tstar = it*DT-siglimc; + // tstar = REAL(it)*DT-siglimc; + tint = tsint; // start against upper bound + pd = 0.; + for (jj = 0; jj < 600; jj++){ + if (tint<(tstar-siglimc)) {break;} + pd = pd + exp(sigfac*(pow((tint-tstar),2)))*tstepc; + tint = tint-tstepc; + } + pds[it] = pd*snormfac; // gaussian integral lookup table for snow fraction + } + pds[itm+1] = 0.; + // *******END initialize PDD + + for(i=0;ielements->Size();i++){ + element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); + element->PositiveDegreeDay(pdds,pds,signorm); + } + + /*free ressouces: */ + xDelete(pdds); + xDelete(pds); +}/*}}}*/ +void SmbHenningx(FemModel* femmodel){/*{{{*/ + + /*Intermediaries*/ + IssmDouble z_critical = 1675.; + IssmDouble dz = 0; + IssmDouble a = -15.86; + IssmDouble b = 0.00969; + IssmDouble c = -0.235; + IssmDouble f = 1.; + IssmDouble g = -0.0011; + IssmDouble h = -1.54e-5; + IssmDouble smb,smbref,anomaly,yts,z; + + /* Get constants */ + femmodel->parameters->FindParam(&yts,ConstantsYtsEnum); + /*iomodel->Constant(&yts,ConstantsYtsEnum);*/ + /*this->parameters->FindParam(&yts,ConstantsYtsEnum);*/ + /*Mathieu original*/ + /*IssmDouble smb,smbref,z;*/ + + /*Loop over all the elements of this partition*/ + for(int i=0;ielements->Size();i++){ + Element* element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); + + /*Get reference SMB (uncorrected) and allocate all arrays*/ + int numvertices = element->GetNumberOfVertices(); + IssmDouble* surfacelist = xNew(numvertices); + IssmDouble* smblistref = xNew(numvertices); + IssmDouble* smblist = xNew(numvertices); + element->GetInputListOnVertices(surfacelist,SurfaceEnum); + element->GetInputListOnVertices(smblistref,SurfaceforcingsSmbrefEnum); + + /*Loop over all vertices of element and correct SMB as a function of altitude z*/ + for(int v=0;v z_critical = 1675 */ + z_critical = z_critical + dz; + + /* Calculate smb acc. to the surface elevation z */ + if(zAddInput(SurfaceforcingsMassBalanceEnum,smblist,P1Enum); + xDelete(surfacelist); + xDelete(smblistref); + xDelete(smblist); + } + +}/*}}}*/ Index: /issm/trunk/src/c/modules/SurfaceMassBalancex/SurfaceMassBalancex.h =================================================================== --- /issm/trunk/src/c/modules/SurfaceMassBalancex/SurfaceMassBalancex.h (revision 17806) +++ /issm/trunk/src/c/modules/SurfaceMassBalancex/SurfaceMassBalancex.h (revision 17806) @@ -0,0 +1,17 @@ +/*!\file: SurfaceMassBalancex.h + * \brief header file for SMB + */ + +#ifndef _SurfaceMassBalancex_H +#define _SurfaceMassBalancex_H + +#include "../../classes/classes.h" + +/* local prototypes: */ +void SurfaceMassBalancex(FemModel* femmodel); +void SmbGradientsx(FemModel* femmodel); +void Delta18oParameterizationx(FemModel* femmodel); +void PositiveDegreeDayx(FemModel* femmodel); +void SmbHenningx(FemModel* femmodel); + +#endif /* _SurfaceMassBalancex_H*/ Index: /issm/trunk/src/c/modules/SystemMatricesx/SystemMatricesx.cpp =================================================================== --- /issm/trunk/src/c/modules/SystemMatricesx/SystemMatricesx.cpp (revision 17805) +++ /issm/trunk/src/c/modules/SystemMatricesx/SystemMatricesx.cpp (revision 17806) @@ -12,5 +12,5 @@ /*intermediary: */ int i,M,N; - int configuration_type; + int configuration_type,analysisenum; Element *element = NULL; Load *load = NULL; @@ -26,6 +26,8 @@ if(VerboseModule()) _printf0_(" Generating matrices"); - /*retrive parameters: */ + /*retrieve parameters: */ femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum); + femmodel->parameters->FindParam(&analysisenum,AnalysisTypeEnum); + Analysis* analysis = EnumToAnalysis(analysisenum); /*First, we might need to do a dry run to get kmax if penalties are employed*/ @@ -39,5 +41,10 @@ for (i=0;ielements->Size();i++){ element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); - element->CreateKMatrix(Kff_temp,NULL); + ElementMatrix* Ke = analysis->CreateKMatrix(element); + ElementVector* pe = analysis->CreatePVector(element); + element->ReduceMatrices(Ke,pe); + if(Ke) Ke->AddToGlobal(Kff_temp,NULL); + delete Ke; + delete pe; } @@ -62,23 +69,25 @@ } - /*Fill stiffness matrix from elements and loads */ + /*Fill stiffness matrix and load vector from elements*/ for (i=0;ielements->Size();i++){ element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); - element->CreateKMatrix(Kff,Kfs); + ElementMatrix* Ke = analysis->CreateKMatrix(element); + ElementVector* pe = analysis->CreatePVector(element); + element->ReduceMatrices(Ke,pe); + if(Ke) Ke->AddToGlobal(Kff,Kfs); + if(pe){ + pe->AddToGlobal(pf); + } + delete Ke; + delete pe; } - for (i=0;iloads->Size();i++){ + /*Fill stiffness matrix and load vector from loads*/ + for(i=0;iloads->Size();i++){ load=dynamic_cast(femmodel->loads->GetObjectByOffset(i)); - if(load->InAnalysis(configuration_type)) load->CreateKMatrix(Kff,Kfs); - } - - /*Fill right hand side vector, from elements and loads */ - for (i=0;ielements->Size();i++){ - element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); - element->CreatePVector(pf); - } - for (i=0;iloads->Size();i++){ - load=dynamic_cast(femmodel->loads->GetObjectByOffset(i)); - if(load->InAnalysis(configuration_type)) load->CreatePVector(pf); + if(load->InAnalysis(configuration_type)){ + load->CreateKMatrix(Kff,Kfs); + load->CreatePVector(pf); + } } @@ -87,16 +96,19 @@ for (i=0;iloads->Size();i++){ load=dynamic_cast(femmodel->loads->GetObjectByOffset(i)); - if(load->InAnalysis(configuration_type)) load->PenaltyCreateKMatrix(Kff,Kfs,kmax); - } - for (i=0;iloads->Size();i++){ - load=dynamic_cast(femmodel->loads->GetObjectByOffset(i)); - if(load->InAnalysis(configuration_type)) load->PenaltyCreatePVector(pf,kmax); + if(load->InAnalysis(configuration_type)){ + load->PenaltyCreateKMatrix(Kff,Kfs,kmax); + load->PenaltyCreatePVector(pf,kmax); + } } } /*Create dof vector for stiffness matrix preconditioning*/ - for (i=0;ielements->Size();i++){ - element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); - element->CreateDVector(df); + if(pdf){ + for(i=0;ielements->Size();i++){ + element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); + ElementVector* de=analysis->CreateDVector(element); + if(de) de->InsertIntoGlobal(df); + delete de; + } } @@ -109,5 +121,6 @@ //Kfs->AllocationInfo(); - /*Assign output pointers: */ + /*cleanu up and assign output pointers: */ + delete analysis; if(pKff) *pKff=Kff; else delete Kff; Index: /issm/trunk/src/c/modules/SystemMatricesx/SystemMatricesx.h =================================================================== --- /issm/trunk/src/c/modules/SystemMatricesx/SystemMatricesx.h (revision 17805) +++ /issm/trunk/src/c/modules/SystemMatricesx/SystemMatricesx.h (revision 17806) @@ -6,4 +6,5 @@ #include "../../classes/classes.h" +#include "../../analyses/analyses.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/modules.h =================================================================== --- /issm/trunk/src/c/modules/modules.h (revision 17805) +++ /issm/trunk/src/c/modules/modules.h (revision 17806) @@ -24,5 +24,4 @@ #include "./CreateNodalConstraintsx/CreateNodalConstraintsx.h" #include "./CreateJacobianMatrixx/CreateJacobianMatrixx.h" -#include "./Delta18oParameterizationx/Delta18oParameterizationx.h" #include "./DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.h" #include "./ElementConnectivityx/ElementConnectivityx.h" @@ -33,4 +32,5 @@ #include "./GiaDeflectionCorex/GiaDeflectionCorex.h" #include "./SetControlInputsFromVectorx/SetControlInputsFromVectorx.h" +#include "./SetActiveNodesLSMx/SetActiveNodesLSMx.h" #include "./Gradjx/Gradjx.h" #include "./GroundinglineMigrationx/GroundinglineMigrationx.h" @@ -75,6 +75,4 @@ #include "./ConstraintsStatex/ConstraintsStatex.h" #include "./PointCloudFindNeighborsx/PointCloudFindNeighborsx.h" -#include "./PositiveDegreeDayx/PositiveDegreeDayx.h" -#include "./PostprocessingEnthalpyx/PostprocessingEnthalpyx.h" #include "./PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h" #include "./Reduceloadx/Reduceloadx.h" @@ -82,9 +80,9 @@ #include "./Reducevectorgtofx/Reducevectorgtofx.h" #include "./ResetConstraintsx/ResetConstraintsx.h" -#include "./ResetCoordinateSystemx/ResetCoordinateSystemx.h" +#include "./ResetFSBasalBoundaryConditionx/ResetFSBasalBoundaryConditionx.h" #include "./RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h" #include "./Scotchx/Scotchx.h" #include "./Shp2Kmlx/Shp2Kmlx.h" -#include "./SmbGradientsx/SmbGradientsx.h" +#include "./SurfaceMassBalancex/SurfaceMassBalancex.h" #include "./Solverx/Solverx.h" #include "./SystemMatricesx/SystemMatricesx.h" Index: /issm/trunk/src/c/shared/Bamg/BigPrimeNumber.cpp =================================================================== --- /issm/trunk/src/c/shared/Bamg/BigPrimeNumber.cpp (revision 17805) +++ /issm/trunk/src/c/shared/Bamg/BigPrimeNumber.cpp (revision 17806) @@ -7,5 +7,5 @@ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/AGoodNumberPrimeWith)*/ - //list of big prime numbers + /*list of big prime numbers*/ const long BigPrimeNumber[] ={ 567890359L, 567890431L, 567890437L, 567890461L, 567890471L, @@ -13,19 +13,19 @@ 567890591L, 567890599L, 567890621L, 567890629L , 0}; - //initialize o and pi - long o =0; - long pi=BigPrimeNumber[1]; + /*initialize o and pi*/ + long o = 0; + long pi = BigPrimeNumber[1]; - //loop until BigPrimeNumber[i]==0 (end of BigPrimeNumber) + /*loop until BigPrimeNumber[i]==0 (end of BigPrimeNumber)*/ for (int i=0; BigPrimeNumber[i]; i++){ - //compute r, rest of the remainder of the division of BigPrimeNumber[i] by n + /*compute r, remainder of the division of BigPrimeNumber[i] by n*/ long r = BigPrimeNumber[i] % n; /*compute oo = min ( r , n-r , |n - 2r|, |n-3r|)*/ - long oo =Min(Min(r,n-r),Min(Abs(n-2*r),Abs(n-3*r))); - if ( o < oo){ - o=oo; - pi=BigPrimeNumber[i]; + long oo = Min(Min(r,n-r),Min(Abs(n-2*r),Abs(n-3*r))); + if(o < oo){ + o = oo; + pi = BigPrimeNumber[i]; } } Index: /issm/trunk/src/c/shared/Elements/Cuffey.cpp =================================================================== --- /issm/trunk/src/c/shared/Elements/Cuffey.cpp (revision 17806) +++ /issm/trunk/src/c/shared/Elements/Cuffey.cpp (revision 17806) @@ -0,0 +1,57 @@ +/* \file Cuffey.cpp + * \brief figure out B of ice for a certain temperature + * INPUT function B=Cuffey(temperature) + * where rigidigty (in s^(1/3)Pa) is the flow law paramter in the flow law sigma=B*e(1/3) (Cuffey, p75). + */ + +#include + +#include "../Numerics/types.h" + +IssmDouble Cuffey(IssmDouble temperature){ + + /*output: */ + IssmDouble B,T; + + /*Switch to celsius from Kelvin: */ + T=temperature-273.15; + + if(T<=-45.0){ + B=1.e+8*(-0.000396645116301*pow(T+50.,3)+ 0.013345579471334*pow(T+50.,2) -0.356868703259105*(T+50.)+7.272363035371383); + } + else if((T>=-45.0) && (T<=-40.0)){ + B=1.e+8*(-0.000396645116301*pow(T+45.,3)+ 0.007395902726819*pow(T+45.,2) -0.253161292268336*(T+45.)+5.772078366321591); + } + else if((T>=-40.0) && (T<=-35.0)){ + B=1.e+8*(0.000408322072669*pow(T+40.,3)+ 0.001446225982305*pow(T+40.,2) -0.208950648722716*(T+40.)+4.641588833612773); + } + else if((T>=-35.0) && (T<=-30.0)){ + B=1.e+8*(-0.000423888728124*pow(T+35.,3)+ 0.007571057072334*pow(T+35.,2) -0.163864233449525*(T+35.)+3.684031498640382); + } + else if((T>=-30.0) && (T<=-25.0)){ + B=1.e+8*(0.000147154327025*pow(T+30.,3)+ 0.001212726150476*pow(T+30.,2) -0.119945317335478*(T+30.)+3.001000667185614); + } + else if((T>=-25.0) && (T<=-20.0)){ + B=1.e+8*(-0.000193435838672*pow(T+25.,3)+ 0.003420041055847*pow(T+25.,2) -0.096781481303861*(T+25.)+2.449986525148220); + } + else if((T>=-20.0) && (T<=-15.0)){ + B=1.e+8*(0.000219771255067*pow(T+20.,3)+ 0.000518503475772*pow(T+20.,2) -0.077088758645767*(T+20.)+2.027400665191131); + } + else if((T>=-15.0) && (T<=-10.0)){ + B=1.e+8*(-0.000653438900191*pow(T+15.,3)+ 0.003815072301777*pow(T+15.,2) -0.055420879758021*(T+15.)+1.682390865739973); + } + else if((T>=-10.0) && (T<=-5.0)){ + B=1.e+8*(0.000692439419762*pow(T+10.,3) -0.005986511201093 *pow(T+10.,2) -0.066278074254598*(T+10.)+1.418983411970382); + } + else if((T>=-5.0) && (T<=-2.0)){ + B=1.e+8*(-0.000132282004110*pow(T+5.,3) +0.004400080095332*pow(T+5.,2) -0.074210229783403*(T+5.)+ 1.024485188140279); + } + else{ + B=1.e+8*(-0.000132282004110*pow(T+2.,3) +0.003209542058346*pow(T+2.,2) -0.051381363322371*(T+2.)+ 0.837883605537096); + } + + /*B cannot be negative!*/ + if(B<0) B=1.e+6; + + return B; +} Index: /issm/trunk/src/c/shared/Elements/DrainageFunctionWaterfraction.cpp =================================================================== --- /issm/trunk/src/c/shared/Elements/DrainageFunctionWaterfraction.cpp (revision 17805) +++ /issm/trunk/src/c/shared/Elements/DrainageFunctionWaterfraction.cpp (revision 17806) @@ -14,32 +14,32 @@ IssmDouble w0=0.01, w1=0.02, w2=0.03; - IssmDouble Dret, D0=0, D1=0.005, D2=0.05; - IssmDouble yts=365*24*60*60; - dt/=yts; + IssmDouble yts=365.*24.*60.*60.; + IssmDouble Dret, D0=0., D1=0.005/yts, D2=0.05/yts; /*get drainage function value*/ if((w0==w1)||(w1==w2)||(w0==w2)) _error_("Error: equal ordinates in DrainageFunctionWaterfraction -> division by zero. Abort"); + if(waterfraction<=w0) Dret=D0; - if((waterfraction>w0) && (waterfraction<=w1)) + else if((waterfraction>w0) && (waterfraction<=w1)) Dret=(D1-D0)/(w1-w0)*(waterfraction-w0)+D0; - if((waterfraction>w1) && (waterfraction<=w2)) + else if((waterfraction>w1) && (waterfraction<=w2)) Dret=(D2-D1)/(w2-w1)*(waterfraction-w1)+D1; else Dret=D2; - /*check if dt*Dret>waterfraction. If so, drain whole waterfraction*/ + /*drain only up to w0*/ if(dt==0.){ - if(Dret>waterfraction) - return waterfraction; + if((waterfraction>w0) && (waterfraction-Dret*ytsw0) && (waterfraction-dt*Dretwaterfraction) - return waterfraction; - else - return dt*Dret; - } } Index: /issm/trunk/src/c/shared/Elements/LliboutryDuval.cpp =================================================================== --- /issm/trunk/src/c/shared/Elements/LliboutryDuval.cpp (revision 17805) +++ /issm/trunk/src/c/shared/Elements/LliboutryDuval.cpp (revision 17806) @@ -36,8 +36,8 @@ /*check feasibility*/ - _assert_(pressure>0); + _assert_(pressure>=0); _assert_(n>0); - _assert_(betaCC>0); - _assert_(referencetemperature>0); + _assert_(betaCC>=0); + _assert_(referencetemperature>=0); _assert_(heatcapacity>0); _assert_(latentheat>0); @@ -53,59 +53,25 @@ if (enthalpy < H_sp){ Tstar = referencetemperature + enthalpy/heatcapacity - betaCC*pressure; - waterfraction = 0; + waterfraction = 0.; } else{ Tstar=Tpmp; waterfraction=(enthalpy - H_sp)/latentheat; + if (waterfraction > 0.01) + waterfraction = 0.01; } /*Get A*/ - if(Tstar<263.15){ - A=3.61*pow(10.,-13.) * exp( -6.*pow(10.,4.)/(R*Tstar)); + if(Tstar<=263.15){ + A=3.61e-13 * exp( -6.e+4/(R*Tstar)); } else{ - A=1.73*pow(10., 3.) * exp(-13.9*pow(10.,4.)/(R*Tstar)); + A=1.73e3 * exp(-13.9e+4/(R*Tstar)); } - A*=(1 + 181.25*waterfraction); + A*=(1. + 181.25*waterfraction); /*Convert to B*/ - _assert_(n>0); B=pow(A,-1./n); return B; } - -// /*Get stiffness from temperature, waterfraction and depth*/ -// IssmDouble LliboutryDuval(IssmDouble temperature, IssmDouble waterfraction, IssmDouble depth,IssmDouble n){ -// /*Use parameterization for the rheology: Greve and Blatter 2009 -// * get enthalpy from temperature and water fraction, -// * and use LliboutryDuval(IssmDouble enthalpy, IssmDouble pressure,IssmDouble n) */ -// -// /*TODO: update params from model*/ -// IssmDouble rho_ice=910; // kg/m^3 -// IssmDouble g=9.81; //kg*m/s^2 -// IssmDouble heatcapacity=2009; // J/kg/K -// IssmDouble referencetemperature=253.15; -// IssmDouble betaCC=7.9*pow(10.,-8.); -// IssmDouble latentheat=3.34*pow(10,5.); // from Aschwanden 2012 -// -// IssmDouble Tstar, enthalpy, pressure, B; -// _assert_(temperature>0); -// _assert_(waterfraction>0); -// _assert_(depth>0); -// -// /*get pressure*/ -// pressure= rho_ice*g*depth; -// Tstar=temperature-betaCC*pressure; // TODO: check whether plus or minus -// /*get enthalpy*/ -// if (Tstar < 273.15){ -// enthalpy=heatcapacity*(Tstar - referencetemperature); -// } -// else{ -// enthalpy=heatcapacity*(273.15 - referencetemperature) + waterfraction*latentheat; -// } -// -// B=LliboutryDuval(enthalpy, pressure, n, betaCC, referencetemperature, heatcapacity, latentheat); -// -// return B; -// } Index: /issm/trunk/src/c/shared/Elements/Paterson.cpp =================================================================== --- /issm/trunk/src/c/shared/Elements/Paterson.cpp (revision 17805) +++ /issm/trunk/src/c/shared/Elements/Paterson.cpp (revision 17806) @@ -11,59 +11,46 @@ IssmDouble Paterson(IssmDouble temperature){ - /*output: */ - IssmDouble B; - IssmDouble T; + IssmDouble B,T; /*Switch to celsius from Kelvin: */ T=temperature-273.15; -// %The routine below is equivalent to: -// % n=3; T=temperature-273; -// % %From Paterson, -// % Temp=[0;-2;-5;-10;-15;-20;-25;-30;-35;-40;-45;-50]; -// % A=[6.8*10^-15;2.4*10^-15;1.6*10^-15;4.9*10^-16;2.9*10^-16;1.7*10^-16;9.4* -// % 10^-17;5.1*10^-17;2.7*10^-17;1.4*10^-17;7.3*10^-18;3.6*10^-18];;%s-1(kPa-3) -// % %Convert into B B -// % B=A.^(-1/n)*10^3; %s^(1/3)Pa -// % %Now, do a cubic fit between Temp and B: -// % fittedmodel=fit(Temp,B,'cubicspline'); -// % B=fittedmodel(temperature); if(T<=-45.0){ - B=pow((IssmPDouble)10,(IssmPDouble)8)*(-0.000292866376675*pow(T+50,3)+ 0.011672640664130*pow(T+50,2) -0.325004442485481*(T+50)+ 6.524779401948101); + B=1.e+8*(-0.000292866376675*pow(T+50.,3)+ 0.011672640664130*pow(T+50.,2) -0.325004442485481*(T+50.)+ 6.524779401948101); } else if((T>=-45.0) && (T<=-40.0)){ - B=pow((IssmPDouble)10,(IssmPDouble)8)*(-0.000292866376675*pow(T+45,3)+ 0.007279645014004*pow(T+45,2) -0.230243014094813*(T+45)+ 5.154964909039554); + B=1.e+8*(-0.000292866376675*pow(T+45.,3)+ 0.007279645014004*pow(T+45.,2) -0.230243014094813*(T+45.)+ 5.154964909039554); } else if((T>=-40.0) && (T<=-35.0)){ - B=pow((IssmPDouble)10,(IssmPDouble)8)*(0.000072737147457*pow(T+40,3)+ 0.002886649363879*pow(T+40,2) -0.179411542205399*(T+40)+ 4.149132666831214); + B=1.e+8*(0.000072737147457*pow(T+40.,3)+ 0.002886649363879*pow(T+40.,2) -0.179411542205399*(T+40.)+ 4.149132666831214); } else if((T>=-35.0) && (T<=-30.0)){ - B=pow((IssmPDouble)10,(IssmPDouble)8)*(-0.000086144770023*pow(T+35,3)+ 0.003977706575736*pow(T+35,2) -0.145089762507325*(T+35)+ 3.333333333333331); + B=1.e+8*(-0.000086144770023*pow(T+35.,3)+ 0.003977706575736*pow(T+35.,2) -0.145089762507325*(T+35.)+ 3.333333333333331); } else if((T>=-30.0) && (T<=-25.0)){ - B=pow((IssmPDouble)10,(IssmPDouble)8)*(-0.000043984685769*pow(T+30,3)+ 0.002685535025386*pow(T+30,2) -0.111773554501713*(T+30)+ 2.696559088937191); + B=1.e+8*(-0.000043984685769*pow(T+30.,3)+ 0.002685535025386*pow(T+30.,2) -0.111773554501713*(T+30.)+ 2.696559088937191); } else if((T>=-25.0) && (T<=-20.0)){ - B=pow((IssmPDouble)10,(IssmPDouble)8)*(-0.000029799523463*pow(T+25,3)+ 0.002025764738854*pow(T+25,2) -0.088217055680511*(T+25)+ 2.199331606342181); + B=1.e+8*(-0.000029799523463*pow(T+25.,3)+ 0.002025764738854*pow(T+25.,2) -0.088217055680511*(T+25.)+ 2.199331606342181); } else if((T>=-20.0) && (T<=-15.0)){ - B=pow((IssmPDouble)10,(IssmPDouble)8)*(0.000136920904777*pow(T+20,3)+ 0.001578771886910*pow(T+20,2) -0.070194372551690*(T+20)+ 1.805165505978111); + B=1.e+8*(0.000136920904777*pow(T+20.,3)+ 0.001578771886910*pow(T+20.,2) -0.070194372551690*(T+20.)+ 1.805165505978111); } else if((T>=-15.0) && (T<=-10.0)){ - B=pow((IssmPDouble)10,(IssmPDouble)8)*(-0.000899763781026*pow(T+15,3)+ 0.003632585458564*pow(T+15,2) -0.044137585824322*(T+15)+ 1.510778053489523); + B=1.e+8*(-0.000899763781026*pow(T+15.,3)+ 0.003632585458564*pow(T+15.,2) -0.044137585824322*(T+15.)+ 1.510778053489523); } else if((T>=-10.0) && (T<=-5.0)){ - B=pow((IssmPDouble)10,(IssmPDouble)8)*(0.001676964325070*pow(T+10,3)- 0.009863871256831*pow(T+10,2) -0.075294014815659*(T+10)+ 1.268434288203714); + B=1.e+8*(0.001676964325070*pow(T+10.,3)- 0.009863871256831*pow(T+10.,2) -0.075294014815659*(T+10.)+ 1.268434288203714); } else if((T>=-5.0) && (T<=-2.0)){ - B=pow((IssmPDouble)10,(IssmPDouble)8)*(-0.003748937622487*pow(T+5,3)+0.015290593619213*pow(T+5,2) -0.048160403003748*(T+5)+ 0.854987973338348); + B=1.e+8*(-0.003748937622487*pow(T+5.,3)+0.015290593619213*pow(T+5.,2) -0.048160403003748*(T+5.)+ 0.854987973338348); } else{ - B=pow((IssmPDouble)10,(IssmPDouble)8)*(-0.003748937622488*pow(T+2,3)-0.018449844983174*pow(T+2,2) -0.057638157095631*(T+2)+ 0.746900791092860); + B=1.e+8*(-0.003748937622488*pow(T+2.,3)-0.018449844983174*pow(T+2.,2) -0.057638157095631*(T+2.)+ 0.746900791092860); } /*B cannot be negative!*/ - if(B<0) B=pow((IssmPDouble)10,(IssmPDouble)6); + if(B<0) B=1.e+6; return B; Index: /issm/trunk/src/c/shared/Elements/elements.h =================================================================== --- /issm/trunk/src/c/shared/Elements/elements.h (revision 17805) +++ /issm/trunk/src/c/shared/Elements/elements.h (revision 17806) @@ -8,4 +8,5 @@ #include "../Numerics/types.h" +IssmDouble Cuffey(IssmDouble temperature); IssmDouble Paterson(IssmDouble temperature); IssmDouble Arrhenius(IssmDouble temperature,IssmDouble depth,IssmDouble n); Index: /issm/trunk/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk/src/c/shared/Enum/EnumDefinitions.h (revision 17805) +++ /issm/trunk/src/c/shared/Enum/EnumDefinitions.h (revision 17806) @@ -41,6 +41,6 @@ BasalforcingsMeltingRateCorrectionEnum, BasalforcingsMeltingRateEnum, - BathymetryEnum, BedEnum, + BaseEnum, ConstantsGEnum, ConstantsReferencetemperatureEnum, @@ -98,7 +98,11 @@ SedimentHeadOldEnum, SedimentHeadResidualEnum, + EffectivePressureEnum, EplHeadEnum, EplHeadOldEnum, - HydrologydcRelTolEnum, + EplHeadSlopeXEnum, + EplHeadSlopeYEnum, + HydrologydcMaxIterEnum, + HydrologydcRelTolEnum, HydrologydcSpcsedimentHeadEnum, HydrologydcSedimentCompressibilityEnum, @@ -108,9 +112,13 @@ HydrologydcWaterCompressibilityEnum, HydrologydcSpceplHeadEnum, - HydrologydcMaskEplactiveEnum, + HydrologydcMaskEplactiveNodeEnum, + HydrologydcMaskEplactiveEltEnum, HydrologydcEplCompressibilityEnum, HydrologydcEplPorosityEnum, + HydrologydcEplInitialThicknessEnum, + HydrologydcEplMaxThicknessEnum, HydrologydcEplThicknessEnum, - HydrologydcEplTransmitivityEnum, + HydrologydcEplThicknessOldEnum, + HydrologydcEplConductivityEnum, HydrologydcIsefficientlayerEnum, HydrologydcSedimentlimitFlagEnum, @@ -119,9 +127,10 @@ HydrologydcLeakageFactorEnum, HydrologydcPenaltyFactorEnum, + HydrologydcPenaltyLockEnum, + HydrologydcBasalMoulinInputEnum, HydrologyLayerEnum, HydrologySedimentEnum, HydrologyEfficientEnum, HydrologySedimentKmaxEnum, - WaterTransferEnum, IndependentObjectEnum, InversionControlParametersEnum, @@ -155,5 +164,7 @@ MaterialsRheologyLawEnum, MaterialsRheologyNEnum, + DamageIsdamageEnum, DamageDEnum, + DamageFEnum, QmuDamageDEnum, DamageDbarEnum, @@ -163,4 +174,5 @@ DamageC3Enum, DamageC4Enum, + DamageElementinterpEnum, DamageHealingEnum, DamageStressThresholdEnum, @@ -172,4 +184,7 @@ DamageSpcdamageEnum, DamageMaxDamageEnum, + DamageEquivStressEnum, + DamageEvolutionNumRequestedOutputsEnum, + DamageEvolutionRequestedOutputsEnum, MaterialsRhoIceEnum, MaterialsRhoWaterEnum, @@ -178,4 +193,5 @@ MaterialsThermalExchangeVelocityEnum, MaterialsThermalconductivityEnum, + MaterialsTemperateiceconductivityEnum, MaterialsLithosphereShearModulusEnum, MaterialsLithosphereDensityEnum, @@ -183,5 +199,5 @@ MaterialsMantleDensityEnum, MeshAverageVertexConnectivityEnum, - MeshElementonbedEnum, + MeshElementonbaseEnum, MeshElementonsurfaceEnum, MeshElements2dEnum, @@ -194,13 +210,15 @@ MeshNumberofverticesEnum, MeshUpperelementsEnum, - MeshVertexonbedEnum, + MeshVertexonbaseEnum, MeshVertexonsurfaceEnum, MeshXEnum, MeshYEnum, MeshZEnum, - MeshTypeEnum, - Mesh2DhorizontalEnum, - Mesh2DverticalEnum, - Mesh3DEnum, + MeshElementtypeEnum, + DomainTypeEnum, + DomainDimensionEnum, + Domain2DhorizontalEnum, + Domain2DverticalEnum, + Domain3DEnum, MiscellaneousNameEnum, //FIXME: only used by qmu, should not be marshalled (already in queueing script) MasstransportHydrostaticAdjustmentEnum, @@ -209,4 +227,5 @@ MasstransportPenaltyFactorEnum, MasstransportSpcthicknessEnum, + MasstransportCalvingrateEnum, MasstransportStabilizationEnum, MasstransportVertexPairingEnum, @@ -225,14 +244,10 @@ RiftsNumriftsEnum, RiftsRiftstructEnum, + SettingsResultsOnNodesEnum, SettingsIoGatherEnum, SettingsLowmemEnum, SettingsOutputFrequencyEnum, SettingsWaitonlockEnum, - SurfaceforcingsDelta18oEnum, - SurfaceforcingsDelta18oSurfaceEnum, - SurfaceforcingsIsdelta18oEnum, - SurfaceforcingsPrecipitationsPresentdayEnum, - SurfaceforcingsTemperaturesPresentdayEnum, - SurfaceforcingsTemperaturesLgmEnum, + DebugProfilingEnum, ProfilingCurrentMemEnum, @@ -245,15 +260,5 @@ SteadystateRequestedOutputsEnum, SurfaceEnum, - SurfaceforcingsPrecipitationEnum, - SurfaceforcingsMassBalanceEnum, - SurfaceforcingsIspddEnum, - SurfaceforcingsDesfacEnum, - SurfaceforcingsS0pEnum, - SurfaceforcingsIssmbgradientsEnum, - SurfaceforcingsMonthlytemperaturesEnum, - SurfaceforcingsHrefEnum, - SurfaceforcingsSmbrefEnum, - SurfaceforcingsBPosEnum, - SurfaceforcingsBNegEnum, + ThermalIsenthalpyEnum, ThermalIsdynamicbasalspcEnum, @@ -279,7 +284,33 @@ TransientIsthermalEnum, TransientIsgiaEnum, - TransientIsdamageEnum, + TransientIsdamageevolutionEnum, + TransientIshydrologyEnum, TransientNumRequestedOutputsEnum, TransientRequestedOutputsEnum, + /*}}}*/ + /*Surfaceforcings{{{*/ + SurfaceforcingsEnum, + SMBEnum, + SurfaceforcingsMassBalanceEnum, + SMBpddEnum, + SurfaceforcingsDelta18oEnum, + SurfaceforcingsDelta18oSurfaceEnum, + SurfaceforcingsIsdelta18oEnum, + SurfaceforcingsPrecipitationsPresentdayEnum, + SurfaceforcingsTemperaturesPresentdayEnum, + SurfaceforcingsTemperaturesLgmEnum, + SurfaceforcingsPrecipitationEnum, + SurfaceforcingsDesfacEnum, + SurfaceforcingsS0pEnum, + SMBgradientsEnum, + SurfaceforcingsMonthlytemperaturesEnum, + SurfaceforcingsHrefEnum, + SurfaceforcingsSmbrefEnum, + SurfaceforcingsBPosEnum, + SurfaceforcingsBNegEnum, + SMBhenningEnum, + /*TO BE REMOVED*/ + SurfaceforcingsIspddEnum, + SurfaceforcingsIssmbgradientsEnum, /*}}}*/ /*Solutions and Analyses{{{ */ @@ -297,4 +328,5 @@ BalancevelocityAnalysisEnum, BalancevelocitySolutionEnum, + L2ProjectionEPLAnalysisEnum, L2ProjectionBaseAnalysisEnum, BedSlopeSolutionEnum, @@ -317,8 +349,9 @@ FreeSurfaceBaseAnalysisEnum, FreeSurfaceTopAnalysisEnum, + SurfaceNormalVelocityEnum, ExtrudeFromBaseAnalysisEnum, ExtrudeFromTopAnalysisEnum, + DepthAverageAnalysisEnum, SteadystateSolutionEnum, - L2ProjectionTopAnalysisEnum, SurfaceSlopeSolutionEnum, SmoothedSurfaceSlopeXAnalysisEnum, @@ -331,4 +364,7 @@ MeshdeformationSolutionEnum, MeshdeformationAnalysisEnum, + LevelsetAnalysisEnum, + ExtrapolationAnalysisEnum, + LsfReinitializationAnalysisEnum, /*}}}*/ /*Approximations {{{*/ @@ -377,8 +413,10 @@ InputToExtrudeEnum, InputToL2ProjectEnum, + InputToDepthaverageEnum, IntParamEnum, IntVecParamEnum, TransientParamEnum, MaticeEnum, + MatdamageiceEnum, MatparEnum, NodeEnum, @@ -388,6 +426,4 @@ PengridEnum, PenpairEnum, - PentaEnum, - PentaInputEnum, ProfilerEnum, MatrixParamEnum, @@ -407,4 +443,8 @@ TriaEnum, TriaInputEnum, + TetraEnum, + TetraInputEnum, + PentaEnum, + PentaInputEnum, VertexEnum, VertexPIdEnum, @@ -447,5 +487,5 @@ QmuVzEnum, QmuThicknessEnum, - QmuBedEnum, + QmuBaseEnum, QmuSurfaceEnum, QmuMeltingEnum, @@ -499,4 +539,5 @@ HydrologyWaterVxEnum, HydrologyWaterVyEnum, + SigmaNNEnum, StressTensorEnum, StressTensorxxEnum, @@ -506,4 +547,19 @@ StressTensoryzEnum, StressTensorzzEnum, + DeviatoricStressEnum, + DeviatoricStressxxEnum, + DeviatoricStressxyEnum, + DeviatoricStressxzEnum, + DeviatoricStressyyEnum, + DeviatoricStressyzEnum, + DeviatoricStresszzEnum, + StrainRateEnum, + StrainRatexxEnum, + StrainRatexyEnum, + StrainRatexzEnum, + StrainRateyyEnum, + StrainRateyzEnum, + StrainRatezzEnum, + DivergenceEnum, GiaCrossSectionShapeEnum, GiadWdtEnum, @@ -519,4 +575,6 @@ P2xP1Enum, P1xP2Enum, + P1xP3Enum, + P2xP4Enum, P1P1Enum, P1P1GLSEnum, @@ -524,6 +582,6 @@ MINIcondensedEnum, TaylorHoodEnum, - P2xP4Enum, - P1xP3Enum, + XTaylorHoodEnum, + OneLayerP4zEnum, /*}}}*/ /*Results{{{*/ @@ -545,4 +603,13 @@ MassfluxatgateNameEnum, MassfluxatgateSegmentsEnum, + MisfitNameEnum, + MisfitModelEnumEnum, + MisfitObservationEnum, + MisfitObservationEnumEnum, + MisfitTimeinterpolationEnum, + MisfitWeightsEnum, + MisfitWeightsEnumEnum, + SurfaceObservationEnum, + WeightsSurfaceObservationEnum, /*}}}*/ /*Responses{{{*/ @@ -565,13 +632,22 @@ AbsoluteEnum, IncrementalEnum, + AugmentedLagrangianREnum, + AugmentedLagrangianThetaEnum, /*}}}*/ /*Grounding Line{{{*/ + NoneEnum, AgressiveMigrationEnum, - NoneEnum, SoftMigrationEnum, SubelementMigrationEnum, SubelementMigration2Enum, + ContactEnum, MaskGroundediceLevelsetEnum, QmuMaskGroundediceLevelsetEnum, + /*}}}*/ + /*Gauss{{{*/ + GaussSegEnum, + GaussTriaEnum, + GaussTetraEnum, + GaussPentaEnum, /*}}}*/ /*Solver{{{*/ @@ -632,8 +708,17 @@ OptionStructEnum, /*}}}*/ - /*Rheology law (move too Material) {{{*/ + /*Rheology law (move to Material) {{{*/ + CuffeyEnum, PatersonEnum, ArrheniusEnum, LliboutryDuvalEnum, + /*}}}*/ + /*Levelset related enums (will be moved to appropriate place when finished){{{*/ + TransientIslevelsetEnum, + ExtrapolationVariableEnum, + IceMaskNodeActivationEnum, + LevelsetfunctionSlopeXEnum, + LevelsetfunctionSlopeYEnum, + LevelsetfunctionPicardEnum, /*}}}*/ MaximumNumberOfDefinitionsEnum Index: /issm/trunk/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk/src/c/shared/Enum/EnumToStringx.cpp (revision 17805) +++ /issm/trunk/src/c/shared/Enum/EnumToStringx.cpp (revision 17806) @@ -49,6 +49,6 @@ case BasalforcingsMeltingRateCorrectionEnum : return "BasalforcingsMeltingRateCorrection"; case BasalforcingsMeltingRateEnum : return "BasalforcingsMeltingRate"; - case BathymetryEnum : return "Bathymetry"; case BedEnum : return "Bed"; + case BaseEnum : return "Base"; case ConstantsGEnum : return "ConstantsG"; case ConstantsReferencetemperatureEnum : return "ConstantsReferencetemperature"; @@ -106,6 +106,10 @@ case SedimentHeadOldEnum : return "SedimentHeadOld"; case SedimentHeadResidualEnum : return "SedimentHeadResidual"; + case EffectivePressureEnum : return "EffectivePressure"; case EplHeadEnum : return "EplHead"; case EplHeadOldEnum : return "EplHeadOld"; + case EplHeadSlopeXEnum : return "EplHeadSlopeX"; + case EplHeadSlopeYEnum : return "EplHeadSlopeY"; + case HydrologydcMaxIterEnum : return "HydrologydcMaxIter"; case HydrologydcRelTolEnum : return "HydrologydcRelTol"; case HydrologydcSpcsedimentHeadEnum : return "HydrologydcSpcsedimentHead"; @@ -116,9 +120,13 @@ case HydrologydcWaterCompressibilityEnum : return "HydrologydcWaterCompressibility"; case HydrologydcSpceplHeadEnum : return "HydrologydcSpceplHead"; - case HydrologydcMaskEplactiveEnum : return "HydrologydcMaskEplactive"; + case HydrologydcMaskEplactiveNodeEnum : return "HydrologydcMaskEplactiveNode"; + case HydrologydcMaskEplactiveEltEnum : return "HydrologydcMaskEplactiveElt"; case HydrologydcEplCompressibilityEnum : return "HydrologydcEplCompressibility"; case HydrologydcEplPorosityEnum : return "HydrologydcEplPorosity"; + case HydrologydcEplInitialThicknessEnum : return "HydrologydcEplInitialThickness"; + case HydrologydcEplMaxThicknessEnum : return "HydrologydcEplMaxThickness"; case HydrologydcEplThicknessEnum : return "HydrologydcEplThickness"; - case HydrologydcEplTransmitivityEnum : return "HydrologydcEplTransmitivity"; + case HydrologydcEplThicknessOldEnum : return "HydrologydcEplThicknessOld"; + case HydrologydcEplConductivityEnum : return "HydrologydcEplConductivity"; case HydrologydcIsefficientlayerEnum : return "HydrologydcIsefficientlayer"; case HydrologydcSedimentlimitFlagEnum : return "HydrologydcSedimentlimitFlag"; @@ -127,9 +135,10 @@ case HydrologydcLeakageFactorEnum : return "HydrologydcLeakageFactor"; case HydrologydcPenaltyFactorEnum : return "HydrologydcPenaltyFactor"; + case HydrologydcPenaltyLockEnum : return "HydrologydcPenaltyLock"; + case HydrologydcBasalMoulinInputEnum : return "HydrologydcBasalMoulinInput"; case HydrologyLayerEnum : return "HydrologyLayer"; case HydrologySedimentEnum : return "HydrologySediment"; case HydrologyEfficientEnum : return "HydrologyEfficient"; case HydrologySedimentKmaxEnum : return "HydrologySedimentKmax"; - case WaterTransferEnum : return "WaterTransfer"; case IndependentObjectEnum : return "IndependentObject"; case InversionControlParametersEnum : return "InversionControlParameters"; @@ -163,5 +172,7 @@ case MaterialsRheologyLawEnum : return "MaterialsRheologyLaw"; case MaterialsRheologyNEnum : return "MaterialsRheologyN"; + case DamageIsdamageEnum : return "DamageIsdamage"; case DamageDEnum : return "DamageD"; + case DamageFEnum : return "DamageF"; case QmuDamageDEnum : return "QmuDamageD"; case DamageDbarEnum : return "DamageDbar"; @@ -171,4 +182,5 @@ case DamageC3Enum : return "DamageC3"; case DamageC4Enum : return "DamageC4"; + case DamageElementinterpEnum : return "DamageElementinterp"; case DamageHealingEnum : return "DamageHealing"; case DamageStressThresholdEnum : return "DamageStressThreshold"; @@ -180,4 +192,7 @@ case DamageSpcdamageEnum : return "DamageSpcdamage"; case DamageMaxDamageEnum : return "DamageMaxDamage"; + case DamageEquivStressEnum : return "DamageEquivStress"; + case DamageEvolutionNumRequestedOutputsEnum : return "DamageEvolutionNumRequestedOutputs"; + case DamageEvolutionRequestedOutputsEnum : return "DamageEvolutionRequestedOutputs"; case MaterialsRhoIceEnum : return "MaterialsRhoIce"; case MaterialsRhoWaterEnum : return "MaterialsRhoWater"; @@ -186,4 +201,5 @@ case MaterialsThermalExchangeVelocityEnum : return "MaterialsThermalExchangeVelocity"; case MaterialsThermalconductivityEnum : return "MaterialsThermalconductivity"; + case MaterialsTemperateiceconductivityEnum : return "MaterialsTemperateiceconductivity"; case MaterialsLithosphereShearModulusEnum : return "MaterialsLithosphereShearModulus"; case MaterialsLithosphereDensityEnum : return "MaterialsLithosphereDensity"; @@ -191,5 +207,5 @@ case MaterialsMantleDensityEnum : return "MaterialsMantleDensity"; case MeshAverageVertexConnectivityEnum : return "MeshAverageVertexConnectivity"; - case MeshElementonbedEnum : return "MeshElementonbed"; + case MeshElementonbaseEnum : return "MeshElementonbase"; case MeshElementonsurfaceEnum : return "MeshElementonsurface"; case MeshElements2dEnum : return "MeshElements2d"; @@ -202,13 +218,15 @@ case MeshNumberofverticesEnum : return "MeshNumberofvertices"; case MeshUpperelementsEnum : return "MeshUpperelements"; - case MeshVertexonbedEnum : return "MeshVertexonbed"; + case MeshVertexonbaseEnum : return "MeshVertexonbase"; case MeshVertexonsurfaceEnum : return "MeshVertexonsurface"; case MeshXEnum : return "MeshX"; case MeshYEnum : return "MeshY"; case MeshZEnum : return "MeshZ"; - case MeshTypeEnum : return "MeshType"; - case Mesh2DhorizontalEnum : return "Mesh2Dhorizontal"; - case Mesh2DverticalEnum : return "Mesh2Dvertical"; - case Mesh3DEnum : return "Mesh3D"; + case MeshElementtypeEnum : return "MeshElementtype"; + case DomainTypeEnum : return "DomainType"; + case DomainDimensionEnum : return "DomainDimension"; + case Domain2DhorizontalEnum : return "Domain2Dhorizontal"; + case Domain2DverticalEnum : return "Domain2Dvertical"; + case Domain3DEnum : return "Domain3D"; case MiscellaneousNameEnum : return "MiscellaneousName"; case MasstransportHydrostaticAdjustmentEnum : return "MasstransportHydrostaticAdjustment"; @@ -217,4 +235,5 @@ case MasstransportPenaltyFactorEnum : return "MasstransportPenaltyFactor"; case MasstransportSpcthicknessEnum : return "MasstransportSpcthickness"; + case MasstransportCalvingrateEnum : return "MasstransportCalvingrate"; case MasstransportStabilizationEnum : return "MasstransportStabilization"; case MasstransportVertexPairingEnum : return "MasstransportVertexPairing"; @@ -233,14 +252,9 @@ case RiftsNumriftsEnum : return "RiftsNumrifts"; case RiftsRiftstructEnum : return "RiftsRiftstruct"; + case SettingsResultsOnNodesEnum : return "SettingsResultsOnNodes"; case SettingsIoGatherEnum : return "SettingsIoGather"; case SettingsLowmemEnum : return "SettingsLowmem"; case SettingsOutputFrequencyEnum : return "SettingsOutputFrequency"; case SettingsWaitonlockEnum : return "SettingsWaitonlock"; - case SurfaceforcingsDelta18oEnum : return "SurfaceforcingsDelta18o"; - case SurfaceforcingsDelta18oSurfaceEnum : return "SurfaceforcingsDelta18oSurface"; - case SurfaceforcingsIsdelta18oEnum : return "SurfaceforcingsIsdelta18o"; - case SurfaceforcingsPrecipitationsPresentdayEnum : return "SurfaceforcingsPrecipitationsPresentday"; - case SurfaceforcingsTemperaturesPresentdayEnum : return "SurfaceforcingsTemperaturesPresentday"; - case SurfaceforcingsTemperaturesLgmEnum : return "SurfaceforcingsTemperaturesLgm"; case DebugProfilingEnum : return "DebugProfiling"; case ProfilingCurrentMemEnum : return "ProfilingCurrentMem"; @@ -253,15 +267,4 @@ case SteadystateRequestedOutputsEnum : return "SteadystateRequestedOutputs"; case SurfaceEnum : return "Surface"; - case SurfaceforcingsPrecipitationEnum : return "SurfaceforcingsPrecipitation"; - case SurfaceforcingsMassBalanceEnum : return "SurfaceforcingsMassBalance"; - case SurfaceforcingsIspddEnum : return "SurfaceforcingsIspdd"; - case SurfaceforcingsDesfacEnum : return "SurfaceforcingsDesfac"; - case SurfaceforcingsS0pEnum : return "SurfaceforcingsS0p"; - case SurfaceforcingsIssmbgradientsEnum : return "SurfaceforcingsIssmbgradients"; - case SurfaceforcingsMonthlytemperaturesEnum : return "SurfaceforcingsMonthlytemperatures"; - case SurfaceforcingsHrefEnum : return "SurfaceforcingsHref"; - case SurfaceforcingsSmbrefEnum : return "SurfaceforcingsSmbref"; - case SurfaceforcingsBPosEnum : return "SurfaceforcingsBPos"; - case SurfaceforcingsBNegEnum : return "SurfaceforcingsBNeg"; case ThermalIsenthalpyEnum : return "ThermalIsenthalpy"; case ThermalIsdynamicbasalspcEnum : return "ThermalIsdynamicbasalspc"; @@ -287,7 +290,30 @@ case TransientIsthermalEnum : return "TransientIsthermal"; case TransientIsgiaEnum : return "TransientIsgia"; - case TransientIsdamageEnum : return "TransientIsdamage"; + case TransientIsdamageevolutionEnum : return "TransientIsdamageevolution"; + case TransientIshydrologyEnum : return "TransientIshydrology"; case TransientNumRequestedOutputsEnum : return "TransientNumRequestedOutputs"; case TransientRequestedOutputsEnum : return "TransientRequestedOutputs"; + case SurfaceforcingsEnum : return "Surfaceforcings"; + case SMBEnum : return "SMB"; + case SurfaceforcingsMassBalanceEnum : return "SurfaceforcingsMassBalance"; + case SMBpddEnum : return "SMBpdd"; + case SurfaceforcingsDelta18oEnum : return "SurfaceforcingsDelta18o"; + case SurfaceforcingsDelta18oSurfaceEnum : return "SurfaceforcingsDelta18oSurface"; + case SurfaceforcingsIsdelta18oEnum : return "SurfaceforcingsIsdelta18o"; + case SurfaceforcingsPrecipitationsPresentdayEnum : return "SurfaceforcingsPrecipitationsPresentday"; + case SurfaceforcingsTemperaturesPresentdayEnum : return "SurfaceforcingsTemperaturesPresentday"; + case SurfaceforcingsTemperaturesLgmEnum : return "SurfaceforcingsTemperaturesLgm"; + case SurfaceforcingsPrecipitationEnum : return "SurfaceforcingsPrecipitation"; + case SurfaceforcingsDesfacEnum : return "SurfaceforcingsDesfac"; + case SurfaceforcingsS0pEnum : return "SurfaceforcingsS0p"; + case SMBgradientsEnum : return "SMBgradients"; + case SurfaceforcingsMonthlytemperaturesEnum : return "SurfaceforcingsMonthlytemperatures"; + case SurfaceforcingsHrefEnum : return "SurfaceforcingsHref"; + case SurfaceforcingsSmbrefEnum : return "SurfaceforcingsSmbref"; + case SurfaceforcingsBPosEnum : return "SurfaceforcingsBPos"; + case SurfaceforcingsBNegEnum : return "SurfaceforcingsBNeg"; + case SMBhenningEnum : return "SMBhenning"; + case SurfaceforcingsIspddEnum : return "SurfaceforcingsIspdd"; + case SurfaceforcingsIssmbgradientsEnum : return "SurfaceforcingsIssmbgradients"; case SolutionTypeEnum : return "SolutionType"; case AnalysisTypeEnum : return "AnalysisType"; @@ -303,4 +329,5 @@ case BalancevelocityAnalysisEnum : return "BalancevelocityAnalysis"; case BalancevelocitySolutionEnum : return "BalancevelocitySolution"; + case L2ProjectionEPLAnalysisEnum : return "L2ProjectionEPLAnalysis"; case L2ProjectionBaseAnalysisEnum : return "L2ProjectionBaseAnalysis"; case BedSlopeSolutionEnum : return "BedSlopeSolution"; @@ -323,8 +350,9 @@ case FreeSurfaceBaseAnalysisEnum : return "FreeSurfaceBaseAnalysis"; case FreeSurfaceTopAnalysisEnum : return "FreeSurfaceTopAnalysis"; + case SurfaceNormalVelocityEnum : return "SurfaceNormalVelocity"; case ExtrudeFromBaseAnalysisEnum : return "ExtrudeFromBaseAnalysis"; case ExtrudeFromTopAnalysisEnum : return "ExtrudeFromTopAnalysis"; + case DepthAverageAnalysisEnum : return "DepthAverageAnalysis"; case SteadystateSolutionEnum : return "SteadystateSolution"; - case L2ProjectionTopAnalysisEnum : return "L2ProjectionTopAnalysis"; case SurfaceSlopeSolutionEnum : return "SurfaceSlopeSolution"; case SmoothedSurfaceSlopeXAnalysisEnum : return "SmoothedSurfaceSlopeXAnalysis"; @@ -337,4 +365,7 @@ case MeshdeformationSolutionEnum : return "MeshdeformationSolution"; case MeshdeformationAnalysisEnum : return "MeshdeformationAnalysis"; + case LevelsetAnalysisEnum : return "LevelsetAnalysis"; + case ExtrapolationAnalysisEnum : return "ExtrapolationAnalysis"; + case LsfReinitializationAnalysisEnum : return "LsfReinitializationAnalysis"; case ApproximationEnum : return "Approximation"; case NoneApproximationEnum : return "NoneApproximation"; @@ -377,8 +408,10 @@ case InputToExtrudeEnum : return "InputToExtrude"; case InputToL2ProjectEnum : return "InputToL2Project"; + case InputToDepthaverageEnum : return "InputToDepthaverage"; case IntParamEnum : return "IntParam"; case IntVecParamEnum : return "IntVecParam"; case TransientParamEnum : return "TransientParam"; case MaticeEnum : return "Matice"; + case MatdamageiceEnum : return "Matdamageice"; case MatparEnum : return "Matpar"; case NodeEnum : return "Node"; @@ -388,6 +421,4 @@ case PengridEnum : return "Pengrid"; case PenpairEnum : return "Penpair"; - case PentaEnum : return "Penta"; - case PentaInputEnum : return "PentaInput"; case ProfilerEnum : return "Profiler"; case MatrixParamEnum : return "MatrixParam"; @@ -407,4 +438,8 @@ case TriaEnum : return "Tria"; case TriaInputEnum : return "TriaInput"; + case TetraEnum : return "Tetra"; + case TetraInputEnum : return "TetraInput"; + case PentaEnum : return "Penta"; + case PentaInputEnum : return "PentaInput"; case VertexEnum : return "Vertex"; case VertexPIdEnum : return "VertexPId"; @@ -441,5 +476,5 @@ case QmuVzEnum : return "QmuVz"; case QmuThicknessEnum : return "QmuThickness"; - case QmuBedEnum : return "QmuBed"; + case QmuBaseEnum : return "QmuBase"; case QmuSurfaceEnum : return "QmuSurface"; case QmuMeltingEnum : return "QmuMelting"; @@ -493,4 +528,5 @@ case HydrologyWaterVxEnum : return "HydrologyWaterVx"; case HydrologyWaterVyEnum : return "HydrologyWaterVy"; + case SigmaNNEnum : return "SigmaNN"; case StressTensorEnum : return "StressTensor"; case StressTensorxxEnum : return "StressTensorxx"; @@ -500,4 +536,19 @@ case StressTensoryzEnum : return "StressTensoryz"; case StressTensorzzEnum : return "StressTensorzz"; + case DeviatoricStressEnum : return "DeviatoricStress"; + case DeviatoricStressxxEnum : return "DeviatoricStressxx"; + case DeviatoricStressxyEnum : return "DeviatoricStressxy"; + case DeviatoricStressxzEnum : return "DeviatoricStressxz"; + case DeviatoricStressyyEnum : return "DeviatoricStressyy"; + case DeviatoricStressyzEnum : return "DeviatoricStressyz"; + case DeviatoricStresszzEnum : return "DeviatoricStresszz"; + case StrainRateEnum : return "StrainRate"; + case StrainRatexxEnum : return "StrainRatexx"; + case StrainRatexyEnum : return "StrainRatexy"; + case StrainRatexzEnum : return "StrainRatexz"; + case StrainRateyyEnum : return "StrainRateyy"; + case StrainRateyzEnum : return "StrainRateyz"; + case StrainRatezzEnum : return "StrainRatezz"; + case DivergenceEnum : return "Divergence"; case GiaCrossSectionShapeEnum : return "GiaCrossSectionShape"; case GiadWdtEnum : return "GiadWdt"; @@ -511,4 +562,6 @@ case P2xP1Enum : return "P2xP1"; case P1xP2Enum : return "P1xP2"; + case P1xP3Enum : return "P1xP3"; + case P2xP4Enum : return "P2xP4"; case P1P1Enum : return "P1P1"; case P1P1GLSEnum : return "P1P1GLS"; @@ -516,6 +569,6 @@ case MINIcondensedEnum : return "MINIcondensed"; case TaylorHoodEnum : return "TaylorHood"; - case P2xP4Enum : return "P2xP4"; - case P1xP3Enum : return "P1xP3"; + case XTaylorHoodEnum : return "XTaylorHood"; + case OneLayerP4zEnum : return "OneLayerP4z"; case SaveResultsEnum : return "SaveResults"; case BoolExternalResultEnum : return "BoolExternalResult"; @@ -533,4 +586,13 @@ case MassfluxatgateNameEnum : return "MassfluxatgateName"; case MassfluxatgateSegmentsEnum : return "MassfluxatgateSegments"; + case MisfitNameEnum : return "MisfitName"; + case MisfitModelEnumEnum : return "MisfitModelEnum"; + case MisfitObservationEnum : return "MisfitObservation"; + case MisfitObservationEnumEnum : return "MisfitObservationEnum"; + case MisfitTimeinterpolationEnum : return "MisfitTimeinterpolation"; + case MisfitWeightsEnum : return "MisfitWeights"; + case MisfitWeightsEnumEnum : return "MisfitWeightsEnum"; + case SurfaceObservationEnum : return "SurfaceObservation"; + case WeightsSurfaceObservationEnum : return "WeightsSurfaceObservation"; case MinVelEnum : return "MinVel"; case MaxVelEnum : return "MaxVel"; @@ -549,11 +611,18 @@ case AbsoluteEnum : return "Absolute"; case IncrementalEnum : return "Incremental"; + case AugmentedLagrangianREnum : return "AugmentedLagrangianR"; + case AugmentedLagrangianThetaEnum : return "AugmentedLagrangianTheta"; + case NoneEnum : return "None"; case AgressiveMigrationEnum : return "AgressiveMigration"; - case NoneEnum : return "None"; case SoftMigrationEnum : return "SoftMigration"; case SubelementMigrationEnum : return "SubelementMigration"; case SubelementMigration2Enum : return "SubelementMigration2"; + case ContactEnum : return "Contact"; case MaskGroundediceLevelsetEnum : return "MaskGroundediceLevelset"; case QmuMaskGroundediceLevelsetEnum : return "QmuMaskGroundediceLevelset"; + case GaussSegEnum : return "GaussSeg"; + case GaussTriaEnum : return "GaussTria"; + case GaussTetraEnum : return "GaussTetra"; + case GaussPentaEnum : return "GaussPenta"; case FSSolverEnum : return "FSSolver"; case AdjointEnum : return "Adjoint"; @@ -601,7 +670,14 @@ case OptionCellEnum : return "OptionCell"; case OptionStructEnum : return "OptionStruct"; + case CuffeyEnum : return "Cuffey"; case PatersonEnum : return "Paterson"; case ArrheniusEnum : return "Arrhenius"; case LliboutryDuvalEnum : return "LliboutryDuval"; + case TransientIslevelsetEnum : return "TransientIslevelset"; + case ExtrapolationVariableEnum : return "ExtrapolationVariable"; + case IceMaskNodeActivationEnum : return "IceMaskNodeActivation"; + case LevelsetfunctionSlopeXEnum : return "LevelsetfunctionSlopeX"; + case LevelsetfunctionSlopeYEnum : return "LevelsetfunctionSlopeY"; + case LevelsetfunctionPicardEnum : return "LevelsetfunctionPicard"; case MaximumNumberOfDefinitionsEnum : return "MaximumNumberOfDefinitions"; default : return "unknown"; Index: /issm/trunk/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk/src/c/shared/Enum/StringToEnumx.cpp (revision 17805) +++ /issm/trunk/src/c/shared/Enum/StringToEnumx.cpp (revision 17806) @@ -49,6 +49,6 @@ else if (strcmp(name,"BasalforcingsMeltingRateCorrection")==0) return BasalforcingsMeltingRateCorrectionEnum; else if (strcmp(name,"BasalforcingsMeltingRate")==0) return BasalforcingsMeltingRateEnum; - else if (strcmp(name,"Bathymetry")==0) return BathymetryEnum; else if (strcmp(name,"Bed")==0) return BedEnum; + else if (strcmp(name,"Base")==0) return BaseEnum; else if (strcmp(name,"ConstantsG")==0) return ConstantsGEnum; else if (strcmp(name,"ConstantsReferencetemperature")==0) return ConstantsReferencetemperatureEnum; @@ -106,6 +106,10 @@ else if (strcmp(name,"SedimentHeadOld")==0) return SedimentHeadOldEnum; else if (strcmp(name,"SedimentHeadResidual")==0) return SedimentHeadResidualEnum; + else if (strcmp(name,"EffectivePressure")==0) return EffectivePressureEnum; else if (strcmp(name,"EplHead")==0) return EplHeadEnum; else if (strcmp(name,"EplHeadOld")==0) return EplHeadOldEnum; + else if (strcmp(name,"EplHeadSlopeX")==0) return EplHeadSlopeXEnum; + else if (strcmp(name,"EplHeadSlopeY")==0) return EplHeadSlopeYEnum; + else if (strcmp(name,"HydrologydcMaxIter")==0) return HydrologydcMaxIterEnum; else if (strcmp(name,"HydrologydcRelTol")==0) return HydrologydcRelTolEnum; else if (strcmp(name,"HydrologydcSpcsedimentHead")==0) return HydrologydcSpcsedimentHeadEnum; @@ -116,9 +120,13 @@ else if (strcmp(name,"HydrologydcWaterCompressibility")==0) return HydrologydcWaterCompressibilityEnum; else if (strcmp(name,"HydrologydcSpceplHead")==0) return HydrologydcSpceplHeadEnum; - else if (strcmp(name,"HydrologydcMaskEplactive")==0) return HydrologydcMaskEplactiveEnum; + else if (strcmp(name,"HydrologydcMaskEplactiveNode")==0) return HydrologydcMaskEplactiveNodeEnum; + else if (strcmp(name,"HydrologydcMaskEplactiveElt")==0) return HydrologydcMaskEplactiveEltEnum; else if (strcmp(name,"HydrologydcEplCompressibility")==0) return HydrologydcEplCompressibilityEnum; else if (strcmp(name,"HydrologydcEplPorosity")==0) return HydrologydcEplPorosityEnum; + else if (strcmp(name,"HydrologydcEplInitialThickness")==0) return HydrologydcEplInitialThicknessEnum; + else if (strcmp(name,"HydrologydcEplMaxThickness")==0) return HydrologydcEplMaxThicknessEnum; else if (strcmp(name,"HydrologydcEplThickness")==0) return HydrologydcEplThicknessEnum; - else if (strcmp(name,"HydrologydcEplTransmitivity")==0) return HydrologydcEplTransmitivityEnum; + else if (strcmp(name,"HydrologydcEplThicknessOld")==0) return HydrologydcEplThicknessOldEnum; + else if (strcmp(name,"HydrologydcEplConductivity")==0) return HydrologydcEplConductivityEnum; else if (strcmp(name,"HydrologydcIsefficientlayer")==0) return HydrologydcIsefficientlayerEnum; else if (strcmp(name,"HydrologydcSedimentlimitFlag")==0) return HydrologydcSedimentlimitFlagEnum; @@ -127,9 +135,13 @@ else if (strcmp(name,"HydrologydcLeakageFactor")==0) return HydrologydcLeakageFactorEnum; else if (strcmp(name,"HydrologydcPenaltyFactor")==0) return HydrologydcPenaltyFactorEnum; - else if (strcmp(name,"HydrologyLayer")==0) return HydrologyLayerEnum; + else if (strcmp(name,"HydrologydcPenaltyLock")==0) return HydrologydcPenaltyLockEnum; + else if (strcmp(name,"HydrologydcBasalMoulinInput")==0) return HydrologydcBasalMoulinInputEnum; + else stage=2; + } + if(stage==2){ + if (strcmp(name,"HydrologyLayer")==0) return HydrologyLayerEnum; else if (strcmp(name,"HydrologySediment")==0) return HydrologySedimentEnum; else if (strcmp(name,"HydrologyEfficient")==0) return HydrologyEfficientEnum; else if (strcmp(name,"HydrologySedimentKmax")==0) return HydrologySedimentKmaxEnum; - else if (strcmp(name,"WaterTransfer")==0) return WaterTransferEnum; else if (strcmp(name,"IndependentObject")==0) return IndependentObjectEnum; else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum; @@ -137,8 +149,5 @@ else if (strcmp(name,"InversionCostFunctionsCoefficients")==0) return InversionCostFunctionsCoefficientsEnum; else if (strcmp(name,"InversionCostFunctions")==0) return InversionCostFunctionsEnum; - else stage=2; - } - if(stage==2){ - if (strcmp(name,"InversionGradientScaling")==0) return InversionGradientScalingEnum; + else if (strcmp(name,"InversionGradientScaling")==0) return InversionGradientScalingEnum; else if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum; else if (strcmp(name,"InversionTao")==0) return InversionTaoEnum; @@ -166,5 +175,7 @@ else if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum; else if (strcmp(name,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum; + else if (strcmp(name,"DamageIsdamage")==0) return DamageIsdamageEnum; else if (strcmp(name,"DamageD")==0) return DamageDEnum; + else if (strcmp(name,"DamageF")==0) return DamageFEnum; else if (strcmp(name,"QmuDamageD")==0) return QmuDamageDEnum; else if (strcmp(name,"DamageDbar")==0) return DamageDbarEnum; @@ -174,4 +185,5 @@ else if (strcmp(name,"DamageC3")==0) return DamageC3Enum; else if (strcmp(name,"DamageC4")==0) return DamageC4Enum; + else if (strcmp(name,"DamageElementinterp")==0) return DamageElementinterpEnum; else if (strcmp(name,"DamageHealing")==0) return DamageHealingEnum; else if (strcmp(name,"DamageStressThreshold")==0) return DamageStressThresholdEnum; @@ -183,4 +195,7 @@ else if (strcmp(name,"DamageSpcdamage")==0) return DamageSpcdamageEnum; else if (strcmp(name,"DamageMaxDamage")==0) return DamageMaxDamageEnum; + else if (strcmp(name,"DamageEquivStress")==0) return DamageEquivStressEnum; + else if (strcmp(name,"DamageEvolutionNumRequestedOutputs")==0) return DamageEvolutionNumRequestedOutputsEnum; + else if (strcmp(name,"DamageEvolutionRequestedOutputs")==0) return DamageEvolutionRequestedOutputsEnum; else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum; else if (strcmp(name,"MaterialsRhoWater")==0) return MaterialsRhoWaterEnum; @@ -189,4 +204,5 @@ else if (strcmp(name,"MaterialsThermalExchangeVelocity")==0) return MaterialsThermalExchangeVelocityEnum; else if (strcmp(name,"MaterialsThermalconductivity")==0) return MaterialsThermalconductivityEnum; + else if (strcmp(name,"MaterialsTemperateiceconductivity")==0) return MaterialsTemperateiceconductivityEnum; else if (strcmp(name,"MaterialsLithosphereShearModulus")==0) return MaterialsLithosphereShearModulusEnum; else if (strcmp(name,"MaterialsLithosphereDensity")==0) return MaterialsLithosphereDensityEnum; @@ -194,5 +210,5 @@ else if (strcmp(name,"MaterialsMantleDensity")==0) return MaterialsMantleDensityEnum; else if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum; - else if (strcmp(name,"MeshElementonbed")==0) return MeshElementonbedEnum; + else if (strcmp(name,"MeshElementonbase")==0) return MeshElementonbaseEnum; else if (strcmp(name,"MeshElementonsurface")==0) return MeshElementonsurfaceEnum; else if (strcmp(name,"MeshElements2d")==0) return MeshElements2dEnum; @@ -205,13 +221,15 @@ else if (strcmp(name,"MeshNumberofvertices")==0) return MeshNumberofverticesEnum; else if (strcmp(name,"MeshUpperelements")==0) return MeshUpperelementsEnum; - else if (strcmp(name,"MeshVertexonbed")==0) return MeshVertexonbedEnum; + else if (strcmp(name,"MeshVertexonbase")==0) return MeshVertexonbaseEnum; else if (strcmp(name,"MeshVertexonsurface")==0) return MeshVertexonsurfaceEnum; else if (strcmp(name,"MeshX")==0) return MeshXEnum; else if (strcmp(name,"MeshY")==0) return MeshYEnum; else if (strcmp(name,"MeshZ")==0) return MeshZEnum; - else if (strcmp(name,"MeshType")==0) return MeshTypeEnum; - else if (strcmp(name,"Mesh2Dhorizontal")==0) return Mesh2DhorizontalEnum; - else if (strcmp(name,"Mesh2Dvertical")==0) return Mesh2DverticalEnum; - else if (strcmp(name,"Mesh3D")==0) return Mesh3DEnum; + else if (strcmp(name,"MeshElementtype")==0) return MeshElementtypeEnum; + else if (strcmp(name,"DomainType")==0) return DomainTypeEnum; + else if (strcmp(name,"DomainDimension")==0) return DomainDimensionEnum; + else if (strcmp(name,"Domain2Dhorizontal")==0) return Domain2DhorizontalEnum; + else if (strcmp(name,"Domain2Dvertical")==0) return Domain2DverticalEnum; + else if (strcmp(name,"Domain3D")==0) return Domain3DEnum; else if (strcmp(name,"MiscellaneousName")==0) return MiscellaneousNameEnum; else if (strcmp(name,"MasstransportHydrostaticAdjustment")==0) return MasstransportHydrostaticAdjustmentEnum; @@ -220,4 +238,5 @@ else if (strcmp(name,"MasstransportPenaltyFactor")==0) return MasstransportPenaltyFactorEnum; else if (strcmp(name,"MasstransportSpcthickness")==0) return MasstransportSpcthicknessEnum; + else if (strcmp(name,"MasstransportCalvingrate")==0) return MasstransportCalvingrateEnum; else if (strcmp(name,"MasstransportStabilization")==0) return MasstransportStabilizationEnum; else if (strcmp(name,"MasstransportVertexPairing")==0) return MasstransportVertexPairingEnum; @@ -236,15 +255,13 @@ else if (strcmp(name,"RiftsNumrifts")==0) return RiftsNumriftsEnum; else if (strcmp(name,"RiftsRiftstruct")==0) return RiftsRiftstructEnum; + else if (strcmp(name,"SettingsResultsOnNodes")==0) return SettingsResultsOnNodesEnum; else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum; else if (strcmp(name,"SettingsLowmem")==0) return SettingsLowmemEnum; else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum; else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum; - else if (strcmp(name,"SurfaceforcingsDelta18o")==0) return SurfaceforcingsDelta18oEnum; - else if (strcmp(name,"SurfaceforcingsDelta18oSurface")==0) return SurfaceforcingsDelta18oSurfaceEnum; - else if (strcmp(name,"SurfaceforcingsIsdelta18o")==0) return SurfaceforcingsIsdelta18oEnum; - else if (strcmp(name,"SurfaceforcingsPrecipitationsPresentday")==0) return SurfaceforcingsPrecipitationsPresentdayEnum; - else if (strcmp(name,"SurfaceforcingsTemperaturesPresentday")==0) return SurfaceforcingsTemperaturesPresentdayEnum; - else if (strcmp(name,"SurfaceforcingsTemperaturesLgm")==0) return SurfaceforcingsTemperaturesLgmEnum; - else if (strcmp(name,"DebugProfiling")==0) return DebugProfilingEnum; + else stage=3; + } + if(stage==3){ + if (strcmp(name,"DebugProfiling")==0) return DebugProfilingEnum; else if (strcmp(name,"ProfilingCurrentMem")==0) return ProfilingCurrentMemEnum; else if (strcmp(name,"ProfilingCurrentFlops")==0) return ProfilingCurrentFlopsEnum; @@ -256,18 +273,4 @@ else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum; else if (strcmp(name,"Surface")==0) return SurfaceEnum; - else if (strcmp(name,"SurfaceforcingsPrecipitation")==0) return SurfaceforcingsPrecipitationEnum; - else if (strcmp(name,"SurfaceforcingsMassBalance")==0) return SurfaceforcingsMassBalanceEnum; - else if (strcmp(name,"SurfaceforcingsIspdd")==0) return SurfaceforcingsIspddEnum; - else if (strcmp(name,"SurfaceforcingsDesfac")==0) return SurfaceforcingsDesfacEnum; - else stage=3; - } - if(stage==3){ - if (strcmp(name,"SurfaceforcingsS0p")==0) return SurfaceforcingsS0pEnum; - else if (strcmp(name,"SurfaceforcingsIssmbgradients")==0) return SurfaceforcingsIssmbgradientsEnum; - else if (strcmp(name,"SurfaceforcingsMonthlytemperatures")==0) return SurfaceforcingsMonthlytemperaturesEnum; - else if (strcmp(name,"SurfaceforcingsHref")==0) return SurfaceforcingsHrefEnum; - else if (strcmp(name,"SurfaceforcingsSmbref")==0) return SurfaceforcingsSmbrefEnum; - else if (strcmp(name,"SurfaceforcingsBPos")==0) return SurfaceforcingsBPosEnum; - else if (strcmp(name,"SurfaceforcingsBNeg")==0) return SurfaceforcingsBNegEnum; else if (strcmp(name,"ThermalIsenthalpy")==0) return ThermalIsenthalpyEnum; else if (strcmp(name,"ThermalIsdynamicbasalspc")==0) return ThermalIsdynamicbasalspcEnum; @@ -293,7 +296,30 @@ else if (strcmp(name,"TransientIsthermal")==0) return TransientIsthermalEnum; else if (strcmp(name,"TransientIsgia")==0) return TransientIsgiaEnum; - else if (strcmp(name,"TransientIsdamage")==0) return TransientIsdamageEnum; + else if (strcmp(name,"TransientIsdamageevolution")==0) return TransientIsdamageevolutionEnum; + else if (strcmp(name,"TransientIshydrology")==0) return TransientIshydrologyEnum; else if (strcmp(name,"TransientNumRequestedOutputs")==0) return TransientNumRequestedOutputsEnum; else if (strcmp(name,"TransientRequestedOutputs")==0) return TransientRequestedOutputsEnum; + else if (strcmp(name,"Surfaceforcings")==0) return SurfaceforcingsEnum; + else if (strcmp(name,"SMB")==0) return SMBEnum; + else if (strcmp(name,"SurfaceforcingsMassBalance")==0) return SurfaceforcingsMassBalanceEnum; + else if (strcmp(name,"SMBpdd")==0) return SMBpddEnum; + else if (strcmp(name,"SurfaceforcingsDelta18o")==0) return SurfaceforcingsDelta18oEnum; + else if (strcmp(name,"SurfaceforcingsDelta18oSurface")==0) return SurfaceforcingsDelta18oSurfaceEnum; + else if (strcmp(name,"SurfaceforcingsIsdelta18o")==0) return SurfaceforcingsIsdelta18oEnum; + else if (strcmp(name,"SurfaceforcingsPrecipitationsPresentday")==0) return SurfaceforcingsPrecipitationsPresentdayEnum; + else if (strcmp(name,"SurfaceforcingsTemperaturesPresentday")==0) return SurfaceforcingsTemperaturesPresentdayEnum; + else if (strcmp(name,"SurfaceforcingsTemperaturesLgm")==0) return SurfaceforcingsTemperaturesLgmEnum; + else if (strcmp(name,"SurfaceforcingsPrecipitation")==0) return SurfaceforcingsPrecipitationEnum; + else if (strcmp(name,"SurfaceforcingsDesfac")==0) return SurfaceforcingsDesfacEnum; + else if (strcmp(name,"SurfaceforcingsS0p")==0) return SurfaceforcingsS0pEnum; + else if (strcmp(name,"SMBgradients")==0) return SMBgradientsEnum; + else if (strcmp(name,"SurfaceforcingsMonthlytemperatures")==0) return SurfaceforcingsMonthlytemperaturesEnum; + else if (strcmp(name,"SurfaceforcingsHref")==0) return SurfaceforcingsHrefEnum; + else if (strcmp(name,"SurfaceforcingsSmbref")==0) return SurfaceforcingsSmbrefEnum; + else if (strcmp(name,"SurfaceforcingsBPos")==0) return SurfaceforcingsBPosEnum; + else if (strcmp(name,"SurfaceforcingsBNeg")==0) return SurfaceforcingsBNegEnum; + else if (strcmp(name,"SMBhenning")==0) return SMBhenningEnum; + else if (strcmp(name,"SurfaceforcingsIspdd")==0) return SurfaceforcingsIspddEnum; + else if (strcmp(name,"SurfaceforcingsIssmbgradients")==0) return SurfaceforcingsIssmbgradientsEnum; else if (strcmp(name,"SolutionType")==0) return SolutionTypeEnum; else if (strcmp(name,"AnalysisType")==0) return AnalysisTypeEnum; @@ -309,4 +335,5 @@ else if (strcmp(name,"BalancevelocityAnalysis")==0) return BalancevelocityAnalysisEnum; else if (strcmp(name,"BalancevelocitySolution")==0) return BalancevelocitySolutionEnum; + else if (strcmp(name,"L2ProjectionEPLAnalysis")==0) return L2ProjectionEPLAnalysisEnum; else if (strcmp(name,"L2ProjectionBaseAnalysis")==0) return L2ProjectionBaseAnalysisEnum; else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum; @@ -329,8 +356,9 @@ else if (strcmp(name,"FreeSurfaceBaseAnalysis")==0) return FreeSurfaceBaseAnalysisEnum; else if (strcmp(name,"FreeSurfaceTopAnalysis")==0) return FreeSurfaceTopAnalysisEnum; + else if (strcmp(name,"SurfaceNormalVelocity")==0) return SurfaceNormalVelocityEnum; else if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum; else if (strcmp(name,"ExtrudeFromTopAnalysis")==0) return ExtrudeFromTopAnalysisEnum; + else if (strcmp(name,"DepthAverageAnalysis")==0) return DepthAverageAnalysisEnum; else if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum; - else if (strcmp(name,"L2ProjectionTopAnalysis")==0) return L2ProjectionTopAnalysisEnum; else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum; else if (strcmp(name,"SmoothedSurfaceSlopeXAnalysis")==0) return SmoothedSurfaceSlopeXAnalysisEnum; @@ -343,4 +371,7 @@ else if (strcmp(name,"MeshdeformationSolution")==0) return MeshdeformationSolutionEnum; else if (strcmp(name,"MeshdeformationAnalysis")==0) return MeshdeformationAnalysisEnum; + else if (strcmp(name,"LevelsetAnalysis")==0) return LevelsetAnalysisEnum; + else if (strcmp(name,"ExtrapolationAnalysis")==0) return ExtrapolationAnalysisEnum; + else if (strcmp(name,"LsfReinitializationAnalysis")==0) return LsfReinitializationAnalysisEnum; else if (strcmp(name,"Approximation")==0) return ApproximationEnum; else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum; @@ -352,5 +383,8 @@ else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum; else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum; - else if (strcmp(name,"FSApproximation")==0) return FSApproximationEnum; + else stage=4; + } + if(stage==4){ + if (strcmp(name,"FSApproximation")==0) return FSApproximationEnum; else if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum; else if (strcmp(name,"FSpressure")==0) return FSpressureEnum; @@ -383,11 +417,10 @@ else if (strcmp(name,"InputToExtrude")==0) return InputToExtrudeEnum; else if (strcmp(name,"InputToL2Project")==0) return InputToL2ProjectEnum; - else stage=4; - } - if(stage==4){ - if (strcmp(name,"IntParam")==0) return IntParamEnum; + else if (strcmp(name,"InputToDepthaverage")==0) return InputToDepthaverageEnum; + else if (strcmp(name,"IntParam")==0) return IntParamEnum; else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum; else if (strcmp(name,"TransientParam")==0) return TransientParamEnum; else if (strcmp(name,"Matice")==0) return MaticeEnum; + else if (strcmp(name,"Matdamageice")==0) return MatdamageiceEnum; else if (strcmp(name,"Matpar")==0) return MatparEnum; else if (strcmp(name,"Node")==0) return NodeEnum; @@ -397,6 +430,4 @@ else if (strcmp(name,"Pengrid")==0) return PengridEnum; else if (strcmp(name,"Penpair")==0) return PenpairEnum; - else if (strcmp(name,"Penta")==0) return PentaEnum; - else if (strcmp(name,"PentaInput")==0) return PentaInputEnum; else if (strcmp(name,"Profiler")==0) return ProfilerEnum; else if (strcmp(name,"MatrixParam")==0) return MatrixParamEnum; @@ -416,4 +447,8 @@ else if (strcmp(name,"Tria")==0) return TriaEnum; else if (strcmp(name,"TriaInput")==0) return TriaInputEnum; + else if (strcmp(name,"Tetra")==0) return TetraEnum; + else if (strcmp(name,"TetraInput")==0) return TetraInputEnum; + else if (strcmp(name,"Penta")==0) return PentaEnum; + else if (strcmp(name,"PentaInput")==0) return PentaInputEnum; else if (strcmp(name,"Vertex")==0) return VertexEnum; else if (strcmp(name,"VertexPId")==0) return VertexPIdEnum; @@ -450,5 +485,5 @@ else if (strcmp(name,"QmuVz")==0) return QmuVzEnum; else if (strcmp(name,"QmuThickness")==0) return QmuThicknessEnum; - else if (strcmp(name,"QmuBed")==0) return QmuBedEnum; + else if (strcmp(name,"QmuBase")==0) return QmuBaseEnum; else if (strcmp(name,"QmuSurface")==0) return QmuSurfaceEnum; else if (strcmp(name,"QmuMelting")==0) return QmuMeltingEnum; @@ -471,5 +506,8 @@ else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum; else if (strcmp(name,"Vel")==0) return VelEnum; - else if (strcmp(name,"Velocity")==0) return VelocityEnum; + else stage=5; + } + if(stage==5){ + if (strcmp(name,"Velocity")==0) return VelocityEnum; else if (strcmp(name,"VxAverage")==0) return VxAverageEnum; else if (strcmp(name,"Vx")==0) return VxEnum; @@ -502,14 +540,27 @@ else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum; else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum; + else if (strcmp(name,"SigmaNN")==0) return SigmaNNEnum; else if (strcmp(name,"StressTensor")==0) return StressTensorEnum; else if (strcmp(name,"StressTensorxx")==0) return StressTensorxxEnum; else if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum; else if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum; - else stage=5; - } - if(stage==5){ - if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum; + else if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum; else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum; else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum; + else if (strcmp(name,"DeviatoricStress")==0) return DeviatoricStressEnum; + else if (strcmp(name,"DeviatoricStressxx")==0) return DeviatoricStressxxEnum; + else if (strcmp(name,"DeviatoricStressxy")==0) return DeviatoricStressxyEnum; + else if (strcmp(name,"DeviatoricStressxz")==0) return DeviatoricStressxzEnum; + else if (strcmp(name,"DeviatoricStressyy")==0) return DeviatoricStressyyEnum; + else if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum; + else if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum; + else if (strcmp(name,"StrainRate")==0) return StrainRateEnum; + else if (strcmp(name,"StrainRatexx")==0) return StrainRatexxEnum; + else if (strcmp(name,"StrainRatexy")==0) return StrainRatexyEnum; + else if (strcmp(name,"StrainRatexz")==0) return StrainRatexzEnum; + else if (strcmp(name,"StrainRateyy")==0) return StrainRateyyEnum; + else if (strcmp(name,"StrainRateyz")==0) return StrainRateyzEnum; + else if (strcmp(name,"StrainRatezz")==0) return StrainRatezzEnum; + else if (strcmp(name,"Divergence")==0) return DivergenceEnum; else if (strcmp(name,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum; else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum; @@ -523,4 +574,6 @@ else if (strcmp(name,"P2xP1")==0) return P2xP1Enum; else if (strcmp(name,"P1xP2")==0) return P1xP2Enum; + else if (strcmp(name,"P1xP3")==0) return P1xP3Enum; + else if (strcmp(name,"P2xP4")==0) return P2xP4Enum; else if (strcmp(name,"P1P1")==0) return P1P1Enum; else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum; @@ -528,6 +581,6 @@ else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum; else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum; - else if (strcmp(name,"P2xP4")==0) return P2xP4Enum; - else if (strcmp(name,"P1xP3")==0) return P1xP3Enum; + else if (strcmp(name,"XTaylorHood")==0) return XTaylorHoodEnum; + else if (strcmp(name,"OneLayerP4z")==0) return OneLayerP4zEnum; else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum; else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum; @@ -545,4 +598,13 @@ else if (strcmp(name,"MassfluxatgateName")==0) return MassfluxatgateNameEnum; else if (strcmp(name,"MassfluxatgateSegments")==0) return MassfluxatgateSegmentsEnum; + else if (strcmp(name,"MisfitName")==0) return MisfitNameEnum; + else if (strcmp(name,"MisfitModelEnum")==0) return MisfitModelEnumEnum; + else if (strcmp(name,"MisfitObservation")==0) return MisfitObservationEnum; + else if (strcmp(name,"MisfitObservationEnum")==0) return MisfitObservationEnumEnum; + else if (strcmp(name,"MisfitTimeinterpolation")==0) return MisfitTimeinterpolationEnum; + else if (strcmp(name,"MisfitWeights")==0) return MisfitWeightsEnum; + else if (strcmp(name,"MisfitWeightsEnum")==0) return MisfitWeightsEnumEnum; + else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum; + else if (strcmp(name,"WeightsSurfaceObservation")==0) return WeightsSurfaceObservationEnum; else if (strcmp(name,"MinVel")==0) return MinVelEnum; else if (strcmp(name,"MaxVel")==0) return MaxVelEnum; @@ -561,11 +623,21 @@ else if (strcmp(name,"Absolute")==0) return AbsoluteEnum; else if (strcmp(name,"Incremental")==0) return IncrementalEnum; + else if (strcmp(name,"AugmentedLagrangianR")==0) return AugmentedLagrangianREnum; + else if (strcmp(name,"AugmentedLagrangianTheta")==0) return AugmentedLagrangianThetaEnum; + else if (strcmp(name,"None")==0) return NoneEnum; else if (strcmp(name,"AgressiveMigration")==0) return AgressiveMigrationEnum; - else if (strcmp(name,"None")==0) return NoneEnum; else if (strcmp(name,"SoftMigration")==0) return SoftMigrationEnum; else if (strcmp(name,"SubelementMigration")==0) return SubelementMigrationEnum; - else if (strcmp(name,"SubelementMigration2")==0) return SubelementMigration2Enum; + else stage=6; + } + if(stage==6){ + if (strcmp(name,"SubelementMigration2")==0) return SubelementMigration2Enum; + else if (strcmp(name,"Contact")==0) return ContactEnum; else if (strcmp(name,"MaskGroundediceLevelset")==0) return MaskGroundediceLevelsetEnum; else if (strcmp(name,"QmuMaskGroundediceLevelset")==0) return QmuMaskGroundediceLevelsetEnum; + else if (strcmp(name,"GaussSeg")==0) return GaussSegEnum; + else if (strcmp(name,"GaussTria")==0) return GaussTriaEnum; + else if (strcmp(name,"GaussTetra")==0) return GaussTetraEnum; + else if (strcmp(name,"GaussPenta")==0) return GaussPentaEnum; else if (strcmp(name,"FSSolver")==0) return FSSolverEnum; else if (strcmp(name,"Adjoint")==0) return AdjointEnum; @@ -613,9 +685,16 @@ else if (strcmp(name,"OptionCell")==0) return OptionCellEnum; else if (strcmp(name,"OptionStruct")==0) return OptionStructEnum; + else if (strcmp(name,"Cuffey")==0) return CuffeyEnum; else if (strcmp(name,"Paterson")==0) return PatersonEnum; else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum; else if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum; + else if (strcmp(name,"TransientIslevelset")==0) return TransientIslevelsetEnum; + else if (strcmp(name,"ExtrapolationVariable")==0) return ExtrapolationVariableEnum; + else if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum; + else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum; + else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum; + else if (strcmp(name,"LevelsetfunctionPicard")==0) return LevelsetfunctionPicardEnum; else if (strcmp(name,"MaximumNumberOfDefinitions")==0) return MaximumNumberOfDefinitionsEnum; - else stage=6; + else stage=7; } /*If we reach this point, the string provided has not been found*/ Index: /issm/trunk/src/c/shared/Enum/Synchronize.sh =================================================================== --- /issm/trunk/src/c/shared/Enum/Synchronize.sh (revision 17805) +++ /issm/trunk/src/c/shared/Enum/Synchronize.sh (revision 17806) @@ -14,4 +14,79 @@ NUMENUMS=$(wc -l temp | awk '{printf("%s",$1);}'); +#Deal with Analyses +#Build EnumToAnalysis.cpp {{{ +#Header +cat < $ISSM_DIR/src/c/analyses/EnumToAnalysis.cpp +/* +* \file EnumToAnalysis.cpp +* \brief: output class depending on enum +* +* WARNING: DO NOT MODIFY THIS FILE +* this file has been automatically generated by Synchronize.sh +* Please read README for more information +*/ + +#include "./analyses.h" +#include "../shared/shared.h" + +Analysis* EnumToAnalysis(int analysis_enum){ + + switch(analysis_enum){ +END +#core +cat temp | grep [a-zA-Z]Analysis | \ + grep -v DefaultAnalysis | grep -v FlaimAnalysis | grep -v SurfaceSlopeAnalysis | grep -v BedSlopeAnalysis | \ + awk '{print "\t\t#ifdef _HAVE_"toupper(substr($1,1,length($1)-12))"_\n\t\t" "case " $1" : return new " substr($1,1,length($1)-4) "();\n\t\t#endif"}' \ + >> $ISSM_DIR/src/c/analyses/EnumToAnalysis.cpp + +#Footer +cat <> $ISSM_DIR/src/c/analyses/EnumToAnalysis.cpp + default : _error_("enum provided not supported ("< $ISSM_DIR/m4/analyses.m4 + +dnl WARNING: DO NOT MODIFY THIS FILE +dnl this file has been automatically generated by Synchronize.sh +dnl Please read README for more information + +# AX_ANALYSES_SELECTION +# ----------------- +# Check for analyses compilation +AC_DEFUN([AX_ANALYSES_SELECTION], +[ + +END +#core +cat temp | grep [a-zA-Z]Analysis | \ + grep -v DefaultAnalysis | grep -v FlaimAnalysis | grep -v SurfaceSlopeAnalysis | grep -v BedSlopeAnalysis | \ + sed -e "s/AnalysisEnum//g" | \ + awk '{print "dnl with-" $1"{{{\n\ +AC_ARG_WITH([" $1"],\n\ +\tAS_HELP_STRING([--with-" $1" = YES], [compile with " $1" capabilities (default is yes)]),\n\ +\t[" toupper($1)"=$withval],[" toupper($1)"=yes])\n\ +AC_MSG_CHECKING(for " $1" capability compilation)\n\n\ +HAVE_" toupper($1)"=no \n\ +if test \"x$" toupper($1)"\" = \"xyes\"; then\n\ + HAVE_" toupper($1)"=yes\n\ + AC_DEFINE([_HAVE_" toupper($1)"_],[1],[with " $1"capability])\n\ +fi\n\ +AM_CONDITIONAL([" toupper($1)"], [test x$HAVE_" toupper($1)" = xyes])\n\ +AC_MSG_RESULT($HAVE_" toupper($1)")\n\ +dnl }}}"}' \ + >> $ISSM_DIR/m4/analyses.m4 + +#Footer +cat <> $ISSM_DIR/m4/analyses.m4 + +]) +END +#}}} + +#Enum to String conversions #Build EnumToStringx.cpp {{{ #Header @@ -104,36 +179,6 @@ END #}}} -##Build EnumToAnalysis.cpp {{{ -##Header -#cat < $ISSM_DIR/src/c/analyses/EnumToAnalysis.cpp -#/* -#* \file EnumToAnalysis.cpp -#* \brief: output class depending on enum -#* -#* WARNING: DO NOT MODIFY THIS FILE -#* this file has been automatically generated by Synchronize.sh -#* Please read README for more information -#*/ -# -##include "./analyses.h" -##include "../shared/shared.h" -# -#Analysis* EnumToAnalysis(int analysis_enum){ -# -# switch(analysis_enum){ -#END -##core -#cat temp | grep [a-z]Analysis | \ -# grep -v DefaultAnalysis | grep -v FlaimAnalysis | grep -v SurfaceSlopeAnalysis | grep -v BedSlopeAnalysis | \ -# awk '{print "\t\t#ifdef _HAVE_"toupper(substr($1,1,length($1)-12))"_\n\t\t" "case " $1" : return new " substr($1,1,length($1)-4) "();\n\t\t#endif"}' \ -# >> $ISSM_DIR/src/c/analyses/EnumToAnalysis.cpp -# -##Footer -#cat <> $ISSM_DIR/src/c/analyses/EnumToAnalysis.cpp -#default : _error_("enum provided not supported ("< $ISSM_DIR/src/m/enum/EnumDefinitions.py @@ -153,5 +198,5 @@ #}}} -# go through the lines of temp +#Deal with Matlab Enums` ENUM=0; Index: /issm/trunk/src/c/shared/Exceptions/Exceptions.cpp =================================================================== --- /issm/trunk/src/c/shared/Exceptions/Exceptions.cpp (revision 17805) +++ /issm/trunk/src/c/shared/Exceptions/Exceptions.cpp (revision 17806) @@ -45,4 +45,6 @@ file_line= what_line; + /*When error messages are not shown properly, uncomment the following line*/ + //this->Report(); }/*}}}*/ Index: /issm/trunk/src/c/shared/Exceptions/exceptions.h =================================================================== --- /issm/trunk/src/c/shared/Exceptions/exceptions.h (revision 17805) +++ /issm/trunk/src/c/shared/Exceptions/exceptions.h (revision 17806) @@ -63,5 +63,5 @@ return 0;\ }\ - catch (exception& e) {\ + catch(exception& e) {\ _printf_("Standard exception: " << e.what() << "\n\n");\ return 0;\ Index: /issm/trunk/src/c/shared/FSanalyticals/fsanalyticals.cpp =================================================================== --- /issm/trunk/src/c/shared/FSanalyticals/fsanalyticals.cpp (revision 17806) +++ /issm/trunk/src/c/shared/FSanalyticals/fsanalyticals.cpp (revision 17806) @@ -0,0 +1,146 @@ +/*!\file fx.cpp + * \brief: analytical fonction for FS + * test case for a cube with Dirichlet conditions on all faces and no variation in z + * case 1: 2d test with quadratic functions + * case 2: 2d test with sinusoidal functions + * case 3: 3d test with quadratic functions + * case 4: 3d test with sinusoidal functions + * case 5: 3d test with sinusoidal functions, no variations with z, non homogeneous Dirichlet conditions + * case 6: 3d test with sinusoidal functions, non homogeneous Dirichlet conditions + */ + +#include +#include "../Numerics/types.h" +#include "../Numerics/constants.h" +#include "./fsanalyticals.h" +#include "../shared.h" + +IssmDouble fx(IssmDouble x,IssmDouble y,IssmDouble z,int testid){ /*{{{*/ + IssmDouble p=2; + IssmDouble q=2; + IssmDouble a=1; + + switch(testid){ + case 1: + z=y; + return 4*pow(x, 2)*z*pow(x - 1, 2) + 4*pow(x, 2)*z*(z - 1)*(2*z - 1) + 4*pow(x, 2)*pow(x - 1, 2)*(z - 1) + 2*pow(x, 2)*pow(x - 1, 2)*(2*z - 1) + 16*x*z*(x - 1)*(z - 1)*(2*z - 1) - 4*pow(z, 3)*(6*pow(x, 2) - 6*x + 1) + 6*pow(z, 2)*(6*pow(x, 2) - 6*x + 1) + 4*z*pow(x - 1, 2)*(z - 1)*(2*z - 1) - 2*z*(6*pow(x, 2) - 6*x + 1) + z - 1.0L/2.0L; + case 2: case 11: + z=y; + return 10*pow(PI, 2)*pow(p, 2)*pow(sin(PI*p*x), 3)*pow(sin(PI*p*z), 2)*cos(PI*p*z) - 2*pow(PI, 2)*pow(p, 2)*pow(sin(PI*p*x), 3)*pow(cos(PI*p*z), 3) - 6*pow(PI, 2)*pow(p, 2)*sin(PI*p*x)*pow(sin(PI*p*z), 2)*pow(cos(PI*p*x), 2)*cos(PI*p*z) + PI*q*sin(PI*q*z)*cos(PI*q*x); + case 3: + return 4*pow(x, 2)*y*z*pow(x - 1, 2)*(z - 1) + 4*pow(x, 2)*y*z*(y - 1)*(2*y - 1)*(z - 1) + 2*pow(x, 2)*y*pow(x - 1, 2)*(y - 1)*(2*y - 1) + 4*pow(x, 2)*z*pow(x - 1, 2)*(y - 1)*(z - 1) + 2*pow(x, 2)*z*pow(x - 1, 2)*(2*y - 1)*(z - 1) - 4*x*pow(y, 2)*z*(x - 1)*(y - 1)*(z - 1) - 2*x*pow(y, 2)*z*(2*x - 1)*(y - 1)*(z - 1) - 4*x*y*z*(x - 1)*pow(y - 1, 2)*(z - 1) + 16*x*y*z*(x - 1)*(y - 1)*(2*y - 1)*(z - 1) - 2*x*y*z*(2*x - 1)*pow(y - 1, 2)*(z - 1) - 2*pow(y, 2)*z*(x - 1)*(2*x - 1)*(y - 1)*(z - 1) + 4*y*z*pow(x - 1, 2)*(y - 1)*(2*y - 1)*(z - 1) - 2*y*z*(x - 1)*(2*x - 1)*pow(y - 1, 2)*(z - 1) + y - 1.0L/2.0L; + case 4: + return 4*pow(PI, 2)*pow(p, 2)*(cos(PI*p*x) - 1)*sin(PI*p*y)*sin(PI*p*z) + 2*pow(PI, 2)*pow(p, 2)*sin(PI*p*y)*sin(PI*p*z)*cos(PI*p*x) + PI*q*sin(PI*q*y)*sin(PI*q*z)*cos(PI*q*x); + case 5: + return 2.*(cos(PI*p*x) - 1)*PI*PI*p*p*sin(PI*p*y) + 3*PI*PI*p*p*sin(PI*p*y)*cos(PI*p*x) + PI*q*sin(PI*q*y)*cos(PI*q*x); + case 6: + return 4. * PI*PI * p*p * (cos(p*PI*x)-1) * sin(p*PI*y) * sin(p*PI*z)+ 2. * PI*PI*p*p* sin(p*PI*y) * sin(p*PI*z) * cos(p*PI*x) + q * PI * cos(q*PI*x) * sin(q*PI*y) * sin(q*PI*z); + case 7: + z=y; + return 4*pow(x, 2)*z*pow(x - 1, 2) + 4*pow(x, 2)*z*(z - 1)*(2*z - 1) + 4*pow(x, 2)*pow(x - 1, 2)*(z - 1) + 2*pow(x, 2)*pow(x - 1, 2)*(2*z - 1) + 16*x*z*(x - 1)*(z - 1)*(2*z - 1) - 4*pow(z, 3)*(6*pow(x, 2) - 6*x + 1) + 6*pow(z, 2)*(6*pow(x, 2) - 6*x + 1) + 4*z*pow(x - 1, 2)*(z - 1)*(2*z - 1) - 2*z*(6*pow(x, 2) - 6*x + 1) + 1; + case 8: case 18: + return 1.0; + case 9: + return 4*pow(PI, 2)*pow(p, 2)*(cos(PI*p*x) - 1)*sin(PI*p*y)*sin(PI*p*z) + 2*pow(PI, 2)*pow(p, 2)*sin(PI*p*y)*sin(PI*p*z)*cos(PI*p*x) + 2*x*z; + case 10: + return 4*pow(PI, 2)*pow(p, 2)*(cos(PI*p*x) - 1)*sin(PI*p*y)*sin(PI*p*z) + 2*pow(PI, 2)*pow(p, 2)*sin(PI*p*y)*sin(PI*p*z)*cos(PI*p*x) + PI*q*pow(z, a)*sin(PI*q*y)*cos(PI*q*x); + case 21: + z=y; + return z - 4.0L/3.0L*pow(2, 1.0L/3.0L)*(pow(x, 2)*z*(x - 1)*(z - 1)*(2*z - 1) + x*z*pow(x - 1, 2)*(z - 1)*(2*z - 1))*(4*(pow(x, 2)*z*(x - 1)*(z - 1)*(2*z - 1) + x*z*pow(x - 1, 2)*(z - 1)*(2*z - 1))*(pow(x, 2)*z*(z - 1)*(2*z - 1) + 4*x*z*(x - 1)*(z - 1)*(2*z - 1) + z*pow(x - 1, 2)*(z - 1)*(2*z - 1)) + 4*(2*pow(z, 3)*(6*pow(x, 2) - 6*x + 1) - 3*pow(z, 2)*(6*pow(x, 2) - 6*x + 1) + z*(6*pow(x, 2) - 6*x + 1))*(2*pow(z, 3)*(2*pow(x, 3) - 3*pow(x, 2) + x) - 3*pow(z, 2)*(2*pow(x, 3) - 3*pow(x, 2) + x) + z*(2*pow(x, 3) - 3*pow(x, 2) + x)) + (2*pow(x, 2)*z*pow(x - 1, 2)*(z - 1) + pow(x, 2)*z*pow(x - 1, 2)*(2*z - 1) + pow(x, 2)*pow(x - 1, 2)*(z - 1)*(2*z - 1) - pow(z, 4)*(6*pow(x, 2) - 6*x + 1) + 2*pow(z, 3)*(6*pow(x, 2) - 6*x + 1) - pow(z, 2)*(6*pow(x, 2) - 6*x + 1))*(2*pow(x, 2)*z*(x - 1)*(z - 1) + pow(x, 2)*z*(x - 1)*(2*z - 1) + pow(x, 2)*(x - 1)*(z - 1)*(2*z - 1) + 2*x*z*pow(x - 1, 2)*(z - 1) + x*z*pow(x - 1, 2)*(2*z - 1) + x*pow(x - 1, 2)*(z - 1)*(2*z - 1) - 3*pow(z, 4)*(2*x - 1) + 6*pow(z, 3)*(2*x - 1) - 3*pow(z, 2)*(2*x - 1)))/pow(4*pow(pow(x, 2)*z*(x - 1)*(z - 1)*(2*z - 1) + x*z*pow(x - 1, 2)*(z - 1)*(2*z - 1), 2) + 4*pow(2*pow(z, 3)*(2*pow(x, 3) - 3*pow(x, 2) + x) - 3*pow(z, 2)*(2*pow(x, 3) - 3*pow(x, 2) + x) + z*(2*pow(x, 3) - 3*pow(x, 2) + x), 2) + (1.0L/2.0L)*pow(2*pow(x, 2)*z*pow(x - 1, 2)*(z - 1) + pow(x, 2)*z*pow(x - 1, 2)*(2*z - 1) + pow(x, 2)*pow(x - 1, 2)*(z - 1)*(2*z - 1) - pow(z, 4)*(6*pow(x, 2) - 6*x + 1) + 2*pow(z, 3)*(6*pow(x, 2) - 6*x + 1) - pow(z, 2)*(6*pow(x, 2) - 6*x + 1), 2), 4.0L/3.0L) - 1.0L/3.0L*pow(2, 1.0L/3.0L)*(4*(pow(x, 2)*z*(x - 1)*(z - 1)*(2*z - 1) + x*z*pow(x - 1, 2)*(z - 1)*(2*z - 1))*(2*pow(x, 2)*z*(x - 1)*(z - 1) + pow(x, 2)*z*(x - 1)*(2*z - 1) + pow(x, 2)*(x - 1)*(z - 1)*(2*z - 1) + 2*x*z*pow(x - 1, 2)*(z - 1) + x*z*pow(x - 1, 2)*(2*z - 1) + x*pow(x - 1, 2)*(z - 1)*(2*z - 1)) + 4*(2*pow(z, 3)*(2*pow(x, 3) - 3*pow(x, 2) + x) - 3*pow(z, 2)*(2*pow(x, 3) - 3*pow(x, 2) + x) + z*(2*pow(x, 3) - 3*pow(x, 2) + x))*(2*pow(x, 3) - 3*pow(x, 2) + x + 6*pow(z, 2)*(2*pow(x, 3) - 3*pow(x, 2) + x) - 6*z*(2*pow(x, 3) - 3*pow(x, 2) + x)) + (2*pow(x, 2)*z*pow(x - 1, 2) + 2*pow(x, 2)*pow(x - 1, 2)*(z - 1) + pow(x, 2)*pow(x - 1, 2)*(2*z - 1) - 2*pow(z, 3)*(6*pow(x, 2) - 6*x + 1) + 3*pow(z, 2)*(6*pow(x, 2) - 6*x + 1) - z*(6*pow(x, 2) - 6*x + 1))*(2*pow(x, 2)*z*pow(x - 1, 2)*(z - 1) + pow(x, 2)*z*pow(x - 1, 2)*(2*z - 1) + pow(x, 2)*pow(x - 1, 2)*(z - 1)*(2*z - 1) - pow(z, 4)*(6*pow(x, 2) - 6*x + 1) + 2*pow(z, 3)*(6*pow(x, 2) - 6*x + 1) - pow(z, 2)*(6*pow(x, 2) - 6*x + 1)))*(2*pow(x, 2)*z*pow(x - 1, 2)*(z - 1) + pow(x, 2)*z*pow(x - 1, 2)*(2*z - 1) + pow(x, 2)*pow(x - 1, 2)*(z - 1)*(2*z - 1) - pow(z, 4)*(6*pow(x, 2) - 6*x + 1) + 2*pow(z, 3)*(6*pow(x, 2) - 6*x + 1) - pow(z, 2)*(6*pow(x, 2) - 6*x + 1))/pow(4*pow(pow(x, 2)*z*(x - 1)*(z - 1)*(2*z - 1) + x*z*pow(x - 1, 2)*(z - 1)*(2*z - 1), 2) + 4*pow(2*pow(z, 3)*(2*pow(x, 3) - 3*pow(x, 2) + x) - 3*pow(z, 2)*(2*pow(x, 3) - 3*pow(x, 2) + x) + z*(2*pow(x, 3) - 3*pow(x, 2) + x), 2) + (1.0L/2.0L)*pow(2*pow(x, 2)*z*pow(x - 1, 2)*(z - 1) + pow(x, 2)*z*pow(x - 1, 2)*(2*z - 1) + pow(x, 2)*pow(x - 1, 2)*(z - 1)*(2*z - 1) - pow(z, 4)*(6*pow(x, 2) - 6*x + 1) + 2*pow(z, 3)*(6*pow(x, 2) - 6*x + 1) - pow(z, 2)*(6*pow(x, 2) - 6*x + 1), 2), 4.0L/3.0L) + 2*pow(2, 1.0L/3.0L)*(pow(x, 2)*z*(z - 1)*(2*z - 1) + 4*x*z*(x - 1)*(z - 1)*(2*z - 1) + z*pow(x - 1, 2)*(z - 1)*(2*z - 1))/pow(4*pow(pow(x, 2)*z*(x - 1)*(z - 1)*(2*z - 1) + x*z*pow(x - 1, 2)*(z - 1)*(2*z - 1), 2) + 4*pow(2*pow(z, 3)*(2*pow(x, 3) - 3*pow(x, 2) + x) - 3*pow(z, 2)*(2*pow(x, 3) - 3*pow(x, 2) + x) + z*(2*pow(x, 3) - 3*pow(x, 2) + x), 2) + (1.0L/2.0L)*pow(2*pow(x, 2)*z*pow(x - 1, 2)*(z - 1) + pow(x, 2)*z*pow(x - 1, 2)*(2*z - 1) + pow(x, 2)*pow(x - 1, 2)*(z - 1)*(2*z - 1) - pow(z, 4)*(6*pow(x, 2) - 6*x + 1) + 2*pow(z, 3)*(6*pow(x, 2) - 6*x + 1) - pow(z, 2)*(6*pow(x, 2) - 6*x + 1), 2), 1.0L/3.0L) - 1.0L/2.0L + pow(2, 1.0L/3.0L)*(2*pow(x, 2)*z*pow(x - 1, 2) + 2*pow(x, 2)*pow(x - 1, 2)*(z - 1) + pow(x, 2)*pow(x - 1, 2)*(2*z - 1) - 2*pow(z, 3)*(6*pow(x, 2) - 6*x + 1) + 3*pow(z, 2)*(6*pow(x, 2) - 6*x + 1) - z*(6*pow(x, 2) - 6*x + 1))/pow(4*pow(pow(x, 2)*z*(x - 1)*(z - 1)*(2*z - 1) + x*z*pow(x - 1, 2)*(z - 1)*(2*z - 1), 2) + 4*pow(2*pow(z, 3)*(2*pow(x, 3) - 3*pow(x, 2) + x) - 3*pow(z, 2)*(2*pow(x, 3) - 3*pow(x, 2) + x) + z*(2*pow(x, 3) - 3*pow(x, 2) + x), 2) + (1.0L/2.0L)*pow(2*pow(x, 2)*z*pow(x - 1, 2)*(z - 1) + pow(x, 2)*z*pow(x - 1, 2)*(2*z - 1) + pow(x, 2)*pow(x - 1, 2)*(z - 1)*(2*z - 1) - pow(z, 4)*(6*pow(x, 2) - 6*x + 1) + 2*pow(z, 3)*(6*pow(x, 2) - 6*x + 1) - pow(z, 2)*(6*pow(x, 2) - 6*x + 1), 2), 1.0L/3.0L); + case 24: + return 2*pow(2, 1.0L/3.0L)*pow(PI, 2)*pow(p, 2)*sin(PI*p*y)*sin(PI*p*z)*cos(PI*p*x)/pow(6*pow(PI, 2)*pow(p, 2)*pow(sin(PI*p*x), 2)*pow(sin(PI*p*y), 2)*pow(sin(PI*p*z), 2) + (1.0L/2.0L)*pow(-2*PI*p*(cos(PI*p*x) - 1)*sin(PI*p*z)*cos(PI*p*y) + PI*p*(cos(PI*p*y) - 1)*sin(PI*p*z)*cos(PI*p*x), 2) + (1.0L/2.0L)*pow(pow(PI, 2)*pow(p, 2)*(cos(PI*p*z)/(PI*p) - 1/(PI*p))*sin(PI*p*x)*cos(PI*p*y) + PI*p*(cos(PI*p*y) - 1)*sin(PI*p*x)*cos(PI*p*z), 2) + (1.0L/2.0L)*pow(pow(PI, 2)*pow(p, 2)*(cos(PI*p*z)/(PI*p) - 1/(PI*p))*sin(PI*p*y)*cos(PI*p*x) - 2*PI*p*(cos(PI*p*x) - 1)*sin(PI*p*y)*cos(PI*p*z), 2), 1.0L/3.0L) - 2.0L/3.0L*pow(2, 1.0L/3.0L)*PI*p*(12*pow(PI, 3)*pow(p, 3)*sin(PI*p*x)*pow(sin(PI*p*y), 2)*pow(sin(PI*p*z), 2)*cos(PI*p*x) - (-2*PI*p*(cos(PI*p*x) - 1)*sin(PI*p*z)*cos(PI*p*y) + PI*p*(cos(PI*p*y) - 1)*sin(PI*p*z)*cos(PI*p*x))*(pow(PI, 2)*pow(p, 2)*(cos(PI*p*y) - 1)*sin(PI*p*x)*sin(PI*p*z) - 2*pow(PI, 2)*pow(p, 2)*sin(PI*p*x)*sin(PI*p*z)*cos(PI*p*y)) + (pow(PI, 2)*pow(p, 2)*(cos(PI*p*z)/(PI*p) - 1/(PI*p))*sin(PI*p*x)*cos(PI*p*y) + PI*p*(cos(PI*p*y) - 1)*sin(PI*p*x)*cos(PI*p*z))*(pow(PI, 3)*pow(p, 3)*(cos(PI*p*z)/(PI*p) - 1/(PI*p))*cos(PI*p*x)*cos(PI*p*y) + pow(PI, 2)*pow(p, 2)*(cos(PI*p*y) - 1)*cos(PI*p*x)*cos(PI*p*z)) - (pow(PI, 2)*pow(p, 2)*(cos(PI*p*z)/(PI*p) - 1/(PI*p))*sin(PI*p*y)*cos(PI*p*x) - 2*PI*p*(cos(PI*p*x) - 1)*sin(PI*p*y)*cos(PI*p*z))*(pow(PI, 3)*pow(p, 3)*(cos(PI*p*z)/(PI*p) - 1/(PI*p))*sin(PI*p*x)*sin(PI*p*y) - 2*pow(PI, 2)*pow(p, 2)*sin(PI*p*x)*sin(PI*p*y)*cos(PI*p*z)))*sin(PI*p*x)*sin(PI*p*y)*sin(PI*p*z)/pow(6*pow(PI, 2)*pow(p, 2)*pow(sin(PI*p*x), 2)*pow(sin(PI*p*y), 2)*pow(sin(PI*p*z), 2) + (1.0L/2.0L)*pow(-2*PI*p*(cos(PI*p*x) - 1)*sin(PI*p*z)*cos(PI*p*y) + PI*p*(cos(PI*p*y) - 1)*sin(PI*p*z)*cos(PI*p*x), 2) + (1.0L/2.0L)*pow(pow(PI, 2)*pow(p, 2)*(cos(PI*p*z)/(PI*p) - 1/(PI*p))*sin(PI*p*x)*cos(PI*p*y) + PI*p*(cos(PI*p*y) - 1)*sin(PI*p*x)*cos(PI*p*z), 2) + (1.0L/2.0L)*pow(pow(PI, 2)*pow(p, 2)*(cos(PI*p*z)/(PI*p) - 1/(PI*p))*sin(PI*p*y)*cos(PI*p*x) - 2*PI*p*(cos(PI*p*x) - 1)*sin(PI*p*y)*cos(PI*p*z), 2), 4.0L/3.0L) + PI*q*sin(PI*q*y)*sin(PI*q*z)*cos(PI*q*x) - 1.0L/6.0L*pow(2, 1.0L/3.0L)*(-2*PI*p*(cos(PI*p*x) - 1)*sin(PI*p*z)*cos(PI*p*y) + PI*p*(cos(PI*p*y) - 1)*sin(PI*p*z)*cos(PI*p*x))*(12*pow(PI, 3)*pow(p, 3)*pow(sin(PI*p*x), 2)*sin(PI*p*y)*pow(sin(PI*p*z), 2)*cos(PI*p*y) + (-2*PI*p*(cos(PI*p*x) - 1)*sin(PI*p*z)*cos(PI*p*y) + PI*p*(cos(PI*p*y) - 1)*sin(PI*p*z)*cos(PI*p*x))*(2*pow(PI, 2)*pow(p, 2)*(cos(PI*p*x) - 1)*sin(PI*p*y)*sin(PI*p*z) - pow(PI, 2)*pow(p, 2)*sin(PI*p*y)*sin(PI*p*z)*cos(PI*p*x)) - (pow(PI, 2)*pow(p, 2)*(cos(PI*p*z)/(PI*p) - 1/(PI*p))*sin(PI*p*x)*cos(PI*p*y) + PI*p*(cos(PI*p*y) - 1)*sin(PI*p*x)*cos(PI*p*z))*(pow(PI, 3)*pow(p, 3)*(cos(PI*p*z)/(PI*p) - 1/(PI*p))*sin(PI*p*x)*sin(PI*p*y) + pow(PI, 2)*pow(p, 2)*sin(PI*p*x)*sin(PI*p*y)*cos(PI*p*z)) + (pow(PI, 2)*pow(p, 2)*(cos(PI*p*z)/(PI*p) - 1/(PI*p))*sin(PI*p*y)*cos(PI*p*x) - 2*PI*p*(cos(PI*p*x) - 1)*sin(PI*p*y)*cos(PI*p*z))*(pow(PI, 3)*pow(p, 3)*(cos(PI*p*z)/(PI*p) - 1/(PI*p))*cos(PI*p*x)*cos(PI*p*y) - 2*pow(PI, 2)*pow(p, 2)*(cos(PI*p*x) - 1)*cos(PI*p*y)*cos(PI*p*z)))/pow(6*pow(PI, 2)*pow(p, 2)*pow(sin(PI*p*x), 2)*pow(sin(PI*p*y), 2)*pow(sin(PI*p*z), 2) + (1.0L/2.0L)*pow(-2*PI*p*(cos(PI*p*x) - 1)*sin(PI*p*z)*cos(PI*p*y) + PI*p*(cos(PI*p*y) - 1)*sin(PI*p*z)*cos(PI*p*x), 2) + (1.0L/2.0L)*pow(pow(PI, 2)*pow(p, 2)*(cos(PI*p*z)/(PI*p) - 1/(PI*p))*sin(PI*p*x)*cos(PI*p*y) + PI*p*(cos(PI*p*y) - 1)*sin(PI*p*x)*cos(PI*p*z), 2) + (1.0L/2.0L)*pow(pow(PI, 2)*pow(p, 2)*(cos(PI*p*z)/(PI*p) - 1/(PI*p))*sin(PI*p*y)*cos(PI*p*x) - 2*PI*p*(cos(PI*p*x) - 1)*sin(PI*p*y)*cos(PI*p*z), 2), 4.0L/3.0L) - 1.0L/6.0L*pow(2, 1.0L/3.0L)*(pow(PI, 2)*pow(p, 2)*(cos(PI*p*z)/(PI*p) - 1/(PI*p))*sin(PI*p*y)*cos(PI*p*x) - 2*PI*p*(cos(PI*p*x) - 1)*sin(PI*p*y)*cos(PI*p*z))*(12*pow(PI, 3)*pow(p, 3)*pow(sin(PI*p*x), 2)*pow(sin(PI*p*y), 2)*sin(PI*p*z)*cos(PI*p*z) + (-2*PI*p*(cos(PI*p*x) - 1)*sin(PI*p*z)*cos(PI*p*y) + PI*p*(cos(PI*p*y) - 1)*sin(PI*p*z)*cos(PI*p*x))*(-2*pow(PI, 2)*pow(p, 2)*(cos(PI*p*x) - 1)*cos(PI*p*y)*cos(PI*p*z) + pow(PI, 2)*pow(p, 2)*(cos(PI*p*y) - 1)*cos(PI*p*x)*cos(PI*p*z)) - (pow(PI, 2)*pow(p, 2)*(cos(PI*p*z)/(PI*p) - 1/(PI*p))*sin(PI*p*x)*cos(PI*p*y) + PI*p*(cos(PI*p*y) - 1)*sin(PI*p*x)*cos(PI*p*z))*(pow(PI, 2)*pow(p, 2)*(cos(PI*p*y) - 1)*sin(PI*p*x)*sin(PI*p*z) + pow(PI, 2)*pow(p, 2)*sin(PI*p*x)*sin(PI*p*z)*cos(PI*p*y)) + (pow(PI, 2)*pow(p, 2)*(cos(PI*p*z)/(PI*p) - 1/(PI*p))*sin(PI*p*y)*cos(PI*p*x) - 2*PI*p*(cos(PI*p*x) - 1)*sin(PI*p*y)*cos(PI*p*z))*(2*pow(PI, 2)*pow(p, 2)*(cos(PI*p*x) - 1)*sin(PI*p*y)*sin(PI*p*z) - pow(PI, 2)*pow(p, 2)*sin(PI*p*y)*sin(PI*p*z)*cos(PI*p*x)))/pow(6*pow(PI, 2)*pow(p, 2)*pow(sin(PI*p*x), 2)*pow(sin(PI*p*y), 2)*pow(sin(PI*p*z), 2) + (1.0L/2.0L)*pow(-2*PI*p*(cos(PI*p*x) - 1)*sin(PI*p*z)*cos(PI*p*y) + PI*p*(cos(PI*p*y) - 1)*sin(PI*p*z)*cos(PI*p*x), 2) + (1.0L/2.0L)*pow(pow(PI, 2)*pow(p, 2)*(cos(PI*p*z)/(PI*p) - 1/(PI*p))*sin(PI*p*x)*cos(PI*p*y) + PI*p*(cos(PI*p*y) - 1)*sin(PI*p*x)*cos(PI*p*z), 2) + (1.0L/2.0L)*pow(pow(PI, 2)*pow(p, 2)*(cos(PI*p*z)/(PI*p) - 1/(PI*p))*sin(PI*p*y)*cos(PI*p*x) - 2*PI*p*(cos(PI*p*x) - 1)*sin(PI*p*y)*cos(PI*p*z), 2), 4.0L/3.0L) + pow(2, 1.0L/3.0L)*(2*pow(PI, 2)*pow(p, 2)*(cos(PI*p*x) - 1)*sin(PI*p*y)*sin(PI*p*z) - pow(PI, 2)*pow(p, 2)*sin(PI*p*y)*sin(PI*p*z)*cos(PI*p*x))/pow(6*pow(PI, 2)*pow(p, 2)*pow(sin(PI*p*x), 2)*pow(sin(PI*p*y), 2)*pow(sin(PI*p*z), 2) + (1.0L/2.0L)*pow(-2*PI*p*(cos(PI*p*x) - 1)*sin(PI*p*z)*cos(PI*p*y) + PI*p*(cos(PI*p*y) - 1)*sin(PI*p*z)*cos(PI*p*x), 2) + (1.0L/2.0L)*pow(pow(PI, 2)*pow(p, 2)*(cos(PI*p*z)/(PI*p) - 1/(PI*p))*sin(PI*p*x)*cos(PI*p*y) + PI*p*(cos(PI*p*y) - 1)*sin(PI*p*x)*cos(PI*p*z), 2) + (1.0L/2.0L)*pow(pow(PI, 2)*pow(p, 2)*(cos(PI*p*z)/(PI*p) - 1/(PI*p))*sin(PI*p*y)*cos(PI*p*x) - 2*PI*p*(cos(PI*p*x) - 1)*sin(PI*p*y)*cos(PI*p*z), 2), 1.0L/3.0L); + + case 101: + return 4*pow(x, 2)*y*z*pow(x - 1, 2)*(z - 1) + 8*pow(x, 2)*y*z*(y - 1)*(2*y - 1)*(z - 1) + 2*pow(x, 2)*y*pow(x - 1, 2)*(y - 1)*(2*y - 1) + 4*pow(x, 2)*z*pow(x - 1, 2)*(y - 1)*(z - 1) + 2*pow(x, 2)*z*pow(x - 1, 2)*(2*y - 1)*(z - 1) - 12*x*pow(y, 2)*z*(x - 1)*(y - 1)*(z - 1) - 6*x*pow(y, 2)*z*(2*x - 1)*(y - 1)*(z - 1) - 12*x*y*z*(x - 1)*pow(y - 1, 2)*(z - 1) + 32*x*y*z*(x - 1)*(y - 1)*(2*y - 1)*(z - 1) - 6*x*y*z*(2*x - 1)*pow(y - 1, 2)*(z - 1) - 6*pow(y, 2)*z*(x - 1)*(2*x - 1)*(y - 1)*(z - 1) + 8*y*z*pow(x - 1, 2)*(y - 1)*(2*y - 1)*(z - 1) - 6*y*z*(x - 1)*(2*x - 1)*pow(y - 1, 2)*(z - 1); + default: + _error_("FS analytical solution"<(ngaus); @@ -1199,5 +1211,5 @@ }/*}}}*/ /*FUNCTION GaussLegendreTetra{{{*/ -void GaussLegendreTetra( int* pngaus, IssmPDouble** pl1, IssmPDouble** pl2, IssmPDouble** pl3, IssmPDouble** pl4, IssmPDouble** pwgt, int iord ) { +void GaussLegendreTetra( int* pngaus, IssmDouble** pl1, IssmDouble** pl2, IssmDouble** pl3, IssmDouble** pl4, IssmDouble** pwgt, int iord ) { /* Gauss quadrature points for the tetrahedron. @@ -1252,4 +1264,7 @@ static IssmPDouble l13[]={ 0.250000000000000, 0.500000000000000, 0.166666666666667, + 0.166666666666667, 0.166666666666667}; + static IssmPDouble l23[]={ + 0.250000000000000, 0.166666666666667, 0.500000000000000, 0.166666666666667, 0.166666666666667}; static IssmPDouble l33[]={ @@ -1376,5 +1391,5 @@ static IssmPDouble* wgtp[MAX_TETRA_SYM_ORD]={wgt1,wgt2,wgt3,wgt4,wgt5,wgt6}; static IssmPDouble* l1p [MAX_TETRA_SYM_ORD]={l11 ,l12 ,l13 ,l14 ,l15 ,l16 }; - static IssmPDouble* l2p [MAX_TETRA_SYM_ORD]={l21 ,l22 ,l32 ,l24 ,l25 ,l26 }; + static IssmPDouble* l2p [MAX_TETRA_SYM_ORD]={l21 ,l22 ,l23 ,l24 ,l25 ,l26 }; static IssmPDouble* l3p [MAX_TETRA_SYM_ORD]={l31 ,l32 ,l33 ,l34 ,l35 ,l36 }; static IssmPDouble* l4p [MAX_TETRA_SYM_ORD]={l41 ,l42 ,l43 ,l44 ,l45 ,l46 }; @@ -1399,9 +1414,9 @@ *pngaus=np[iord-1]; - *pl1 =xNew(*pngaus); - *pl2 =xNew(*pngaus); - *pl3 =xNew(*pngaus); - *pl4 =xNew(*pngaus); - *pwgt =xNew(*pngaus); + *pl1 =xNew(*pngaus); + *pl2 =xNew(*pngaus); + *pl3 =xNew(*pngaus); + *pl4 =xNew(*pngaus); + *pwgt =xNew(*pngaus); for (i=0; i<*pngaus; i++) { @@ -1419,9 +1434,9 @@ *pngaus=nigaus*nigaus*nigaus; - *pl1 =xNew(*pngaus); - *pl2 =xNew(*pngaus); - *pl3 =xNew(*pngaus); - *pl4 =xNew(*pngaus); - *pwgt =xNew(*pngaus); + *pl1 =xNew(*pngaus); + *pl2 =xNew(*pngaus); + *pl3 =xNew(*pngaus); + *pl4 =xNew(*pngaus); + *pwgt =xNew(*pngaus); /* get the gauss points in each direction */ Index: /issm/trunk/src/c/shared/Numerics/GaussPoints.h =================================================================== --- /issm/trunk/src/c/shared/Numerics/GaussPoints.h (revision 17805) +++ /issm/trunk/src/c/shared/Numerics/GaussPoints.h (revision 17806) @@ -7,10 +7,10 @@ #define _GAUSSPOINTS_H -#define MAX_LINE_GAUS_PTS 4 +#define MAX_LINE_GAUS_PTS 7 void GaussLegendreLinear(IssmPDouble** pxgaus, IssmPDouble** pxwgt, int ngaus); #define MAX_TRIA_SYM_ORD 20 void GaussLegendreTria(int* pngaus, IssmDouble** pl1, IssmDouble** pl2, IssmDouble** pl3, IssmDouble** pwgt, int iord); #define MAX_TETRA_SYM_ORD 6 -void GaussLegendreTetra(int* pngaus, IssmPDouble** pl1, IssmPDouble** pl2, IssmPDouble** pl3, IssmPDouble** pl4, IssmPDouble** pwgt, int iord); +void GaussLegendreTetra(int* pngaus, IssmDouble** pl1, IssmDouble** pl2, IssmDouble** pl3, IssmDouble** pl4, IssmDouble** pwgt, int iord); #define MAX_LINE_GLOB_PTS 5 void GaussLobatto(IssmPDouble** pxgaus, IssmPDouble** pxwgt, int ngaus); Index: /issm/trunk/src/c/shared/Numerics/NewtonSolveDnorm.cpp =================================================================== --- /issm/trunk/src/c/shared/Numerics/NewtonSolveDnorm.cpp (revision 17806) +++ /issm/trunk/src/c/shared/Numerics/NewtonSolveDnorm.cpp (revision 17806) @@ -0,0 +1,53 @@ +#include +#include "./types.h" +#include "../Exceptions/exceptions.h" + +int NewtonSolveDnorm(IssmDouble* pdnorm,IssmDouble c1,IssmDouble c2,IssmDouble c3,IssmDouble n,IssmDouble dnorm){ + /* solve the following equation using Newton-Raphson + * + * c1*x^(s-1) + c2*x = c3 + * + * s = (1+n)/n + * + * we solve y = 10^x: + */ + + /*trivial solution*/ + if(c3==0.){ + *pdnorm = 0.; + return 0; + } + + /*Intermediaries*/ + int counter = 0; + IssmDouble s = (1.+n)/n; + IssmDouble y2; + IssmDouble threshold = 1.e-12; + + /*Initial guess*/ + _assert_(dnorm>0.); + IssmDouble y1 = log10(dnorm); + + while(true){ + + /*Newton step*/ + y2 = y1 - (c1*pow(pow(10.,y1),s-1.) + c2*pow(10.,y1) - c3)/((s-1)*c1*log(10.)*pow(pow(10.,y1),s-1.) + c2*log(10.)*pow(10.,y1)); + + if( fabs(y2-y1)/(fabs(y2))50) break; + } + + /*Avoid extremely large values that indicate non convergence*/ + if(y2>50.) y2 = 50; + + /*Assign output pointer*/ + *pdnorm = pow(10.,y2); + return 0; +} Index: /issm/trunk/src/c/shared/Numerics/numerics.h =================================================================== --- /issm/trunk/src/c/shared/Numerics/numerics.h (revision 17805) +++ /issm/trunk/src/c/shared/Numerics/numerics.h (revision 17806) @@ -38,3 +38,5 @@ int cubic(IssmDouble a, IssmDouble b, IssmDouble c, IssmDouble d, double X[3], int *num); +int NewtonSolveDnorm(IssmDouble* pdnorm,IssmDouble c1,IssmDouble c2,IssmDouble c3,IssmDouble n,IssmDouble dnorm); + #endif //ifndef _NUMERICS_H_ Index: /issm/trunk/src/c/shared/shared.h =================================================================== --- /issm/trunk/src/c/shared/shared.h (revision 17805) +++ /issm/trunk/src/c/shared/shared.h (revision 17806) @@ -6,4 +6,5 @@ #define _SHARED_H_ +#include "./FSanalyticals/fsanalyticals.h" #include "./MemOps/MemOps.h" #include "./Bamg/shared.h" Index: sm/trunk/src/c/solutionsequences/solutionsequence_damage_nonlinear.cpp =================================================================== --- /issm/trunk/src/c/solutionsequences/solutionsequence_damage_nonlinear.cpp (revision 17805) +++ (revision ) @@ -1,80 +1,0 @@ -/* - * \brief: solutionsequence_damage_nonlinear.cpp: core of the damage solution - */ - -#include "../toolkits/toolkits.h" -#include "../classes/classes.h" -#include "../shared/shared.h" -#include "../modules/modules.h" - -void solutionsequence_damage_nonlinear(FemModel* femmodel){ - - /*solution : */ - Vector* Dg=NULL; - Vector* Df=NULL; - Vector* Df_old=NULL; - Vector* ys=NULL; - - /*intermediary: */ - Matrix* Kff=NULL; - Matrix* Kfs=NULL; - Vector* pf=NULL; - Vector* df=NULL; - - bool converged; - int constraints_converged; - int num_unstable_constraints; - int count; - int damage_penalty_threshold; - int damage_maxiter; - - /*parameters:*/ - int configuration_type; - - /*Recover parameters: */ - femmodel->parameters->FindParam(&damage_penalty_threshold,DamagePenaltyThresholdEnum); - femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum); - femmodel->parameters->FindParam(&damage_maxiter,DamageMaxiterEnum); - - count=1; - converged=false; - - InputUpdateFromConstantx(femmodel,true,ResetPenaltiesEnum); - InputUpdateFromConstantx(femmodel,false,ConvergedEnum); - femmodel->UpdateConstraintsx(); - - for(;;){ - - delete Df_old; Df_old=Df; - SystemMatricesx(&Kff, &Kfs, &pf,&df, NULL,femmodel); - CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type); - Reduceloadx(pf, Kfs, ys); delete Kfs; - Solverx(&Df, Kff, pf,Df_old, df, femmodel->parameters); - delete Kff;delete pf;delete Dg; delete df; - Mergesolutionfromftogx(&Dg, Df,ys,femmodel->nodes,femmodel->parameters); delete ys; - InputUpdateFromSolutionx(femmodel,Dg); - - ConstraintsStatex(&constraints_converged,&num_unstable_constraints,femmodel); - - if (!converged){ - if(VerboseConvergence()) _printf0_(" #unstable constraints = " << num_unstable_constraints << "\n"); - if (num_unstable_constraints <= damage_penalty_threshold)converged=true; - if (count>=damage_maxiter){ - converged=true; - _printf0_(" maximum number of iterations (" << damage_maxiter << ") exceeded\n"); - } - } - count++; - - InputUpdateFromConstantx(femmodel,converged,ConvergedEnum); - - if(converged)break; - } - - InputUpdateFromSolutionx(femmodel,Dg); - - /*Free ressources: */ - delete Dg; - delete Df; - delete Df_old; -} Index: /issm/trunk/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp =================================================================== --- /issm/trunk/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp (revision 17805) +++ /issm/trunk/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp (revision 17806) @@ -7,4 +7,6 @@ #include "../shared/shared.h" #include "../modules/modules.h" +/*FIXME, dirty hack to get the solutionsequence linear needed to compute the slopes*/ +#include "../solutionsequences/solutionsequences.h" void solutionsequence_hydro_nonlinear(FemModel* femmodel){ @@ -18,14 +20,20 @@ Vector* uf_epl=NULL; Vector* uf_epl_sub_iter=NULL; + Vector* ug_epl_sub_iter=NULL; Vector* ug_epl_main_iter=NULL; Vector* ys=NULL; Vector* dug=NULL; + Vector* duf=NULL; Matrix* Kff=NULL; Matrix* Kfs=NULL; + Vector* pf=NULL; Vector* df=NULL; + HydrologyDCInefficientAnalysis* inefanalysis = NULL; + HydrologyDCEfficientAnalysis* effanalysis = NULL; + bool sedconverged,eplconverged,hydroconverged; bool isefficientlayer; @@ -34,5 +42,5 @@ int sedcount,eplcount,hydrocount; int hydro_maxiter; - IssmDouble sediment_kmax,time; + IssmDouble sediment_kmax; IssmDouble eps_hyd; IssmDouble ndu_sed,nu_sed; @@ -42,31 +50,38 @@ femmodel->SetCurrentConfiguration(HydrologyDCInefficientAnalysisEnum); femmodel->parameters->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum); + femmodel->parameters->FindParam(&hydro_maxiter,HydrologydcMaxIterEnum); femmodel->parameters->FindParam(&eps_hyd,HydrologydcRelTolEnum); - femmodel->parameters->FindParam(&time,TimeEnum); - hydro_maxiter=150; + hydrocount=1; hydroconverged=false; + /*We don't need the outer loop if only one layer is used*/ + if(!isefficientlayer) hydroconverged=true; /*Retrieve inputs as the initial state for the non linear iteration*/ - //femmodel->SetCurrentConfiguration(HydrologyDCInefficientAnalysisEnum); - GetSolutionFromInputsx(&ug_sed,femmodel); + GetSolutionFromInputsx(&ug_sed,femmodel); + Reducevectorgtofx(&uf_sed, ug_sed, femmodel->nodes,femmodel->parameters); if(isefficientlayer) { + inefanalysis = new HydrologyDCInefficientAnalysis(); + effanalysis = new HydrologyDCEfficientAnalysis(); femmodel->SetCurrentConfiguration(HydrologyDCEfficientAnalysisEnum); GetSolutionFromInputsx(&ug_epl,femmodel); + /*Initialize the element mask*/ + inefanalysis->ElementizeEplMask(femmodel); } - - /*Iteration on the two layers*/ + /*The real computation starts here, outermost loop is on the two layer system*/ for(;;){ + sedcount=1; eplcount=1; - //save pointer to old velocity - ug_sed_main_iter=ug_sed->Duplicate(); - ug_sed->Copy(ug_sed_main_iter); + + /*If there is two layers we need an outer loop value to compute convergence*/ if(isefficientlayer){ + ug_sed_main_iter=ug_sed->Duplicate(); + ug_sed->Copy(ug_sed_main_iter); ug_epl_main_iter=ug_epl->Duplicate(); ug_epl->Copy(ug_epl_main_iter); } - + /*Loop on sediment layer to deal with transfer and head value*/ femmodel->SetCurrentConfiguration(HydrologyDCInefficientAnalysisEnum); InputUpdateFromConstantx(femmodel,true,ResetPenaltiesEnum); @@ -74,32 +89,62 @@ femmodel->UpdateConstraintsx(); femmodel->parameters->SetParam(HydrologySedimentEnum,HydrologyLayerEnum); - - /*Iteration on the sediment layer*/ - sedconverged=false; + + /*Reset constraint on the ZigZag Lock, this thing doesn't work, it have to disapear*/ + ResetConstraintsx(femmodel); + + /* {{{ *//*Treating the sediment*/ for(;;){ - femmodel->HydrologyTransferx(); - SystemMatricesx(&Kff,&Kfs,&pf,&df,&sediment_kmax,femmodel); - CreateNodalConstraintsx(&ys,femmodel->nodes,HydrologyDCInefficientAnalysisEnum); - Reduceloadx(pf,Kfs,ys); delete Kfs; - delete uf_sed; - Solverx(&uf_sed,Kff,pf,uf_sed_sub_iter,df,femmodel->parameters); - delete Kff; delete pf; delete df; + sedconverged=false; + uf_sed_sub_iter=uf_sed->Duplicate();_assert_(uf_sed_sub_iter); + uf_sed->Copy(uf_sed_sub_iter); + /* {{{ *//*Loop on the sediment layer to deal with the penalization*/ + for(;;){ + /* {{{ *//*Core of the computation*/ + if(VerboseSolution()) _printf0_("Building Sediment Matrix...\n"); + SystemMatricesx(&Kff,&Kfs,&pf,&df,&sediment_kmax,femmodel); + CreateNodalConstraintsx(&ys,femmodel->nodes,HydrologyDCInefficientAnalysisEnum); + Reduceloadx(pf,Kfs,ys); delete Kfs; + delete uf_sed; + Solverx(&uf_sed,Kff,pf,uf_sed_sub_iter,df,femmodel->parameters); + delete Kff; delete pf; delete df; + delete ug_sed; + Mergesolutionfromftogx(&ug_sed,uf_sed,ys,femmodel->nodes,femmodel->parameters); delete ys; + InputUpdateFromSolutionx(femmodel,ug_sed); + ConstraintsStatex(&constraints_converged,&num_unstable_constraints,femmodel); + /* }}} */ + if (!sedconverged){ + if(VerboseConvergence()) _printf0_(" # Sediment unstable constraints = " << num_unstable_constraints << "\n"); + if(num_unstable_constraints==0) sedconverged = true; + if (sedcount>=hydro_maxiter){ + _error_(" maximum number of Sediment iterations (" << hydro_maxiter << ") exceeded"); + } + } + /*Add an iteration and get out of the loop if the penalisation is converged*/ + sedcount++; + if(sedconverged)break; + } + + /* }}} *//*End of the sediment penalization loop*/ + /*Update EPL mask*/ + if(isefficientlayer){ + inefanalysis->ElementizeEplMask(femmodel); + } + sedconverged=false; + + /*Checking convegence on the value of the sediment head*/ + duf=uf_sed_sub_iter->Duplicate();_assert_(duf); + uf_sed_sub_iter->Copy(duf); + duf->AYPX(uf_sed,-1.0); + ndu_sed=duf->Norm(NORM_TWO); + delete duf; + nu_sed=uf_sed_sub_iter->Norm(NORM_TWO); + if (xIsNan(ndu_sed) || xIsNan(nu_sed)) _error_("convergence criterion is NaN!"); + if (ndu_sed==0.0 && nu_sed==0.0) nu_sed=1.0e-6; /*Hacking the case where the layer is empty*/ + if(VerboseConvergence()) _printf0_(setw(50) << left << " Inner Sediment Convergence criterion:" << ndu_sed/nu_sed*100 << "%, aiming lower than " << eps_hyd*10*100 << " %\n"); + if((ndu_sed/nu_sed)Duplicate(); - uf_sed->Copy(uf_sed_sub_iter); - delete ug_sed; - Mergesolutionfromftogx(&ug_sed,uf_sed,ys,femmodel->nodes,femmodel->parameters); delete ys; - InputUpdateFromSolutionx(femmodel,ug_sed); - ConstraintsStatex(&constraints_converged,&num_unstable_constraints,femmodel); - - if (!sedconverged){ - if(VerboseConvergence()) _printf0_(" # Sediment unstable constraints = " << num_unstable_constraints << "\n"); - if(num_unstable_constraints==0) sedconverged = true; - if (sedcount>=hydro_maxiter){ - _error_(" maximum number of Sediment iterations (" << hydro_maxiter << ") exceeded"); - } - } - sedcount++; - if(sedconverged){ femmodel->parameters->SetParam(sediment_kmax,HydrologySedimentKmaxEnum); @@ -110,17 +155,37 @@ } } - - /*Second layer*/ + /* }}} *//*End of the global sediment loop*/ + /* {{{ *//*Now dealing with the EPL in the same way*/ if(isefficientlayer){ femmodel->SetCurrentConfiguration(HydrologyDCEfficientAnalysisEnum); + /*updating mask*/ + femmodel->HydrologyEPLupdateDomainx(); InputUpdateFromConstantx(femmodel,true,ResetPenaltiesEnum); InputUpdateFromConstantx(femmodel,false,ConvergedEnum); - femmodel->HydrologyEPLupdateDomainx(); femmodel->parameters->SetParam(HydrologyEfficientEnum,HydrologyLayerEnum); - /*Iteration on the EPL layer*/ - eplconverged = false; for(;;){ - femmodel->HydrologyTransferx(); + eplconverged=false; + ug_epl_sub_iter=ug_epl->Duplicate();_assert_(ug_epl_sub_iter); + ug_epl->Copy(ug_epl_sub_iter); + /* {{{ *//*Retrieve the EPL head slopes and compute EPL Thickness*/ + if(VerboseSolution()) _printf0_("computing EPL Head slope...\n"); + inefanalysis->ElementizeEplMask(femmodel); + femmodel->SetCurrentConfiguration(L2ProjectionEPLAnalysisEnum); + femmodel->UpdateConstraintsL2ProjectionEPLx(); + femmodel->parameters->SetParam(EplHeadSlopeXEnum,InputToL2ProjectEnum); + solutionsequence_linear(femmodel); + femmodel->parameters->SetParam(EplHeadSlopeYEnum,InputToL2ProjectEnum); + solutionsequence_linear(femmodel); + femmodel->SetCurrentConfiguration(HydrologyDCEfficientAnalysisEnum); + + effanalysis->ComputeEPLThickness(femmodel); + + //updating mask after the computation of the epl thickness (Allow to close too thin EPL) + femmodel->HydrologyEPLupdateDomainx(); + inefanalysis->ElementizeEplMask(femmodel); + /* }}} */ + + if(VerboseSolution()) _printf0_("Building EPL Matrix...\n"); SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel); CreateNodalConstraintsx(&ys,femmodel->nodes,HydrologyDCEfficientAnalysisEnum); @@ -129,5 +194,5 @@ Solverx(&uf_epl,Kff,pf,uf_epl_sub_iter,df,femmodel->parameters); delete Kff; delete pf; delete df; - delete uf_epl_sub_iter; + delete uf_epl_sub_iter; uf_epl_sub_iter=uf_epl->Duplicate(); uf_epl->Copy(uf_epl_sub_iter); @@ -136,18 +201,24 @@ InputUpdateFromSolutionx(femmodel,ug_epl); ConstraintsStatex(&constraints_converged,&num_unstable_constraints,femmodel); - femmodel->HydrologyEPLupdateDomainx(); - - if (!eplconverged){ - if(VerboseConvergence()) _printf0_(" # EPL unstable constraints = " << num_unstable_constraints << "\n"); - if(num_unstable_constraints==0) eplconverged = true; - if (eplcount>=hydro_maxiter){ - _error_(" maximum number of EPL iterations (" << hydro_maxiter << ") exceeded"); - } + + dug=ug_epl_sub_iter->Duplicate();_assert_(dug); + ug_epl_sub_iter->Copy(dug); + dug->AYPX(ug_epl,-1.0); + ndu_epl=dug->Norm(NORM_TWO); + delete dug; + nu_epl=ug_epl_sub_iter->Norm(NORM_TWO); + if (xIsNan(ndu_epl) || xIsNan(nu_epl)) _error_("convergence criterion is NaN!"); + if (ndu_epl==0.0 && nu_epl==0.0) nu_epl=1.0e-6; /*Hacking the case where the EPL is used but empty*/ + if(VerboseConvergence()) _printf0_(setw(50) << left << " Inner EPL Convergence criterion:" << ndu_epl/nu_epl*100 << "%, aiming lower than " << eps_hyd*10*100 << " %\n"); + if((ndu_epl/nu_epl)=hydro_maxiter){ + _error_(" maximum number of EPL iterations (" << hydro_maxiter << ") exceeded"); } eplcount++; - + + delete ug_epl_sub_iter; if(eplconverged){ + if(VerboseSolution()) _printf0_("eplconverged...\n"); InputUpdateFromConstantx(femmodel,eplconverged,ConvergedEnum); - InputUpdateFromConstantx(femmodel,sediment_kmax,MeltingOffsetEnum); InputUpdateFromSolutionx(femmodel,ug_epl); break; @@ -155,8 +226,10 @@ } } - /*System convergence check*/ + /* }}} */ /*End of the global EPL loop*/ + + /* {{{ */ /*Now dealing with the convergence of the whole system*/ if(!hydroconverged){ //compute norm(du)/norm(u) - dug=ug_sed->Duplicate(); _assert_(dug); + dug=ug_sed_main_iter->Duplicate(); _assert_(dug); ug_sed_main_iter->Copy(dug); dug->AYPX(ug_sed,-1.0); @@ -166,34 +239,23 @@ delete ug_sed_main_iter; if (xIsNan(ndu_sed) || xIsNan(nu_sed)) _error_("Sed convergence criterion is NaN!"); + if (ndu_sed==0.0 && nu_sed==0.0) nu_sed=1.0e-6; /*Hacking the case where the Sediment is used but empty*/ + dug=ug_epl_main_iter->Duplicate();_assert_(dug); + ug_epl_main_iter->Copy(dug); + dug->AYPX(ug_epl,-1.0); + ndu_epl=dug->Norm(NORM_TWO); + delete dug; + nu_epl=ug_epl_main_iter->Norm(NORM_TWO); + delete ug_epl_main_iter; + if (xIsNan(ndu_epl) || xIsNan(nu_epl)) _error_("EPL convergence criterion is NaN!"); + if (ndu_epl==0.0 && nu_epl==0.0) nu_epl=1.0e-6; /*Hacking the case where the EPL is used but empty*/ if (!xIsNan(eps_hyd)){ - if (!isefficientlayer){ - if ((ndu_sed/nu_sed) " << eps_hyd*100 << " %\n"); - hydroconverged=false; - } - } - else{ - dug=ug_epl->Duplicate();_assert_(dug); - ug_epl_main_iter->Copy(dug);_assert_(ug_epl_main_iter); - dug->AYPX(ug_epl,-1.0); - ndu_epl=dug->Norm(NORM_TWO); - delete dug; - nu_epl=ug_epl_main_iter->Norm(NORM_TWO); - delete ug_epl_main_iter; - if (xIsNan(ndu_epl) || xIsNan(nu_epl)) _error_("EPL convergence criterion is NaN!"); - if (ndu_epl==0.0 && nu_epl==0.0) nu_epl=1.0e-6; /*Hacking the case where the EPL is used but empty*/ - if ((ndu_epl/nu_epl)SetCurrentConfiguration(HydrologyDCInefficientAnalysisEnum); InputUpdateFromSolutionx(femmodel,ug_sed); - if(isefficientlayer)InputUpdateFromSolutionx(femmodel,ug_epl); - /*Free ressources: */ delete ug_epl; @@ -215,6 +277,6 @@ delete uf_sed; delete uf_epl; - delete uf_sed_sub_iter; delete uf_epl_sub_iter; - //delete dug; + delete inefanalysis; + delete effanalysis; } Index: /issm/trunk/src/c/solutionsequences/solutionsequence_la_theta.cpp =================================================================== --- /issm/trunk/src/c/solutionsequences/solutionsequence_la_theta.cpp (revision 17806) +++ /issm/trunk/src/c/solutionsequences/solutionsequence_la_theta.cpp (revision 17806) @@ -0,0 +1,102 @@ +/*!\file: solutionsequence_la_theta.cpp + * \brief: numerical core of la_theta solutions + */ + +#include "../toolkits/toolkits.h" +#include "../classes/classes.h" +#include "../shared/shared.h" +#include "../modules/modules.h" + +void solutionsequence_la_theta(FemModel* femmodel){ + + /*intermediary: */ + Matrix* Kff = NULL; + Matrix* Kfs = NULL; + Vector* ug_old = NULL; + Vector* ug = NULL; + Vector* uf = NULL; + Vector* pf = NULL; + Vector* df = NULL; + Vector* ys = NULL; + IssmDouble eps_rel,r,theta; // 0 .15parameters->FindParam(&configuration_type,ConfigurationTypeEnum); + femmodel->parameters->FindParam(&eps_rel,StressbalanceReltolEnum); + femmodel->parameters->FindParam(&max_nonlinear_iterations,StressbalanceMaxiterEnum); + femmodel->parameters->FindParam(&r,AugmentedLagrangianREnum); + femmodel->parameters->FindParam(&theta,AugmentedLagrangianThetaEnum); + + /*Update constraints and initialize d and tau if necessary*/ + femmodel->UpdateConstraintsx(); + analysis->InitializeXTH(femmodel->elements,femmodel->parameters); + + /*Convergence criterion*/ + int count = 0; + GetSolutionFromInputsx(&ug,femmodel); + Vector* vx = NULL; + Vector* vx_old = NULL; + GetVectorFromInputsx(&vx,femmodel,VxEnum,VertexEnum); + + while(true){ + count++; + + /*save pointer to old velocity*/ + delete ug_old;ug_old=ug; + delete vx_old;vx_old=vx; + + /*Calculate d*/ + if(theta>0.){ + analysis->InputUpdateFromSolutionFSXTH_d(femmodel->elements,femmodel->parameters); + } + + /*Solve KU=F*/ + SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel); + CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type); + Reduceloadx(pf, Kfs, ys); delete Kfs; + Solverx(&uf, Kff, pf, NULL, df, femmodel->parameters); + delete Kff; delete pf; delete df; + Mergesolutionfromftogx(&ug, uf,ys,femmodel->nodes,femmodel->parameters);delete uf; delete ys; + + /*Update solution*/ + InputUpdateFromSolutionx(femmodel,ug); + + /*Update d and tau accordingly*/ + analysis->InputUpdateFromSolutionFSXTH_d( femmodel->elements,femmodel->parameters); + analysis->InputUpdateFromSolutionFSXTH_tau(femmodel->elements,femmodel->parameters); + GetVectorFromInputsx(&vx,femmodel,VxEnum,VertexEnum); + + /*Check for convergence*/ + //Vector* dug=ug_old->Duplicate(); ug_old->Copy(dug); dug->AYPX(ug,-1.0); + //IssmDouble ndu=dug->Norm(NORM_TWO); delete dug; + //IssmDouble nu =ug_old->Norm(NORM_TWO); + Vector* dvx=vx_old->Duplicate(); vx_old->Copy(dvx); dvx->AYPX(vx,-1.0); + IssmDouble ndu=dvx->Norm(NORM_TWO); delete dvx; + IssmDouble nu =vx_old->Norm(NORM_TWO); + if (xIsNan(ndu) || xIsNan(nu)) _error_("convergence criterion is NaN!"); + if((ndu/nu) " << eps_rel*100 << " %\n"); + } + + if(count>=max_nonlinear_iterations){ + _printf0_(" maximum number of nonlinear iterations (" << max_nonlinear_iterations << ") exceeded\n"); + break; + } + } + + if(VerboseConvergence()) _printf0_("\n total number of iterations: " << count-1 << "\n"); + + delete ug; + delete ug_old; + delete vx; + delete vx_old; + delete analysis; +} Index: /issm/trunk/src/c/solutionsequences/solutionsequence_linear.cpp =================================================================== --- /issm/trunk/src/c/solutionsequences/solutionsequence_linear.cpp (revision 17805) +++ /issm/trunk/src/c/solutionsequences/solutionsequence_linear.cpp (revision 17806) @@ -23,5 +23,4 @@ femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum); femmodel->UpdateConstraintsx(); - SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel); CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type); Index: /issm/trunk/src/c/solutionsequences/solutionsequence_newton.cpp =================================================================== --- /issm/trunk/src/c/solutionsequences/solutionsequence_newton.cpp (revision 17805) +++ /issm/trunk/src/c/solutionsequences/solutionsequence_newton.cpp (revision 17806) @@ -86,16 +86,18 @@ delete Kff; delete pf; if(converged==true){ + int step; IssmDouble time; bool max_iteration_state=false; - int tempStep=1; - IssmDouble tempTime=1.0; - femmodel->results->AddObject(new GenericExternalResult(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, tempStep, tempTime)); + femmodel->parameters->FindParam(&time,TimeEnum); + femmodel->parameters->FindParam(&step,StepEnum); + femmodel->results->AddObject(new GenericExternalResult(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, step,time)); break; } if(count>=max_nonlinear_iterations){ _printf0_(" maximum number of Newton iterations (" << max_nonlinear_iterations << ") exceeded\n"); + int step; IssmDouble time; bool max_iteration_state=true; - int tempStep=1; - IssmDouble tempTime=1.0; - femmodel->results->AddObject(new GenericExternalResult(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, tempStep, tempTime)); + femmodel->parameters->FindParam(&time,TimeEnum); + femmodel->parameters->FindParam(&step,StepEnum); + femmodel->results->AddObject(new GenericExternalResult(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, step, time)); break; } Index: /issm/trunk/src/c/solutionsequences/solutionsequence_nonlinear.cpp =================================================================== --- /issm/trunk/src/c/solutionsequences/solutionsequence_nonlinear.cpp (revision 17805) +++ /issm/trunk/src/c/solutionsequences/solutionsequence_nonlinear.cpp (revision 17806) @@ -85,7 +85,8 @@ if(converged==true){ bool max_iteration_state=false; - int tempStep=1; - IssmDouble tempTime=1.0; - femmodel->results->AddObject(new GenericExternalResult(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, tempStep, tempTime)); + int step; IssmDouble time; + femmodel->parameters->FindParam(&time,TimeEnum); + femmodel->parameters->FindParam(&step,StepEnum); + femmodel->results->AddObject(new GenericExternalResult(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, step, time)); break; } @@ -96,7 +97,8 @@ InputUpdateFromSolutionx(femmodel,ug); bool max_iteration_state=true; - int tempStep=1; - IssmDouble tempTime=1.0; - femmodel->results->AddObject(new GenericExternalResult(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, tempStep, tempTime)); + int step; IssmDouble time; + femmodel->parameters->FindParam(&time,TimeEnum); + femmodel->parameters->FindParam(&step,StepEnum); + femmodel->results->AddObject(new GenericExternalResult(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, step, time)); break; } Index: /issm/trunk/src/c/solutionsequences/solutionsequence_thermal_nonlinear.cpp =================================================================== --- /issm/trunk/src/c/solutionsequences/solutionsequence_thermal_nonlinear.cpp (revision 17805) +++ /issm/trunk/src/c/solutionsequences/solutionsequence_thermal_nonlinear.cpp (revision 17806) @@ -74,5 +74,5 @@ InputUpdateFromSolutionx(femmodel,tg); - InputUpdateFromConstantx(femmodel,melting_offset,MeltingOffsetEnum); + femmodel->parameters->SetParam(melting_offset,MeltingOffsetEnum); /*Free ressources: */ Index: /issm/trunk/src/c/solutionsequences/solutionsequences.h =================================================================== --- /issm/trunk/src/c/solutionsequences/solutionsequences.h (revision 17805) +++ /issm/trunk/src/c/solutionsequences/solutionsequences.h (revision 17806) @@ -13,5 +13,4 @@ void solutionsequence_thermal_nonlinear(FemModel* femmodel); -void solutionsequence_damage_nonlinear(FemModel* femmodel); void solutionsequence_hydro_nonlinear(FemModel* femmodel); void solutionsequence_nonlinear(FemModel* femmodel,bool conserve_loads); @@ -19,4 +18,5 @@ void solutionsequence_FScoupling_nonlinear(FemModel* femmodel,bool conserve_loads); void solutionsequence_linear(FemModel* femmodel); +void solutionsequence_la_theta(FemModel* femmodel); void solutionsequence_adjoint_linear(FemModel* femmodel); Index: /issm/trunk/src/c/toolkits/gsl/DenseGslSolve.cpp =================================================================== --- /issm/trunk/src/c/toolkits/gsl/DenseGslSolve.cpp (revision 17805) +++ /issm/trunk/src/c/toolkits/gsl/DenseGslSolve.cpp (revision 17806) @@ -32,5 +32,5 @@ } /*}}}*/ -void DenseGslSolve(/*output*/ IssmPDouble** px,/*stiffness matrix:*/ IssmPDouble* Kff, int Kff_M, int Kff_N, /*right hand side load vector: */ IssmPDouble* pf, int pf_M, Parameters* parameters){ /*{{{*/ +void DenseGslSolve(IssmPDouble** px,IssmPDouble* Kff,int Kff_M,int Kff_N,IssmPDouble* pf,int pf_M,Parameters* parameters){ /*{{{*/ /*Intermediary: */ Index: /issm/trunk/src/c/toolkits/gsl/gslincludes.h =================================================================== --- /issm/trunk/src/c/toolkits/gsl/gslincludes.h (revision 17805) +++ /issm/trunk/src/c/toolkits/gsl/gslincludes.h (revision 17806) @@ -21,5 +21,5 @@ void DenseGslSolve(IssmPDouble** pX,IssmPDouble* A,IssmPDouble* B, int n); -void DenseGslSolve(IssmDouble** px, IssmDouble* Kff,int Kff_M, int Kff_N, IssmDouble* pf, int pf_M, Parameters* parameters); +void DenseGslSolve(IssmDouble** pX,IssmDouble* Kff,int Kff_M,int Kff_N,IssmDouble* pf,int pf_M,Parameters* parameters); void SolverxSeq(IssmPDouble *X, IssmPDouble *A, IssmPDouble *B,int n); Index: /issm/trunk/src/c/toolkits/mpi/issmmpi.cpp =================================================================== --- /issm/trunk/src/c/toolkits/mpi/issmmpi.cpp (revision 17805) +++ /issm/trunk/src/c/toolkits/mpi/issmmpi.cpp (revision 17806) @@ -324,5 +324,5 @@ source, tag, - AMPI_SEND, // as long as there are no other variants + AMPI_FROM_SEND, // as long as there are no other variants comm, status); @@ -464,5 +464,5 @@ dest, tag, - AMPI_RECV, // as long as there are no other variants + AMPI_TO_RECV, // as long as there are no other variants comm); # else Index: /issm/trunk/src/c/toolkits/mpi/issmmpi.h =================================================================== --- /issm/trunk/src/c/toolkits/mpi/issmmpi.h (revision 17805) +++ /issm/trunk/src/c/toolkits/mpi/issmmpi.h (revision 17806) @@ -12,6 +12,7 @@ #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" #endif - #include +#include +#include "../../shared/Numerics/types.h" #ifdef _HAVE_MPI_ @@ -83,4 +84,36 @@ /*}}}*/ # endif + +template ISSM_MPI_Datatype TypeToMPIType(){assert(false);}; +template <> inline ISSM_MPI_Datatype TypeToMPIType(){return ISSM_MPI_DOUBLE;}; +template <> inline ISSM_MPI_Datatype TypeToMPIType(){return ISSM_MPI_INT;}; +template <> inline ISSM_MPI_Datatype TypeToMPIType(){return ISSM_MPI_CHAR;}; +template int ISSM_MPI_Bcast(T *buffer, int count,int root, ISSM_MPI_Comm comm){ /*{{{*/ + + int rc=0; + + /*Get MPI type*/ + ISSM_MPI_Datatype datatype = TypeToMPIType(); + +#ifdef _HAVE_MPI_ +# ifdef _HAVE_AMPI_ + rc=AMPI_Bcast(buffer, + count, + datatype, + root, + comm); +# else + rc=MPI_Bcast(buffer, + count, + datatype, + root, + comm); +# endif +#else + // nothing to be done here +#endif + return rc; +}/*}}}*/ + /* interfaces {{{*/ int ISSM_MPI_Allgather(void *sendbuf, int sendcount, ISSM_MPI_Datatype sendtype, void *recvbuf, int recvcount, ISSM_MPI_Datatype recvtype, ISSM_MPI_Comm comm); Index: /issm/trunk/src/c/toolkits/objects/Matrix.h =================================================================== --- /issm/trunk/src/c/toolkits/objects/Matrix.h (revision 17805) +++ /issm/trunk/src/c/toolkits/objects/Matrix.h (revision 17806) @@ -16,4 +16,5 @@ #include #include "../../shared/Enum/Enum.h" +#include "../petsc/petscincludes.h" #include "../issm/issmtoolkit.h" /*}}}*/ Index: /issm/trunk/src/c/toolkits/objects/Solver.h =================================================================== --- /issm/trunk/src/c/toolkits/objects/Solver.h (revision 17805) +++ /issm/trunk/src/c/toolkits/objects/Solver.h (revision 17806) @@ -14,4 +14,5 @@ #include "./Vector.h" #include "../issm/issmtoolkit.h" +#include "../petsc/petscincludes.h" class Parameters; Index: /issm/trunk/src/c/toolkits/objects/Vector.h =================================================================== --- /issm/trunk/src/c/toolkits/objects/Vector.h (revision 17805) +++ /issm/trunk/src/c/toolkits/objects/Vector.h (revision 17806) @@ -16,4 +16,5 @@ #include #include "../../shared/Enum/Enum.h" +#include "../petsc/petscincludes.h" #include "../issm/issmtoolkit.h" /*}}}*/ @@ -304,4 +305,18 @@ } /*}}}*/ + /*FUNCTION Max{{{*/ + doubletype Max(void){_assert_(this); + + doubletype max=0; + + if(type==PetscVecType){ + #ifdef _HAVE_PETSC_ + max=this->pvector->Max(); + #endif + } + else _error_("operation not supported yet"); + return max; + } + /*}}}*/ /*FUNCTION Norm{{{*/ doubletype Norm(NormMode norm_type){_assert_(this); Index: /issm/trunk/src/c/toolkits/petsc/objects/PetscMat.cpp =================================================================== --- /issm/trunk/src/c/toolkits/petsc/objects/PetscMat.cpp (revision 17805) +++ /issm/trunk/src/c/toolkits/petsc/objects/PetscMat.cpp (revision 17806) @@ -47,5 +47,5 @@ MatSetFromOptions(this->matrix); MatMPIAIJSetPreallocation(this->matrix,0,d_nnz,0,o_nnz); - //MatSetOption(this->matrix,MAT_NEW_NONZERO_ALLOCATION_ERR,PETSC_FALSE); +// MatSetOption(this->matrix,MAT_NEW_NONZERO_ALLOCATION_ERR,PETSC_FALSE); } Index: /issm/trunk/src/c/toolkits/petsc/objects/PetscVec.cpp =================================================================== --- /issm/trunk/src/c/toolkits/petsc/objects/PetscVec.cpp (revision 17805) +++ /issm/trunk/src/c/toolkits/petsc/objects/PetscVec.cpp (revision 17806) @@ -188,4 +188,15 @@ } /*}}}*/ +/*FUNCTION PetscVec::Max{{{*/ +IssmDouble PetscVec::Max(void){ + + _assert_(this->vector); + + IssmDouble max; + VecMax(this->vector,NULL,&max); + return max; + +} +/*}}}*/ /*FUNCTION PetscVec::Norm{{{*/ IssmDouble PetscVec::Norm(NormMode mode){ Index: /issm/trunk/src/c/toolkits/petsc/objects/PetscVec.h =================================================================== --- /issm/trunk/src/c/toolkits/petsc/objects/PetscVec.h (revision 17805) +++ /issm/trunk/src/c/toolkits/petsc/objects/PetscVec.h (revision 17806) @@ -38,21 +38,22 @@ /*PetscVec specific routines*/ - void Echo(void); - void Assemble(void); - void SetValues(int ssize, int* list, IssmDouble* values, InsMode mode); - void SetValue(int dof, IssmDouble value, InsMode mode); - void GetValue(IssmDouble* pvalue, int dof); - void GetSize(int* pM); - void GetLocalSize(int* pM); - PetscVec* Duplicate(void); - void Set(IssmDouble value); - void AXPY(PetscVec* X, IssmDouble a); - void AYPX(PetscVec* X, IssmDouble a); + void Echo(void); + void Assemble(void); + void SetValues(int ssize, int* list, IssmDouble* values, InsMode mode); + void SetValue(int dof, IssmDouble value, InsMode mode); + void GetValue(IssmDouble* pvalue, int dof); + void GetSize(int* pM); + void GetLocalSize(int* pM); + PetscVec* Duplicate(void); + void Set(IssmDouble value); + void AXPY(PetscVec* X, IssmDouble a); + void AYPX(PetscVec* X, IssmDouble a); IssmDouble* ToMPISerial(void); - void Copy(PetscVec* to); - IssmDouble Norm(NormMode norm_type); - void Scale(IssmDouble scale_factor); - void PointwiseDivide(PetscVec* x,PetscVec* y); - IssmDouble Dot(PetscVec* vector); + void Copy(PetscVec* to); + IssmDouble Norm(NormMode norm_type); + IssmDouble Max(void); + void Scale(IssmDouble scale_factor); + void PointwiseDivide(PetscVec* x,PetscVec* y); + IssmDouble Dot(PetscVec* vector); }; Index: /issm/trunk/src/c/toolkits/petsc/patches/NewVec.cpp =================================================================== --- /issm/trunk/src/c/toolkits/petsc/patches/NewVec.cpp (revision 17805) +++ /issm/trunk/src/c/toolkits/petsc/patches/NewVec.cpp (revision 17806) @@ -33,11 +33,7 @@ VecCreate(comm,&vector); - VecSetSizes(vector,local_size,PETSC_DECIDE); VecSetFromOptions(vector); - /*fill with 0: */ - VecSet(vector,0.0); - return vector; } Index: /issm/trunk/src/m/Makefile.am =================================================================== --- /issm/trunk/src/m/Makefile.am (revision 17805) +++ /issm/trunk/src/m/Makefile.am (revision 17806) @@ -13,4 +13,5 @@ ./kml/*.m \ ./enum/*.m \ + ./dev/issmversion.m \ ./classes/*.m \ ./classes/qmu/*.m \ @@ -60,8 +61,10 @@ ./classes/clusters/*.py \ ./consistency/*.py \ + ./dev/issmversion.py \ ./boundaryconditions/*.py \ ./exp/*.py \ ./geometry/*.py \ ./coordsystems/*.py \ + ./interp/*.py \ ./mech/*.py \ ./mesh/*.py \ Index: /issm/trunk/src/m/boundaryconditions/PattynSMB.m =================================================================== --- /issm/trunk/src/m/boundaryconditions/PattynSMB.m (revision 17806) +++ /issm/trunk/src/m/boundaryconditions/PattynSMB.m (revision 17806) @@ -0,0 +1,51 @@ +function smb=PattynSMB(md,Tf) +%PATTYNSMB- Compute SMB over Antarctica (from Pattyn 2006, pg. 18, "GRANTISM: An ExcelTM model for Greenland and +% Antarctic ice-sheet response to climate changes") +% +% Usage: +% md=PattynSMB(md,Tf) +% +% where Tf is a background forcing temperature ("an anomalous temperature relative to the present conditions) +% +% +% See also: SETICESHELFBC, SETMARINEICESHEETBC + + +% Tma : Mean annual surface temperature in [deg C] +% Tms : Mean summer temperature in [deg C] +% h : Surface/bedrock elevation (I assume in meters but paper does not specify) +% phi : Latitude in degrees SOUTH +% lambda : Longitude in degrees WEST +% Tf : Background forcing temperature ("an anomalous temperature relative to the present conditions) +% ACCdot : Accumulation rate in units of [m/a] ice equivalent +% ABLdot : Surface ablation rate in [m/a] ice equivalent + + %Double check lat and long exist: + if isnan(md.mesh.lat), + error('PattynSMB error message: md.mesh.lat field required'); + end + + %Delta Temperature forcing + if (nargin==1), + Tf=0; + end + + % Calculate mean annual surface temperature, Eqn (11) + % Here, -0.012 is the atmospheric Lapse rate from sea level in deg/m. + % It is multiplied by surface elevation from sea level + Tma = -15.15 - 0.012*md.geometry.surface; + + %% Calculate summer temperature, Eqn (12) + %% No melting at PIG in mean conditions - need about 6 degress Tf to start having a negative yearly SMB + Tms = 16.81 - 0.00692*md.geometry.surface - 0.27937*abs(md.mesh.lat) + Tf; + + %% Calculate Accumulation perturbation with Tf forcing, Eqn (9) + ACCdot = 2.5*2.^((Tma+Tf)/10.) - 2.5*2.^(Tma/10.); + + %% Calculate Ablation, Eqn (10) (use for both Antarctica & Greenland), max melt is 10m/a + ABLdot=zeros(size(ACCdot)); + pos=Tms>=0; + ABLdot(pos)=min(1.4*Tms(Tms>=0),10); + + smb=ACCdot-ABLdot; +end Index: /issm/trunk/src/m/boundaryconditions/PattynSMB.py =================================================================== --- /issm/trunk/src/m/boundaryconditions/PattynSMB.py (revision 17806) +++ /issm/trunk/src/m/boundaryconditions/PattynSMB.py (revision 17806) @@ -0,0 +1,50 @@ +import os +import numpy as npy +def PattynSMB(md,Tf): + """ + PATTYNSMB- Compute SMB over Antarctica (from Pattyn 2006, pg. 18, "GRANTISM: An ExcelTM model for Greenland + and Antarctic ice-sheet response to climate changes") + + Usage: + md=PattynSMB(md,Tf) + + where Tf is a background forcing temperature ("an anomalous temperature relative to the present conditions) + + + See also: SETICESHELFBC, SETMARINEICESHEETBC + """ + + # Tma : Mean annual surface temperature in [deg C] + # Tms : Mean summer temperature in [deg C] + # h : Surface/bedrock elevation (I assume in meters but paper does not specify) + # phi : Latitude in degrees SOUTH + # lambda : Longitude in degrees WEST + # Tf : Background forcing temperature ("an anomalous temperature relative to the present conditions) + # ACCdot : Accumulation rate in units of [m/a] ice equivalent + # ABLdot : Surface ablation rate in [m/a] ice equivalent + + #Double check lat and long exist: + if npy.any(npy.isnan(md.mesh.lat)): + raise IOError('PattynSMB error message: md.mesh.lat field required') + + # Calculate mean annual surface temperature, Eqn (11) + # Here, -0.012 is the atmospheric Lapse rate from sea level in deg/m. + # It is multiplied by surface elevation from sea level + Tma = -15.15 - 0.012*md.geometry.surface + + + # Calculate summer temperature, Eqn (12) + # No melting at PIG in mean conditions - need about 6 degress Tf to start having a negative yearly SMB + Tms = 16.81 - 0.00692*md.geometry.surface - 0.27937*npy.abs(md.mesh.lat) + Tf + Tms= Tms[0] + + # Calculate Accumulation perturbation with Tf forcing, Eqn (9) + ACCdot = 2.5*2**((Tma+Tf)/10.) - 2.5*2**(Tma/10.) + + # Calculate Ablation, Eqn (10) (use for both Antarctica & Greenland), max melt is 10m/a + ABLdot=0.*npy.ones(md.mesh.numberofvertices) + pos=npy.nonzero(Tms>=0) + ABLdot[pos]=npy.minimum(1.4*Tms[pos],10) + + smb=ACCdot-ABLdot + return smb[0] Index: /issm/trunk/src/m/boundaryconditions/SetIceSheetBC.m =================================================================== --- /issm/trunk/src/m/boundaryconditions/SetIceSheetBC.m (revision 17805) +++ /issm/trunk/src/m/boundaryconditions/SetIceSheetBC.m (revision 17806) @@ -29,22 +29,13 @@ %No ice front: do nothing -%Create zeros basal melting rate and surface mass balance if not specified -if (isnan(md.surfaceforcings.precipitation) & (md.surfaceforcings.ispdd==1)), - md.surfaceforcings.precipitation=zeros(md.mesh.numberofvertices,1); - disp(' no surfaceforcings.precipitation specified: values set as zero'); -end -if (isnan(md.surfaceforcings.mass_balance) & (md.surfaceforcings.ispdd==0)), - md.surfaceforcings.mass_balance=zeros(md.mesh.numberofvertices,1); - disp(' no surfaceforcings.mass_balance specified: values set as zero'); -end -if isnan(md.basalforcings.melting_rate), - md.basalforcings.melting_rate=zeros(md.mesh.numberofvertices,1); - disp(' no basalforcings.melting_rate specified: values set as zero'); -end +%Initialize surface and basal forcings +md.surfaceforcings = initialize(md.surfaceforcings,md); +md.basalforcings = initialize(md.basalforcings,md); + +%Deal with other boundary conditions if isnan(md.balancethickness.thickening_rate), md.balancethickness.thickening_rate=zeros(md.mesh.numberofvertices,1); disp(' no balancethickness.thickening_rate specified: values set as zero'); end - md.masstransport.spcthickness=NaN*ones(md.mesh.numberofvertices,1); md.balancethickness.spcthickness=NaN*ones(md.mesh.numberofvertices,1); Index: /issm/trunk/src/m/boundaryconditions/SetIceSheetBC.py =================================================================== --- /issm/trunk/src/m/boundaryconditions/SetIceSheetBC.py (revision 17805) +++ /issm/trunk/src/m/boundaryconditions/SetIceSheetBC.py (revision 17806) @@ -1,5 +1,5 @@ import os import numpy -from ContourToMesh import * +from ContourToMesh import ContourToMesh def SetIceSheetBC(md): @@ -34,18 +34,12 @@ #No ice front -> do nothing - #Create zeros basal melting rate and surface mass balance if not specified - if numpy.all(numpy.isnan(md.surfaceforcings.precipitation)) and (md.surfaceforcings.ispdd==1): - md.surfaceforcings.precipitation=numpy.zeros((md.mesh.numberofvertices,1)) - print " no surfaceforcings.precipitation specified: values set as zero" - if numpy.all(numpy.isnan(md.surfaceforcings.mass_balance)) and (md.surfaceforcings.ispdd==0): - md.surfaceforcings.mass_balance=numpy.zeros((md.mesh.numberofvertices,1)) - print " no surfaceforcings.mass_balance specified: values set as zero" - if numpy.all(numpy.isnan(md.basalforcings.melting_rate)): - md.basalforcings.melting_rate=numpy.zeros((md.mesh.numberofvertices,1)) - print " no basalforcings.melting_rate specified: values set as zero" + #Create zeros basalforcings and surfaceforcings + md.surfaceforcings.initialize(md) + md.basalforcings.initialize(md) + + #Deal with other boundary conditions if numpy.all(numpy.isnan(md.balancethickness.thickening_rate)): md.balancethickness.thickening_rate=numpy.zeros((md.mesh.numberofvertices,1)) print " no balancethickness.thickening_rate specified: values set as zero" - md.masstransport.spcthickness=float('nan')*numpy.ones((md.mesh.numberofvertices,1)) md.balancethickness.spcthickness=float('nan')*numpy.ones((md.mesh.numberofvertices,1)) Index: /issm/trunk/src/m/boundaryconditions/SetIceShelfBC.m =================================================================== --- /issm/trunk/src/m/boundaryconditions/SetIceShelfBC.m (revision 17805) +++ /issm/trunk/src/m/boundaryconditions/SetIceShelfBC.m (revision 17806) @@ -38,7 +38,7 @@ %First find segments that are not completely on the front -if strcmp(meshtype(md.mesh),'3D'), +if strcmp(elementtype(md.mesh),'Penta'), numbernodesfront=4; -elseif strcmp(meshtype(md.mesh),'2Dhorizontal'), +elseif strcmp(elementtype(md.mesh),'Tria'), numbernodesfront=2; else @@ -62,22 +62,13 @@ end -%Create zeros basalforcings and surfaceforcings -if (isnan(md.surfaceforcings.precipitation) & (md.surfaceforcings.ispdd==1)), - md.surfaceforcings.precipitation=zeros(md.mesh.numberofvertices,1); - disp(' no surfaceforcings.precipitation specified: values set as zero'); -end -if (isnan(md.surfaceforcings.mass_balance) & (md.surfaceforcings.ispdd==0)), - md.surfaceforcings.mass_balance=zeros(md.mesh.numberofvertices,1); - disp(' no surfaceforcings.mass_balance specified: values set as zero'); -end -if isnan(md.basalforcings.melting_rate), - md.basalforcings.melting_rate=zeros(md.mesh.numberofvertices,1); - disp(' no basalforcings.melting_rate specified: values set as zero'); -end +%Initialize surface and basal forcings +md.surfaceforcings = initialize(md.surfaceforcings,md); +md.basalforcings = initialize(md.basalforcings,md); + +%Deal with other boundary conditions if isnan(md.balancethickness.thickening_rate), md.balancethickness.thickening_rate=zeros(md.mesh.numberofvertices,1); disp(' no balancethickness.thickening_rate specified: values set as zero'); end - md.masstransport.spcthickness=NaN*ones(md.mesh.numberofvertices,1); md.balancethickness.spcthickness=NaN*ones(md.mesh.numberofvertices,1); Index: /issm/trunk/src/m/boundaryconditions/SetIceShelfBC.py =================================================================== --- /issm/trunk/src/m/boundaryconditions/SetIceShelfBC.py (revision 17805) +++ /issm/trunk/src/m/boundaryconditions/SetIceShelfBC.py (revision 17806) @@ -1,6 +1,6 @@ import os import numpy -from ContourToMesh import * -from MatlabFuncs import * +from ContourToMesh import ContourToMesh +import MatlabFuncs as m def SetIceShelfBC(md,icefrontfile=''): @@ -44,7 +44,7 @@ #First find segments that are not completely on the front - if strcmp(md.mesh.meshtype(),'3D'): + if m.strcmp(md.mesh.elementtype(),'Penta'): numbernodesfront=4; - elif strcmp(md.mesh.meshtype(),'2Dhorizontal'): + elif m.strcmp(md.mesh.elementtype(),'Tria'): numbernodesfront=2; else: @@ -77,17 +77,11 @@ #Create zeros basalforcings and surfaceforcings - if numpy.all(numpy.isnan(md.surfaceforcings.precipitation)) and (md.surfaceforcings.ispdd==1): - md.surfaceforcings.precipitation=numpy.zeros((md.mesh.numberofvertices,1)) - print " no surfaceforcings.precipitation specified: values set as zero" - if numpy.all(numpy.isnan(md.surfaceforcings.mass_balance)) and (md.surfaceforcings.ispdd==0): - md.surfaceforcings.mass_balance=numpy.zeros((md.mesh.numberofvertices,1)) - print " no surfaceforcings.mass_balance specified: values set as zero" - if numpy.all(numpy.isnan(md.basalforcings.melting_rate)): - md.basalforcings.melting_rate=numpy.zeros((md.mesh.numberofvertices,1)) - print " no basalforcings.melting_rate specified: values set as zero" + md.surfaceforcings.initialize(md) + md.basalforcings.initialize(md) + + #Deal with other boundary conditions if numpy.all(numpy.isnan(md.balancethickness.thickening_rate)): md.balancethickness.thickening_rate=numpy.zeros((md.mesh.numberofvertices,1)) print " no balancethickness.thickening_rate specified: values set as zero" - md.masstransport.spcthickness=float('nan')*numpy.ones((md.mesh.numberofvertices,1)) md.balancethickness.spcthickness=float('nan')*numpy.ones((md.mesh.numberofvertices,1)) Index: /issm/trunk/src/m/boundaryconditions/SetMarineIceSheetBC.m =================================================================== --- /issm/trunk/src/m/boundaryconditions/SetMarineIceSheetBC.m (revision 17805) +++ /issm/trunk/src/m/boundaryconditions/SetMarineIceSheetBC.m (revision 17806) @@ -52,8 +52,10 @@ %First find segments that are not completely on the front -if(md.mesh.dimension==2), +if strcmp(elementtype(md.mesh),'Penta'), + numbernodesfront=4; +elseif strcmp(elementtype(md.mesh),'Tria'), numbernodesfront=2; -else - numbernodesfront=4; +else + error('mesh type not supported yet'); end segmentsfront=md.mask.ice_levelset(md.mesh.segments(:,1:numbernodesfront))==0; @@ -63,5 +65,5 @@ md.stressbalance.spcvx(pos(:))=0; md.stressbalance.spcvy(pos(:))=0; -md.stressbalance.spcvz(pos(:))=0; +md.stressbalance.spcvz(pos(:))=0; % FIXME probably shouldn't spc vertical velocity here %Dirichlet Values @@ -78,17 +80,9 @@ md.hydrology.spcwatercolumn(pos,1)=1; -%Create zeros basalforcings and surfaceforcings -if (isnan(md.surfaceforcings.precipitation) & (md.surfaceforcings.ispdd==1)), - md.surfaceforcings.precipitation=zeros(md.mesh.numberofvertices,1); - disp(' no surfaceforcings.precipitation specified: values set as zero'); -end -if (isnan(md.surfaceforcings.mass_balance) & (md.surfaceforcings.ispdd==0)), - md.surfaceforcings.mass_balance=zeros(md.mesh.numberofvertices,1); - disp(' no surfaceforcings.mass_balance specified: values set as zero'); -end -if isnan(md.basalforcings.melting_rate), - md.basalforcings.melting_rate=zeros(md.mesh.numberofvertices,1); - disp(' no basalforcings.melting_rate specified: values set as zero'); -end +%Initialize surface and basal forcings +md.surfaceforcings = initialize(md.surfaceforcings,md); +md.basalforcings = initialize(md.basalforcings,md); + +%Deal with other boundary conditions if isnan(md.balancethickness.thickening_rate), md.balancethickness.thickening_rate=zeros(md.mesh.numberofvertices,1); Index: /issm/trunk/src/m/boundaryconditions/SetMarineIceSheetBC.py =================================================================== --- /issm/trunk/src/m/boundaryconditions/SetMarineIceSheetBC.py (revision 17805) +++ /issm/trunk/src/m/boundaryconditions/SetMarineIceSheetBC.py (revision 17806) @@ -1,5 +1,6 @@ import os import numpy -from ContourToMesh import * +from ContourToMesh import ContourToMesh +import MatlabFuncs as m def SetMarineIceSheetBC(md,icefrontfile=''): @@ -52,8 +53,10 @@ #First find segments that are not completely on the front - if md.mesh.dimension==2: + if m.strcmp(md.mesh.elementtype(),'Penta'): + numbernodesfront=4 + elif m.strcmp(md.mesh.elementtype(),'Tria'): numbernodesfront=2 else: - numbernodesfront=4 + raise StandardError("Mesh type not supported") if any(md.mask.ice_levelset<=0): values=md.mask.ice_levelset[md.mesh.segments[:,0:-1]-1] @@ -82,13 +85,8 @@ #Create zeros basalforcings and surfaceforcings - if numpy.all(numpy.isnan(md.surfaceforcings.precipitation)) and (md.surfaceforcings.ispdd==1): - md.surfaceforcings.precipitation=numpy.zeros((md.mesh.numberofvertices,1)) - print " no surfaceforcings.precipitation specified: values set as zero" - if numpy.all(numpy.isnan(md.surfaceforcings.mass_balance)) and (md.surfaceforcings.ispdd==0): - md.surfaceforcings.mass_balance=numpy.zeros((md.mesh.numberofvertices,1)) - print " no surfaceforcings.mass_balance specified: values set as zero" - if numpy.all(numpy.isnan(md.basalforcings.melting_rate)): - md.basalforcings.melting_rate=numpy.zeros((md.mesh.numberofvertices,1)) - print " no basalforcings.melting_rate specified: values set as zero" + md.surfaceforcings.initialize(md) + md.basalforcings.initialize(md) + + #Deal with other boundary conditions if numpy.all(numpy.isnan(md.balancethickness.thickening_rate)): md.balancethickness.thickening_rate=numpy.zeros((md.mesh.numberofvertices,1)) Index: /issm/trunk/src/m/classes/SMB.m =================================================================== --- /issm/trunk/src/m/classes/SMB.m (revision 17806) +++ /issm/trunk/src/m/classes/SMB.m (revision 17806) @@ -0,0 +1,58 @@ +%SMB Class definition +% +% Usage: +% SMB=SMB(); + +classdef SMB + properties (SetAccess=public) + mass_balance = NaN; + end + methods + function createxml(obj,fid) % {{{ + fprintf(fid, '\n\n'); + fprintf(fid, '%s\n', ''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n','','
',' surface mass balance [m/yr ice eq] ',''); + + end % }}} + function obj = SMB(varargin) % {{{ + switch nargin + case 0 + otherwise + error('constructor not supported'); + end + end % }}} + function self = extrude(self,md) % {{{ + + self.mass_balance=project3d(md,'vector',self.mass_balance,'type','node'); + + end % }}} + function self = initialize(self,md) % {{{ + + if isnan(self.mass_balance) + self.mass_balance=zeros(md.mesh.numberofvertices,1); + disp(' no surfaceforcings.mass_balance specified: values set as zero'); + end + + end % }}} + function md = checkconsistency(obj,md,solution,analyses) % {{{ + + if ismember(MasstransportAnalysisEnum(),analyses), + md = checkfield(md,'fieldname','surfaceforcings.mass_balance','forcing',1,'NaN',1); + end + if ismember(BalancethicknessAnalysisEnum(),analyses), + md = checkfield(md,'fieldname','surfaceforcings.mass_balance','size',[md.mesh.numberofvertices 1],'NaN',1); + end + end % }}} + function disp(obj) % {{{ + disp(sprintf(' surface forcings parameters:')); + fielddisplay(obj,'mass_balance','surface mass balance [m/yr ice eq]'); + end % }}} + function marshall(obj,md,fid) % {{{ + + yts=365.0*24.0*3600.0; + + WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBEnum(),'format','Integer'); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); + end % }}} + end +end Index: /issm/trunk/src/m/classes/SMB.py =================================================================== --- /issm/trunk/src/m/classes/SMB.py (revision 17806) +++ /issm/trunk/src/m/classes/SMB.py (revision 17806) @@ -0,0 +1,53 @@ +import numpy +from fielddisplay import fielddisplay +from EnumDefinitions import * +from checkfield import checkfield +from WriteData import WriteData +from project3d import project3d + +class SMB(object): + """ + SMB Class definition + + Usage: + SMB=SMB(); + """ + + def __init__(self): # {{{ + self.mass_balance = float('NaN') + #}}} + def __repr__(self): # {{{ + string=" surface forcings parameters:" + string="%s\n%s"%(string,fielddisplay(self,'mass_balance','surface mass balance [m/yr ice eq]')) + return string + #}}} + def extrude(self,md): # {{{ + + self.mass_balance=project3d(md,'vector',self.mass_balance,'type','node'); + return self + #}}} + def initialize(self,md): # {{{ + + if numpy.all(numpy.isnan(self.mass_balance)): + self.mass_balance=numpy.zeros((md.mesh.numberofvertices,1)) + print " no SMB.mass_balance specified: values set as zero" + + return self + #}}} + def checkconsistency(self,md,solution,analyses): # {{{ + + if MasstransportAnalysisEnum() in analyses: + md = checkfield(md,'fieldname','surfaceforcings.mass_balance','forcing',1,'NaN',1) + + if BalancethicknessAnalysisEnum() in analyses: + md = checkfield(md,'fieldname','surfaceforcings.mass_balance','size',[md.mesh.numberofvertices],'NaN',1) + + return md + # }}} + def marshall(self,md,fid): # {{{ + + yts=365.0*24.0*3600.0 + + WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBEnum(),'format','Integer'); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) + # }}} Index: /issm/trunk/src/m/classes/SMBgradients.m =================================================================== --- /issm/trunk/src/m/classes/SMBgradients.m (revision 17806) +++ /issm/trunk/src/m/classes/SMBgradients.m (revision 17806) @@ -0,0 +1,68 @@ +%SMBgradients Class definition +% +% Usage: +% SMBgradients=SMBgradients(); + +classdef SMBgradients + properties (SetAccess=public) + href = NaN; + smbref = NaN; + b_pos = NaN; + b_neg = NaN; + end + methods + function obj = SMBgradients(varargin) % {{{ + switch nargin + case 0 + obj=setdefaultparameters(obj); + otherwise + error('constructor not supported'); + end + end % }}} + function self = extrude(self,md) % {{{ + + %Nothing for now + + end % }}} + function self = initialize(self,md) % {{{ + + %Nothing done for now + + end % }}} + function obj = setdefaultparameters(obj) % {{{ + + %Nothing for now + + end % }}} + function md = checkconsistency(obj,md,solution,analyses) % {{{ + + if ismember(MasstransportAnalysisEnum(),analyses), + md = checkfield(md,'fieldname','surfaceforcings.href','forcing',1,'NaN',1); + md = checkfield(md,'fieldname','surfaceforcings.smbref','forcing',1,'NaN',1); + md = checkfield(md,'fieldname','surfaceforcings.b_pos','forcing',1,'NaN',1); + md = checkfield(md,'fieldname','surfaceforcings.b_neg','forcing',1,'NaN',1); + end + end % }}} + function disp(obj) % {{{ + disp(sprintf(' surface forcings parameters:')); + + disp(sprintf('\n SMB gradients parameters:')); + fielddisplay(obj,'href',' reference elevation from which deviation is used to calculate SMB adjustment in smb gradients method'); + fielddisplay(obj,'smbref',' reference smb from which deviation is calculated in smb gradients method'); + fielddisplay(obj,'b_pos',' slope of hs - smb regression line for accumulation regime required if smb gradients is activated'); + fielddisplay(obj,'b_neg',' slope of hs - smb regression line for ablation regime required if smb gradients is activated'); + + end % }}} + function marshall(obj,md,fid) % {{{ + + yts=365.0*24.0*3600.0; + + WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBgradientsEnum(),'format','Integer'); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','href','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','b_pos','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','b_neg','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); + + end % }}} + end +end Index: /issm/trunk/src/m/classes/SMBgradients.py =================================================================== --- /issm/trunk/src/m/classes/SMBgradients.py (revision 17806) +++ /issm/trunk/src/m/classes/SMBgradients.py (revision 17806) @@ -0,0 +1,62 @@ +from fielddisplay import fielddisplay +from EnumDefinitions import * +from checkfield import checkfield +from WriteData import WriteData +from project3d import project3d + +class SMBgradients(object): + """ + SMBgradients Class definition + + Usage: + SMBgradients=SMBgradients(); + """ + + def __init__(self): # {{{ + self.href = float('NaN') + self.smbref = float('NaN') + self.b_pos = float('NaN') + self.b_neg = float('NaN') + #}}} + def __repr__(self): # {{{ + string=" surface forcings parameters:" + + string="%s\n%s"%(string,fielddisplay(self,'issmbgradients','is smb gradients method activated (0 or 1, default is 0)')) + string="%s\n%s"%(string,fielddisplay(self,'href',' reference elevation from which deviation is used to calculate SMB adjustment in smb gradients method')) + string="%s\n%s"%(string,fielddisplay(self,'smbref',' reference smb from which deviation is calculated in smb gradients method')) + string="%s\n%s"%(string,fielddisplay(self,'b_pos',' slope of hs - smb regression line for accumulation regime required if smb gradients is activated')) + string="%s\n%s"%(string,fielddisplay(self,'b_neg',' slope of hs - smb regression line for ablation regime required if smb gradients is activated')) + + return string + #}}} + def extrude(self,md): # {{{ + + #Nothing for now + return self + #}}} + def initialize(self,md): # {{{ + + #Nothing for now + + return self + #}}} + def checkconsistency(self,md,solution,analyses): # {{{ + + if MasstransportAnalysisEnum() in analyses: + md = checkfield(md,'fieldname','surfaceforcings.href','forcing',1,'NaN',1) + md = checkfield(md,'fieldname','surfaceforcings.smbref','forcing',1,'NaN',1) + md = checkfield(md,'fieldname','surfaceforcings.b_pos','forcing',1,'NaN',1) + md = checkfield(md,'fieldname','surfaceforcings.b_neg','forcing',1,'NaN',1) + + return md + # }}} + def marshall(self,md,fid): # {{{ + + yts=365.0*24.0*3600.0 + + WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBgradientsEnum(),'format','Integer'); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','href','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','b_pos','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','b_neg','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) + # }}} Index: /issm/trunk/src/m/classes/SMBhenning.m =================================================================== --- /issm/trunk/src/m/classes/SMBhenning.m (revision 17806) +++ /issm/trunk/src/m/classes/SMBhenning.m (revision 17806) @@ -0,0 +1,52 @@ +%SMBhenning Class definition +% +% Usage: +% SMBhenning=SMBhenning(); + +classdef SMBhenning + properties (SetAccess=public) + smbref = NaN; + end + methods + function obj = SMBhenning(varargin) % {{{ + switch nargin + case 0 + otherwise + error('constructor not supported'); + end + end % }}} + function self = extrude(self,md) % {{{ + + self.smbref=project3d(md,'vector',self.smbref,'type','node'); + + end % }}} + function self = initialize(self,md) % {{{ + + if isnan(self.smbref) + self.smbref=zeros(md.mesh.numberofvertices,1); + disp(' no surfaceforcings.smbref specified: values set as zero'); + end + + end % }}} + function md = checkconsistency(obj,md,solution,analyses) % {{{ + + if ismember(MasstransportAnalysisEnum(),analyses), + md = checkfield(md,'fieldname','surfaceforcings.smbref','forcing',1,'NaN',1); + end + if ismember(BalancethicknessAnalysisEnum(),analyses), + md = checkfield(md,'fieldname','surfaceforcings.smbref','size',[md.mesh.numberofvertices 1],'NaN',1); + end + end % }}} + function disp(obj) % {{{ + disp(sprintf(' surface forcings parameters:')); + fielddisplay(obj,'smbref','reference smb from which deviation is calculated [m/yr ice eq]'); + end % }}} + function marshall(obj,md,fid) % {{{ + + yts=365.0*24.0*3600.0; + + WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBhenningEnum(),'format','Integer'); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); + end % }}} + end +end Index: /issm/trunk/src/m/classes/SMBpdd.m =================================================================== --- /issm/trunk/src/m/classes/SMBpdd.m (revision 17806) +++ /issm/trunk/src/m/classes/SMBpdd.m (revision 17806) @@ -0,0 +1,106 @@ +%SMBpdd Class definition +% +% Usage: +% SMBpdd=SMBpdd(); + +classdef SMBpdd + properties (SetAccess=public) + precipitation = NaN; + monthlytemperatures = NaN; + desfac = 0.5; + s0p = 0; + isdelta18o = 0; + delta18o = NaN; + delta18o_surface = NaN; + temperatures_presentday = NaN; + temperatures_lgm = NaN; + precipitations_presentday = NaN; + end + methods + function obj = SMBpdd(varargin) % {{{ + switch nargin + case 0 + obj=setdefaultparameters(obj); + otherwise + error('constructor not supported'); + end + end % }}} + function self = extrude(self,md) % {{{ + + self.precipitation=project3d(md,'vector',self.precipitation,'type','node'); + self.monthlytemperatures=project3d(md,'vector',self.monthlytemperatures,'type','node'); + if(self.isdelta18o),self.temperatures_lgm=project3d(md,'vector',self.temperatures_lgm,'type','node');end + if(self.isdelta18o),self.temperatures_presentday=project3d(md,'vector',self.temperatures_presentday,'type','node');end + if(self.isdelta18o),self.precipitations_presentday=project3d(md,'vector',self.precipitations_presentday,'type','node');end + + + end % }}} + function self = initialize(self,md) % {{{ + + if isnan(self.precipitation), + self.precipitation=zeros(md.mesh.numberofvertices,1); + disp(' no SMBpdd.precipitation specified: values set as zero'); + end + + end % }}} + function obj = setdefaultparameters(obj) % {{{ + + obj.isdelta18o = 0; + obj.desfac = 0.5; + obj.s0p = 0; + end % }}} + function md = checkconsistency(obj,md,solution,analyses) % {{{ + + if ismember(MasstransportAnalysisEnum(),analyses), + md = checkfield(md,'fieldname','surfaceforcings.desfac','<=',1,'numel',1); + md = checkfield(md,'fieldname','surfaceforcings.s0p','>=',0,'numel',1); + if(obj.isdelta18o==0) + md = checkfield(md,'fieldname','surfaceforcings.monthlytemperatures','forcing',1,'NaN',1); + md = checkfield(md,'fieldname','surfaceforcings.precipitation','forcing',1,'NaN',1); + else + md = checkfield(md,'fieldname','surfaceforcings.delta18o','NaN',1); + md = checkfield(md,'fieldname','surfaceforcings.delta18o_surface','NaN',1); + md = checkfield(md,'fieldname','surfaceforcings.temperatures_presentday','size',[md.mesh.numberofvertices+1 12],'NaN',1); + md = checkfield(md,'fieldname','surfaceforcings.temperatures_lgm','size',[md.mesh.numberofvertices+1 12],'NaN',1); + md = checkfield(md,'fieldname','surfaceforcings.precipitations_presentday','size',[md.mesh.numberofvertices+1 12],'NaN',1); + end + end + end % }}} + function disp(obj) % {{{ + disp(sprintf(' surface forcings parameters:')); + + disp(sprintf('\n PDD and deltaO18 parameters:')); + fielddisplay(obj,'isdelta18o','is temperature and precipitation delta18o parametrisation activated (0 or 1, default is 0)'); + fielddisplay(obj,'desfac','desertification elevation factor (between 0 and 1, default is 0.5) [m]'); + fielddisplay(obj,'s0p','should be set to elevation from precip source (between 0 and a few 1000s m, default is 0) [m]'); + fielddisplay(obj,'monthlytemperatures','monthly surface temperatures [K], required if pdd is activated and delta18o not activated'); + fielddisplay(obj,'precipitation','surface precipitation [m/yr water eq]'); + fielddisplay(obj,'temperatures_presentday','monthly present day surface temperatures [K], required if pdd is activated and delta18o activated'); + fielddisplay(obj,'temperatures_lgm','monthly LGM surface temperatures [K], required if pdd is activated and delta18o activated'); + fielddisplay(obj,'precipitations_presentday','monthly surface precipitation [m/yr water eq], required if pdd is activated and delta18o activated'); + fielddisplay(obj,'delta18o','delta18o, required if pdd is activated and delta18o activated'); + fielddisplay(obj,'delta18o_surface','surface elevation of the delta18o site, required if pdd is activated and delta18o activated'); + + end % }}} + function marshall(obj,md,fid) % {{{ + + yts=365.0*24.0*3600.0; + + WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBpddEnum(),'format','Integer'); + + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','precipitation','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','desfac','format','Double'); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','s0p','format','Double'); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','isdelta18o','format','Boolean'); + if obj.isdelta18o + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','temperatures_presentday','format','DoubleMat','mattype',1); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','temperatures_lgm','format','DoubleMat','mattype',1); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','precipitations_presentday','format','DoubleMat','mattype',1); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','delta18o_surface','format','DoubleMat','mattype',1); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','delta18o','format','DoubleMat','mattype',1); + else + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','monthlytemperatures','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); + end + end % }}} + end +end Index: /issm/trunk/src/m/classes/SMBpdd.py =================================================================== --- /issm/trunk/src/m/classes/SMBpdd.py (revision 17806) +++ /issm/trunk/src/m/classes/SMBpdd.py (revision 17806) @@ -0,0 +1,108 @@ +import numpy +from fielddisplay import fielddisplay +from EnumDefinitions import * +from checkfield import checkfield +from WriteData import WriteData +from project3d import project3d + +class SMBpdd(object): + """ + SMBpdd Class definition + + Usage: + SMBpdd=SMBpdd(); + """ + + def __init__(self): # {{{ + self.precipitation = float('NaN') + self.monthlytemperatures = float('NaN') + self.desfac = 0. + self.s0p = 0. + self.isdelta18o = 0 + self.delta18o = float('NaN') + self.delta18o_surface = float('NaN') + self.temperatures_presentday = float('NaN') + self.temperatures_lgm = float('NaN') + self.precipitations_presentday = float('NaN') + + #set defaults + self.setdefaultparameters() + #}}} + def __repr__(self): # {{{ + string=" surface forcings parameters:" + + string="%s\n%s"%(string,fielddisplay(self,'precipitation','surface precipitation [m/yr water eq]')) + string="%s\n%s"%(string,fielddisplay(self,'desfac','desertification elevation factor (between 0 and 1, default is 0.5) [m]')) + string="%s\n%s"%(string,fielddisplay(self,'isdelta18o','is temperature and precipitation delta18o parametrisation activated (0 or 1, default is 0)')) + string="%s\n%s"%(string,fielddisplay(self,'s0p','should be set to elevation from precip source (between 0 and a few 1000s m, default is 0) [m]')) + string="%s\n%s"%(string,fielddisplay(self,'monthlytemperatures','monthly surface temperatures [K], required if pdd is activated and delta18o not activated')) + string="%s\n%s"%(string,fielddisplay(self,'temperatures_presentday','monthly present day surface temperatures [K], required if pdd is activated and delta18o activated')) + string="%s\n%s"%(string,fielddisplay(self,'temperatures_lgm','monthly LGM surface temperatures [K], required if pdd is activated and delta18o activated')) + string="%s\n%s"%(string,fielddisplay(self,'precipitations_presentday','monthly surface precipitation [m/yr water eq], required if pdd is activated and delta18o activated')) + string="%s\n%s"%(string,fielddisplay(self,'delta18o','delta18o, required if pdd is activated and delta18o activated')) + string="%s\n%s"%(string,fielddisplay(self,'delta18o_surface','surface elevation of the delta18o site, required if pdd is activated and delta18o activated')) + + return string + #}}} + def extrude(self,md): # {{{ + + self.precipitation=project3d(md,'vector',self.precipitation,'type','node'); + self.monthlytemperatures=project3d(md,'vector',self.monthlytemperatures,'type','node'); + if self.isdelta18o: self.temperatures_lgm=project3d(md,'vector',self.temperatures_lgm,'type','node') + if self.isdelta18o: self.temperatures_presentday=project3d(md,'vector',self.temperatures_presentday,'type','node') + if self.isdelta18o: self.precipitations_presentday=project3d(md,'vector',self.precipitations_presentday,'type','node') + return self + #}}} + def initialize(self,md): # {{{ + + if numpy.all(numpy.isnan(self.precipitation)): + self.precipitation=numpy.zeros((md.mesh.numberofvertices,1)) + print " no SMBpdd.precipitation specified: values set as zero" + + return self + #}}} + def setdefaultparameters(self): # {{{ + + #pdd method not used in default mode + self.isdelta18o = 0 + self.desfac = 0.5 + self.s0p = 0. + + return self + #}}} + def checkconsistency(self,md,solution,analyses): # {{{ + + if MasstransportAnalysisEnum() in analyses: + md = checkfield(md,'fieldname','surfaceforcings.desfac','<=',1,'numel',[1]); + md = checkfield(md,'fieldname','surfaceforcings.s0p','>=',0,'numel',[1]); + if not self.isdelta18o: + md = checkfield(md,'fieldname','surfaceforcings.monthlytemperatures','forcing',1,'NaN',1) + md = checkfield(md,'fieldname','surfaceforcings.precipitation','forcing',1,'NaN',1) + else: + md = checkfield(md,'fieldname','surfaceforcings.delta18o','NaN',1) + md = checkfield(md,'fieldname','surfaceforcings.delta18o_surface','NaN',1) + md = checkfield(md,'fieldname','surfaceforcings.temperatures_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1) + md = checkfield(md,'fieldname','surfaceforcings.temperatures_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1) + md = checkfield(md,'fieldname','surfaceforcings.precipitations_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1) + + return md + # }}} + def marshall(self,md,fid): # {{{ + + yts=365.0*24.0*3600.0 + + WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBpddEnum(),'format','Integer'); + + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','precipitation','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','isdelta18o','format','Boolean') + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','desfac','format','Double'); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','s0p','format','Double'); + if self.isdelta18o: + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','temperatures_presentday','format','DoubleMat','mattype',1) + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','temperatures_lgm','format','DoubleMat','mattype',1) + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','precipitations_presentday','format','DoubleMat','mattype',1) + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','delta18o_surface','format','DoubleMat','mattype',1) + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','delta18o','format','DoubleMat','mattype',1) + else: + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','monthlytemperatures','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1) + # }}} Index: /issm/trunk/src/m/classes/autodiff.m =================================================================== --- /issm/trunk/src/m/classes/autodiff.m (revision 17805) +++ /issm/trunk/src/m/classes/autodiff.m (revision 17806) @@ -20,4 +20,24 @@ %}}} methods + function createxml(obj,fid) % {{{ + fprintf(fid, '\n'); + + % automatic differentiation parameters + fprintf(fid,'%s\n%s\n%s\n','','
'); + fprintf(fid,'%s%s%s\n%s\n%s%s%s\n%s\n%s\n',' ','
',' ',' indicates if the automatic differentiation is activated ',' '); + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' list of dependent variables ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' list of independent variables ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' ADOLC driver (''fos_forward'' or ''fov_forward'') ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' Number of operations per buffer (==OBUFSIZE in usrparms.h) ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' Number of locations per buffer (==LBUFSIZE in usrparms.h) ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' Number of values per buffer (==CBUFSIZE in usrparms.h) ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' Number of taylors per buffer (&lt;=TBUFSIZE in usrparms.h) ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' free location block sorting/consolidation triggered if the ratio between allocated and used locations exceeds gcTriggerRatio ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' free location block sorting/consolidation triggered if the allocated locations exceed gcTriggerMaxSize ',' '); + + fprintf(fid,'%s\n%s\n',''); + + end % }}} function obj = autodiff(varargin) % {{{ switch nargin @@ -42,13 +62,13 @@ %Driver value: - md = checkfield(md,'autodiff.driver','values',{'fos_forward','fov_forward','fov_forward_all','fos_reverse','fov_reverse','fov_reverse_all'}); + md = checkfield(md,'fieldname','autodiff.driver','values',{'fos_forward','fov_forward','fov_forward_all','fos_reverse','fov_reverse','fov_reverse_all'}); %buffer values: - md = checkfield(md,'autodiff.obufsize','>=',16); - md = checkfield(md,'autodiff.lbufsize','>=',16); - md = checkfield(md,'autodiff.cbufsize','>=',16); - md = checkfield(md,'autodiff.tbufsize','>=',16); - md = checkfield(md,'autodiff.gcTriggerRatio','>=',0); - md = checkfield(md,'autodiff.gcTriggerMaxSize','>=',65536); + md = checkfield(md,'fieldname','autodiff.obufsize','>=',16); + md = checkfield(md,'fieldname','autodiff.lbufsize','>=',16); + md = checkfield(md,'fieldname','autodiff.cbufsize','>=',16); + md = checkfield(md,'fieldname','autodiff.tbufsize','>=',16); + md = checkfield(md,'fieldname','autodiff.gcTriggerRatio','>=',0); + md = checkfield(md,'fieldname','autodiff.gcTriggerMaxSize','>=',65536); %go through our dependents and independents and check consistency: Index: /issm/trunk/src/m/classes/autodiff.py =================================================================== --- /issm/trunk/src/m/classes/autodiff.py (revision 17805) +++ /issm/trunk/src/m/classes/autodiff.py (revision 17806) @@ -1,9 +1,9 @@ import numpy -from dependent import * -from independent import * +from dependent import dependent +from independent import independent from fielddisplay import fielddisplay from EnumDefinitions import * -from checkfield import * -from WriteData import * +from checkfield import checkfield +from WriteData import WriteData class autodiff(object): @@ -62,13 +62,13 @@ return md - md = checkfield(md,'autodiff.obufsize','>=',524288) - md = checkfield(md,'autodiff.lbufsize','>=',524288) - md = checkfield(md,'autodiff.cbufsize','>=',524288) - md = checkfield(md,'autodiff.tbufsize','>=',524288) - md = checkfield(md,'autodiff.gcTriggerRatio','>=',2.0) - md = checkfield(md,'autodiff.gcTriggerMaxSize','>=',2000000) + md = checkfield(md,'fieldname','autodiff.obufsize','>=',524288) + md = checkfield(md,'fieldname','autodiff.lbufsize','>=',524288) + md = checkfield(md,'fieldname','autodiff.cbufsize','>=',524288) + md = checkfield(md,'fieldname','autodiff.tbufsize','>=',524288) + md = checkfield(md,'fieldname','autodiff.gcTriggerRatio','>=',2.0) + md = checkfield(md,'fieldname','autodiff.gcTriggerMaxSize','>=',2000000) #Driver value: - md = checkfield(md,'autodiff.driver','values',['fos_forward','fov_forward','fov_forward_all','fos_reverse','fov_reverse','fov_reverse_all']) + md = checkfield(md,'fieldname','autodiff.driver','values',['fos_forward','fov_forward','fov_forward_all','fos_reverse','fov_reverse','fov_reverse_all']) #go through our dependents and independents and check consistency: Index: /issm/trunk/src/m/classes/balancethickness.m =================================================================== --- /issm/trunk/src/m/classes/balancethickness.m (revision 17805) +++ /issm/trunk/src/m/classes/balancethickness.m (revision 17806) @@ -11,4 +11,13 @@ end methods + function createxml(obj,fid) % {{{ + fprintf(fid, '\n\n'); + fprintf(fid, '%s\n', ''); + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' thickness constraints (NaN means no constraint) [m] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' ice thickening rate used in the mass conservation (dh/dt) [m/yr] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n', '', '
',' 0: None, 1: SU, 2: SSAs artificial diffusivity, 3:DG ',''); + + end % }}} function obj = balancethickness(varargin) % {{{ switch nargin @@ -29,7 +38,7 @@ if solution~=BalancethicknessSolutionEnum(), return; end - md = checkfield(md,'balancethickness.spcthickness'); - md = checkfield(md,'balancethickness.thickening_rate','size',[md.mesh.numberofvertices 1],'NaN',1); - md = checkfield(md,'balancethickness.stabilization','size',[1 1],'values',[0 1 2 3]); + md = checkfield(md,'fieldname','balancethickness.spcthickness'); + md = checkfield(md,'fieldname','balancethickness.thickening_rate','size',[md.mesh.numberofvertices 1],'NaN',1); + md = checkfield(md,'fieldname','balancethickness.stabilization','size',[1 1],'values',[0 1 2 3]); end % }}} function disp(obj) % {{{ Index: /issm/trunk/src/m/classes/balancethickness.py =================================================================== --- /issm/trunk/src/m/classes/balancethickness.py (revision 17805) +++ /issm/trunk/src/m/classes/balancethickness.py (revision 17806) @@ -1,6 +1,6 @@ from fielddisplay import fielddisplay from EnumDefinitions import * -from checkfield import * -from WriteData import * +from checkfield import checkfield +from WriteData import WriteData class balancethickness(object): @@ -42,7 +42,7 @@ return md - md = checkfield(md,'balancethickness.spcthickness') - md = checkfield(md,'balancethickness.thickening_rate','size',[md.mesh.numberofvertices],'NaN',1) - md = checkfield(md,'balancethickness.stabilization','size',[1],'values',[0,1,2,3]) + md = checkfield(md,'fieldname','balancethickness.spcthickness') + md = checkfield(md,'fieldname','balancethickness.thickening_rate','size',[md.mesh.numberofvertices],'NaN',1) + md = checkfield(md,'fieldname','balancethickness.stabilization','size',[1],'values',[0,1,2,3]) return md Index: /issm/trunk/src/m/classes/basalforcings.m =================================================================== --- /issm/trunk/src/m/classes/basalforcings.m (revision 17805) +++ /issm/trunk/src/m/classes/basalforcings.m (revision 17806) @@ -11,4 +11,12 @@ end methods + function createxml(obj,fid) % {{{ + fprintf(fid, '\n\n'); + fprintf(fid, '%s\n', ''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' basal melting rate (positive if melting) [m/yr] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' additional melting applied to compensate for dh/dt [m/yr] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n', '', '
',' geothermal heat flux [W/m^2] ',''); + + end % }}} function obj = basalforcings(varargin) % {{{ switch nargin @@ -19,4 +27,12 @@ end end % }}} + function self = initialize(self,md) % {{{ + + if isnan(self.melting_rate), + self.melting_rate=zeros(md.mesh.numberofvertices,1); + disp(' no basalforcings.melting_rate specified: values set as zero'); + end + + end % }}} function obj = setdefaultparameters(obj) % {{{ @@ -25,12 +41,12 @@ if ismember(MasstransportAnalysisEnum(),analyses) & ~(solution==TransientSolutionEnum() & md.transient.ismasstransport==0), - md = checkfield(md,'basalforcings.melting_rate','NaN',1,'forcing',1); + md = checkfield(md,'fieldname','basalforcings.melting_rate','NaN',1,'forcing',1); end if ismember(BalancethicknessAnalysisEnum(),analyses), - md = checkfield(md,'basalforcings.melting_rate','NaN',1,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','basalforcings.melting_rate','NaN',1,'size',[md.mesh.numberofvertices 1]); end if ismember(ThermalAnalysisEnum(),analyses) & ~(solution==TransientSolutionEnum() & md.transient.isthermal==0), - md = checkfield(md,'basalforcings.melting_rate','NaN',1,'forcing',1); - md = checkfield(md,'basalforcings.geothermalflux','NaN',1,'forcing',1,'>=',0); + md = checkfield(md,'fieldname','basalforcings.melting_rate','NaN',1,'forcing',1); + md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'forcing',1,'>=',0); end end % }}} Index: /issm/trunk/src/m/classes/basalforcings.py =================================================================== --- /issm/trunk/src/m/classes/basalforcings.py (revision 17805) +++ /issm/trunk/src/m/classes/basalforcings.py (revision 17806) @@ -1,6 +1,6 @@ from fielddisplay import fielddisplay from EnumDefinitions import * -from checkfield import * -from WriteData import * +from checkfield import checkfield +from WriteData import WriteData import numpy @@ -30,4 +30,12 @@ return string #}}} + def initialize(self,md): # {{{ + + if numpy.all(numpy.isnan(self.melting_rate)): + self.melting_rate=numpy.zeros((md.mesh.numberofvertices,1)) + print " no basalforcings.melting_rate specified: values set as zero" + + return self + #}}} def setdefaultparameters(self): # {{{ return self @@ -36,12 +44,12 @@ if MasstransportAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and not md.transient.ismasstransport): - md = checkfield(md,'basalforcings.melting_rate','NaN',1,'forcing',1) + md = checkfield(md,'fieldname','basalforcings.melting_rate','NaN',1,'forcing',1) if BalancethicknessAnalysisEnum() in analyses: - md = checkfield(md,'basalforcings.melting_rate','NaN',1,'size',[md.mesh.numberofvertices]) + md = checkfield(md,'fieldname','basalforcings.melting_rate','NaN',1,'size',[md.mesh.numberofvertices]) if ThermalAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and not md.transient.isthermal): - md = checkfield(md,'basalforcings.melting_rate','NaN',1,'forcing',1) - md = checkfield(md,'basalforcings.geothermalflux','NaN',1,'forcing',1,'>=',0) + md = checkfield(md,'fieldname','basalforcings.melting_rate','NaN',1,'forcing',1) + md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'forcing',1,'>=',0) return md Index: /issm/trunk/src/m/classes/clusters/acenet.m =================================================================== --- /issm/trunk/src/m/classes/clusters/acenet.m (revision 17805) +++ /issm/trunk/src/m/classes/clusters/acenet.m (revision 17806) @@ -72,4 +72,6 @@ fprintf(fid,'module load gcc openmpi/gcc\n'); fprintf(fid,'module load issm\n'); + fprintf(fid,'export ISSM_DIR="%s/../"\n',cluster.codepath); %FIXME + fprintf(fid,'source $ISSM_DIR/etc/environment.sh\n'); %FIXME fprintf(fid,'\n'); fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',... Index: /issm/trunk/src/m/classes/clusters/discover.m =================================================================== --- /issm/trunk/src/m/classes/clusters/discover.m (revision 17805) +++ /issm/trunk/src/m/classes/clusters/discover.m (revision 17806) @@ -96,8 +96,8 @@ %write queuing script fid=fopen([modelname '.queue'],'w'); - fprintf(fid,'#PBS -S /bin/bash\n'); + fprintf(fid,'#!/bin/bash\n'); % fprintf(fid,'#PBS -N %s\n',modelname); - fprintf(fid,'#PBS -l select=%i:ncpus=%i:proc=%s\n',cluster.numnodes,cluster.cpuspernode,cluster.processor); - fprintf(fid,'#PBS -l walltime=%i\n',cluster.time*60); %walltime is in seconds. + fprintf(fid,'#PBS -l select=%i:mpiprocs=%i:proc=%s\n',cluster.numnodes,cluster.cpuspernode,cluster.processor); + fprintf(fid,'#PBS -l walltime=%i:00\n',cluster.time); %SLURM walltime is in minutes: fprintf(fid,'#PBS -q %s \n',cluster.queue); fprintf(fid,'#PBS -W group_list=s1010\n'); Index: /issm/trunk/src/m/classes/clusters/generic.m =================================================================== --- /issm/trunk/src/m/classes/clusters/generic.m (revision 17805) +++ /issm/trunk/src/m/classes/clusters/generic.m (revision 17806) @@ -19,7 +19,26 @@ valgrindlib=[issmdir() '/externalpackages/valgrind/install/lib/libmpidebug.so']; valgrindsup=[issmdir() '/externalpackages/valgrind/issm.supp']; + verbose=1; %}}} end methods + function createxml(obj,fid) % {{{ + fprintf(fid, '\n\n'); + fprintf(fid, '%s\n', ''); + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n', '', '
',' N/A ',''); + + end % }}} function cluster=generic(varargin) % {{{ @@ -50,4 +69,5 @@ disp(sprintf(' valgrindlib: %s',cluster.valgrindlib)); disp(sprintf(' valgrindsup: %s',cluster.valgrindsup)); + disp(sprintf(' verbose: %s',cluster.verbose)); end %}}} @@ -114,4 +134,7 @@ fid=fopen([modelname '.bat'],'w'); fprintf(fid,'@echo off\n'); + + warning('parallel runs not allowed yet in Windows. Defaulting to 1 cpus'); + cluster.np=1; if cluster.np>1, @@ -189,8 +212,8 @@ system(compressstring); - disp('uploading input file and queueing script'); + if cluster.verbose, disp('uploading input file and queueing script'); end issmscpout(cluster.name,cluster.executionpath,cluster.login,cluster.port,{[dirname '.tar.gz']}); - disp('launching solution sequence on remote cluster'); + if cluster.verbose, disp('launching solution sequence on remote cluster'); end launchcommand=['source ' cluster.etcpath '/environment.sh && cd ' cluster.executionpath ' && rm -rf ./' dirname ' && mkdir ' dirname ... ' && cd ' dirname ' && mv ../' dirname '.tar.gz ./ && tar -zxf ' dirname '.tar.gz && source ' modelname '.queue ']; Index: /issm/trunk/src/m/classes/clusters/generic.py =================================================================== --- /issm/trunk/src/m/classes/clusters/generic.py (revision 17805) +++ /issm/trunk/src/m/classes/clusters/generic.py (revision 17806) @@ -1,13 +1,14 @@ import socket +import os import math import subprocess from IssmConfig import IssmConfig from EnumToString import EnumToString -from issmdir import * -from pairoptions import * -from issmssh import * -from issmscpin import * -from issmscpout import * -from MatlabFuncs import * +from issmdir import issmdir +from pairoptions import pairoptions +from issmssh import issmssh +from issmscpin import issmscpin +from issmscpout import issmscpout +import MatlabFuncs as m class generic(object): @@ -37,5 +38,5 @@ #get name - self.name=options.getfieldvalue('name',socket.gethostname().lower().split('.')[0]) + self.name=socket.gethostname() #initialize cluster using user settings if provided @@ -46,5 +47,4 @@ self=options.AssignObjectFields(self) # }}} - def __repr__(self): # {{{ # display the object @@ -61,5 +61,4 @@ return s # }}} - def checkconsistency(self,md,solution,analyses): # {{{ if self.np<1: @@ -70,9 +69,8 @@ return md # }}} - def BuildQueueScript(self,dirname,modelname,solution,io_gather,isvalgrind,isgprof): # {{{ #write queuing script - if not ispc(): + if not m.ispc(): fid=open(modelname+'.queue','w') @@ -123,9 +121,8 @@ fid.close() # }}} - def BuildKrigingQueueScript(self,modelname,solution,io_gather,isvalgrind,isgprof): # {{{ #write queuing script - if not ispc(): + if not m.ispc(): fid=open(modelname+'.queue','w') @@ -165,5 +162,4 @@ fid.close() # }}} - def LaunchQueueJob(self,modelname,dirname,filelist): # {{{ @@ -184,8 +180,7 @@ issmssh(self.name,self.login,self.port,launchcommand) # }}} - def Download(self,dirname,filelist): # {{{ - if ispc(): + if m.ispc(): #do nothing return @@ -195,3 +190,2 @@ issmscpin(self.name,self.login,self.port,directory,filelist) # }}} - Index: /issm/trunk/src/m/classes/clusters/greenplanet.m =================================================================== --- /issm/trunk/src/m/classes/clusters/greenplanet.m (revision 17805) +++ /issm/trunk/src/m/classes/clusters/greenplanet.m (revision 17806) @@ -19,4 +19,5 @@ interactive=0; time=24*60; + memory=2; end properties (SetAccess=private) @@ -47,4 +48,6 @@ disp(sprintf(' executionpath: %s',cluster.executionpath)); disp(sprintf(' interactive: %i',cluster.interactive)); + disp(sprintf(' time: %i',cluster.time)); + disp(sprintf(' memory: %i',cluster.memory)); end %}}} @@ -78,4 +81,6 @@ fprintf(fid,'#PBS -q %s \n',cluster.queue); fprintf(fid,'#PBS -l nodes=%i:ppn=%i\n',cluster.numnodes,cluster.cpuspernode); + fprintf(fid,'#PBS -l walltime=%i\n',cluster.time*60);%walltime is in seconds. + fprintf(fid,'#PBS -l mem=%igb\n',cluster.memory); fprintf(fid,'#PBS -m bea\n'); fprintf(fid,'#PBS -M mmorligh@uci.edu\n'); @@ -103,5 +108,8 @@ fprintf(fid,'#PBS -N %s\n',modelname); fprintf(fid,'#PBS -q %s \n',cluster.queue); - fprintf(fid,'#PBS -l nodes=%i:ppn=%i\n',cluster.numnodes,cluster.cpuspernode); + fprintf(fid,'#PBS -l nodes=%i:ppn=%i\n',cluster.numnodes, ... + cluster.cpuspernode); + fprintf(fid,'#PBS -l walltime=%i\n',cluster.time*60); %walltime is in seconds. + fprintf(fid,'#PBS -l mem=%igb\n',cluster.memory); fprintf(fid,'#PBS -m bea\n'); fprintf(fid,'#PBS -M mmorligh@uci.edu\n'); @@ -147,6 +155,6 @@ disp('launching solution sequence on remote cluster'); - launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' dirname ' && mkdir ' dirname ... - ' && cd ' dirname ' && mv ../' dirname '.tar.gz ./ && tar -zxf ' dirname '.tar.gz && qsub ' modelname '.queue ']; + launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' dirname ' && mkdir ' dirname ... + ' && cd ' dirname ' && mv ../' dirname '.tar.gz ./ && tar -zxf ' dirname '.tar.gz && hostname && qsub ' modelname '.queue ']; issmssh(cluster.name,cluster.login,cluster.port,launchcommand); end %}}} Index: /issm/trunk/src/m/classes/constants.m =================================================================== --- /issm/trunk/src/m/classes/constants.m (revision 17805) +++ /issm/trunk/src/m/classes/constants.m (revision 17806) @@ -11,4 +11,11 @@ end methods + function createxml(obj,fid) % {{{ + fprintf(fid, '\n\n'); + fprintf(fid, '%s\n', ''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' gravitational acceleration [m/s^2] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' number of seconds in a year [s/yr] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n','','
',' reference temperature used in the enthalpy model [K] ',''); + end % }}} function obj = constants(varargin) % {{{ switch nargin @@ -33,7 +40,7 @@ function md = checkconsistency(obj,md,solution,analyses) % {{{ -% md = checkfield(md,'constants.g','>',0,'size',[1 1]); - md = checkfield(md,'constants.yts','>',0,'size',[1 1]); - md = checkfield(md,'constants.referencetemperature','size',[1 1]); +% md = checkfield(md,'fieldname','constants.g','>',0,'size',[1 1]); + md = checkfield(md,'fieldname','constants.yts','>',0,'size',[1 1]); + md = checkfield(md,'fieldname','constants.referencetemperature','size',[1 1]); end % }}} Index: /issm/trunk/src/m/classes/constants.py =================================================================== --- /issm/trunk/src/m/classes/constants.py (revision 17805) +++ /issm/trunk/src/m/classes/constants.py (revision 17806) @@ -1,6 +1,6 @@ from fielddisplay import fielddisplay from EnumDefinitions import * -from checkfield import * -from WriteData import * +from checkfield import checkfield +from WriteData import WriteData class constants(object): @@ -45,7 +45,7 @@ def checkconsistency(self,md,solution,analyses): # {{{ - md = checkfield(md,'constants.g','>',0,'size',[1]) - md = checkfield(md,'constants.yts','>',0,'size',[1]) - md = checkfield(md,'constants.referencetemperature','size',[1]) + md = checkfield(md,'fieldname','constants.g','>',0,'size',[1]) + md = checkfield(md,'fieldname','constants.yts','>',0,'size',[1]) + md = checkfield(md,'fieldname','constants.referencetemperature','size',[1]) return md Index: /issm/trunk/src/m/classes/damage.m =================================================================== --- /issm/trunk/src/m/classes/damage.m (revision 17805) +++ /issm/trunk/src/m/classes/damage.m (revision 17806) @@ -7,4 +7,5 @@ properties (SetAccess=public) %damage + isdamage = NaN; D = NaN; law = ''; @@ -14,6 +15,7 @@ %numerical stabilization = NaN; + maxiter = NaN; + elementinterp = ''; penalty_threshold = NaN; - maxiter = NaN; penalty_lock = NaN; penalty_factor = NaN; @@ -26,6 +28,56 @@ c4 = NaN; healing = NaN; + equiv_stress = NaN; + requested_outputs = {}; end methods + function createxml(obj,fid) % {{{ + fprintf(fid, '\n\n'); + fprintf(fid, '%s\n', ''); + fprintf(fid, '%s\n', ''); + + %fprintf(fid,'%s%s%s%s\n%s\n%s\n%s\n', '', '
',' damage law (string) from {"undamaged","pralong"} ',''); + % drop-down + fprintf(fid,'%s%s%s%s%s\n\t%s\n','','
'); + + % law = 'undamage' + fprintf(fid,'\t%s%s%s%s%s\n\t\t%s\n',''); + + % law = 'pralong' + fprintf(fid,'\t%s%s%s%s%s\n\t\t%s\n',''); + + + % footer for drop-down + fprintf(fid,'\t%s\n%s\n%s',' damage law (string) from {"undamaged","pralong"} ',''); + + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' damage tensor (scalar) ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' damage law (string) from {"undamaged","pralong"} ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' damage constraints (NaN means no constraint) ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' maximum possible damage (0&lt;=max_damage&lt;1) ',''); + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' 0: no, 1: artificial_diffusivity, 2: SUPG ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' maximum number of non linear iterations ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' stabilize unstable damage constraints that keep zigzagging after n iteration (default is 0, no stabilization) ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' threshold to declare convergence of damage evolution solution (default is 0) ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' scaling exponent (default is 3) ',''); + + end % }}} + function obj = damage(varargin) % {{{ switch nargin @@ -49,4 +101,5 @@ %damage parameters: + obj.isdamage=0; obj.D=0; obj.law='undamaged'; @@ -59,4 +112,7 @@ %Maximum number of iterations obj.maxiter=100; + + %finite element interpolation + obj.elementinterp='P1'; %factor used to compute the values of the penalties: kappa=max(stiffness matrix)*10^penalty_factor @@ -76,26 +132,36 @@ obj.c3=0; obj.c4=0; + obj.equiv_stress=0; + + %output default: + obj.requested_outputs={'default'}; end % }}} function md = checkconsistency(obj,md,solution,analyses) % {{{ - md = checkfield(md,'damage.D','>=',0,'<=',obj.max_damage,'size',[md.mesh.numberofvertices 1]); - md = checkfield(md,'damage.max_damage','<',1,'>=',0); - md = checkfield(md,'damage.law','values',{'undamaged','pralong'}); - md = checkfield(md,'damage.spcdamage','forcing',1); - - md = checkfield(md,'damage.stabilization','numel',[1],'values',[0 1 2]); - md = checkfield(md,'damage.maxiter','>=0',0); - md = checkfield(md,'damage.penalty_factor','>=0',0); - md = checkfield(md,'damage.penalty_lock','>=0',0); - md = checkfield(md,'damage.penalty_threshold','>=0',0); + md = checkfield(md,'fieldname','damage.isdamage','values',[1,0]); + if obj.isdamage, + md = checkfield(md,'fieldname','damage.law','values',{'undamaged','pralong'}); + md = checkfield(md,'fieldname','damage.D','>=',0,'<=',obj.max_damage,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','damage.spcdamage','forcing',1); + md = checkfield(md,'fieldname','damage.max_damage','<',1,'>=',0); + + md = checkfield(md,'fieldname','damage.stabilization','numel',[1],'values',[0 1 2]); + md = checkfield(md,'fieldname','damage.maxiter','>=0',0); + md = checkfield(md,'fieldname','damage.elementinterp','values',{'P1','P2'}); + md = checkfield(md,'fieldname','damage.penalty_factor','>=0',0); + md = checkfield(md,'fieldname','damage.penalty_lock','>=0',0); + md = checkfield(md,'fieldname','damage.penalty_threshold','>=0',0); + end if strcmpi(obj.law,'pralong'), - md = checkfield(md,'damage.healing','>=',0); - md = checkfield(md,'damage.c1','>=',0); - md = checkfield(md,'damage.c2','>=',0); - md = checkfield(md,'damage.c3','>=',0); - md = checkfield(md,'damage.c4','>=',0); - md = checkfield(md,'damage.stress_threshold','>=',0); + md = checkfield(md,'fieldname','damage.healing','>=',0); + md = checkfield(md,'fieldname','damage.c1','>=',0); + md = checkfield(md,'fieldname','damage.c2','>=',0); + md = checkfield(md,'fieldname','damage.c3','>=',0); + md = checkfield(md,'fieldname','damage.c4','>=',0); + md = checkfield(md,'fieldname','damage.stress_threshold','>=',0); + md = checkfield(md,'fieldname','damage.equiv_stress','numel',[1],'values',[0 1]); + md = checkfield(md,'fieldname','damage.requested_outputs','stringrow',1); elseif strcmpi(obj.law,'undamaged'), if (solution==DamageEvolutionSolutionEnum), @@ -107,17 +173,29 @@ end % }}} + function list=defaultoutputs(self,md) % {{{ + + if strcmp(domaintype(md.mesh),'2Dhorizontal'), + list = {'DamageDbar'}; + else + list = {'DamageD'}; + end + end % }}} function disp(obj) % {{{ disp(sprintf(' Damage:\n')); - fielddisplay(obj,'D','damage tensor (scalar)'); - fielddisplay(obj,'law','damage law (string) from {''undamaged'',''pralong''}'); - fielddisplay(obj,'spcdamage','damage constraints (NaN means no constraint)'); - fielddisplay(obj,'max_damage','maximum possible damage (0<=max_damage<1)'); - - fielddisplay(obj,'stabilization','0: no, 1: artificial_diffusivity, 2: SUPG'); - fielddisplay(obj,'maxiter','maximum number of non linear iterations'); - fielddisplay(obj,'penalty_lock','stabilize unstable damage constraints that keep zigzagging after n iteration (default is 0, no stabilization)'); - fielddisplay(obj,'penalty_threshold','threshold to declare convergence of damage evolution solution (default is 0)'); - fielddisplay(obj,'penalty_factor','scaling exponent (default is 3)'); + fielddisplay(obj,'isdamage','is damage mechanics being used? {true,false}'); + if obj.isdamage, + fielddisplay(obj,'law','damage law (string) from {''undamaged'',''pralong''}'); + fielddisplay(obj,'D','damage tensor (scalar)'); + fielddisplay(obj,'spcdamage','damage constraints (NaN means no constraint)'); + fielddisplay(obj,'max_damage','maximum possible damage (0<=max_damage<1)'); + + fielddisplay(obj,'stabilization','0: no, 1: artificial_diffusivity, 2: SUPG'); + fielddisplay(obj,'maxiter','maximum number of non linear iterations'); + fielddisplay(obj,'elementinterp','interpolation scheme for finite elements {''P1'',''P2''}'); + fielddisplay(obj,'penalty_lock','stabilize unstable damage constraints that keep zigzagging after n iteration (default is 0, no stabilization)'); + fielddisplay(obj,'penalty_threshold','threshold to declare convergence of damage evolution solution (default is 0)'); + fielddisplay(obj,'penalty_factor','scaling exponent (default is 3)'); + end if strcmpi(obj.law,'pralong'), @@ -126,6 +204,8 @@ fielddisplay(obj,'c3','damage parameter 3'); fielddisplay(obj,'c4','damage parameter 4'); - fielddisplay(obj,'healing','damage healing parameter 1'); + fielddisplay(obj,'healing','damage healing parameter'); fielddisplay(obj,'stress_threshold','damage stress threshold [Pa]'); + fielddisplay(obj,'equiv_stress','0: von Mises, 1: max principal'); + fielddisplay(obj,'requested_outputs','additional outputs requested'); end @@ -133,14 +213,18 @@ function marshall(obj,md,fid) % {{{ - WriteData(fid,'object',obj,'fieldname','D','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'fieldname','law','format','String'); - WriteData(fid,'object',obj,'fieldname','spcdamage','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); - WriteData(fid,'object',obj,'fieldname','max_damage','format','Double'); - - WriteData(fid,'object',obj,'fieldname','stabilization','format','Integer'); - WriteData(fid,'object',obj,'fieldname','penalty_threshold','format','Integer'); - WriteData(fid,'object',obj,'fieldname','maxiter','format','Integer'); - WriteData(fid,'object',obj,'fieldname','penalty_lock','format','Integer'); - WriteData(fid,'object',obj,'fieldname','penalty_factor','format','Double'); + WriteData(fid,'object',obj,'fieldname','isdamage','format','Boolean'); + if obj.isdamage, + WriteData(fid,'object',obj,'fieldname','law','format','String'); + WriteData(fid,'object',obj,'fieldname','D','format','DoubleMat','mattype',1); + WriteData(fid,'object',obj,'fieldname','spcdamage','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'fieldname','max_damage','format','Double'); + + WriteData(fid,'object',obj,'fieldname','stabilization','format','Integer'); + WriteData(fid,'object',obj,'fieldname','maxiter','format','Integer'); + WriteData(fid,'object',obj,'fieldname','elementinterp','format','String'); + WriteData(fid,'object',obj,'fieldname','penalty_threshold','format','Integer'); + WriteData(fid,'object',obj,'fieldname','penalty_lock','format','Integer'); + WriteData(fid,'object',obj,'fieldname','penalty_factor','format','Double'); + end if strcmpi(obj.law,'pralong'), @@ -151,4 +235,16 @@ WriteData(fid,'object',obj,'fieldname','stress_threshold','format','Double'); WriteData(fid,'object',obj,'fieldname','healing','format','Double'); + WriteData(fid,'object',obj,'fieldname','equiv_stress','format','Integer'); + end + + %process requested outputs + outputs = obj.requested_outputs; + pos = find(ismember(outputs,'default')); + if ~isempty(pos), + outputs(pos) = []; %remove 'default' from outputs + outputs = [outputs defaultoutputs(obj,md)]; %add defaults + end + if obj.isdamage, + WriteData(fid,'data',outputs,'enum',DamageEvolutionRequestedOutputsEnum,'format','StringArray'); end Index: /issm/trunk/src/m/classes/damage.py =================================================================== --- /issm/trunk/src/m/classes/damage.py (revision 17805) +++ /issm/trunk/src/m/classes/damage.py (revision 17806) @@ -2,6 +2,7 @@ from EnumDefinitions import * from StringToEnum import StringToEnum -from checkfield import * -from WriteData import * +from checkfield import checkfield +from WriteData import WriteData +import MatlabFuncs as m class damage(object): @@ -10,5 +11,5 @@ Usage: - damage=damage(); + damage=damage() """ @@ -16,4 +17,5 @@ #damage: + self.isdamage = float('NaN') self.D = float('NaN') self.law = '' @@ -23,6 +25,7 @@ #numerical stabilization = float('NaN') + maxiter = float('NaN') + elementinterp = '' penalty_threshold = float('NaN') - maxiter = float('NaN') penalty_lock = float('NaN') penalty_factor = float('NaN') @@ -35,4 +38,6 @@ self.c4 = float('NaN') self.healing = float('NaN') + self.equiv_stress = float('NaN') + self.requested_outputs = [] if not len(args): @@ -44,15 +49,18 @@ def __repr__(self): # {{{ s =' Damage:\n' + + s+="%s\n" % fielddisplay(self,"isdamage","is damage mechanics being used? [0 (default) or 1]") + if self.isdamage: + s+="%s\n" % fielddisplay(self,"D","damage tensor (scalar for now)") + s+="%s\n" % fielddisplay(self,"law","damage law (string) from ['undamaged','pralong']") + s+="%s\n" % fielddisplay(self,"spcdamage","damage constraints (NaN means no constraint)") + s+="%s\n" % fielddisplay(self,"max_damage","maximum possible damage (0<=max_damage<1)") - s+="%s\n" % fielddisplay(self,"D","damage tensor (scalar for now)") - s+="%s\n" % fielddisplay(self,"law","damage law (string) from ['undamaged','pralong']") - s+="%s\n" % fielddisplay(self,"spcdamage","damage constraints (NaN means no constraint)") - s+="%s\n" % fielddisplay(self,"max_damage","maximum possible damage (0<=max_damage<1)") - - s+="%s\n" % fielddisplay(self,"stabilization","0: no, 1: artificial_diffusivity, 2: SUPG") - s+="%s\n" % fielddisplay(self,"maxiter","maximum number of non linear iterations") - s+="%s\n" % fielddisplay(self,"penalty_lock","stabilize unstable damage constraints that keep zigzagging after n iteration (default is 0, no stabilization)") - s+="%s\n" % fielddisplay(self,"penalty_lock","threshold to declare convergence of damage evolution solution (default is 0)") - s+="%s\n" % fielddisplay(self,"penalty_lock","scaling exponent (default is 3)") + s+="%s\n" % fielddisplay(self,"stabilization","0: no, 1: artificial_diffusivity, 2: SUPG") + s+="%s\n" % fielddisplay(self,"maxiter","maximum number of non linear iterations") + s+="%s\n" % fielddisplay(self,"elementinterp","interpolation scheme for finite elements {''P1'',''P2''}") + s+="%s\n" % fielddisplay(self,"penalty_lock","stabilize unstable damage constraints that keep zigzagging after n iteration (default is 0, no stabilization)") + s+="%s\n" % fielddisplay(self,"penalty_threshold","threshold to declare convergence of damage evolution solution (default is 0)") + s+="%s\n" % fielddisplay(self,"penalty_factor","scaling exponent (default is 3)") if (self.law=='pralong'): @@ -62,4 +70,7 @@ s+="%s\n" % fielddisplay(self,"c4","damage parameter 4 ") s+="%s\n" % fielddisplay(self,"stress_threshold","damage stress threshold [Pa]") + s+="%s\n" % fielddisplay(self,"healing","damage healing parameter") + s+="%s\n" % fielddisplay(self,"equiv_stress","0: von Mises, 1: max principal") + s+="%s\n" % fielddisplay(self,'requested_outputs','additional outputs requested') return s @@ -68,4 +79,5 @@ #damage parameters: + self.isdamage=0 self.D=0 self.law='undamaged' @@ -78,4 +90,7 @@ #Maximum number of iterations self.maxiter=100 + + #finite element interpolation + self.elementinterp='P1' #factor used to compute the values of the penalties: kappa=max(stiffness matrix)*10^penalty_factor @@ -95,29 +110,49 @@ self.c4=0 self.healing=0 + self.equiv_stress=0 + #output default: + self.requested_outputs=['default'] + + return self # }}} + def defaultoutputs(self,md): # {{{ + + if md.mesh.domaintype().lower()=='2dhorizontal': + list = ['DamageDbar'] + else: + list = ['DamageD'] + return list + + #}}} def checkconsistency(self,md,solution,analyses): # {{{ - md = checkfield(md,'damage.D','>=',0,'<=',self.max_damage,'size',[md.mesh.numberofvertices]) - md = checkfield(md,'damage.max_damage','<',1,'>=',0) - md = checkfield(md,'damage.law','values',['undamaged','pralong']) - md = checkfield(md,'damage.spcdamage','forcing',1) - - md = checkfield(md,'damage.stabilization','numel',[1],'values',[0,1,2]); - md = checkfield(md,'damage.maxiter','>=0',0); - md = checkfield(md,'damage.penalty_factor','>=0',0); - md = checkfield(md,'damage.penalty_lock','>=0',0); - md = checkfield(md,'damage.penalty_threshold','>=0',0); + md = checkfield(md,'fieldname','damage.isdamage','numel',[1],'values',[0,1]) + if self.isdamage: + md = checkfield(md,'fieldname','damage.D','>=',0,'<=',self.max_damage,'size',[md.mesh.numberofvertices]) + md = checkfield(md,'fieldname','damage.max_damage','<',1,'>=',0) + md = checkfield(md,'fieldname','damage.law','values',['undamaged','pralong']) + md = checkfield(md,'fieldname','damage.spcdamage','forcing',1) + + md = checkfield(md,'fieldname','damage.stabilization','numel',[1],'values',[0,1,2]) + md = checkfield(md,'fieldname','damage.maxiter','>=0',0) + md = checkfield(md,'fieldname','damage.elementinterp','values',['P1','P2']) + md = checkfield(md,'fieldname','damage.penalty_factor','>=0',0) + md = checkfield(md,'fieldname','damage.penalty_lock','>=0',0) + md = checkfield(md,'fieldname','damage.penalty_threshold','>=0',0) if self.law == 'pralong': - md = checkfield(md,'damage.healing','>=',0); - md = checkfield(md,'damage.c1','>=',0) - md = checkfield(md,'damage.c2','>=',0) - md = checkfield(md,'damage.c3','>=',0) - md = checkfield(md,'damage.c4','>=',0) - md = checkfield(md,'damage.stress_threshold','>=',0) - elif strcmpi(self.law,'undamaged'): + md = checkfield(md,'fieldname','damage.healing','>=',0) + md = checkfield(md,'fieldname','damage.c1','>=',0) + md = checkfield(md,'fieldname','damage.c2','>=',0) + md = checkfield(md,'fieldname','damage.c3','>=',0) + md = checkfield(md,'fieldname','damage.c4','>=',0) + md = checkfield(md,'fieldname','damage.stress_threshold','>=',0) + md = checkfield(md,'fieldname','damage.healing','>=',0) + md = checkfield(md,'fieldname','damage.equiv_stress','numel',[1],'values',[0,1]) + md = checkfield(md,'fieldname','damage.requested_outputs','stringrow',1) + elif m.strcmpi(self.law,'undamaged'): if (solution==DamageEvolutionSolutionEnum): - raise RuntimeError('Invalid evolution law (md.damage.law) for a damage solution'); + raise RuntimeError('Invalid evolution law (md.damage.law) for a damage solution') return md @@ -125,14 +160,17 @@ def marshall(self,md,fid): # {{{ - WriteData(fid,'object',self,'fieldname','D','format','DoubleMat','mattype',1) - WriteData(fid,'object',self,'fieldname','law','format','String') - WriteData(fid,'object',self,'fieldname','spcdamage','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); - WriteData(fid,'object',self,'fieldname','max_damage','format','Double'); + WriteData(fid,'object',self,'fieldname','isdamage','format','Boolean') + if self.isdamage: + WriteData(fid,'object',self,'fieldname','D','format','DoubleMat','mattype',1) + WriteData(fid,'object',self,'fieldname','law','format','String') + WriteData(fid,'object',self,'fieldname','spcdamage','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'fieldname','max_damage','format','Double') - WriteData(fid,'object',self,'fieldname','stabilization','format','Integer'); - WriteData(fid,'object',self,'fieldname','penalty_threshold','format','Integer'); - WriteData(fid,'object',self,'fieldname','maxiter','format','Integer'); - WriteData(fid,'object',self,'fieldname','penalty_lock','format','Integer'); - WriteData(fid,'object',self,'fieldname','penalty_factor','format','Double'); + WriteData(fid,'object',self,'fieldname','stabilization','format','Integer') + WriteData(fid,'object',self,'fieldname','elementinterp','format','String') + WriteData(fid,'object',self,'fieldname','penalty_threshold','format','Integer') + WriteData(fid,'object',self,'fieldname','maxiter','format','Integer') + WriteData(fid,'object',self,'fieldname','penalty_lock','format','Integer') + WriteData(fid,'object',self,'fieldname','penalty_factor','format','Double') if self.law=='pralong': @@ -142,3 +180,13 @@ WriteData(fid,'object',self,'fieldname','c4','format','Double') WriteData(fid,'object',self,'fieldname','stress_threshold','format','Double') + WriteData(fid,'object',self,'fieldname','healing','format','Double') + WriteData(fid,'object',self,'fieldname','equiv_stress','format','Integer') + + #process requested outputs + outputs = self.requested_outputs + indices = [i for i, x in enumerate(outputs) if x == 'default'] + if len(indices) > 0: + outputscopy=outputs[0:max(0,indices[0]-1)]+self.defaultoutputs(md)+outputs[indices[0]+1:] + outputs =outputscopy + WriteData(fid,'data',outputs,'enum',DamageEvolutionRequestedOutputsEnum(),'format','StringArray') # }}} Index: /issm/trunk/src/m/classes/debug.m =================================================================== --- /issm/trunk/src/m/classes/debug.m (revision 17805) +++ /issm/trunk/src/m/classes/debug.m (revision 17806) @@ -11,4 +11,11 @@ end methods + function createxml(obj,fid) % {{{ + fprintf(fid, '\n\n'); + fprintf(fid, '%s\n', ''); + fprintf(fid,'%s%s%s\n%s\n%s%s%s\n%s\n%s\n', '', '
',' ',' use Valgrind to debug (0 or 1) ',''); + fprintf(fid,'%s%s%s\n%s\n%s%s%s\n%s\n%s\n', '', '
',' ',' use gnu-profiler to find out where the time is spent ',''); + fprintf(fid,'%s%s%s\n%s\n%s%s%s\n%s\n', '', '
',' ',' enables profiling (memory, flops, time) ',''); + end % }}} function obj = debug(varargin) % {{{ switch nargin Index: /issm/trunk/src/m/classes/dependent.py =================================================================== --- /issm/trunk/src/m/classes/dependent.py (revision 17805) +++ /issm/trunk/src/m/classes/dependent.py (revision 17806) @@ -1,10 +1,9 @@ import os.path import numpy -from pairoptions import * -from fielddisplay import * -from MatlabFuncs import * +from pairoptions import pairoptions +from fielddisplay import fielddisplay +import MatlabFuncs as m from EnumDefinitions import * -from WriteData import * -from MeshProfileIntersection import * +from MeshProfileIntersection import MeshProfileIntersection class dependent(object): Index: /issm/trunk/src/m/classes/flaim.m =================================================================== --- /issm/trunk/src/m/classes/flaim.m (revision 17805) +++ /issm/trunk/src/m/classes/flaim.m (revision 17806) @@ -21,4 +21,37 @@ end methods + function createxml(obj,fid) % {{{ + fprintf(fid, '\n'); + + % Input + fprintf(fid,'%s\n%s\n%s\n','','
'); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' name of kml output targets file ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' name of kml input tracks file ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' structure of kml flight requirements (not used yet) ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' element or nodal criterion for flight path evaluation (metric) ',' '); + fprintf(fid,'%s\n%s\n',''); + + % Arguments + fprintf(fid,'%s\n%s\n%s\n','','
'); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' number of grids at equator (determines resolution) ',' '); + fprintf(fid,'%s%s%s\n%s\n%s%s%s\n%s\n%s\n',' ','
',' ',' flag to consider target values for flight path evaluation ',' '); + fprintf(fid,'%s%s%s\n%s\n%s%s%s\n%s\n%s\n',' ','
',' ',' flag to split polygons on the antimeridian ',' '); + fprintf(fid,'%s\n%s\n',''); + + % Optimization + fprintf(fid,'%s\n%s\n%s\n','','
'); + fprintf(fid,'%s%s%s\n%s\n%s%s%s\n%s\n%s\n',' ','
',' ',' optimize? (default false) ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' number of directions to test when moving a point. If this value = 1, a random direction is tested. A value > 1 results in directions equally spaced from [0, 2*PI] being tested. For example, 4 would result in directions [0, PI/2, PI, 3PI/2] ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' specifies the distance in km (default 25) to move a randomly selected path point on each iteration ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' number of iterations (default 30,000) to run for flightplan optimization, i.e. the number of times to randomly select a point and move it. ',' '); + fprintf(fid,'%s\n%s\n',''); + + % Output + fprintf(fid,'%s\n%s\n%s\n','','
'); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' name of kml solution file ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' quality of kml solution ',' '); + fprintf(fid,'%s\n%s\n',''); + + end % }}} function obj = flaim(varargin) % {{{ switch nargin @@ -37,9 +70,9 @@ if solution~=FlaimSolutionEnum(), return; end - md = checkfield(md,'flaim.tracks','file',1); + md = checkfield(md,'fieldname','flaim.tracks','file',1); if any(isnan(md.flaim.criterion)) || isempty(md.flaim.criterion) - md = checkfield(md,'flaim.targets','file',1); + md = checkfield(md,'fieldname','flaim.targets','file',1); else - md = checkfield(md,'flaim.criterion','numel',[md.mesh.numberofvertices md.mesh.numberofelements]); + md = checkfield(md,'fieldname','flaim.criterion','numel',[md.mesh.numberofvertices md.mesh.numberofelements]); end Index: /issm/trunk/src/m/classes/flaim.py =================================================================== --- /issm/trunk/src/m/classes/flaim.py (revision 17805) +++ /issm/trunk/src/m/classes/flaim.py (revision 17806) @@ -3,6 +3,6 @@ from fielddisplay import fielddisplay from EnumDefinitions import * -from checkfield import * -from WriteData import * +from checkfield import checkfield +from WriteData import WriteData class flaim(object): @@ -63,9 +63,9 @@ return md - md = checkfield(md,'flaim.tracks','file',1) + md = checkfield(md,'fieldname','flaim.tracks','file',1) if numpy.any(numpy.isnan(md.flaim.criterion)) or not md.flaim.criterion: - md = checkfield(md,'flaim.targets','file',1) + md = checkfield(md,'fieldname','flaim.targets','file',1) else: - md = checkfield(md,'flaim.criterion','numel',[md.mesh.numberofvertices,md.mesh.numberofelements]) + md = checkfield(md,'fieldname','flaim.criterion','numel',[md.mesh.numberofvertices,md.mesh.numberofelements]) return md Index: /issm/trunk/src/m/classes/flowequation.m =================================================================== --- /issm/trunk/src/m/classes/flowequation.m (revision 17805) +++ /issm/trunk/src/m/classes/flowequation.m (revision 17806) @@ -14,4 +14,6 @@ fe_HO = ''; fe_FS = ''; + XTH_r = 1.; + XTH_theta = 0.; vertex_equation = NaN; element_equation = NaN; @@ -57,4 +59,27 @@ end methods + function createxml(obj,fid) % {{{ + fprintf(fid, '\n\n'); + fprintf(fid, '%s\n', ''); + fprintf(fid,'%s\n%s\n%s\n','','
'); + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' is the Shallow Ice Approximation (SIA) used ? ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' is the Shelfy-Stream Approximation (SSA) used ? ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' is the L1L2 approximation used ? ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' is the Higher-Order (HO) approximation used ? ',''); + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' are the Full-FS (FS) equations used ? ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' Finite Element for SSA "P1", "P1bubble" "P1bubblecondensed" "P2" ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' Finite Element for HO "P1" "P1bubble" "P1bubblecondensed" "P1xP2" "P2xP1" "P2" ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' Finite Element for FS "P1P1" (debugging only) "P1P1GLS" "MINIcondensed" "MINI" "TaylorHood" ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' flow equation for each vertex ',''); + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' flow equation for each element ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' vertices on SSAs border (for tiling) ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' vertices on HOs border (for tiling) ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n', '', '
',' vertices on FS border (for tiling) ',''); + + fprintf(fid,'%s\n%s\n',''); + end % }}} function obj = flowequation(varargin) % {{{ switch nargin @@ -80,24 +105,26 @@ if ismember(StressbalanceAnalysisEnum(),analyses), - md = checkfield(md,'flowequation.isSIA','numel',[1],'values',[0 1]); - md = checkfield(md,'flowequation.isSSA','numel',[1],'values',[0 1]); - md = checkfield(md,'flowequation.isL1L2','numel',[1],'values',[0 1]); - md = checkfield(md,'flowequation.isHO','numel',[1],'values',[0 1]); - md = checkfield(md,'flowequation.isFS','numel',[1],'values',[0 1]); - md = checkfield(md,'flowequation.fe_SSA','values',{'P1','P1bubble','P1bubblecondensed','P2'}); - md = checkfield(md,'flowequation.fe_HO' ,'values',{'P1','P1bubble','P1bubblecondensed','P1xP2','P2xP1','P2'}); - md = checkfield(md,'flowequation.fe_FS' ,'values',{'P1P1','P1P1GLS','MINIcondensed','MINI','TaylorHood'}); - md = checkfield(md,'flowequation.borderSSA','size',[md.mesh.numberofvertices 1],'values',[0 1]); - md = checkfield(md,'flowequation.borderHO','size',[md.mesh.numberofvertices 1],'values',[0 1]); - md = checkfield(md,'flowequation.borderFS','size',[md.mesh.numberofvertices 1],'values',[0 1]); - if strcmp(meshtype(md.mesh),'2Dhorizontal') - md = checkfield(md,'flowequation.vertex_equation','size',[md.mesh.numberofvertices 1],'values',[1:2]); - md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements 1],'values',[1:2]); - elseif strcmp(meshtype(md.mesh),'2Dvertical') - md = checkfield(md,'flowequation.vertex_equation','size',[md.mesh.numberofvertices 1],'values',[4]); - md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements 1],'values',[4]); - elseif strcmp(meshtype(md.mesh),'3D'), - md = checkfield(md,'flowequation.vertex_equation','size',[md.mesh.numberofvertices 1],'values',[0:8]); - md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements 1],'values',[0:8]); + md = checkfield(md,'fieldname','flowequation.isSIA','numel',[1],'values',[0 1]); + md = checkfield(md,'fieldname','flowequation.isSSA','numel',[1],'values',[0 1]); + md = checkfield(md,'fieldname','flowequation.isL1L2','numel',[1],'values',[0 1]); + md = checkfield(md,'fieldname','flowequation.isHO','numel',[1],'values',[0 1]); + md = checkfield(md,'fieldname','flowequation.isFS','numel',[1],'values',[0 1]); + md = checkfield(md,'fieldname','flowequation.fe_SSA','values',{'P1','P1bubble','P1bubblecondensed','P2'}); + md = checkfield(md,'fieldname','flowequation.fe_HO' ,'values',{'P1','P1bubble','P1bubblecondensed','P1xP2','P2xP1','P2','P1xP3','P2xP4'}); + md = checkfield(md,'fieldname','flowequation.fe_FS' ,'values',{'P1P1','P1P1GLS','MINIcondensed','MINI','TaylorHood','XTaylorHood','OneLayerP4z'}); + md = checkfield(md,'fieldname','flowequation.XTH_r','numel',[1],'>',0.); + md = checkfield(md,'fieldname','flowequation.XTH_theta','numel',[1],'>=',0.,'<',0.5); + md = checkfield(md,'fieldname','flowequation.borderSSA','size',[md.mesh.numberofvertices 1],'values',[0 1]); + md = checkfield(md,'fieldname','flowequation.borderHO','size',[md.mesh.numberofvertices 1],'values',[0 1]); + md = checkfield(md,'fieldname','flowequation.borderFS','size',[md.mesh.numberofvertices 1],'values',[0 1]); + if strcmp(domaintype(md.mesh),'2Dhorizontal') + md = checkfield(md,'fieldname','flowequation.vertex_equation','size',[md.mesh.numberofvertices 1],'values',[1:2]); + md = checkfield(md,'fieldname','flowequation.element_equation','size',[md.mesh.numberofelements 1],'values',[1:2]); + elseif strcmp(domaintype(md.mesh),'2Dvertical') + md = checkfield(md,'fieldname','flowequation.vertex_equation','size',[md.mesh.numberofvertices 1],'values',[2:4]); + md = checkfield(md,'fieldname','flowequation.element_equation','size',[md.mesh.numberofelements 1],'values',[2:4]); + elseif strcmp(domaintype(md.mesh),'3D'), + md = checkfield(md,'fieldname','flowequation.vertex_equation','size',[md.mesh.numberofvertices 1],'values',[0:8]); + md = checkfield(md,'fieldname','flowequation.element_equation','size',[md.mesh.numberofelements 1],'values',[0:8]); else error('Case not supported yet'); @@ -126,5 +153,5 @@ fielddisplay(obj,'fe_SSA','Finite Element for SSA ''P1'', ''P1bubble'' ''P1bubblecondensed'' ''P2'''); fielddisplay(obj,'fe_HO', 'Finite Element for HO ''P1'' ''P1bubble'' ''P1bubblecondensed'' ''P1xP2'' ''P2xP1'' ''P2'''); - fielddisplay(obj,'fe_FS', 'Finite Element for FS ''P1P1'' (debugging only) ''P1P1GLS'' ''MINIcondensed'' ''MINI'' ''TaylorHood'''); + fielddisplay(obj,'fe_FS', 'Finite Element for FS ''P1P1'' (debugging only) ''P1P1GLS'' ''MINIcondensed'' ''MINI'' ''TaylorHood'' ''XTaylorHood'''); fielddisplay(obj,'vertex_equation','flow equation for each vertex'); fielddisplay(obj,'element_equation','flow equation for each element'); @@ -143,4 +170,6 @@ WriteData(fid,'enum',FlowequationFeHOEnum() ,'data',StringToEnum(obj.fe_HO) ,'format','Integer'); WriteData(fid,'enum',FlowequationFeFSEnum() ,'data',StringToEnum(obj.fe_FS) ,'format','Integer'); + WriteData(fid,'enum',AugmentedLagrangianREnum() ,'data',obj.XTH_r ,'format','Double'); + WriteData(fid,'enum',AugmentedLagrangianThetaEnum() ,'data',obj.XTH_theta ,'format','Double'); WriteData(fid,'object',obj,'fieldname','borderSSA','format','DoubleMat','mattype',1); WriteData(fid,'object',obj,'fieldname','borderHO','format','DoubleMat','mattype',1); Index: /issm/trunk/src/m/classes/flowequation.py =================================================================== --- /issm/trunk/src/m/classes/flowequation.py (revision 17805) +++ /issm/trunk/src/m/classes/flowequation.py (revision 17806) @@ -3,6 +3,7 @@ from fielddisplay import fielddisplay from EnumDefinitions import * -from checkfield import * -from WriteData import * +from checkfield import checkfield +from WriteData import WriteData +import MatlabFuncs as m class flowequation(object): @@ -24,4 +25,6 @@ self.fe_HO = '' self.fe_FS = '' + self.XTH_r = 1. + self.XTH_theta = 0. self.vertex_equation = float('NaN') self.element_equation = float('NaN') @@ -44,5 +47,5 @@ string="%s\n%s"%(string,fielddisplay(self,'fe_SSA',"Finite Element for SSA: 'P1', 'P1bubble' 'P1bubblecondensed' 'P2'")) string="%s\n%s"%(string,fielddisplay(self,'fe_HO' ,"Finite Element for HO: 'P1' 'P1bubble' 'P1bubblecondensed' 'P1xP2' 'P2xP1' 'P2'")) - string="%s\n%s"%(string,fielddisplay(self,'fe_FS' ,"Finite Element for FS: 'P1P1' (debugging only) 'P1P1GLS' 'MINIcondensed' 'MINI' 'TaylorHood'")) + string="%s\n%s"%(string,fielddisplay(self,'fe_FS' ,"Finite Element for FS: 'P1P1' (debugging only) 'P1P1GLS' 'MINIcondensed' 'MINI' 'TaylorHood' 'XTaylorHood'")) string="%s\n%s"%(string,fielddisplay(self,'vertex_equation',"flow equation for each vertex")) string="%s\n%s"%(string,fielddisplay(self,'element_equation',"flow equation for each element")) @@ -68,21 +71,23 @@ if StressbalanceAnalysisEnum() in analyses: - md = checkfield(md,'flowequation.isSIA','numel',[1],'values',[0,1]) - md = checkfield(md,'flowequation.isSSA','numel',[1],'values',[0,1]) - md = checkfield(md,'flowequation.isL1L2','numel',[1],'values',[0,1]) - md = checkfield(md,'flowequation.isHO','numel',[1],'values',[0,1]) - md = checkfield(md,'flowequation.isFS','numel',[1],'values',[0,1]) - md = checkfield(md,'flowequation.fe_SSA','values',['P1','P1bubble','P1bubblecondensed','P2']) - md = checkfield(md,'flowequation.fe_HO' ,'values',['P1','P1bubble','P1bubblecondensed','P1xP2','P2xP1','P2']) - md = checkfield(md,'flowequation.fe_FS' ,'values',['P1P1','P1P1GLS','MINIcondensed','MINI','TaylorHood']) - md = checkfield(md,'flowequation.borderSSA','size',[md.mesh.numberofvertices],'values',[0,1]) - md = checkfield(md,'flowequation.borderHO','size',[md.mesh.numberofvertices],'values',[0,1]) - md = checkfield(md,'flowequation.borderFS','size',[md.mesh.numberofvertices],'values',[0,1]) - if strcmp(md.mesh.meshtype(),'2Dhorizontal'): - md = checkfield(md,'flowequation.vertex_equation','size',[md.mesh.numberofvertices],'values',[1,2]) - md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements],'values',[1,2]) - elif strcmp(md.mesh.meshtype(),'3D'): - md = checkfield(md,'flowequation.vertex_equation','size',[md.mesh.numberofvertices],'values',numpy.arange(0,8+1)) - md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements],'values',numpy.arange(0,8+1)) + md = checkfield(md,'fieldname','flowequation.isSIA','numel',[1],'values',[0,1]) + md = checkfield(md,'fieldname','flowequation.isSSA','numel',[1],'values',[0,1]) + md = checkfield(md,'fieldname','flowequation.isL1L2','numel',[1],'values',[0,1]) + md = checkfield(md,'fieldname','flowequation.isHO','numel',[1],'values',[0,1]) + md = checkfield(md,'fieldname','flowequation.isFS','numel',[1],'values',[0,1]) + md = checkfield(md,'fieldname','flowequation.fe_SSA','values',['P1','P1bubble','P1bubblecondensed','P2']) + md = checkfield(md,'fieldname','flowequation.fe_HO' ,'values',['P1','P1bubble','P1bubblecondensed','P1xP2','P2xP1','P2','P1xP3','P2xP4']) + md = checkfield(md,'fieldname','flowequation.fe_FS' ,'values',['P1P1','P1P1GLS','MINIcondensed','MINI','TaylorHood','XTaylorHood','OneLayerP4z']) + md = checkfield(md,'fieldname','flowequation.borderSSA','size',[md.mesh.numberofvertices],'values',[0,1]) + md = checkfield(md,'fieldname','flowequation.borderHO','size',[md.mesh.numberofvertices],'values',[0,1]) + md = checkfield(md,'fieldname','flowequation.borderFS','size',[md.mesh.numberofvertices],'values',[0,1]) + md = checkfield(md,'fieldname','flowequation.XTH_r','numel',[1],'>',0.) + md = checkfield(md,'fieldname','flowequation.XTH_theta','numel',[1],'>=',0.,'<',.5) + if m.strcmp(md.mesh.domaintype(),'2Dhorizontal'): + md = checkfield(md,'fieldname','flowequation.vertex_equation','size',[md.mesh.numberofvertices],'values',[1,2]) + md = checkfield(md,'fieldname','flowequation.element_equation','size',[md.mesh.numberofelements],'values',[1,2]) + elif m.strcmp(md.mesh.domaintype(),'3D'): + md = checkfield(md,'fieldname','flowequation.vertex_equation','size',[md.mesh.numberofvertices],'values',numpy.arange(0,8+1)) + md = checkfield(md,'fieldname','flowequation.element_equation','size',[md.mesh.numberofelements],'values',numpy.arange(0,8+1)) else: raise RuntimeError('mesh type not supported yet') @@ -106,4 +111,6 @@ WriteData(fid,'enum',FlowequationFeHOEnum() ,'data',StringToEnum(self.fe_HO)[0] ,'format','Integer') WriteData(fid,'enum',FlowequationFeFSEnum() ,'data',StringToEnum(self.fe_FS)[0] ,'format','Integer') + WriteData(fid,'enum',AugmentedLagrangianREnum() ,'data',self.XTH_r ,'format','Double') + WriteData(fid,'enum',AugmentedLagrangianThetaEnum() ,'data',self.XTH_theta ,'format','Double') WriteData(fid,'object',self,'fieldname','borderSSA','format','DoubleMat','mattype',1) WriteData(fid,'object',self,'fieldname','borderHO','format','DoubleMat','mattype',1) Index: /issm/trunk/src/m/classes/friction.m =================================================================== --- /issm/trunk/src/m/classes/friction.m (revision 17805) +++ /issm/trunk/src/m/classes/friction.m (revision 17806) @@ -11,4 +11,13 @@ end methods + function createxml(obj,fid) % {{{ + fprintf(fid, '\n\n'); + fprintf(fid, '%s\n', ''); + fprintf(fid,'%s\n%s\n%s\n','','
'); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' friction coefficient [SI] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' p exponent ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n', '', '
',' q exponent ',''); + fprintf(fid,'%s\n%s\n',''); + end % }}} function obj = friction(varargin) % {{{ switch nargin @@ -26,8 +35,7 @@ %Early return if ~ismember(StressbalanceAnalysisEnum(),analyses) & ~ismember(ThermalAnalysisEnum(),analyses), return; end - - md = checkfield(md,'friction.coefficient','NaN',1,'size',[md.mesh.numberofvertices 1]); - md = checkfield(md,'friction.q','NaN',1,'size',[md.mesh.numberofelements 1]); - md = checkfield(md,'friction.p','NaN',1,'size',[md.mesh.numberofelements 1]); + md = checkfield(md,'fieldname','friction.coefficient','forcing',1,'NaN',1); + md = checkfield(md,'fieldname','friction.q','NaN',1,'size',[md.mesh.numberofelements 1]); + md = checkfield(md,'fieldname','friction.p','NaN',1,'size',[md.mesh.numberofelements 1]); end % }}} function disp(obj) % {{{ @@ -38,7 +46,12 @@ end % }}} function marshall(obj,md,fid) % {{{ - WriteData(fid,'object',obj,'fieldname','coefficient','format','DoubleMat','mattype',1); + yts=365.0*24.0*3600.0; + + WriteData(fid,'object',obj,'fieldname','coefficient','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); + %WriteData(fid,'object',obj,'fieldname','coefficient','format','DoubleMat','mattype',1); WriteData(fid,'object',obj,'fieldname','p','format','DoubleMat','mattype',2); WriteData(fid,'object',obj,'fieldname','q','format','DoubleMat','mattype',2); + + end % }}} end Index: /issm/trunk/src/m/classes/friction.py =================================================================== --- /issm/trunk/src/m/classes/friction.py (revision 17805) +++ /issm/trunk/src/m/classes/friction.py (revision 17806) @@ -1,6 +1,6 @@ from fielddisplay import fielddisplay from EnumDefinitions import * -from checkfield import * -from WriteData import * +from checkfield import checkfield +from WriteData import WriteData class friction(object): @@ -38,7 +38,7 @@ return md - md = checkfield(md,'friction.coefficient','NaN',1,'size',[md.mesh.numberofvertices]) - md = checkfield(md,'friction.q','NaN',1,'size',[md.mesh.numberofelements]) - md = checkfield(md,'friction.p','NaN',1,'size',[md.mesh.numberofelements]) + md = checkfield(md,'fieldname','friction.coefficient','forcing',1,'NaN',1) + md = checkfield(md,'fieldname','friction.q','NaN',1,'size',[md.mesh.numberofelements]) + md = checkfield(md,'fieldname','friction.p','NaN',1,'size',[md.mesh.numberofelements]) return md Index: /issm/trunk/src/m/classes/geometry.m =================================================================== --- /issm/trunk/src/m/classes/geometry.m (revision 17805) +++ /issm/trunk/src/m/classes/geometry.m (revision 17806) @@ -8,9 +8,40 @@ surface = NaN; thickness = NaN; + base = NaN; bed = NaN; - bathymetry = NaN; hydrostatic_ratio = NaN; end + methods (Static) + function obj = loadobj(obj) % {{{ + % This function is directly called by matlab when a model object is + % loaded. Update old properties here + + %2014 March 26th + if isstruct(obj), + disp('WARNING: updating geometry'); + disp(' md.geometry.bed is now md.geometry.base'); + disp(' md.geometry.bathymetry is now md.geometry.bed'); + obj2=obj; + obj=geometry(); + obj.surface = obj2.surface; + obj.thickness = obj2.thickness; + obj.base = obj2.bed; + obj.bed = obj2.bathymetry; + end + + end% }}} + end methods + function createxml(obj,fid) % {{{ + fprintf(fid, '\n\n'); + fprintf(fid, '%s\n', ''); + fprintf(fid,'%s\n%s\n%s\n','','
'); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' surface elevation [m] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' ice thickness [m] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' bed elevation [m] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' bathymetry elevation [m] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n','','
',' coefficient for ice shelves; thickness correction: hydrostatic_ratio H_obs+ (1-hydrostatic_ratio) H_hydro ',''); + fprintf(fid,'%s\n%s\n',''); + end % }}} function obj = geometry(varargin) % {{{ switch nargin @@ -27,14 +58,14 @@ if (solution==TransientSolutionEnum() & md.transient.isgia) | (solution==GiaSolutionEnum()), - md = checkfield(md,'geometry.thickness','forcing',1,'NaN',1,'>=',0); + md = checkfield(md,'fieldname','geometry.thickness','forcing',1,'NaN',1,'>=',0); else - md = checkfield(md,'geometry.surface' ,'NaN',1,'size',[md.mesh.numberofvertices 1]); - md = checkfield(md,'geometry.bed' ,'NaN',1,'size',[md.mesh.numberofvertices 1]); - md = checkfield(md,'geometry.thickness','NaN',1,'size',[md.mesh.numberofvertices 1],'>',0); - if any((obj.thickness-obj.surface+obj.bed)>10^-9), - md = checkmessage(md,['equality thickness=surface-bed violated']); + md = checkfield(md,'fieldname','geometry.surface' ,'NaN',1,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','geometry.base' ,'NaN',1,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','geometry.thickness','NaN',1,'size',[md.mesh.numberofvertices 1],'>',0); + if any((obj.thickness-obj.surface+obj.base)>10^-9), + md = checkmessage(md,['equality thickness=surface-base violated']); end if solution==TransientSolutionEnum() & md.transient.isgroundingline, - md = checkfield(md,'geometry.bathymetry','NaN',1,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','geometry.bed','NaN',1,'size',[md.mesh.numberofvertices 1]); end end @@ -43,9 +74,8 @@ disp(sprintf(' geometry parameters:')); - fielddisplay(obj,'surface','surface elevation [m]'); + fielddisplay(obj,'surface','ice upper surface elevation [m]'); fielddisplay(obj,'thickness','ice thickness [m]'); + fielddisplay(obj,'base','ice base elevation [m]'); fielddisplay(obj,'bed','bed elevation [m]'); - fielddisplay(obj,'bathymetry','bathymetry elevation [m]'); - fielddisplay(obj,'hydrostatic_ratio','coefficient for ice shelves'' thickness correction: hydrostatic_ratio H_obs+ (1-hydrostatic_ratio) H_hydro'); end % }}} @@ -53,6 +83,6 @@ WriteData(fid,'data',obj.surface,'format','DoubleMat','mattype',1,'enum',SurfaceEnum()); WriteData(fid,'data',obj.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum(),'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'data',obj.base,'format','DoubleMat','mattype',1,'enum',BaseEnum()); WriteData(fid,'data',obj.bed,'format','DoubleMat','mattype',1,'enum',BedEnum()); - WriteData(fid,'data',obj.bathymetry,'format','DoubleMat','mattype',1,'enum',BathymetryEnum()); WriteData(fid,'object',obj,'fieldname','hydrostatic_ratio','format','DoubleMat','mattype',1); end % }}} Index: /issm/trunk/src/m/classes/geometry.py =================================================================== --- /issm/trunk/src/m/classes/geometry.py (revision 17805) +++ /issm/trunk/src/m/classes/geometry.py (revision 17806) @@ -1,6 +1,6 @@ from fielddisplay import fielddisplay from EnumDefinitions import * -from checkfield import * -from WriteData import * +from checkfield import checkfield +from WriteData import WriteData class geometry(object): @@ -15,6 +15,6 @@ self.surface = float('NaN') self.thickness = float('NaN') - self.bed = float('NaN') - self.bathymetry = float('NaN') + self.base = float('NaN') + self.bed = float('NaN') self.hydrostatic_ratio = float('NaN') @@ -26,9 +26,8 @@ string=" geometry parameters:" - string="%s\n%s"%(string,fielddisplay(self,'surface','surface elevation [m]')) + string="%s\n%s"%(string,fielddisplay(self,'surface','ice upper surface elevation [m]')) string="%s\n%s"%(string,fielddisplay(self,'thickness','ice thickness [m]')) + string="%s\n%s"%(string,fielddisplay(self,'base','ice base elevation [m]')) string="%s\n%s"%(string,fielddisplay(self,'bed','bed elevation [m]')) - string="%s\n%s"%(string,fielddisplay(self,'bathymetry','bathymetry elevation [m]')) - string="%s\n%s"%(string,fielddisplay(self,'hydrostatic_ratio','coefficient for ice shelves'' thickness correction: hydrostatic_ratio H_obs+ (1-hydrostatic_ratio) H_hydro')) return string #}}} @@ -38,11 +37,11 @@ def checkconsistency(self,md,solution,analyses): # {{{ - md = checkfield(md,'geometry.surface' ,'NaN',1,'size',[md.mesh.numberofvertices]) - md = checkfield(md,'geometry.bed' ,'NaN',1,'size',[md.mesh.numberofvertices]) - md = checkfield(md,'geometry.thickness','NaN',1,'size',[md.mesh.numberofvertices],'>',0,'forcing',1) - if any((self.thickness-self.surface+self.bed)>10**-9): - md.checkmessage("equality thickness=surface-bed violated") + md = checkfield(md,'fieldname','geometry.surface' ,'NaN',1,'size',[md.mesh.numberofvertices]) + md = checkfield(md,'fieldname','geometry.base' ,'NaN',1,'size',[md.mesh.numberofvertices]) + md = checkfield(md,'fieldname','geometry.thickness','NaN',1,'size',[md.mesh.numberofvertices],'>',0,'forcing',1) + if any((self.thickness-self.surface+self.base)>10**-9): + md.checkmessage("equality thickness=surface-base violated") if solution==TransientSolutionEnum() and md.transient.isgroundingline: - md = checkfield(md,'geometry.bathymetry','NaN',1,'size',[md.mesh.numberofvertices]) + md = checkfield(md,'fieldname','geometry.bed','NaN',1,'size',[md.mesh.numberofvertices]) return md @@ -51,6 +50,6 @@ WriteData(fid,'data',self.surface,'format','DoubleMat','mattype',1,'enum',SurfaceEnum()) WriteData(fid,'data',self.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum(),'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'data',self.base,'format','DoubleMat','mattype',1,'enum',BaseEnum()) WriteData(fid,'data',self.bed,'format','DoubleMat','mattype',1,'enum',BedEnum()) - WriteData(fid,'data',self.bathymetry,'format','DoubleMat','mattype',1,'enum',BathymetryEnum()) WriteData(fid,'object',self,'fieldname','hydrostatic_ratio','format','DoubleMat','mattype',1) # }}} Index: /issm/trunk/src/m/classes/gia.m =================================================================== --- /issm/trunk/src/m/classes/gia.m (revision 17805) +++ /issm/trunk/src/m/classes/gia.m (revision 17806) @@ -11,4 +11,15 @@ end methods + function createxml(obj,fid) % {{{ + fprintf(fid, '\n'); + + % gia solution parameters + fprintf(fid,'%s\n%s\n%s\n','','
'); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' mantle viscosity[Pa s] ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' lithosphere thickness (km) ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' 1: square-edged (default). 2: elliptical. See iedge in GiaDeflectionCore ',' '); + fprintf(fid,'%s\n%s\n',''); + + end % }}} function obj = gia(varargin) % {{{ switch nargin @@ -25,7 +36,7 @@ if ~ismember(GiaAnalysisEnum(),analyses), return; end - md = checkfield(md,'gia.mantle_viscosity','NaN',1,'size',[md.mesh.numberofvertices 1],'>',0); - md = checkfield(md,'gia.lithosphere_thickness','NaN',1,'size',[md.mesh.numberofvertices 1],'>',0); - md = checkfield(md,'gia.cross_section_shape','numel',[1],'values',[1,2]); + md = checkfield(md,'fieldname','gia.mantle_viscosity','NaN',1,'size',[md.mesh.numberofvertices 1],'>',0); + md = checkfield(md,'fieldname','gia.lithosphere_thickness','NaN',1,'size',[md.mesh.numberofvertices 1],'>',0); + md = checkfield(md,'fieldname','gia.cross_section_shape','numel',[1],'values',[1,2]); %be sure that if we are running a masstransport ice flow model coupled with gia, that thickness forcings Index: /issm/trunk/src/m/classes/gia.py =================================================================== --- /issm/trunk/src/m/classes/gia.py (revision 17805) +++ /issm/trunk/src/m/classes/gia.py (revision 17806) @@ -1,6 +1,6 @@ from fielddisplay import fielddisplay from EnumDefinitions import * -from checkfield import * -from WriteData import * +from checkfield import checkfield +from WriteData import WriteData class gia(object): @@ -42,7 +42,7 @@ return md - md = checkfield(md,'gia.mantle_viscosity','NaN',1,'size',[md.mesh.numberofvertices,1],'>',0) - md = checkfield(md,'gia.lithosphere_thickness','NaN',1,'size',[md.mesh.numberofvertices,1],'>',0) - md = checkfield(md,'gia.cross_section_shape','numel',[1],'values',[1,2]) + md = checkfield(md,'fieldname','gia.mantle_viscosity','NaN',1,'size',[md.mesh.numberofvertices,1],'>',0) + md = checkfield(md,'fieldname','gia.lithosphere_thickness','NaN',1,'size',[md.mesh.numberofvertices,1],'>',0) + md = checkfield(md,'fieldname','gia.cross_section_shape','numel',[1],'values',[1,2]) #be sure that if we are running a masstransport ice flow model coupled with gia, that thickness forcings Index: /issm/trunk/src/m/classes/groundingline.m =================================================================== --- /issm/trunk/src/m/classes/groundingline.m (revision 17805) +++ /issm/trunk/src/m/classes/groundingline.m (revision 17806) @@ -10,4 +10,14 @@ end methods + function createxml(obj,fid) % {{{ + fprintf(fid, '\n\n'); + fprintf(fid, '%s\n', ''); + + % Convergence criteria + fprintf(fid,'%s\n%s\n%s\n','','
'); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' type of grounding line migration: "SoftMigration","AgressiveMigration" or "None" ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n', '', '
',' melting rate applied when previously grounded parts start floating [m/yr] ',''); + fprintf(fid,'%s\n%s\n',''); + end % }}} function obj = groundingline(varargin) % {{{ switch nargin @@ -29,16 +39,15 @@ function md = checkconsistency(obj,md,solution,analyses) % {{{ - md = checkfield(md,'groundingline.migration','values',{'None' 'AgressiveMigration' 'SoftMigration' 'SubelementMigration','SubelementMigration2'}); + md = checkfield(md,'fieldname','groundingline.migration','values',{'None' 'AgressiveMigration' 'SoftMigration' 'SubelementMigration','SubelementMigration2' 'Contact'}); if ~strcmp(obj.migration,'None'), - if isnan(md.geometry.bathymetry), + if isnan(md.geometry.bed), md = checkmessage(md,['requesting grounding line migration, but bathymetry is absent!']); end pos=find(md.mask.groundedice_levelset>0.); - if any(abs(md.geometry.bed(pos)-md.geometry.bathymetry(pos))>10^-10), + if any(abs(md.geometry.base(pos)-md.geometry.bed(pos))>10^-10), md = checkmessage(md,['bathymetry not equal to bed on grounded ice!']); end - pos=find(md.mask.groundedice_levelset<0.); - if any(md.geometry.bathymetry(pos)-md.geometry.bed(pos)>10^-9), + if any(md.geometry.bed - md.geometry.base > 10^-9), md = checkmessage(md,['bathymetry superior to bed on floating ice!']); end Index: /issm/trunk/src/m/classes/groundingline.py =================================================================== --- /issm/trunk/src/m/classes/groundingline.py (revision 17805) +++ /issm/trunk/src/m/classes/groundingline.py (revision 17806) @@ -3,7 +3,7 @@ from EnumDefinitions import * from StringToEnum import StringToEnum -from checkfield import * -from WriteData import * -from MatlabFuncs import * +from checkfield import checkfield +from WriteData import WriteData +import MatlabFuncs as m class groundingline(object): @@ -42,14 +42,13 @@ def checkconsistency(self,md,solution,analyses): # {{{ - md = checkfield(md,'groundingline.migration','values',['None','AgressiveMigration','SoftMigration','SubelementMigration','SubelementMigration2']) + md = checkfield(md,'fieldname','groundingline.migration','values',['None','AgressiveMigration','SoftMigration','SubelementMigration','SubelementMigration2','Contact']) - if not strcmp(self.migration,'None'): - if numpy.any(numpy.isnan(md.geometry.bathymetry)): + if not m.strcmp(self.migration,'None'): + if numpy.any(numpy.isnan(md.geometry.bed)): md.checkmessage("requesting grounding line migration, but bathymetry is absent!") pos=numpy.nonzero(md.mask.groundedice_levelset>0.)[0] - if any(numpy.abs(md.geometry.bed[pos]-md.geometry.bathymetry[pos])>10**-10): + if any(numpy.abs(md.geometry.base[pos]-md.geometry.bed[pos])>10**-10): md.checkmessage("bathymetry not equal to bed on grounded ice!") - pos=numpy.nonzero(md.mask.groundedice_levelset<0.)[0] - if any(md.geometry.bathymetry[pos]-md.geometry.bed[pos]>10**-9): + if any(md.geometry.bed - md.geometry.base > 10**-9): md.checkmessage("bathymetry superior to bed on floating ice!") Index: /issm/trunk/src/m/classes/hydrologydc.m =================================================================== --- /issm/trunk/src/m/classes/hydrologydc.m (revision 17805) +++ /issm/trunk/src/m/classes/hydrologydc.m (revision 17806) @@ -9,22 +9,27 @@ isefficientlayer = 0; penalty_factor = 0; + penalty_lock = 0; rel_tol = 0; + max_iter = 0; sedimentlimit_flag = 0; sedimentlimit = 0; transfer_flag = 0; leakage_factor = 0; + basal_moulin_input = NaN; spcsediment_head = NaN; + sediment_transmitivity = NaN; sediment_compressibility = 0; sediment_porosity = 0; sediment_thickness = 0; - sediment_transmitivity = 0; + spcepl_head = NaN; - mask_eplactive = NaN; + mask_eplactive_node = NaN; epl_compressibility = 0; epl_porosity = 0; - epl_thickness = 0; - epl_transmitivity = 0; + epl_initial_thickness = 0; + epl_max_thickness = 0; + epl_conductivity = 0; end methods @@ -39,12 +44,20 @@ end % }}} + function self = initialize(self,md) % {{{ + if isnan(self.basal_moulin_input), + self.basal_moulin_input=zeros(md.mesh.numberofvertices,1); + disp(' no hydrology.basal_moulin_input specified: values set as zero'); + end + + end % }}} % {{{ function obj = setdefaultparameters(obj) function obj = setdefaultparameters(obj) - %Parameters from de Fleurian 2013 + %Parameters from de Fleurian 2014 obj.water_compressibility = 5.04e-10; obj.isefficientlayer = 1; obj.penalty_factor = 3; obj.rel_tol = 1.0e-06; + obj.max_iter = 100; obj.sedimentlimit_flag = 0; obj.sedimentlimit = 0; @@ -59,6 +72,7 @@ obj.epl_compressibility = 1.0e-08; obj.epl_porosity = 0.4; - obj.epl_thickness = 1.0; - obj.epl_transmitivity = 8.0e-02; + obj.epl_initial_thickness = 1.0; + obj.epl_max_thickness = 5.0; + obj.epl_conductivity = 8.0e-02; end @@ -71,30 +85,33 @@ end - md = checkfield(md,'hydrology.water_compressibility','>',0,'numel',1); - md = checkfield(md,'hydrology.isefficientlayer','numel',[1],'values',[0 1]); - md = checkfield(md,'hydrology.penalty_factor','>',0,'numel',1); - md = checkfield(md,'hydrology.rel_tol','>',0,'numel',1); - md = checkfield(md,'hydrology.sedimentlimit_flag','numel',[1],'values',[0 1 2 3]); - md = checkfield(md,'hydrology.transfer_flag','numel',[1],'values',[0 1]); + md = checkfield(md,'fieldname','hydrology.water_compressibility','>',0,'numel',1); + md = checkfield(md,'fieldname','hydrology.isefficientlayer','numel',[1],'values',[0 1]); + md = checkfield(md,'fieldname','hydrology.penalty_factor','>',0,'numel',1); + md = checkfield(md,'fieldname','hydrology.rel_tol','>',0,'numel',1); + md = checkfield(md,'fieldname','hydrology.max_iter','>',0,'numel',1); + md = checkfield(md,'fieldname','hydrology.sedimentlimit_flag','numel',[1],'values',[0 1 2 3]); + md = checkfield(md,'fieldname','hydrology.transfer_flag','numel',[1],'values',[0 1]); if obj.sedimentlimit_flag==1, - md = checkfield(md,'hydrology.sedimentlimit','>',0,'numel',1); + md = checkfield(md,'fieldname','hydrology.sedimentlimit','>',0,'numel',1); end if obj.transfer_flag==1, - md = checkfield(md,'hydrology.leakage_factor','>',0,'numel',1); - end - - md = checkfield(md,'hydrology.spcsediment_head','forcing',1); - md = checkfield(md,'hydrology.sediment_compressibility','>',0,'numel',1); - md = checkfield(md,'hydrology.sediment_porosity','>',0,'numel',1); - md = checkfield(md,'hydrology.sediment_thickness','>',0,'numel',1); - md = checkfield(md,'hydrology.sediment_transmitivity','>',0,'numel',1); + md = checkfield(md,'fieldname','hydrology.leakage_factor','>',0,'numel',1); + end + md = checkfield(md,'fieldname','hydrology.basal_moulin_input','NaN',1,'forcing',1); + + md = checkfield(md,'fieldname','hydrology.spcsediment_head','forcing',1); + md = checkfield(md,'fieldname','hydrology.sediment_compressibility','>',0,'numel',1); + md = checkfield(md,'fieldname','hydrology.sediment_porosity','>',0,'numel',1); + md = checkfield(md,'fieldname','hydrology.sediment_thickness','>',0,'numel',1); + md = checkfield(md,'fieldname','hydrology.sediment_transmitivity','>=',0,'size',[md.mesh.numberofvertices 1]); if obj.isefficientlayer==1, - md = checkfield(md,'hydrology.spcepl_head','forcing',1); - md = checkfield(md,'hydrology.mask_eplactive','size',[md.mesh.numberofvertices 1],'values',[0 1]); - md = checkfield(md,'hydrology.epl_compressibility','>',0,'numel',1); - md = checkfield(md,'hydrology.epl_porosity','>',0,'numel',1); - md = checkfield(md,'hydrology.epl_thickness','>',0,'numel',1); - md = checkfield(md,'hydrology.epl_transmitivity','>',0,'numel',1); + md = checkfield(md,'fieldname','hydrology.spcepl_head','forcing',1); + md = checkfield(md,'fieldname','hydrology.mask_eplactive_node','size',[md.mesh.numberofvertices 1],'values',[0 1]); + md = checkfield(md,'fieldname','hydrology.epl_compressibility','>',0,'numel',1); + md = checkfield(md,'fieldname','hydrology.epl_porosity','>',0,'numel',1); + md = checkfield(md,'fieldname','hydrology.epl_initial_thickness','>',0,'numel',1); + md = checkfield(md,'fieldname','hydrology.epl_max_thickness','>',0,'numel',1); + md = checkfield(md,'fieldname','hydrology.epl_conductivity','>',0,'numel',1); end end @@ -107,5 +124,7 @@ fielddisplay(obj,'isefficientlayer','do we use an efficient drainage system [1: true; 0: false]'); fielddisplay(obj,'penalty_factor','exponent of the value used in the penalisation method [dimensionless]'); + fielddisplay(obj,'penalty_lock','stabilize unstable constraints that keep zigzagging after n iteration (default is 0, no stabilization)'); fielddisplay(obj,'rel_tol','tolerance of the nonlinear iteration for the transfer between layers [dimensionless]'); + fielddisplay(obj,'max_iter','maximum number of nonlinear iteration'); fielddisplay(obj,'sedimentlimit_flag','what kind of upper limit is applied for the inefficient layer'); disp(sprintf('%55s 0: no limit',' ')); @@ -122,4 +141,5 @@ fielddisplay(obj,'leakage_factor','user defined leakage factor [m]'); end + fielddisplay(obj,'basal_moulin_input','Figure out what it is'); disp(sprintf(' - for the sediment layer')); fielddisplay(obj,'spcsediment_head','sediment water head constraints (NaN means no constraint) [m above MSL]'); @@ -132,9 +152,10 @@ disp(sprintf(' - for the epl layer')); fielddisplay(obj,'spcepl_head','epl water head constraints (NaN means no constraint) [m above MSL]'); - fielddisplay(obj,'mask_eplactive','active (1) or not (0) EPL'); + fielddisplay(obj,'mask_eplactive_node','active (1) or not (0) EPL'); fielddisplay(obj,'epl_compressibility','epl compressibility [Pa^-1]'); fielddisplay(obj,'epl_porosity','epl [dimensionless]'); - fielddisplay(obj,'epl_thickness','epl thickness [m]'); - fielddisplay(obj,'epl_transmitivity','epl transmitivity [m^2/s]'); + fielddisplay(obj,'epl_initial_thickness','epl initial thickness [m]'); + fielddisplay(obj,'epl_max_thickness','epl maximal thickness [m]'); + fielddisplay(obj,'epl_conductivity','epl conductivity [m^2/s]'); end @@ -147,5 +168,7 @@ WriteData(fid,'object',obj,'fieldname','isefficientlayer','format','Boolean'); WriteData(fid,'object',obj,'fieldname','penalty_factor','format','Double'); + WriteData(fid,'object',obj,'fieldname','penalty_lock','format','Integer'); WriteData(fid,'object',obj,'fieldname','rel_tol','format','Double'); + WriteData(fid,'object',obj,'fieldname','max_iter','format','Integer'); WriteData(fid,'object',obj,'fieldname','sedimentlimit_flag','format','Integer'); WriteData(fid,'object',obj,'fieldname','transfer_flag','format','Integer'); @@ -156,4 +179,5 @@ WriteData(fid,'object',obj,'fieldname','leakage_factor','format','Double'); end + WriteData(fid,'object',obj,'fieldname','basal_moulin_input','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1) WriteData(fid,'object',obj,'fieldname','spcsediment_head','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); @@ -161,13 +185,14 @@ WriteData(fid,'object',obj,'fieldname','sediment_porosity','format','Double'); WriteData(fid,'object',obj,'fieldname','sediment_thickness','format','Double'); - WriteData(fid,'object',obj,'fieldname','sediment_transmitivity','format','Double'); + WriteData(fid,'object',obj,'fieldname','sediment_transmitivity','format','DoubleMat','mattype',1'); if obj.isefficientlayer==1, WriteData(fid,'object',obj,'fieldname','spcepl_head','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); - WriteData(fid,'object',obj,'fieldname','mask_eplactive','format','DoubleMat','mattype',1); + WriteData(fid,'object',obj,'fieldname','mask_eplactive_node','format','DoubleMat','mattype',1); WriteData(fid,'object',obj,'fieldname','epl_compressibility','format','Double'); WriteData(fid,'object',obj,'fieldname','epl_porosity','format','Double'); - WriteData(fid,'object',obj,'fieldname','epl_thickness','format','Double'); - WriteData(fid,'object',obj,'fieldname','epl_transmitivity','format','Double'); + WriteData(fid,'object',obj,'fieldname','epl_initial_thickness','format','Double'); + WriteData(fid,'object',obj,'fieldname','epl_max_thickness','format','Double'); + WriteData(fid,'object',obj,'fieldname','epl_conductivity','format','Double'); end end Index: /issm/trunk/src/m/classes/hydrologydc.py =================================================================== --- /issm/trunk/src/m/classes/hydrologydc.py (revision 17806) +++ /issm/trunk/src/m/classes/hydrologydc.py (revision 17806) @@ -0,0 +1,175 @@ +from fielddisplay import fielddisplay +from EnumDefinitions import * +from checkfield import checkfield +from WriteData import WriteData + +class hydrologydc(object): + """ + Hydrologydc class definition + + Usage: + hydrologydc=hydrologydc(); + """ + + def __init__(self): # {{{ + self.water_compressibility = 0 + self.isefficientlayer = 0 + self.penalty_factor = 0 + self.penalty_lock = 0 + self.rel_tol = 0 + self.max_iter = 0 + self.sedimentlimit_flag = 0 + self.sedimentlimit = 0 + self.transfer_flag = 0 + self.leakage_factor = 0 + + self.spcsediment_head = float('NaN') + self.sediment_transmitivity = float('NaN') + self.sediment_compressibility = 0 + self.sediment_porosity = 0 + self.sediment_thickness = 0 + + + self.spcepl_head = float('NaN') + self.mask_eplactive_node = float('NaN') + self.epl_compressibility = 0 + self.epl_porosity = 0 + self.epl_initial_thickness = 0 + self.epl_conductivity = 0 + + #set defaults + self.setdefaultparameters() + #}}} + + def __repr__(self): # {{{ + string=' hydrology Dual Porous Continuum Equivalent parameters:' + string=' - general parameters' + string="%s\n%s"%(string,fielddisplay(self,'water_compressibility','compressibility of water [Pa^-1]')) + string="%s\n%s"%(string,fielddisplay(self,'isefficientlayer','do we use an efficient drainage system [1: true 0: false]')) + string="%s\n%s"%(string,fielddisplay(self,'penalty_factor','exponent of the value used in the penalisation method [dimensionless]')) + string="%s\n%s"%(string,fielddisplay(self,'penalty_lock','stabilize unstable constraints that keep zigzagging after n iteration (default is 0, no stabilization)')) + string="%s\n%s"%(string,fielddisplay(self,'rel_tol','tolerance of the nonlinear iteration for the transfer between layers [dimensionless]')) + string="%s\n%s"%(string,fielddisplay(self,'max_iter','maximum number of nonlinear iteration')) + string="%s\n%s"%(string,fielddisplay(self,'sedimentlimit_flag','what kind of upper limit is applied for the inefficient layer')) + string='%55s 0: no limit',' ' + string='%55s 1: user defined: %s',' ','sedimentlimit' + string='%55s 2: hydrostatic pressure',' ' + string='%55s 3: normal stress',' ' + + if self.sedimentlimit_flag==1: + string="%s\n%s"%(string,fielddisplay(self,'sedimentlimit','user defined upper limit for the inefficient layer [m]')) + string="%s\n%s"%(string,fielddisplay(self,'transfer_flag',['what kind of transfer method is applied between the layers'])) + string='%55s 0: no transfer',' ' + string='%55s 1: constant leakage factor: %s',' ','leakage_factor' + + if self.transfer_flag is 1: + string="%s\n%s"%(string,fielddisplay(self,'leakage_factor','user defined leakage factor [m]')) + string=' - for the sediment layer' + string="%s\n%s"%(string,fielddisplay(self,'spcsediment_head','sediment water head constraints (NaN means no constraint) [m above MSL]')) + string="%s\n%s"%(string,fielddisplay(self,'sediment_compressibility','sediment compressibility [Pa^-1]')) + string="%s\n%s"%(string,fielddisplay(self,'sediment_porosity','sediment [dimensionless]')) + string="%s\n%s"%(string,fielddisplay(self,'sediment_thickness','sediment thickness [m]')) + string="%s\n%s"%(string,fielddisplay(self,'sediment_transmitivity','sediment transmitivity [m^2/s]')) + + if self.isefficientlayer==1: + string=' - for the epl layer' + string="%s\n%s"%(string,fielddisplay(self,'spcepl_head','epl water head constraints (NaN means no constraint) [m above MSL]')) + string="%s\n%s"%(string,fielddisplay(self,'mask_eplactive_node','active (1) or not (0) EPL')) + string="%s\n%s"%(string,fielddisplay(self,'epl_compressibility','epl compressibility [Pa^-1]')) + string="%s\n%s"%(string,fielddisplay(self,'epl_porosity','epl [dimensionless]')) + string="%s\n%s"%(string,fielddisplay(self,'epl_initial_thickness','epl initial thickness [m]')) + string="%s\n%s"%(string,fielddisplay(self,'epl_conductivity','epl conductivity [m^2/s]')) + + #}}} + def setdefaultparameters(self): #{{{ + + #Parameters from de Fleurian 2014 + self.water_compressibility = 5.04e-10 + self.isefficientlayer = 1 + self.penalty_factor = 3 + self.rel_tol = 1.0e-06 + self.max_iter = 100 + self.sedimentlimit_flag = 0 + self.sedimentlimit = 0 + self.transfer_flag = 0 + self.leakage_factor = 10.0 + + self.sediment_compressibility = 1.0e-08 + self.sediment_porosity = 0.4 + self.sediment_thickness = 20.0 + self.sediment_transmitivity = 8.0e-04 + + self.epl_compressibility = 1.0e-08 + self.epl_porosity = 0.4 + self.epl_initial_thickness = 1.0 + self.epl_conductivity = 8.0e-02 + + return self + # }}} + + def checkconsistency(self,md,solution,analyses): #{{{ + + #Early return + if HydrologyDCInefficientAnalysisEnum() not in analyses: + return md + + md = checkfield(md,'fieldname','hydrology.water_compressibility','>',0,'numel',1) + md = checkfield(md,'fieldname','hydrology.isefficientlayer','numel',[1],'values',[0 1]) + md = checkfield(md,'fieldname','hydrology.penalty_factor','>',0,'numel',1) + md = checkfield(md,'fieldname','hydrology.rel_tol','>',0,'numel',1) + md = checkfield(md,'fieldname','hydrology.max_iter','>',0,'numel',1) + md = checkfield(md,'fieldname','hydrology.sedimentlimit_flag','numel',[1],'values',[0 1 2 3]) + md = checkfield(md,'fieldname','hydrology.transfer_flag','numel',[1],'values',[0 1]) + + if self.sedimentlimit_flag==1: + md = checkfield(md,'fieldname','hydrology.sedimentlimit','>',0,'numel',1) + + if self.transfer_flag==1: + md = checkfield(md,'fieldname','hydrology.leakage_factor','>',0,'numel',1) + + md = checkfield(md,'fieldname','hydrology.spcsediment_head','forcing',1) + md = checkfield(md,'fieldname','hydrology.sediment_compressibility','>',0,'numel',1) + md = checkfield(md,'fieldname','hydrology.sediment_porosity','>',0,'numel',1) + md = checkfield(md,'fieldname','hydrology.sediment_thickness','>',0,'numel',1) + md = checkfield(md,'fieldname','hydrology.sediment_transmitivity','>=',0,'size',[md.mesh.numberofvertices 1]) + if self.isefficientlayer==1: + md = checkfield(md,'fieldname','hydrology.spcepl_head','forcing',1) + md = checkfield(md,'fieldname','hydrology.mask_eplactive_node','size',[md.mesh.numberofvertices 1],'values',[0 1]) + md = checkfield(md,'fieldname','hydrology.epl_compressibility','>',0,'numel',1) + md = checkfield(md,'fieldname','hydrology.epl_porosity','>',0,'numel',1) + md = checkfield(md,'fieldname','hydrology.epl_initial_thickness','>',0,'numel',1) + md = checkfield(md,'fieldname','hydrology.epl_conductivity','>',0,'numel',1) + + # }}} + def marshall(self,md,fid): #{{{ + WriteData(fid,'enum',HydrologyModelEnum(),'data',HydrologydcEnum(),'format','Integer') + WriteData(fid,'object',self,'fieldname','water_compressibility','format','Double') + WriteData(fid,'object',self,'fieldname','isefficientlayer','format','Boolean') + WriteData(fid,'object',self,'fieldname','penalty_factor','format','Double') + WriteData(fid,'object',self,'fieldname','penalty_lock','format','Integer') + WriteData(fid,'object',self,'fieldname','rel_tol','format','Double') + WriteData(fid,'object',self,'fieldname','max_iter','format','Integer') + WriteData(fid,'object',self,'fieldname','sedimentlimit_flag','format','Integer') + WriteData(fid,'object',self,'fieldname','transfer_flag','format','Integer') + + if self.sedimentlimit_flag==1: + WriteData(fid,'object',self,'fieldname','sedimentlimit','format','Double') + + if self.transfer_flag==1: + WriteData(fid,'object',self,'fieldname','leakage_factor','format','Double') + + WriteData(fid,'object',self,'fieldname','spcsediment_head','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'fieldname','sediment_compressibility','format','Double') + WriteData(fid,'object',self,'fieldname','sediment_porosity','format','Double') + WriteData(fid,'object',self,'fieldname','sediment_thickness','format','Double') + WriteData(fid,'object',self,'fieldname','sediment_transmitivity','format','DoubleMat','mattype',1) + + if self.isefficientlayer==1: + WriteData(fid,'object',self,'fieldname','spcepl_head','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'fieldname','mask_eplactive_node','format','DoubleMat','mattype',1) + WriteData(fid,'object',self,'fieldname','epl_compressibility','format','Double') + WriteData(fid,'object',self,'fieldname','epl_porosity','format','Double') + WriteData(fid,'object',self,'fieldname','epl_initial_thickness','format','Double') + WriteData(fid,'object',self,'fieldname','epl_conductivity','format','Double') +# }}} + Index: /issm/trunk/src/m/classes/hydrologyshreve.m =================================================================== --- /issm/trunk/src/m/classes/hydrologyshreve.m (revision 17805) +++ /issm/trunk/src/m/classes/hydrologyshreve.m (revision 17806) @@ -15,4 +15,20 @@ end methods + function createxml(obj,fid) % {{{ + fprintf(fid, '\n\n'); + fprintf(fid, '%s\n', ''); + + % Convergence criteria + fprintf(fid,'%s\n%s\n%s\n','','
'); + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' water thickness constraints (NaN means no constraint) [m] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' Manning roughness coefficient ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' tortuosity parameter ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' dimensionless exponent in Manning velocity formula ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' dimensionless exponent in Manning velocity formula ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' parameter in effective pressure formula ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' artificial diffusivity (default is 1). can be more than 1 to increase diffusivity. ',''); + fprintf(fid,'%s\n%s\n',''); + end % }}} function obj = hydrologyshreve(varargin) % {{{ switch nargin @@ -44,6 +60,6 @@ end - md = checkfield(md,'hydrology.spcwatercolumn','forcing',1); - md = checkfield(md,'hydrology.stabilization','>=',0); + md = checkfield(md,'fieldname','hydrology.spcwatercolumn','forcing',1); + md = checkfield(md,'fieldname','hydrology.stabilization','>=',0); end % }}} function disp(obj) % {{{ Index: /issm/trunk/src/m/classes/hydrologyshreve.py =================================================================== --- /issm/trunk/src/m/classes/hydrologyshreve.py (revision 17805) +++ /issm/trunk/src/m/classes/hydrologyshreve.py (revision 17806) @@ -1,6 +1,6 @@ from fielddisplay import fielddisplay from EnumDefinitions import * -from checkfield import * -from WriteData import * +from checkfield import checkfield +from WriteData import WriteData class hydrologyshreve(object): @@ -52,11 +52,11 @@ #}}} def checkconsistency(self,md,solution,analyses): # {{{ - + #Early return if HydrologyShreveAnalysisEnum() not in analyses: return md - md = checkfield(md,'hydrology.spcwatercolumn','forcing',1) - md = checkfield(md,'hydrology.stabilization','>=',0) + md = checkfield(md,'fieldname','hydrology.spcwatercolumn','forcing',1) + md = checkfield(md,'fieldname','hydrology.stabilization','>=',0) return md Index: /issm/trunk/src/m/classes/independent.m =================================================================== --- /issm/trunk/src/m/classes/independent.m (revision 17805) +++ /issm/trunk/src/m/classes/independent.m (revision 17806) @@ -44,5 +44,5 @@ error('independent checkconsistency error: nods should be set to the size of the independent variable'); end - md = checkfield(md,['autodiff.independents{' num2str(i) '}.fov_forward_indices'],'>=',1,'<=',obj.nods,'size',[NaN 1]); + md = checkfield(md,'fieldname',['autodiff.independents{' num2str(i) '}.fov_forward_indices'],'>=',1,'<=',obj.nods,'size',[NaN 1]); end Index: /issm/trunk/src/m/classes/independent.py =================================================================== --- /issm/trunk/src/m/classes/independent.py (revision 17805) +++ /issm/trunk/src/m/classes/independent.py (revision 17806) @@ -1,8 +1,7 @@ import numpy -from pairoptions import * -from fielddisplay import * -from MatlabFuncs import * +from pairoptions import pairoptions +from fielddisplay import fielddisplay +import MatlabFuncs as m from EnumDefinitions import * -from WriteData import * class independent(object): @@ -58,5 +57,5 @@ if self.nods==0: raise TypeError("independent checkconsistency error: nods should be set to the size of the independent variable") - md = checkfield(md,"autodiff.independents[%d].fov_forward_indices" % i,'>=',1,'<=',self.nods,'size',[float('NaN'),1]) + md = checkfield(md,'fieldname',"autodiff.independents[%d].fov_forward_indices" % i,'>=',1,'<=',self.nods,'size',[float('NaN'),1]) return md Index: /issm/trunk/src/m/classes/initialization.m =================================================================== --- /issm/trunk/src/m/classes/initialization.m (revision 17805) +++ /issm/trunk/src/m/classes/initialization.m (revision 17806) @@ -15,7 +15,25 @@ sediment_head = NaN; epl_head = NaN; + epl_thickness = NaN; watercolumn = NaN; end methods + function createxml(obj,fid) % {{{ + fprintf(fid, '\n\n'); + fprintf(fid, '%s\n', ''); + fprintf(fid,'%s\n%s\n%s\n','','
'); + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' x component of velocity [m/yr] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' y component of velocity [m/yr] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' z component of velocity [m/yr] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' velocity norm [m/yr] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' pressure field [Pa] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' fraction of water in the ice ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' ice thickness [m] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' sediment water head of subglacial system [m] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' epl water head of subglacial system [m] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n','','
',' thickness of subglacial water [m] ',''); + fprintf(fid,'%s\n%s\n',''); + end % }}} function obj = initialization(varargin) % {{{ switch nargin @@ -32,15 +50,15 @@ if ismember(StressbalanceAnalysisEnum(),analyses) if ~(isnan(md.initialization.vx) | isnan(md.initialization.vy)), - md = checkfield(md,'initialization.vx','NaN',1,'size',[md.mesh.numberofvertices 1]); - md = checkfield(md,'initialization.vy','NaN',1,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','initialization.vx','NaN',1,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','initialization.vy','NaN',1,'size',[md.mesh.numberofvertices 1]); end end if ismember(MasstransportAnalysisEnum(),analyses), - md = checkfield(md,'initialization.vx','NaN',1,'size',[md.mesh.numberofvertices 1]); - md = checkfield(md,'initialization.vy','NaN',1,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','initialization.vx','NaN',1,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','initialization.vy','NaN',1,'size',[md.mesh.numberofvertices 1]); end if ismember(BalancethicknessAnalysisEnum(),analyses) & solution==BalancethicknessSolutionEnum, - md = checkfield(md,'initialization.vx','NaN',1,'size',[md.mesh.numberofvertices 1]); - md = checkfield(md,'initialization.vy','NaN',1,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','initialization.vx','NaN',1,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','initialization.vy','NaN',1,'size',[md.mesh.numberofvertices 1]); %Triangle with zero velocity if any(sum(abs(md.initialization.vx(md.mesh.elements)),2)==0 & sum(abs(md.initialization.vy(md.mesh.elements)),2)==0) @@ -49,23 +67,23 @@ end if ismember(ThermalAnalysisEnum(),analyses), - md = checkfield(md,'initialization.vx','NaN',1,'size',[md.mesh.numberofvertices 1]); - md = checkfield(md,'initialization.vy','NaN',1,'size',[md.mesh.numberofvertices 1]); - if strcmp(meshtype(md.mesh),'3D') - md = checkfield(md,'initialization.vz','NaN',1,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','initialization.vx','NaN',1,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','initialization.vy','NaN',1,'size',[md.mesh.numberofvertices 1]); + if dimension(md.mesh)==3 + md = checkfield(md,'fieldname','initialization.vz','NaN',1,'size',[md.mesh.numberofvertices 1]); end - md = checkfield(md,'initialization.pressure','NaN',1,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','initialization.pressure','NaN',1,'size',[md.mesh.numberofvertices 1]); end if (ismember(EnthalpyAnalysisEnum(),analyses) & md.thermal.isenthalpy) - md = checkfield(md,'initialization.waterfraction','>=',0,'size',[md.mesh.numberofvertices 1]); - md = checkfield(md,'initialization.watercolumn' ,'>=',0,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','initialization.waterfraction','>=',0,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','initialization.watercolumn' ,'>=',0,'size',[md.mesh.numberofvertices 1]); end if ismember(HydrologyShreveAnalysisEnum(),analyses), if isa(md.hydrology,'hydrologyshreve'), - md = checkfield(md,'initialization.watercolumn','NaN',1,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','initialization.watercolumn','NaN',1,'size',[md.mesh.numberofvertices 1]); end end if ismember(HydrologyDCInefficientAnalysisEnum(),analyses), if isa(md.hydrology,'hydrologydc'), - md = checkfield(md,'initialization.sediment_head','NaN',1,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','initialization.sediment_head','NaN',1,'size',[md.mesh.numberofvertices 1]); end end @@ -73,5 +91,7 @@ if isa(md.hydrology,'hydrologydc'), if md.hydrology.isefficientlayer==1, - md = checkfield(md,'initialization.epl_head','NaN',1,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname', ... + 'initialization.epl_head','NaN',1,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','initialization.epl_thickness','NaN',1,'size',[md.mesh.numberofvertices 1]); end end @@ -90,4 +110,5 @@ fielddisplay(obj,'sediment_head','sediment water head of subglacial system [m]'); fielddisplay(obj,'epl_head','epl water head of subglacial system [m]'); + fielddisplay(obj,'epl_thickness','epl layer thickness [m]'); fielddisplay(obj,'watercolumn','thickness of subglacial water [m]'); @@ -105,4 +126,5 @@ WriteData(fid,'data',obj.sediment_head,'format','DoubleMat','mattype',1,'enum',SedimentHeadEnum); WriteData(fid,'data',obj.epl_head,'format','DoubleMat','mattype',1,'enum',EplHeadEnum); + WriteData(fid,'data',obj.epl_thickness,'format','DoubleMat','mattype',1,'enum',HydrologydcEplThicknessEnum); WriteData(fid,'data',obj.watercolumn,'format','DoubleMat','mattype',1,'enum',WatercolumnEnum); Index: /issm/trunk/src/m/classes/initialization.py =================================================================== --- /issm/trunk/src/m/classes/initialization.py (revision 17805) +++ /issm/trunk/src/m/classes/initialization.py (revision 17806) @@ -2,6 +2,7 @@ from fielddisplay import fielddisplay from EnumDefinitions import * -from checkfield import * -from WriteData import * +from checkfield import checkfield +from WriteData import WriteData +import MatlabFuncs as m class initialization(object): @@ -50,12 +51,12 @@ if StressbalanceAnalysisEnum() in analyses: if not numpy.any(numpy.logical_or(numpy.isnan(md.initialization.vx),numpy.isnan(md.initialization.vy))): - md = checkfield(md,'initialization.vx','NaN',1,'size',[md.mesh.numberofvertices]) - md = checkfield(md,'initialization.vy','NaN',1,'size',[md.mesh.numberofvertices]) + md = checkfield(md,'fieldname','initialization.vx','NaN',1,'size',[md.mesh.numberofvertices]) + md = checkfield(md,'fieldname','initialization.vy','NaN',1,'size',[md.mesh.numberofvertices]) if MasstransportAnalysisEnum() in analyses: - md = checkfield(md,'initialization.vx','NaN',1,'size',[md.mesh.numberofvertices]) - md = checkfield(md,'initialization.vy','NaN',1,'size',[md.mesh.numberofvertices]) + md = checkfield(md,'fieldname','initialization.vx','NaN',1,'size',[md.mesh.numberofvertices]) + md = checkfield(md,'fieldname','initialization.vy','NaN',1,'size',[md.mesh.numberofvertices]) if BalancethicknessAnalysisEnum() in analyses: - md = checkfield(md,'initialization.vx','NaN',1,'size',[md.mesh.numberofvertices]) - md = checkfield(md,'initialization.vy','NaN',1,'size',[md.mesh.numberofvertices]) + md = checkfield(md,'fieldname','initialization.vx','NaN',1,'size',[md.mesh.numberofvertices]) + md = checkfield(md,'fieldname','initialization.vy','NaN',1,'size',[md.mesh.numberofvertices]) #Triangle with zero velocity if numpy.any(numpy.logical_and(numpy.sum(numpy.abs(md.initialization.vx[md.mesh.elements-1]),axis=1)==0,\ @@ -63,14 +64,14 @@ md.checkmessage("at least one triangle has all its vertices with a zero velocity") if ThermalAnalysisEnum() in analyses: - md = checkfield(md,'initialization.vx','NaN',1,'size',[md.mesh.numberofvertices]) - md = checkfield(md,'initialization.vy','NaN',1,'size',[md.mesh.numberofvertices]) - if strcmp(md.mesh.meshtype(),'3D'): - md = checkfield(md,'initialization.vz','NaN',1,'size',[md.mesh.numberofvertices]) - md = checkfield(md,'initialization.pressure','NaN',1,'size',[md.mesh.numberofvertices]) + md = checkfield(md,'fieldname','initialization.vx','NaN',1,'size',[md.mesh.numberofvertices]) + md = checkfield(md,'fieldname','initialization.vy','NaN',1,'size',[md.mesh.numberofvertices]) + if md.mesh.dimension()==3: + md = checkfield(md,'fieldname','initialization.vz','NaN',1,'size',[md.mesh.numberofvertices]) + md = checkfield(md,'fieldname','initialization.pressure','NaN',1,'size',[md.mesh.numberofvertices]) if (EnthalpyAnalysisEnum() in analyses and md.thermal.isenthalpy): - md = checkfield(md,'initialization.waterfraction','>=',0,'size',[md.mesh.numberofvertices]) - md = checkfield(md,'initialization.watercolumn' ,'>=',0,'size',[md.mesh.numberofvertices]) + md = checkfield(md,'fieldname','initialization.waterfraction','>=',0,'size',[md.mesh.numberofvertices]) + md = checkfield(md,'fieldname','initialization.watercolumn' ,'>=',0,'size',[md.mesh.numberofvertices]) if HydrologyShreveAnalysisEnum() in analyses: - md = checkfield(md,'initialization.watercolumn','NaN',1,'size',[md.mesh.numberofvertices]) + md = checkfield(md,'fieldname','initialization.watercolumn','NaN',1,'size',[md.mesh.numberofvertices]) return md # }}} Index: /issm/trunk/src/m/classes/inversion.m =================================================================== --- /issm/trunk/src/m/classes/inversion.m (revision 17805) +++ /issm/trunk/src/m/classes/inversion.m (revision 17806) @@ -26,4 +26,48 @@ end methods + function createxml(obj,fid) % {{{ + fprintf(fid, '\n'); + + % inversion parameters + fprintf(fid,'%s\n%s\n%s\n','','
'); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' is inversion activated? ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' 1: linear viscosity, 0: non-linear viscosity ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' ex: {''FrictionCoefficient''}, or {''MaterialsRheologyBbar''} ',' '); + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' number of optimization searches ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' indicate the type of response for each optimization step ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' cost_functions_coefficients applied to the misfit of each vertex and for each control_parameter ',' '); + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' misfit convergence criterion. Default is 1%, NaN if not applied ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' maximum iterations during each optimization step ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' scaling factor on gradient direction during optimization, for each optimization step ',' '); + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' decrease threshold for misfit, default is 30% ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' absolute minimum acceptable value of the inversed parameter on each vertex ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' absolute maximum acceptable value of the inversed parameter on each vertex ',' '); + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' observed velocity x component [m/yr] ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' observed velocity y component [m/yr] ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' observed velocity magnitude [m/yr] ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' observed thickness [m]) ',' '); + + fprintf(fid,'%s\n%s\n',''); + + fprintf(fid,'%s\n%s\n%s\n','','
'); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' ',' '); + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' ',' '); + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' ',' '); + + fprintf(fid,'%s\n%s\n',''); + + end % }}} function obj = inversion(varargin) % {{{ switch nargin @@ -32,14 +76,14 @@ case 1 if isa(varargin{1},'taoinversion'), - disp('converting taoinversion to inversion'); + disp('converting taoinversion'); in=varargin{1}; obj=inversion(); obj.iscontrol = in.iscontrol; - obj.tao = 1; + obj.tao = 1;rsion to inve obj.incomplete_adjoint = in.incomplete_adjoint; obj.control_parameters = in.control_parameters; obj.nsteps = in.nsteps; obj.maxiter_per_step = 10*ones(in.nsteps,1); - obj.cost_functions = repmat(in.cost_functions,in.nsteps,1); + obj.cost_functions = in.cost_functions; obj.cost_functions_coefficients = in.cost_functions_coefficients; obj.gradient_scaling = 100*ones(in.nsteps,1); @@ -107,17 +151,17 @@ num_costfunc=size(md.inversion.cost_functions,2); - md = checkfield(md,'inversion.iscontrol','values',[0 1]); - md = checkfield(md,'inversion.tao','values',[0 1]); - md = checkfield(md,'inversion.incomplete_adjoint','values',[0 1]); - md = checkfield(md,'inversion.control_parameters','cell',1,'values',... + md = checkfield(md,'fieldname','inversion.iscontrol','values',[0 1]); + md = checkfield(md,'fieldname','inversion.tao','values',[0 1]); + md = checkfield(md,'fieldname','inversion.incomplete_adjoint','values',[0 1]); + md = checkfield(md,'fieldname','inversion.control_parameters','cell',1,'values',... {'BalancethicknessThickeningRate' 'FrictionCoefficient' 'MaterialsRheologyBbar' 'DamageDbar' 'Vx' 'Vy' 'Thickness'}); - md = checkfield(md,'inversion.nsteps','numel',1,'>=',0); - md = checkfield(md,'inversion.maxiter_per_step','size',[md.inversion.nsteps 1],'>=',0); - md = checkfield(md,'inversion.step_threshold','size',[md.inversion.nsteps 1]); - md = checkfield(md,'inversion.cost_functions','size',[1 num_costfunc],'values',[101:105 201 501:506]); - md = checkfield(md,'inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices num_costfunc],'>=',0); - md = checkfield(md,'inversion.gradient_scaling','size',[md.inversion.nsteps num_controls]); - md = checkfield(md,'inversion.min_parameters','size',[md.mesh.numberofvertices num_controls]); - md = checkfield(md,'inversion.max_parameters','size',[md.mesh.numberofvertices num_controls]); + md = checkfield(md,'fieldname','inversion.nsteps','numel',1,'>=',0); + md = checkfield(md,'fieldname','inversion.maxiter_per_step','size',[md.inversion.nsteps 1],'>=',0); + md = checkfield(md,'fieldname','inversion.step_threshold','size',[md.inversion.nsteps 1]); + md = checkfield(md,'fieldname','inversion.cost_functions','size',[1 num_costfunc],'values',[101:105 201 501:506]); + md = checkfield(md,'fieldname','inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices num_costfunc],'>=',0); + md = checkfield(md,'fieldname','inversion.gradient_scaling','size',[md.inversion.nsteps num_controls]); + md = checkfield(md,'fieldname','inversion.min_parameters','size',[md.mesh.numberofvertices num_controls]); + md = checkfield(md,'fieldname','inversion.max_parameters','size',[md.mesh.numberofvertices num_controls]); %Only SSA, HO and FS are supported right now @@ -129,10 +173,10 @@ if solution==BalancethicknessSolutionEnum() - md = checkfield(md,'inversion.thickness_obs','size',[md.mesh.numberofvertices 1],'NaN',1); + md = checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices 1],'NaN',1); elseif solution==BalancethicknessSoftSolutionEnum() - md = checkfield(md,'inversion.thickness_obs','size',[md.mesh.numberofvertices 1],'NaN',1); + md = checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices 1],'NaN',1); else - md = checkfield(md,'inversion.vx_obs','size',[md.mesh.numberofvertices 1],'NaN',1); - md = checkfield(md,'inversion.vy_obs','size',[md.mesh.numberofvertices 1],'NaN',1); + md = checkfield(md,'fieldname','inversion.vx_obs','size',[md.mesh.numberofvertices 1],'NaN',1); + md = checkfield(md,'fieldname','inversion.vy_obs','size',[md.mesh.numberofvertices 1],'NaN',1); end end % }}} @@ -199,16 +243,16 @@ num_cost_functions=size(obj.cost_functions,2); data=obj.cost_functions; - pos=find(data==101); data(pos)=SurfaceAbsVelMisfitEnum(); - pos=find(data==102); data(pos)=SurfaceRelVelMisfitEnum(); - pos=find(data==103); data(pos)=SurfaceLogVelMisfitEnum(); - pos=find(data==104); data(pos)=SurfaceLogVxVyMisfitEnum(); - pos=find(data==105); data(pos)=SurfaceAverageVelMisfitEnum(); - pos=find(data==201); data(pos)=ThicknessAbsMisfitEnum(); - pos=find(data==501); data(pos)=DragCoefficientAbsGradientEnum(); - pos=find(data==502); data(pos)=RheologyBbarAbsGradientEnum(); - pos=find(data==503); data(pos)=ThicknessAbsGradientEnum(); - pos=find(data==504); data(pos)=ThicknessAlongGradientEnum(); - pos=find(data==505); data(pos)=ThicknessAcrossGradientEnum(); - pos=find(data==506); data(pos)=BalancethicknessMisfitEnum(); + pos=find(obj.cost_functions==101); data(pos)=SurfaceAbsVelMisfitEnum(); + pos=find(obj.cost_functions==102); data(pos)=SurfaceRelVelMisfitEnum(); + pos=find(obj.cost_functions==103); data(pos)=SurfaceLogVelMisfitEnum(); + pos=find(obj.cost_functions==104); data(pos)=SurfaceLogVxVyMisfitEnum(); + pos=find(obj.cost_functions==105); data(pos)=SurfaceAverageVelMisfitEnum(); + pos=find(obj.cost_functions==201); data(pos)=ThicknessAbsMisfitEnum(); + pos=find(obj.cost_functions==501); data(pos)=DragCoefficientAbsGradientEnum(); + pos=find(obj.cost_functions==502); data(pos)=RheologyBbarAbsGradientEnum(); + pos=find(obj.cost_functions==503); data(pos)=ThicknessAbsGradientEnum(); + pos=find(obj.cost_functions==504); data(pos)=ThicknessAlongGradientEnum(); + pos=find(obj.cost_functions==505); data(pos)=ThicknessAcrossGradientEnum(); + pos=find(obj.cost_functions==506); data(pos)=BalancethicknessMisfitEnum(); WriteData(fid,'data',data,'enum',InversionCostFunctionsEnum(),'format','DoubleMat','mattype',3); WriteData(fid,'data',num_cost_functions,'enum',InversionNumCostFunctionsEnum(),'format','Integer'); Index: /issm/trunk/src/m/classes/inversion.py =================================================================== --- /issm/trunk/src/m/classes/inversion.py (revision 17805) +++ /issm/trunk/src/m/classes/inversion.py (revision 17806) @@ -4,6 +4,6 @@ from EnumDefinitions import * from StringToEnum import StringToEnum -from checkfield import * -from WriteData import * +from checkfield import checkfield +from WriteData import WriteData class inversion(object): @@ -116,16 +116,16 @@ num_costfunc=numpy.size(md.inversion.cost_functions) - md = checkfield(md,'inversion.iscontrol','values',[0,1]) - md = checkfield(md,'inversion.tao','values',[0,1]) - md = checkfield(md,'inversion.incomplete_adjoint','values',[0,1]) - md = checkfield(md,'inversion.control_parameters','cell',1,'values',['BalancethicknessThickeningRate','FrictionCoefficient','MaterialsRheologyBbar','DamageDbar','Vx','Vy']) - md = checkfield(md,'inversion.nsteps','numel',[1],'>=',0) - md = checkfield(md,'inversion.maxiter_per_step','size',[md.inversion.nsteps],'>=',0) - md = checkfield(md,'inversion.step_threshold','size',[md.inversion.nsteps]) - md = checkfield(md,'inversion.cost_functions','size',[num_costfunc],'values',[101,102,103,104,105,201,501,502,503,504,505]) - md = checkfield(md,'inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices,num_costfunc],'>=',0) - md = checkfield(md,'inversion.gradient_scaling','size',[md.inversion.nsteps,num_controls]) - md = checkfield(md,'inversion.min_parameters','size',[md.mesh.numberofvertices,num_controls]) - md = checkfield(md,'inversion.max_parameters','size',[md.mesh.numberofvertices,num_controls]) + md = checkfield(md,'fieldname','inversion.iscontrol','values',[0,1]) + md = checkfield(md,'fieldname','inversion.tao','values',[0,1]) + md = checkfield(md,'fieldname','inversion.incomplete_adjoint','values',[0,1]) + md = checkfield(md,'fieldname','inversion.control_parameters','cell',1,'values',['BalancethicknessThickeningRate','FrictionCoefficient','MaterialsRheologyBbar','DamageDbar','Vx','Vy']) + md = checkfield(md,'fieldname','inversion.nsteps','numel',[1],'>=',0) + md = checkfield(md,'fieldname','inversion.maxiter_per_step','size',[md.inversion.nsteps],'>=',0) + md = checkfield(md,'fieldname','inversion.step_threshold','size',[md.inversion.nsteps]) + md = checkfield(md,'fieldname','inversion.cost_functions','size',[num_costfunc],'values',[101,102,103,104,105,201,501,502,503,504,505]) + md = checkfield(md,'fieldname','inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices,num_costfunc],'>=',0) + md = checkfield(md,'fieldname','inversion.gradient_scaling','size',[md.inversion.nsteps,num_controls]) + md = checkfield(md,'fieldname','inversion.min_parameters','size',[md.mesh.numberofvertices,num_controls]) + md = checkfield(md,'fieldname','inversion.max_parameters','size',[md.mesh.numberofvertices,num_controls]) #Only SSA, HO and FS are supported right now @@ -135,8 +135,8 @@ if solution==BalancethicknessSolutionEnum(): - md = checkfield(md,'inversion.thickness_obs','size',[md.mesh.numberofvertices],'NaN',1) + md = checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices],'NaN',1) else: - md = checkfield(md,'inversion.vx_obs','size',[md.mesh.numberofvertices],'NaN',1) - md = checkfield(md,'inversion.vy_obs','size',[md.mesh.numberofvertices],'NaN',1) + md = checkfield(md,'fieldname','inversion.vx_obs','size',[md.mesh.numberofvertices],'NaN',1) + md = checkfield(md,'fieldname','inversion.vy_obs','size',[md.mesh.numberofvertices],'NaN',1) return md @@ -173,15 +173,26 @@ num_cost_functions=numpy.size(self.cost_functions) data=copy.deepcopy(self.cost_functions) - data=[SurfaceAbsVelMisfitEnum() if x==101 else x for x in data] - data=[SurfaceRelVelMisfitEnum() if x==102 else x for x in data] - data=[SurfaceLogVelMisfitEnum() if x==103 else x for x in data] - data=[SurfaceLogVxVyMisfitEnum() if x==104 else x for x in data] - data=[SurfaceAverageVelMisfitEnum() if x==105 else x for x in data] - data=[ThicknessAbsMisfitEnum() if x==201 else x for x in data] - data=[DragCoefficientAbsGradientEnum() if x==501 else x for x in data] - data=[RheologyBbarAbsGradientEnum() if x==502 else x for x in data] - data=[ThicknessAbsGradientEnum() if x==503 else x for x in data] - data=[ThicknessAlongGradientEnum() if x==504 else x for x in data] - data=[ThicknessAcrossGradientEnum() if x==505 else x for x in data] + pos=[i for i,x in enumerate(self.cost_functions) if x==101]; + for i in pos: data[i]=SurfaceAbsVelMisfitEnum() + pos=[i for i,x in enumerate(self.cost_functions) if x==102]; + for i in pos: data[i]=SurfaceRelVelMisfitEnum() + pos=[i for i,x in enumerate(self.cost_functions) if x==103]; + for i in pos: data[i]=SurfaceLogVelMisfitEnum() + pos=[i for i,x in enumerate(self.cost_functions) if x==104]; + for i in pos: data[i]=SurfaceLogVxVyMisfitEnum() + pos=[i for i,x in enumerate(self.cost_functions) if x==105]; + for i in pos: data[i]=SurfaceAverageVelMisfitEnum() + pos=[i for i,x in enumerate(self.cost_functions) if x==201]; + for i in pos: data[i]=ThicknessAbsMisfitEnum() + pos=[i for i,x in enumerate(self.cost_functions) if x==501]; + for i in pos: data[i]=DragCoefficientAbsGradientEnum() + pos=[i for i,x in enumerate(self.cost_functions) if x==502]; + for i in pos: data[i]=RheologyBbarAbsGradientEnum() + pos=[i for i,x in enumerate(self.cost_functions) if x==503]; + for i in pos: data[i]=ThicknessAbsGradientEnum() + pos=[i for i,x in enumerate(self.cost_functions) if x==504]; + for i in pos: data[i]=ThicknessAlongGradientEnum() + pos=[i for i,x in enumerate(self.cost_functions) if x==505]; + for i in pos: data[i]=ThicknessAcrossGradientEnum() WriteData(fid,'data',numpy.array(data).reshape(1,-1),'enum',InversionCostFunctionsEnum(),'format','DoubleMat','mattype',3) WriteData(fid,'data',num_cost_functions,'enum',InversionNumCostFunctionsEnum(),'format','Integer') Index: /issm/trunk/src/m/classes/mask.m =================================================================== --- /issm/trunk/src/m/classes/mask.m (revision 17805) +++ /issm/trunk/src/m/classes/mask.m (revision 17806) @@ -9,5 +9,23 @@ ice_levelset = NaN; end + methods (Static) + function obj = loadobj(obj) % {{{ + % This function is directly called by matlab when a model object is + % loaded. Update old properties here + + %2014 February 5th + if numel(obj.ice_levelset)>1 & all(obj.ice_levelset>=0), + disp('WARNING: md.mask.ice_levelset>=0, you probably need to change the sign of this levelset'); + end + + end% }}} + end methods + function createxml(obj,fid) % {{{ + fprintf(fid, '\n\n'); + fprintf(fid, '%s\n', ''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' is ice grounded ? grounded ice if > 0, grounding line position if = 0, floating ice if &lt; 0 ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n','','
',' presence of ice if > 0, icefront position if = 0, no ice if &lt; 0 ',''); + end % }}} function obj = mask(varargin) % {{{ switch nargin @@ -23,10 +41,10 @@ function md = checkconsistency(obj,md,solution,analyses) % {{{ - md = checkfield(md,'mask.groundedice_levelset','size',[md.mesh.numberofvertices 1]); - md = checkfield(md,'mask.ice_levelset' ,'size',[md.mesh.numberofvertices 1]); - isice=(md.mask.ice_levelset>0); - if any(sum(isice(md.mesh.elements),2)==0), - warning('elements with no ice not implemented yet, each element should have at least one vertex with md.mask.ice_levelset > 0'); - end + md = checkfield(md,'fieldname','mask.groundedice_levelset','size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','mask.ice_levelset' ,'size',[md.mesh.numberofvertices 1]); + %isice=(md.mask.ice_levelset>0); + %if any(sum(isice(md.mesh.elements),2)==0), + % warning('elements with no ice not implemented yet, each element should have at least one vertex with md.mask.ice_levelset > 0'); + % end end % }}} function disp(obj) % {{{ @@ -34,9 +52,17 @@ fielddisplay(obj,'groundedice_levelset','is ice grounded ? grounded ice if > 0, grounding line position if = 0, floating ice if < 0'); - fielddisplay(obj,'ice_levelset','presence of ice if > 0, icefront position if = 0, no ice if < 0'); + fielddisplay(obj,'ice_levelset','presence of ice if < 0, icefront position if = 0, no ice if > 0'); end % }}} function marshall(obj,md,fid) % {{{ WriteData(fid,'object',obj,'fieldname','groundedice_levelset','format','DoubleMat','mattype',1); WriteData(fid,'object',obj,'fieldname','ice_levelset','format','DoubleMat','mattype',1); + + % get mask of vertices of elements with ice + isice=md.mask.ice_levelset<=0.; + vlist = zeros(md.mesh.numberofvertices,1); + pos=find(sum(isice(md.mesh.elements),2)>0); + vlist(md.mesh.elements(pos,:))=1; + WriteData(fid,'data',vlist,'enum',IceMaskNodeActivationEnum(),'format','DoubleMat','mattype',1); + end % }}} end Index: /issm/trunk/src/m/classes/mask.py =================================================================== --- /issm/trunk/src/m/classes/mask.py (revision 17805) +++ /issm/trunk/src/m/classes/mask.py (revision 17806) @@ -1,6 +1,7 @@ +import numpy from fielddisplay import fielddisplay from EnumDefinitions import * -from checkfield import * -from WriteData import * +from checkfield import checkfield +from WriteData import WriteData class mask(object): @@ -24,5 +25,5 @@ string="%s\n%s"%(string,fielddisplay(self,"groundedice_levelset","is ice grounded ? grounded ice if > 0, grounding line position if = 0, floating ice if < 0")) - string="%s\n%s"%(string,fielddisplay(self,"ice_levelset","presence of ice if > 0, icefront position if = 0, no ice if < 0")) + string="%s\n%s"%(string,fielddisplay(self,"ice_levelset","presence of ice if < 0, icefront position if = 0, no ice if > 0")) return string #}}} @@ -32,9 +33,9 @@ def checkconsistency(self,md,solution,analyses): # {{{ - md = checkfield(md,'mask.ice_levelset' ,'size',[md.mesh.numberofvertices]) - isice=numpy.array(md.mask.ice_levelset>0,int) - totallyicefree=(numpy.sum(isice[md.mesh.elements-1],axis=1)==0).astype(int) - if any(totallyicefree): - raise TypeError("elements with no ice not implemented yet, each element should have at least one vertex with md.mask.ice_levelset > 0") + md = checkfield(md,'fieldname','mask.ice_levelset' ,'size',[md.mesh.numberofvertices]) + #isice=numpy.array(md.mask.ice_levelset<0,int) + #totallyicefree=(numpy.sum(isice[md.mesh.elements-1],axis=1)==0).astype(int) + #if any(totallyicefree): + # raise TypeError("elements with no ice not implemented yet, each element should have at least one vertex with md.mask.ice_levelset > 0") return md @@ -43,3 +44,10 @@ WriteData(fid,'object',self,'fieldname','groundedice_levelset','format','DoubleMat','mattype',1) WriteData(fid,'object',self,'fieldname','ice_levelset','format','DoubleMat','mattype',1) + + # get mask of vertices of elements with ice + isice=numpy.array(md.mask.ice_levelset<0.,int) + vlist = numpy.zeros((md.mesh.numberofvertices,1), dtype=int) + pos=numpy.nonzero(numpy.sum(isice[md.mesh.elements-1],axis=1))[0] + vlist[md.mesh.elements[pos,:]-1]=1 + WriteData(fid,'data',vlist,'enum',IceMaskNodeActivationEnum(),'format','DoubleMat','mattype',1); # }}} Index: /issm/trunk/src/m/classes/massfluxatgate.py =================================================================== --- /issm/trunk/src/m/classes/massfluxatgate.py (revision 17805) +++ /issm/trunk/src/m/classes/massfluxatgate.py (revision 17806) @@ -1,7 +1,7 @@ from fielddisplay import fielddisplay from EnumDefinitions import * -from checkfield import * -from WriteData import * -from MeshProfileIntersection import * +from checkfield import checkfield +from WriteData import WriteData +from MeshProfileIntersection import MeshProfileIntersection import os Index: /issm/trunk/src/m/classes/masstransport.m =================================================================== --- /issm/trunk/src/m/classes/masstransport.m (revision 17805) +++ /issm/trunk/src/m/classes/masstransport.m (revision 17806) @@ -7,4 +7,5 @@ properties (SetAccess=public) spcthickness = NaN; + calvingrate = NaN; isfreesurface = 0; min_thickness = 0; @@ -42,4 +43,25 @@ end methods + function createxml(obj,fid) % {{{ + fprintf(fid, '\n'); + + % Masstransport solution parameters + fprintf(fid,'%s\n%s\n%s\n','','
'); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' thickness constraints (NaN means no constraint) [m] ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' calving rate at given location [m/a] ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' do we use free surfaces (FS only) are mass conservation ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' minimum ice thickness allowed [m] ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' adjustment of ice shelves surface and bed elevations: ''Incremental'' or ''Absolute'' ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' 0: no, 1: artificial_diffusivity, 2: streamline upwinding, 3: discontinuous Galerkin ',' '); + fprintf(fid,'%s\n%s\n',''); + + %Penalty options + fprintf(fid,'%s\n%s\n%s\n','','
'); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' offset used by penalties: penalty = Kmax*10^offset ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' pairs of vertices that are penalized ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' additional outputs requested ',' '); + fprintf(fid,'%s\n%s\n',''); + + end % }}} function obj = masstransport(varargin) % {{{ switch nargin @@ -62,5 +84,5 @@ function list = defaultoutputs(self,md) % {{{ - list = {'Thickness','Surface','Bed'}; + list = {'Thickness','Surface','Base'}; end % }}} @@ -87,10 +109,14 @@ if ~ismember(MasstransportAnalysisEnum(),analyses) | (solution==TransientSolutionEnum() & md.transient.ismasstransport==0), return; end - md = checkfield(md,'masstransport.spcthickness','forcing',1); - md = checkfield(md,'masstransport.isfreesurface','values',[0 1]); - md = checkfield(md,'masstransport.hydrostatic_adjustment','values',{'Absolute' 'Incremental'}); - md = checkfield(md,'masstransport.stabilization','values',[0 1 2 3]); - md = checkfield(md,'masstransport.min_thickness','>',0); - md = checkfield(md,'masstransport.requested_outputs','stringrow',1); + md = checkfield(md,'fieldname','masstransport.spcthickness','forcing',1); + if(ismember(LevelsetAnalysisEnum(), analyses) & md.transient.islevelset) + md = checkfield(md,'fieldname','masstransport.calvingrate','NaN',1,'size',[md.mesh.numberofvertices 1],'>=',0); + end + + md = checkfield(md,'fieldname','masstransport.isfreesurface','values',[0 1]); + md = checkfield(md,'fieldname','masstransport.hydrostatic_adjustment','values',{'Absolute' 'Incremental'}); + md = checkfield(md,'fieldname','masstransport.stabilization','values',[0 1 2 3]); + md = checkfield(md,'fieldname','masstransport.min_thickness','>',0); + md = checkfield(md,'fieldname','masstransport.requested_outputs','stringrow',1); end % }}} @@ -98,4 +124,5 @@ disp(sprintf(' Masstransport solution parameters:')); fielddisplay(obj,'spcthickness','thickness constraints (NaN means no constraint) [m]'); + fielddisplay(obj,'calvingrate','calving rate at given location [m/a]'); fielddisplay(obj,'isfreesurface','do we use free surfaces (FS only) are mass conservation'); fielddisplay(obj,'min_thickness','minimum ice thickness allowed [m]'); @@ -110,5 +137,9 @@ end % }}} function marshall(obj,md,fid) % {{{ + + yts=365.*24.*3600.; + WriteData(fid,'object',obj,'fieldname','spcthickness','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'fieldname','calvingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts); WriteData(fid,'object',obj,'fieldname','isfreesurface','format','Boolean'); WriteData(fid,'object',obj,'fieldname','min_thickness','format','Double'); Index: /issm/trunk/src/m/classes/masstransport.py =================================================================== --- /issm/trunk/src/m/classes/masstransport.py (revision 17805) +++ /issm/trunk/src/m/classes/masstransport.py (revision 17806) @@ -2,6 +2,6 @@ from EnumDefinitions import * from StringToEnum import StringToEnum -from checkfield import * -from WriteData import * +from checkfield import checkfield +from WriteData import WriteData class masstransport(object): @@ -15,4 +15,5 @@ def __init__(self): # {{{ self.spcthickness = float('NaN') + self.calvingrate = float('NaN') self.isfreesurface = 0 self.min_thickness = 0 @@ -30,4 +31,5 @@ string=' Masstransport solution parameters:' string="%s\n%s"%(string,fielddisplay(self,'spcthickness','thickness constraints (NaN means no constraint) [m]')) + string="%s\n%s"%(string,fielddisplay(self,'calvingrate','calving rate at given location [m/a]')) string="%s\n%s"%(string,fielddisplay(self,'isfreesurface','do we use free surfaces (FS only) are mass conservation')) string="%s\n%s"%(string,fielddisplay(self,'min_thickness','minimum ice thickness allowed [m]')) @@ -40,5 +42,5 @@ def defaultoutputs(self,md): # {{{ - return ['Thickness','Surface','Bed'] + return ['Thickness','Surface','Base'] #}}} @@ -67,15 +69,21 @@ return md - md = checkfield(md,'masstransport.spcthickness','forcing',1) - md = checkfield(md,'masstransport.isfreesurface','values',[0,1]) - md = checkfield(md,'masstransport.hydrostatic_adjustment','values',['Absolute','Incremental']) - md = checkfield(md,'masstransport.stabilization','values',[0,1,2,3]) - md = checkfield(md,'masstransport.min_thickness','>',0) - md = checkfield(md,'masstransport.requested_outputs','stringrow',1) + md = checkfield(md,'fieldname','masstransport.spcthickness','forcing',1) + if LevelsetAnalysisEnum() in analyses and md.transient.islevelset: + md = checkfield(md,'fieldname','masstransport.calvingrate','NaN',1,'size',[md.mesh.numberofvertices],'>=',0) + md = checkfield(md,'fieldname','masstransport.isfreesurface','values',[0,1]) + md = checkfield(md,'fieldname','masstransport.hydrostatic_adjustment','values',['Absolute','Incremental']) + md = checkfield(md,'fieldname','masstransport.stabilization','values',[0,1,2,3]) + md = checkfield(md,'fieldname','masstransport.min_thickness','>',0) + md = checkfield(md,'fieldname','masstransport.requested_outputs','stringrow',1) return md # }}} def marshall(self,md,fid): # {{{ + + yts=365.*24.*3600. + WriteData(fid,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'fieldname','calvingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts) WriteData(fid,'object',self,'fieldname','isfreesurface','format','Boolean') WriteData(fid,'object',self,'fieldname','min_thickness','format','Double') Index: /issm/trunk/src/m/classes/matdamageice.m =================================================================== --- /issm/trunk/src/m/classes/matdamageice.m (revision 17806) +++ /issm/trunk/src/m/classes/matdamageice.m (revision 17806) @@ -0,0 +1,197 @@ +%MATDAMAGEICE class definition +% +% Usage: +% matdamageice=matdamageice(); + +classdef matdamageice + properties (SetAccess=public) + rho_ice = 0.; + rho_water = 0.; + rho_freshwater = 0.; + mu_water = 0.; + heatcapacity = 0.; + latentheat = 0.; + thermalconductivity = 0.; + temperateiceconductivity = 0.; + meltingpoint = 0.; + beta = 0.; + mixed_layer_capacity = 0.; + thermal_exchange_velocity = 0.; + rheology_B = NaN; + rheology_n = NaN; + rheology_law = ''; + + %gia: + lithosphere_shear_modulus = 0.; + lithosphere_density = 0.; + mantle_shear_modulus = 0.; + mantle_density = 0.; + + end + methods + function createxml(obj,fid) % {{{ + fprintf(fid, '\n\n'); + fprintf(fid, '\n'); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' ice density [kg/m^3] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' ocean water density [kg/m^3] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' fresh water density [kg/m^3] ',''); + + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' water viscosity [N s/m^2] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' heat capacity [J/kg/K] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' latent heat of fusion [J/kg] ',''); + + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' ice thermal conductivity [W/m/K] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' temperate ice thermal conductivity [W/m/K] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' melting point of ice at 1atm in K ',''); + + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' rate of change of melting point with pressure [K/Pa] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' mixed layer capacity [W/kg/K] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' thermal exchange velocity [m/s] ',''); + + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' flow law parameter [Pa/s^(1/n)] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' Glens flow law exponent ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' law for the temperature dependance of the rheology: "None", "Paterson", "Arrhenius" or "LliboutryDuval" ',''); + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' Lithosphere shear modulus [Pa] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' Lithosphere density [g/cm^-3] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' Mantle shear modulus [Pa] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' Mantle density [g/cm^-3] ',''); + + + end % }}} + function obj = matdamageice(varargin) % {{{ + switch nargin + case 0 + obj=setdefaultparameters(obj); + case 1 + inputstruct=varargin{1}; + list1 = properties('matdamageice'); + list2 = fieldnames(inputstruct); + for i=1:length(list1) + fieldname = list1{i}; + if ismember(fieldname,list2), + obj.(fieldname) = inputstruct.(fieldname); + end + end + otherwise + error('constructor not supported'); + end + end % }}} + function obj = setdefaultparameters(obj) % {{{ + + %ice density (kg/m^3) + obj.rho_ice=917.; + + %ocean water density (kg/m^3) + obj.rho_water=1023.; + + %fresh water density (kg/m^3) + obj.rho_freshwater=1000.; + + %water viscosity (N.s/m^2) + obj.mu_water=0.001787; + + %ice heat capacity cp (J/kg/K) + obj.heatcapacity=2093.; + + %ice latent heat of fusion L (J/kg) + obj.latentheat=3.34*10^5; + + %ice thermal conductivity (W/m/K) + obj.thermalconductivity=2.4; + + %wet ice thermal conductivity (W/m/K) + obj.temperateiceconductivity=.24; + + %the melting point of ice at 1 atmosphere of pressure in K + obj.meltingpoint=273.15; + + %rate of change of melting point with pressure (K/Pa) + obj.beta=9.8*10^-8; + + %mixed layer (ice-water interface) heat capacity (J/kg/K) + obj.mixed_layer_capacity=3974.; + + %thermal exchange velocity (ice-water interface) (m/s) + obj.thermal_exchange_velocity=1.00*10^-4; + + %Rheology law: what is the temperature dependence of B with T + %available: none, paterson and arrhenius + obj.rheology_law='Paterson'; + + % GIA: + obj.lithosphere_shear_modulus = 6.7*10^10; % (Pa) + obj.lithosphere_density = 3.32; % (g/cm^-3) + obj.mantle_shear_modulus = 1.45*10^11; % (Pa) + obj.mantle_density = 3.34; % (g/cm^-3) + + end % }}} + function md = checkconsistency(obj,md,solution,analyses) % {{{ + md = checkfield(md,'fieldname','materials.rho_ice','>',0); + md = checkfield(md,'fieldname','materials.rho_water','>',0); + md = checkfield(md,'fieldname','materials.rho_freshwater','>',0); + md = checkfield(md,'fieldname','materials.mu_water','>',0); + md = checkfield(md,'fieldname','materials.rheology_B','>',0,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','materials.rheology_n','>',0,'size',[md.mesh.numberofelements 1]); + md = checkfield(md,'fieldname','materials.rheology_law','values',{'None' 'Cuffey' 'Paterson' 'Arrhenius' 'LliboutryDuval'}); + + if ismember(GiaAnalysisEnum(),analyses), + md = checkfield(md,'fieldname','materials.lithosphere_shear_modulus','>',0,'numel',1); + md = checkfield(md,'fieldname','materials.lithosphere_density','>',0,'numel',1); + md = checkfield(md,'fieldname','materials.mantle_shear_modulus','>',0,'numel',1); + md = checkfield(md,'fieldname','materials.mantle_density','>',0,'numel',1); + end + + end % }}} + function disp(obj) % {{{ + disp(sprintf(' Materials:')); + + fielddisplay(obj,'rho_ice','ice density [kg/m^3]'); + fielddisplay(obj,'rho_water','ocean water density [kg/m^3]'); + fielddisplay(obj,'rho_freshwater','fresh water density [kg/m^3]'); + fielddisplay(obj,'mu_water','water viscosity [N s/m^2]'); + fielddisplay(obj,'heatcapacity','heat capacity [J/kg/K]'); + fielddisplay(obj,'thermalconductivity',['ice thermal conductivity [W/m/K]']); + fielddisplay(obj,'temperateiceconductivity','temperate ice thermal conductivity [W/m/K]'); + fielddisplay(obj,'meltingpoint','melting point of ice at 1atm in K'); + fielddisplay(obj,'latentheat','latent heat of fusion [J/kg]'); + fielddisplay(obj,'beta','rate of change of melting point with pressure [K/Pa]'); + fielddisplay(obj,'mixed_layer_capacity','mixed layer capacity [W/kg/K]'); + fielddisplay(obj,'thermal_exchange_velocity','thermal exchange velocity [m/s]'); + fielddisplay(obj,'rheology_B','flow law parameter [Pa/s^(1/n)]'); + fielddisplay(obj,'rheology_n','Glen''s flow law exponent'); + fielddisplay(obj,'rheology_law',['law for the temperature dependance of the rheology: ''None'', ''Cuffey'', ''Paterson'', ''Arrhenius'' or ''LliboutryDuval''']); + fielddisplay(obj,'lithosphere_shear_modulus','Lithosphere shear modulus [Pa]'); + fielddisplay(obj,'lithosphere_density','Lithosphere density [g/cm^-3]'); + fielddisplay(obj,'mantle_shear_modulus','Mantle shear modulus [Pa]'); + fielddisplay(obj,'mantle_density','Mantle density [g/cm^-3]'); + end % }}} + function marshall(obj,md,fid) % {{{ + WriteData(fid,'enum',MaterialsEnum(),'data',MatdamageiceEnum(),'format','Integer'); + WriteData(fid,'object',obj,'class','materials','fieldname','rho_ice','format','Double'); + WriteData(fid,'object',obj,'class','materials','fieldname','rho_water','format','Double'); + WriteData(fid,'object',obj,'class','materials','fieldname','rho_freshwater','format','Double'); + WriteData(fid,'object',obj,'class','materials','fieldname','mu_water','format','Double'); + WriteData(fid,'object',obj,'class','materials','fieldname','heatcapacity','format','Double'); + WriteData(fid,'object',obj,'class','materials','fieldname','latentheat','format','Double'); + WriteData(fid,'object',obj,'class','materials','fieldname','thermalconductivity','format','Double'); + WriteData(fid,'object',obj,'class','materials','fieldname','temperateiceconductivity','format','Double'); + WriteData(fid,'object',obj,'class','materials','fieldname','meltingpoint','format','Double'); + WriteData(fid,'object',obj,'class','materials','fieldname','beta','format','Double'); + WriteData(fid,'object',obj,'class','materials','fieldname','mixed_layer_capacity','format','Double'); + WriteData(fid,'object',obj,'class','materials','fieldname','thermal_exchange_velocity','format','Double'); + WriteData(fid,'object',obj,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1); + WriteData(fid,'object',obj,'class','materials','fieldname','rheology_n','format','DoubleMat','mattype',2); + WriteData(fid,'data',StringToEnum(obj.rheology_law),'enum',MaterialsRheologyLawEnum(),'format','Integer'); + + WriteData(fid,'object',obj,'class','materials','fieldname','lithosphere_shear_modulus','format','Double'); + WriteData(fid,'object',obj,'class','materials','fieldname','lithosphere_density','format','Double','scale',10^3); + WriteData(fid,'object',obj,'class','materials','fieldname','mantle_shear_modulus','format','Double'); + WriteData(fid,'object',obj,'class','materials','fieldname','mantle_density','format','Double','scale',10^3); + end % }}} + end +end Index: /issm/trunk/src/m/classes/matdamageice.py =================================================================== --- /issm/trunk/src/m/classes/matdamageice.py (revision 17806) +++ /issm/trunk/src/m/classes/matdamageice.py (revision 17806) @@ -0,0 +1,150 @@ +from fielddisplay import fielddisplay +from EnumDefinitions import MaterialsEnum, MatdamageiceEnum, MaterialsRheologyLawEnum +from StringToEnum import StringToEnum +from checkfield import checkfield +from WriteData import WriteData + +class matdamageice(object): + """ + MATICE class definition + + Usage: + matdamagice=matdamageice(); + """ + + def __init__(self): # {{{ + self.rho_ice = 0. + self.rho_water = 0. + self.rho_freshwater = 0. + self.mu_water = 0. + self.heatcapacity = 0. + self.latentheat = 0. + self.thermalconductivity = 0. + self.temperateiceconductivity = 0. + self.meltingpoint = 0. + self.beta = 0. + self.mixed_layer_capacity = 0. + self.thermal_exchange_velocity = 0. + self.rheology_B = float('NaN') + self.rheology_n = float('NaN') + self.rheology_law = '' + + #gia: + self.lithosphere_shear_modulus = 0. + self.lithosphere_density = 0. + self.mantle_shear_modulus = 0. + self.mantle_density = 0. + + self.setdefaultparameters() + #}}} + def __repr__(self): # {{{ + string=" Materials:" + + string="%s\n%s"%(string,fielddisplay(self,"rho_ice","ice density [kg/m^3]")) + string="%s\n%s"%(string,fielddisplay(self,"rho_water","water density [kg/m^3]")) + string="%s\n%s"%(string,fielddisplay(self,"rho_freshwater","fresh water density [kg/m^3]")) + string="%s\n%s"%(string,fielddisplay(self,"mu_water","water viscosity [N s/m^2]")) + string="%s\n%s"%(string,fielddisplay(self,"heatcapacity","heat capacity [J/kg/K]")) + string="%s\n%s"%(string,fielddisplay(self,"thermalconductivity","ice thermal conductivity [W/m/K]")) + string="%s\n%s"%(string,fielddisplay(self,"temperateiceconductivity","temperate ice thermal conductivity [W/m/K]")) + string="%s\n%s"%(string,fielddisplay(self,"meltingpoint","melting point of ice at 1atm in K")) + string="%s\n%s"%(string,fielddisplay(self,"latentheat","latent heat of fusion [J/m^3]")) + string="%s\n%s"%(string,fielddisplay(self,"beta","rate of change of melting point with pressure [K/Pa]")) + string="%s\n%s"%(string,fielddisplay(self,"mixed_layer_capacity","mixed layer capacity [W/kg/K]")) + string="%s\n%s"%(string,fielddisplay(self,"thermal_exchange_velocity","thermal exchange velocity [m/s]")) + string="%s\n%s"%(string,fielddisplay(self,"rheology_B","flow law parameter [Pa/s^(1/n)]")) + string="%s\n%s"%(string,fielddisplay(self,"rheology_n","Glen's flow law exponent")) + string="%s\n%s"%(string,fielddisplay(self,"rheology_law","law for the temperature dependance of the rheology: 'None', 'Cuffey', 'Paterson', 'Arrhenius' or 'LliboutryDuval'")) + string="%s\n%s"%(string,fielddisplay(self,"lithosphere_shear_modulus","Lithosphere shear modulus [Pa]")) + string="%s\n%s"%(string,fielddisplay(self,"lithosphere_density","Lithosphere density [g/cm^-3]")) + string="%s\n%s"%(string,fielddisplay(self,"mantle_shear_modulus","Mantle shear modulus [Pa]")) + string="%s\n%s"%(string,fielddisplay(self,"mantle_density","Mantle density [g/cm^-3]")) + + return string + #}}} + def setdefaultparameters(self): # {{{ + #ice density (kg/m^3) + self.rho_ice=917. + + #ocean water density (kg/m^3) + self.rho_water=1023. + + #fresh water density (kg/m^3) + self.rho_freshwater=1000. + + #water viscosity (N.s/m^2) + self.mu_water=0.001787 + + #ice heat capacity cp (J/kg/K) + self.heatcapacity=2093. + + #ice latent heat of fusion L (J/kg) + self.latentheat=3.34*10**5 + + #ice thermal conductivity (W/m/K) + self.thermalconductivity=2.4 + + #temperate ice thermal conductivity (W/m/K) + self.temperateiceconductivity=0.24 + + #the melting point of ice at 1 atmosphere of pressure in K + self.meltingpoint=273.15 + + #rate of change of melting point with pressure (K/Pa) + self.beta=9.8*10**-8 + + #mixed layer (ice-water interface) heat capacity (J/kg/K) + self.mixed_layer_capacity=3974. + + #thermal exchange velocity (ice-water interface) (m/s) + self.thermal_exchange_velocity=1.00*10**-4 + + #Rheology law: what is the temperature dependence of B with T + #available: none, paterson and arrhenius + self.rheology_law='Paterson' + + # GIA: + self.lithosphere_shear_modulus = 6.7*10**10 # (Pa) + self.lithosphere_density = 3.32 # (g/cm^-3) + self.mantle_shear_modulus = 1.45*10**11 # (Pa) + self.mantle_density = 3.34 # (g/cm^-3) + + return self + #}}} + def checkconsistency(self,md,solution,analyses): # {{{ + md = checkfield(md,'fieldname','materials.rho_ice','>',0) + md = checkfield(md,'fieldname','materials.rho_water','>',0) + md = checkfield(md,'fieldname','materials.rho_freshwater','>',0) + md = checkfield(md,'fieldname','materials.mu_water','>',0) + md = checkfield(md,'fieldname','materials.rheology_B','>',0,'size',[md.mesh.numberofvertices]) + md = checkfield(md,'fieldname','materials.rheology_n','>',0,'size',[md.mesh.numberofelements]) + md = checkfield(md,'fieldname','materials.rheology_law','values',['None','Cuffey','Paterson','Arrhenius','LliboutryDuval']) + md = checkfield(md,'fieldname','materials.lithosphere_shear_modulus','>',0,'numel',[1]); + md = checkfield(md,'fieldname','materials.lithosphere_density','>',0,'numel',[1]); + md = checkfield(md,'fieldname','materials.mantle_shear_modulus','>',0,'numel',[1]); + md = checkfield(md,'fieldname','materials.mantle_density','>',0,'numel',[1]); + return md + # }}} + def marshall(self,md,fid): # {{{ + WriteData(fid,'enum',MaterialsEnum(),'data',MatdamageiceEnum(),'format','Integer'); + WriteData(fid,'object',self,'class','materials','fieldname','rho_ice','format','Double') + WriteData(fid,'object',self,'class','materials','fieldname','rho_water','format','Double') + WriteData(fid,'object',self,'class','materials','fieldname','rho_freshwater','format','Double') + WriteData(fid,'object',self,'class','materials','fieldname','mu_water','format','Double') + WriteData(fid,'object',self,'class','materials','fieldname','heatcapacity','format','Double') + WriteData(fid,'object',self,'class','materials','fieldname','latentheat','format','Double') + WriteData(fid,'object',self,'class','materials','fieldname','thermalconductivity','format','Double') + WriteData(fid,'object',self,'class','materials','fieldname','temperateiceconductivity','format','Double') + WriteData(fid,'object',self,'class','materials','fieldname','meltingpoint','format','Double') + WriteData(fid,'object',self,'class','materials','fieldname','beta','format','Double') + WriteData(fid,'object',self,'class','materials','fieldname','mixed_layer_capacity','format','Double') + WriteData(fid,'object',self,'class','materials','fieldname','thermal_exchange_velocity','format','Double') + WriteData(fid,'object',self,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1) + WriteData(fid,'object',self,'class','materials','fieldname','rheology_n','format','DoubleMat','mattype',2) + WriteData(fid,'data',StringToEnum(self.rheology_law)[0],'enum',MaterialsRheologyLawEnum(),'format','Integer') + + WriteData(fid,'object',self,'class','materials','fieldname','lithosphere_shear_modulus','format','Double'); + WriteData(fid,'object',self,'class','materials','fieldname','lithosphere_density','format','Double','scale',10.**3.); + WriteData(fid,'object',self,'class','materials','fieldname','mantle_shear_modulus','format','Double'); + WriteData(fid,'object',self,'class','materials','fieldname','mantle_density','format','Double','scale',10.**3.); + # }}} Index: /issm/trunk/src/m/classes/matice.m =================================================================== --- /issm/trunk/src/m/classes/matice.m (revision 17805) +++ /issm/trunk/src/m/classes/matice.m (revision 17806) @@ -13,4 +13,5 @@ latentheat = 0.; thermalconductivity = 0.; + temperateiceconductivity = 0.; meltingpoint = 0.; beta = 0.; @@ -29,4 +30,38 @@ end methods + function createxml(obj,fid) % {{{ + fprintf(fid, '\n\n'); + fprintf(fid, '\n'); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' ice density [kg/m^3] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' ocean water density [kg/m^3] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' fresh water density [kg/m^3] ',''); + + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' water viscosity [N s/m^2] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' heat capacity [J/kg/K] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' latent heat of fusion [J/kg] ',''); + + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' ice thermal conductivity [W/m/K] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' temperate ice thermal conductivity [W/m/K] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' melting point of ice at 1atm in K ',''); + + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' rate of change of melting point with pressure [K/Pa] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' mixed layer capacity [W/kg/K] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' thermal exchange velocity [m/s] ',''); + + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' flow law parameter [Pa/s^(1/n)] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' Glens flow law exponent ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' law for the temperature dependance of the rheology: "None", "Paterson", "Arrhenius" or "LliboutryDuval" ',''); + + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' Lithosphere shear modulus [Pa] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' Lithosphere density [g/cm^-3] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' Mantle shear modulus [Pa] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' Mantle density [g/cm^-3] ',''); + + + end % }}} function obj = matice(varargin) % {{{ switch nargin @@ -69,4 +104,7 @@ %ice thermal conductivity (W/m/K) obj.thermalconductivity=2.4; + + %wet ice thermal conductivity (W/m/K) + obj.temperateiceconductivity=.24; %the melting point of ice at 1 atmosphere of pressure in K @@ -94,17 +132,17 @@ end % }}} function md = checkconsistency(obj,md,solution,analyses) % {{{ - md = checkfield(md,'materials.rho_ice','>',0); - md = checkfield(md,'materials.rho_water','>',0); - md = checkfield(md,'materials.rho_freshwater','>',0); - md = checkfield(md,'materials.mu_water','>',0); - md = checkfield(md,'materials.rheology_B','>',0,'size',[md.mesh.numberofvertices 1]); - md = checkfield(md,'materials.rheology_n','>',0,'size',[md.mesh.numberofelements 1]); - md = checkfield(md,'materials.rheology_law','values',{'None' 'Paterson' 'Arrhenius' 'LliboutryDuval'}); + md = checkfield(md,'fieldname','materials.rho_ice','>',0); + md = checkfield(md,'fieldname','materials.rho_water','>',0); + md = checkfield(md,'fieldname','materials.rho_freshwater','>',0); + md = checkfield(md,'fieldname','materials.mu_water','>',0); + md = checkfield(md,'fieldname','materials.rheology_B','>',0,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','materials.rheology_n','>',0,'size',[md.mesh.numberofelements 1]); + md = checkfield(md,'fieldname','materials.rheology_law','values',{'None' 'Cuffey' 'Paterson' 'Arrhenius' 'LliboutryDuval'}); if ismember(GiaAnalysisEnum(),analyses), - md = checkfield(md,'materials.lithosphere_shear_modulus','>',0,'numel',1); - md = checkfield(md,'materials.lithosphere_density','>',0,'numel',1); - md = checkfield(md,'materials.mantle_shear_modulus','>',0,'numel',1); - md = checkfield(md,'materials.mantle_density','>',0,'numel',1); + md = checkfield(md,'fieldname','materials.lithosphere_shear_modulus','>',0,'numel',1); + md = checkfield(md,'fieldname','materials.lithosphere_density','>',0,'numel',1); + md = checkfield(md,'fieldname','materials.mantle_shear_modulus','>',0,'numel',1); + md = checkfield(md,'fieldname','materials.mantle_density','>',0,'numel',1); end @@ -118,7 +156,8 @@ fielddisplay(obj,'mu_water','water viscosity [N s/m^2]'); fielddisplay(obj,'heatcapacity','heat capacity [J/kg/K]'); - fielddisplay(obj,'thermalconductivity','ice thermal conductivity [W/m/K]'); + fielddisplay(obj,'thermalconductivity',['ice thermal conductivity [W/m/K]']); + fielddisplay(obj,'temperateiceconductivity','temperate ice thermal conductivity [W/m/K]'); fielddisplay(obj,'meltingpoint','melting point of ice at 1atm in K'); - fielddisplay(obj,'latentheat','latent heat of fusion [J/m^3]'); + fielddisplay(obj,'latentheat','latent heat of fusion [J/kg]'); fielddisplay(obj,'beta','rate of change of melting point with pressure [K/Pa]'); fielddisplay(obj,'mixed_layer_capacity','mixed layer capacity [W/kg/K]'); @@ -126,5 +165,5 @@ fielddisplay(obj,'rheology_B','flow law parameter [Pa/s^(1/n)]'); fielddisplay(obj,'rheology_n','Glen''s flow law exponent'); - fielddisplay(obj,'rheology_law',['law for the temperature dependance of the rheology: ''None'', ''Paterson'', ''Arrhenius'' or ''LliboutryDuval''']); + fielddisplay(obj,'rheology_law',['law for the temperature dependance of the rheology: ''None'', ''Cuffey'', ''Paterson'', ''Arrhenius'' or ''LliboutryDuval''']); fielddisplay(obj,'lithosphere_shear_modulus','Lithosphere shear modulus [Pa]'); fielddisplay(obj,'lithosphere_density','Lithosphere density [g/cm^-3]'); @@ -141,4 +180,5 @@ WriteData(fid,'object',obj,'class','materials','fieldname','latentheat','format','Double'); WriteData(fid,'object',obj,'class','materials','fieldname','thermalconductivity','format','Double'); + WriteData(fid,'object',obj,'class','materials','fieldname','temperateiceconductivity','format','Double'); WriteData(fid,'object',obj,'class','materials','fieldname','meltingpoint','format','Double'); WriteData(fid,'object',obj,'class','materials','fieldname','beta','format','Double'); Index: /issm/trunk/src/m/classes/matice.py =================================================================== --- /issm/trunk/src/m/classes/matice.py (revision 17805) +++ /issm/trunk/src/m/classes/matice.py (revision 17806) @@ -2,6 +2,6 @@ from EnumDefinitions import * from StringToEnum import StringToEnum -from checkfield import * -from WriteData import * +from checkfield import checkfield +from WriteData import WriteData class matice(object): @@ -21,4 +21,5 @@ self.latentheat = 0. self.thermalconductivity = 0. + self.temperateiceconductivity = 0. self.meltingpoint = 0. self.beta = 0. @@ -46,4 +47,5 @@ string="%s\n%s"%(string,fielddisplay(self,"heatcapacity","heat capacity [J/kg/K]")) string="%s\n%s"%(string,fielddisplay(self,"thermalconductivity","ice thermal conductivity [W/m/K]")) + string="%s\n%s"%(string,fielddisplay(self,"temperateiceconductivity","temperate ice thermal conductivity [W/m/K]")) string="%s\n%s"%(string,fielddisplay(self,"meltingpoint","melting point of ice at 1atm in K")) string="%s\n%s"%(string,fielddisplay(self,"latentheat","latent heat of fusion [J/m^3]")) @@ -53,5 +55,5 @@ string="%s\n%s"%(string,fielddisplay(self,"rheology_B","flow law parameter [Pa/s^(1/n)]")) string="%s\n%s"%(string,fielddisplay(self,"rheology_n","Glen's flow law exponent")) - string="%s\n%s"%(string,fielddisplay(self,"rheology_law","law for the temperature dependance of the rheology: 'None', 'Paterson', 'Arrhenius' or 'LliboutryDuval'")) + string="%s\n%s"%(string,fielddisplay(self,"rheology_law","law for the temperature dependance of the rheology: 'None', 'Cuffey', 'Paterson', 'Arrhenius' or 'LliboutryDuval'")) string="%s\n%s"%(string,fielddisplay(self,"lithosphere_shear_modulus","Lithosphere shear modulus [Pa]")) string="%s\n%s"%(string,fielddisplay(self,"lithosphere_density","Lithosphere density [g/cm^-3]")) @@ -83,4 +85,7 @@ self.thermalconductivity=2.4 + #temperate ice thermal conductivity (W/m/K) + self.temperateiceconductivity=0.24 + #the melting point of ice at 1 atmosphere of pressure in K self.meltingpoint=273.15 @@ -108,15 +113,15 @@ #}}} def checkconsistency(self,md,solution,analyses): # {{{ - md = checkfield(md,'materials.rho_ice','>',0) - md = checkfield(md,'materials.rho_water','>',0) - md = checkfield(md,'materials.rho_freshwater','>',0) - md = checkfield(md,'materials.mu_water','>',0) - md = checkfield(md,'materials.rheology_B','>',0,'size',[md.mesh.numberofvertices]) - md = checkfield(md,'materials.rheology_n','>',0,'size',[md.mesh.numberofelements]) - md = checkfield(md,'materials.rheology_law','values',['None','Paterson','Arrhenius','LliboutryDuval']) - md = checkfield(md,'materials.lithosphere_shear_modulus','>',0,'numel',[1]); - md = checkfield(md,'materials.lithosphere_density','>',0,'numel',[1]); - md = checkfield(md,'materials.mantle_shear_modulus','>',0,'numel',[1]); - md = checkfield(md,'materials.mantle_density','>',0,'numel',[1]); + md = checkfield(md,'fieldname','materials.rho_ice','>',0) + md = checkfield(md,'fieldname','materials.rho_water','>',0) + md = checkfield(md,'fieldname','materials.rho_freshwater','>',0) + md = checkfield(md,'fieldname','materials.mu_water','>',0) + md = checkfield(md,'fieldname','materials.rheology_B','>',0,'size',[md.mesh.numberofvertices]) + md = checkfield(md,'fieldname','materials.rheology_n','>',0,'size',[md.mesh.numberofelements]) + md = checkfield(md,'fieldname','materials.rheology_law','values',['None','Cuffey','Paterson','Arrhenius','LliboutryDuval']) + md = checkfield(md,'fieldname','materials.lithosphere_shear_modulus','>',0,'numel',[1]); + md = checkfield(md,'fieldname','materials.lithosphere_density','>',0,'numel',[1]); + md = checkfield(md,'fieldname','materials.mantle_shear_modulus','>',0,'numel',[1]); + md = checkfield(md,'fieldname','materials.mantle_density','>',0,'numel',[1]); return md # }}} @@ -130,4 +135,5 @@ WriteData(fid,'object',self,'class','materials','fieldname','latentheat','format','Double') WriteData(fid,'object',self,'class','materials','fieldname','thermalconductivity','format','Double') + WriteData(fid,'object',self,'class','materials','fieldname','temperateiceconductivity','format','Double') WriteData(fid,'object',self,'class','materials','fieldname','meltingpoint','format','Double') WriteData(fid,'object',self,'class','materials','fieldname','beta','format','Double') Index: sm/trunk/src/m/classes/mesh.m =================================================================== --- /issm/trunk/src/m/classes/mesh.m (revision 17805) +++ (revision ) @@ -1,210 +1,0 @@ -%MESH class definition -% -% Usage: -% mesh=mesh(); - -classdef mesh - properties (SetAccess=public) - x = NaN; - y = NaN; - z = NaN - elements = NaN - dimension = 0; - numberoflayers = 0; - numberofelements = 0; - numberofvertices = 0; - numberofedges = 0; - - lat = NaN - long = NaN - hemisphere = NaN - - elementonbed = NaN - elementonsurface = NaN - vertexonbed = NaN - vertexonsurface = NaN - lowerelements = NaN - lowervertex = NaN - upperelements = NaN - uppervertex = NaN - vertexonboundary = NaN - - edges = NaN - segments = NaN - segmentmarkers = NaN - vertexconnectivity = NaN - elementconnectivity = NaN - average_vertex_connectivity = 0; - - x2d = NaN - y2d = NaN - elements2d = NaN - numberofvertices2d = 0; - numberofelements2d = 0; - - extractedvertices = NaN - extractedelements = NaN - end - methods (Static) - function obj = loadobj(obj) % {{{ - % This function is directly called by matlab when a model object is - % loaded. Update old properties here - - %2012 June 28th - if numel(obj.edges)>1 & any(isnan(obj.edges(:))) - disp('Update model edges from previous version'); - obj.edges(isnan(obj.edges))=-1; - end - - end% }}} - end - methods - function obj = mesh(varargin) % {{{ - switch nargin - case 0 - obj=setdefaultparameters(obj); - otherwise - error('constructor not supported'); - end - end % }}} - function obj = setdefaultparameters(obj) % {{{ - - %the connectivity is the averaged number of nodes linked to a - %given node through an edge. This connectivity is used to initially - %allocate memory to the stiffness matrix. A value of 16 seems to - %give a good memory/time ration. This value can be checked in - %trunk/test/Miscellaneous/runme.m - obj.average_vertex_connectivity=25; - end % }}} - function md = checkconsistency(obj,md,solution,analyses) % {{{ - - md = checkfield(md,'mesh.x','NaN',1,'size',[md.mesh.numberofvertices 1]); - md = checkfield(md,'mesh.y','NaN',1,'size',[md.mesh.numberofvertices 1]); - md = checkfield(md,'mesh.z','NaN',1,'size',[md.mesh.numberofvertices 1]); - md = checkfield(md,'mesh.elements','NaN',1,'>',0,'values',1:md.mesh.numberofvertices); - if(md.mesh.dimension==2), - md = checkfield(md,'mesh.elements','size',[md.mesh.numberofelements 3]); - else - md = checkfield(md,'mesh.elements','size',[md.mesh.numberofelements 6]); - end - if any(~ismember(1:md.mesh.numberofvertices,sort(unique(md.mesh.elements(:))))); - md = checkmessage(md,'orphan nodes have been found. Check the mesh outline'); - end - md = checkfield(md,'mesh.dimension','values',[2 3]); - md = checkfield(md,'mesh.numberoflayers','>=',0); - md = checkfield(md,'mesh.numberofelements','>',0); - md = checkfield(md,'mesh.numberofvertices','>',0); - %no checks for numberofedges lat long and hemisphere - md = checkfield(md,'mesh.elementonbed','size',[md.mesh.numberofelements 1],'values',[0 1]); - md = checkfield(md,'mesh.elementonsurface','size',[md.mesh.numberofelements 1],'values',[0 1]); - md = checkfield(md,'mesh.vertexonbed','size',[md.mesh.numberofvertices 1],'values',[0 1]); - md = checkfield(md,'mesh.vertexonsurface','size',[md.mesh.numberofvertices 1],'values',[0 1]); - if (md.mesh.dimension==3), - md = checkfield(md,'mesh.z','>=',md.geometry.bed-10^-10,'message','''mesh.z'' lower than bedrock'); - md = checkfield(md,'mesh.z','<=',md.geometry.surface+10^-10,'message','''mesh.z'' higher than surface elevation'); - end - if (md.mesh.dimension==2), - md = checkfield(md,'mesh.average_vertex_connectivity','>=',9,'message','''mesh.average_vertex_connectivity'' should be at least 9 in 2d'); - else - md = checkfield(md,'mesh.average_vertex_connectivity','>=',24,'message','''mesh.average_vertex_connectivity'' should be at least 24 in 3d'); - end - - %Solution specific checks - switch(solution), - case MasstransportSolutionEnum(), - if md.masstransport.stabilization==3, - md = checkfield(md,'mesh.dimension','values',2,'message','Discontinuous Galerkin only supported for 2d meshes'); - end - case BalancethicknessSolutionEnum(), - if md.balancethickness.stabilization==3, - md = checkfield(md,'mesh.dimension','values',2,'message','Discontinuous Galerkin only supported for 2d meshes'); - end - case TransientSolutionEnum(), - if md.transient.ismasstransport & md.masstransport.stabilization==3, - md = checkfield(md,'mesh.dimension','values',2,'message','Discontinuous Galerkin only supported for 2d meshes'); - end - case ThermalSolutionEnum(), - md = checkfield(md,'mesh.dimension','values',3,'message','thermal solution only supported on 3d meshes'); - end - end % }}} - function disp(obj) % {{{ - disp(sprintf(' Mesh:')); - - if obj.dimension==3, - disp(sprintf('\n Elements and vertices of the original 2d mesh:')); - fielddisplay(obj,'numberofelements2d','number of elements'); - fielddisplay(obj,'numberofvertices2d','number of vertices'); - fielddisplay(obj,'elements2d','vertex indices of the mesh elements'); - fielddisplay(obj,'x2d','vertices x coordinate [m]'); - fielddisplay(obj,'y2d','vertices y coordinate [m]'); - - disp(sprintf('\n Elements and vertices of the extruded 3d mesh:')); - else - disp(sprintf('\n Elements and vertices:')); - end - fielddisplay(obj,'numberofelements','number of elements'); - fielddisplay(obj,'numberofvertices','number of vertices'); - fielddisplay(obj,'elements','vertex indices of the mesh elements'); - fielddisplay(obj,'x','vertices x coordinate [m]'); - fielddisplay(obj,'y','vertices y coordinate [m]'); - fielddisplay(obj,'z','vertices z coordinate [m]'); - fielddisplay(obj,'edges','edges of the 2d mesh (vertex1 vertex2 element1 element2)'); - fielddisplay(obj,'numberofedges','number of edges of the 2d mesh'); - - disp(sprintf('\n Properties:')); - fielddisplay(obj,'dimension','mesh dimension'); - fielddisplay(obj,'numberoflayers','number of extrusion layers'); - fielddisplay(obj,'vertexonbed','lower vertices flags list'); - fielddisplay(obj,'elementonbed','lower elements flags list'); - fielddisplay(obj,'vertexonsurface','upper vertices flags list'); - fielddisplay(obj,'elementonsurface','upper elements flags list'); - fielddisplay(obj,'uppervertex','upper vertex list (NaN for vertex on the upper surface)'); - fielddisplay(obj,'upperelements','upper element list (NaN for element on the upper layer)'); - fielddisplay(obj,'lowervertex','lower vertex list (NaN for vertex on the lower surface)'); - fielddisplay(obj,'lowerelements','lower element list (NaN for element on the lower layer'); - fielddisplay(obj,'vertexonboundary','vertices on the boundary of the domain flag list'); - - fielddisplay(obj,'segments','edges on domain boundary (vertex1 vertex2 element)'); - fielddisplay(obj,'segmentmarkers','number associated to each segment'); - fielddisplay(obj,'vertexconnectivity','list of vertices connected to vertex_i'); - fielddisplay(obj,'elementconnectivity','list of vertices connected to element_i'); - fielddisplay(obj,'average_vertex_connectivity','average number of vertices connected to one vertex'); - - disp(sprintf('\n Extracted model:')); - fielddisplay(obj,'extractedvertices','vertices extracted from the model'); - fielddisplay(obj,'extractedelements','elements extracted from the model'); - - disp(sprintf('\n Projection:')); - fielddisplay(obj,'lat','vertices latitude [degrees]'); - fielddisplay(obj,'long','vertices longitude [degrees]'); - fielddisplay(obj,'hemisphere','Indicate hemisphere ''n'' or ''s'' '); - end % }}} - function marshall(obj,md,fid) % {{{ - WriteData(fid,'enum',MeshTypeEnum(),'data',StringToEnum(['Mesh' meshtype(obj)]),'format','Integer'); - WriteData(fid,'object',obj,'fieldname','x','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'fieldname','y','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'fieldname','z','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'fieldname','elements','format','DoubleMat','mattype',2); - WriteData(fid,'object',obj,'fieldname','numberoflayers','format','Integer'); - WriteData(fid,'object',obj,'fieldname','numberofelements','format','Integer'); - WriteData(fid,'object',obj,'fieldname','numberofvertices','format','Integer'); - WriteData(fid,'object',obj,'fieldname','elementonbed','format','BooleanMat','mattype',2); - WriteData(fid,'object',obj,'fieldname','elementonsurface','format','BooleanMat','mattype',2); - WriteData(fid,'object',obj,'fieldname','vertexonbed','format','BooleanMat','mattype',1); - WriteData(fid,'object',obj,'fieldname','vertexonsurface','format','BooleanMat','mattype',1); - WriteData(fid,'object',obj,'fieldname','lowerelements','format','DoubleMat','mattype',2); - WriteData(fid,'object',obj,'fieldname','upperelements','format','DoubleMat','mattype',2); - WriteData(fid,'object',obj,'fieldname','average_vertex_connectivity','format','Integer'); - WriteData(fid,'object',obj,'fieldname','elements2d','format','DoubleMat','mattype',3); - WriteData(fid,'object',obj,'fieldname','numberofvertices2d','format','Integer'); - WriteData(fid,'object',obj,'fieldname','numberofelements2d','format','Integer'); - end % }}} - function type = meshtype(obj) % {{{ - if obj.dimension==2, - type = '2Dhorizontal'; - else - type = '3D'; - end - end % }}} - end -end Index: sm/trunk/src/m/classes/mesh.py =================================================================== --- /issm/trunk/src/m/classes/mesh.py (revision 17805) +++ (revision ) @@ -1,190 +1,0 @@ -import numpy -from fielddisplay import fielddisplay -from EnumDefinitions import * -from checkfield import * -from MatlabFuncs import * - -class mesh(object): - """ - MESH class definition - - Usage: - mesh=mesh(); - """ - - def __init__(self): # {{{ - self.x = float('NaN'); - self.y = float('NaN'); - self.z = float('NaN'); - self.elements = float('NaN'); - self.dimension = 0; - self.numberoflayers = 0; - self.numberofelements = 0; - self.numberofvertices = 0; - self.numberofedges = 0; - - self.lat = float('NaN'); - self.long = float('NaN'); - self.hemisphere = float('NaN'); - - self.elementonbed = float('NaN'); - self.elementonsurface = float('NaN'); - self.vertexonbed = float('NaN'); - self.vertexonsurface = float('NaN'); - self.lowerelements = float('NaN'); - self.lowervertex = float('NaN'); - self.upperelements = float('NaN'); - self.uppervertex = float('NaN'); - self.vertexonboundary = float('NaN'); - - self.edges = float('NaN'); - self.segments = float('NaN'); - self.segmentmarkers = float('NaN'); - self.vertexconnectivity = float('NaN'); - self.elementconnectivity = float('NaN'); - self.average_vertex_connectivity = 0; - - self.x2d = float('NaN'); - self.y2d = float('NaN'); - self.elements2d = float('NaN'); - self.numberofvertices2d = 0; - self.numberofelements2d = 0; - - self.extractedvertices = float('NaN'); - self.extractedelements = float('NaN'); - - #set defaults - self.setdefaultparameters() - #}}} - def __repr__(self): # {{{ - string=" Mesh:" - - - if self.dimension==3: - string="%s\n%s"%(string,"\n Elements and vertices of the original 2d mesh:") - - string="%s\n%s"%(string,fielddisplay(self,"numberofelements2d","number of elements")) - string="%s\n%s"%(string,fielddisplay(self,"numberofvertices2d","number of vertices")) - string="%s\n%s"%(string,fielddisplay(self,"elements2d","vertex indices of the mesh elements")) - string="%s\n%s"%(string,fielddisplay(self,"x2d","vertices x coordinate [m]")) - string="%s\n%s"%(string,fielddisplay(self,"y2d","vertices y coordinate [m]")) - - string="%s\n%s"%(string,"\n\n Elements and vertices of the extruded 3d mesh:") - else: - string="%s\n%s"%(string,"\n Elements and vertices:") - string="%s\n%s"%(string,fielddisplay(self,"numberofelements","number of elements")) - string="%s\n%s"%(string,fielddisplay(self,"numberofvertices","number of vertices")) - string="%s\n%s"%(string,fielddisplay(self,"elements","vertex indices of the mesh elements")) - string="%s\n%s"%(string,fielddisplay(self,"x","vertices x coordinate [m]")) - string="%s\n%s"%(string,fielddisplay(self,"y","vertices y coordinate [m]")) - string="%s\n%s"%(string,fielddisplay(self,"z","vertices z coordinate [m]")) - string="%s\n%s"%(string,fielddisplay(self,"edges","edges of the 2d mesh (vertex1 vertex2 element1 element2)")) - string="%s\n%s"%(string,fielddisplay(self,"numberofedges","number of edges of the 2d mesh")) - - string="%s%s"%(string,"\n\n Properties:") - string="%s\n%s"%(string,fielddisplay(self,"dimension","mesh dimension (2d or 3d)")) - string="%s\n%s"%(string,fielddisplay(self,"numberoflayers","number of extrusion layers")) - string="%s\n%s"%(string,fielddisplay(self,"vertexonbed","lower vertices flags list")) - string="%s\n%s"%(string,fielddisplay(self,"elementonbed","lower elements flags list")) - string="%s\n%s"%(string,fielddisplay(self,"vertexonsurface","upper vertices flags list")) - string="%s\n%s"%(string,fielddisplay(self,"elementonsurface","upper elements flags list")) - string="%s\n%s"%(string,fielddisplay(self,"uppervertex","upper vertex list (-1 for vertex on the upper surface)")) - string="%s\n%s"%(string,fielddisplay(self,"upperelements","upper element list (-1 for element on the upper layer)")) - string="%s\n%s"%(string,fielddisplay(self,"lowervertex","lower vertex list (-1 for vertex on the lower surface)")) - string="%s\n%s"%(string,fielddisplay(self,"lowerelements","lower element list (-1 for element on the lower layer)")) - string="%s\n%s"%(string,fielddisplay(self,"vertexonboundary","vertices on the boundary of the domain flag list")) - string="%s\n%s"%(string,fielddisplay(self,"segments","edges on domain boundary (vertex1 vertex2 element)")) - string="%s\n%s"%(string,fielddisplay(self,"segmentmarkers","number associated to each segment")) - string="%s\n%s"%(string,fielddisplay(self,"vertexconnectivity","list of vertices connected to vertex_i")) - string="%s\n%s"%(string,fielddisplay(self,"elementconnectivity","list of vertices connected to element_i")) - string="%s\n%s"%(string,fielddisplay(self,"average_vertex_connectivity","average number of vertices connected to one vertex")) - - string="%s%s"%(string,"\n\n Extracted model:") - string="%s\n%s"%(string,fielddisplay(self,"extractedvertices","vertices extracted from the model")) - string="%s\n%s"%(string,fielddisplay(self,"extractedelements","elements extracted from the model")) - - string="%s%s"%(string,"\n\n Projection:") - string="%s\n%s"%(string,fielddisplay(self,"lat","vertices latitude [degrees]")) - string="%s\n%s"%(string,fielddisplay(self,"long","vertices longitude [degrees]")) - string="%s\n%s"%(string,fielddisplay(self,"hemisphere","Indicate hemisphere 'n' or 's'")) - return string - #}}} - def setdefaultparameters(self): # {{{ - - #the connectivity is the averaged number of nodes linked to a - #given node through an edge. This connectivity is used to initially - #allocate memory to the stiffness matrix. A value of 16 seems to - #give a good memory/time ration. This value can be checked in - #trunk/test/Miscellaneous/runme.m - self.average_vertex_connectivity=25 - - return self - #}}} - def checkconsistency(self,md,solution,analyses): # {{{ - - md = checkfield(md,'mesh.x','NaN',1,'size',[md.mesh.numberofvertices]) - md = checkfield(md,'mesh.y','NaN',1,'size',[md.mesh.numberofvertices]) - md = checkfield(md,'mesh.z','NaN',1,'size',[md.mesh.numberofvertices]) - md = checkfield(md,'mesh.elements','NaN',1,'>',0,'values',numpy.arange(1,md.mesh.numberofvertices+1)) - if md.mesh.dimension==2: - md = checkfield(md,'mesh.elements','size',[md.mesh.numberofelements,3]) - else: - md = checkfield(md,'mesh.elements','size',[md.mesh.numberofelements,6]) - if numpy.any(numpy.logical_not(ismember(numpy.arange(1,md.mesh.numberofvertices+1),md.mesh.elements))): - md.checkmessage("orphan nodes have been found. Check the mesh outline") - md = checkfield(md,'mesh.dimension','values',[2,3]) - md = checkfield(md,'mesh.numberoflayers','>=',0) - md = checkfield(md,'mesh.numberofelements','>',0) - md = checkfield(md,'mesh.numberofvertices','>',0) - #no checks for numberofedges lat long and hemisphere - md = checkfield(md,'mesh.elementonbed','size',[md.mesh.numberofelements],'values',[0,1]) - md = checkfield(md,'mesh.elementonsurface','size',[md.mesh.numberofelements],'values',[0,1]) - md = checkfield(md,'mesh.vertexonbed','size',[md.mesh.numberofvertices],'values',[0,1]) - md = checkfield(md,'mesh.vertexonsurface','size',[md.mesh.numberofvertices],'values',[0,1]) - if md.mesh.dimension==2: - md = checkfield(md,'mesh.average_vertex_connectivity','>=',9,'message',"'mesh.average_vertex_connectivity' should be at least 9 in 2d") - else: - md = checkfield(md,'mesh.average_vertex_connectivity','>=',24,'message',"'mesh.average_vertex_connectivity' should be at least 24 in 3d") - - #Solution specific checks - if solution==MasstransportSolutionEnum(): - if md.masstransport.stabilization==3: - md = checkfield(md,'mesh.dimension','values',2,'message',"Discontinuous Galerkin only supported for 2d meshes") - elif solution==BalancethicknessSolutionEnum(): - if md.balancethickness.stabilization==3: - md = checkfield(md,'mesh.dimension','values',2,'message',"Discontinuous Galerkin only supported for 2d meshes") - elif solution==TransientSolutionEnum(): - if md.transient.ismasstransport and md.masstransport.stabilization==3: - md = checkfield(md,'mesh.dimension','values',2,'message',"Discontinuous Galerkin only supported for 2d meshes") - elif solution==ThermalSolutionEnum(): - md = checkfield(md,'mesh.dimension','values',3,'message','thermal solution only supported on 3d meshes') - - return md - # }}} - def meshtype(self): # {{{ - - if self.dimension==2: - return "2Dhorizontal" - else: - return "3D" - #}}} - def marshall(self,md,fid): # {{{ - WriteData(fid,'enum',MeshTypeEnum(),'data',StringToEnum("Mesh"+self.meshtype())[0],'format','Integer'); - WriteData(fid,'object',self,'fieldname','x','format','DoubleMat','mattype',1) - WriteData(fid,'object',self,'fieldname','y','format','DoubleMat','mattype',1) - WriteData(fid,'object',self,'fieldname','z','format','DoubleMat','mattype',1) - WriteData(fid,'object',self,'fieldname','elements','format','DoubleMat','mattype',2) - WriteData(fid,'object',self,'fieldname','numberoflayers','format','Integer') - WriteData(fid,'object',self,'fieldname','numberofelements','format','Integer') - WriteData(fid,'object',self,'fieldname','numberofvertices','format','Integer') - WriteData(fid,'object',self,'fieldname','elementonbed','format','BooleanMat','mattype',2) - WriteData(fid,'object',self,'fieldname','elementonsurface','format','BooleanMat','mattype',2) - WriteData(fid,'object',self,'fieldname','vertexonbed','format','BooleanMat','mattype',1) - WriteData(fid,'object',self,'fieldname','vertexonsurface','format','BooleanMat','mattype',1) - WriteData(fid,'object',self,'fieldname','lowerelements','format','DoubleMat','mattype',2) - WriteData(fid,'object',self,'fieldname','upperelements','format','DoubleMat','mattype',2) - WriteData(fid,'object',self,'fieldname','average_vertex_connectivity','format','Integer') - WriteData(fid,'object',self,'fieldname','elements2d','format','DoubleMat','mattype',3) - WriteData(fid,'object',self,'fieldname','numberofvertices2d','format','Integer') - WriteData(fid,'object',self,'fieldname','numberofelements2d','format','Integer') - # }}} Index: /issm/trunk/src/m/classes/mesh2d.m =================================================================== --- /issm/trunk/src/m/classes/mesh2d.m (revision 17805) +++ /issm/trunk/src/m/classes/mesh2d.m (revision 17806) @@ -30,8 +30,18 @@ end methods - function obj = mesh2d(varargin) % {{{ + function self = mesh2d(varargin) % {{{ switch nargin case 0 - obj=setdefaultparameters(obj); + self=setdefaultparameters(self); + case 1 + self=mesh2d(); + object=varargin{1}; + fields=fieldnames(object); + for i=1:length(fields) + field=fields{i}; + if ismember(field,properties('mesh2d')), + self.(field)=object.(field); + end + end otherwise error('constructor not supported'); @@ -49,14 +59,14 @@ function md = checkconsistency(obj,md,solution,analyses) % {{{ - md = checkfield(md,'mesh.x','NaN',1,'size',[md.mesh.numberofvertices 1]); - md = checkfield(md,'mesh.y','NaN',1,'size',[md.mesh.numberofvertices 1]); - md = checkfield(md,'mesh.elements','NaN',1,'>',0,'values',1:md.mesh.numberofvertices); - md = checkfield(md,'mesh.elements','size',[md.mesh.numberofelements 3]); + md = checkfield(md,'fieldname','mesh.x','NaN',1,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','mesh.y','NaN',1,'size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','mesh.elements','NaN',1,'>',0,'values',1:md.mesh.numberofvertices); + md = checkfield(md,'fieldname','mesh.elements','size',[md.mesh.numberofelements 3]); if any(~ismember(1:md.mesh.numberofvertices,sort(unique(md.mesh.elements(:))))); md = checkmessage(md,'orphan nodes have been found. Check the mesh outline'); end - md = checkfield(md,'mesh.numberofelements','>',0); - md = checkfield(md,'mesh.numberofvertices','>',0); - md = checkfield(md,'mesh.average_vertex_connectivity','>=',9,'message','''mesh.average_vertex_connectivity'' should be at least 9 in 2d'); + md = checkfield(md,'fieldname','mesh.numberofelements','>',0); + md = checkfield(md,'fieldname','mesh.numberofvertices','>',0); + md = checkfield(md,'fieldname','mesh.average_vertex_connectivity','>=',9,'message','''mesh.average_vertex_connectivity'' should be at least 9 in 2d'); switch(solution), @@ -66,5 +76,5 @@ end % }}} function disp(obj) % {{{ - disp(sprintf(' 2d Mesh:')); + disp(sprintf(' 2D tria Mesh (horizontal):')); disp(sprintf('\n Elements and vertices:')); @@ -94,6 +104,83 @@ fielddisplay(obj,'hemisphere','Indicate hemisphere ''n'' or ''s'' '); end % }}} + function createxml(obj,fid) % {{{ + fprintf(fid, '\n'); + + % drop-down + fprintf(fid,'%s%s%s%s%s\n%s\n','','
'); + + % dimension=0 + fprintf(fid,'%s%s%s%s%s\n%s\n',' '); + + % dimension=3 + fprintf(fid,'%s%s%s\n%s\n','