Index: sm/workshop/2012/Talks/06_Mesh_generation/06_Mesh_generation.tex
===================================================================
--- /issm/workshop/2012/Talks/06_Mesh_generation/06_Mesh_generation.tex	(revision 14032)
+++ 	(revision )
@@ -1,345 +1,0 @@
-%Preamble {{{
-\documentclass[9pt,notes=hide]{beamer}    % Document class: beamer %8 pts is also a good option
-\usetheme[jpl,headstyle=institute,fnolabel=,sidebar=.15\paperwidth,footstyle=low,footsep={ $\cdot$ },TPomitframeno]{Pasadena}
-\useinnertheme{MLHacks}              % ISSM bonuses (ghostframes for example)
-\usepackage[T1]{fontenc}             % T1 encoding is better for foreign langages
-\usepackage{aeguill,aecompl}         % Virtual fonts
-\usepackage{amsmath,amssymb,amsfonts}% Mathematical symbols (useful for equations)
-\usepackage{bm}                      % maths letters, real = IR
-\usepackage{xcolor}                  % We can define new colors
-\usepackage{graphicx}                % Include pictures
-\usepackage{times}                   % Use Times Font instead of default
-\usepackage{appendixnumberbeamer}
-\usepackage[framed,numbered,autolinebreaks,useliterate]{mcode}
-\usepackage{booktabs}                        %nice tables (toprule, bottomrule,...)
-\graphicspath{                       % directories where the pictures are located
-{Images/}
-}
-\hypersetup{pdfstartview={Fit}}     % Acrobat reader: open fit to screen
-
-\setbeamercovered{invisible} %invisible, transparent, dynamic, highly dynamic
-%}}}
-%Newcommands {{{
-%%Automatically insert outline slide at the begining of each new section (very nice!)
-%\AtBeginSection[]{
-%\begin{frame}<beamer>
-%	\ghostframe                      %do not count slide
-%	\frametitle{Outline}             % title of the slide
-%	\tableofcontents[currentsection]
-%\end{frame}
-%}
-%}}}
-%Presentation properties{{{
-%between brackets    []: shown on headers and footers of every slide (must be short)
-%between parenthesis (): shown on title page only (long)
-\title[Mesh generation]{Ice Sheet System model}
-\subtitle{Mesh Generation}
-\author[]{
-Eric       \textsc{Larour}\inst{1},
-Eric       \textsc{Rignot}\inst{1,3},
-\textbf{Mathieu    \textsc{Morlighem}}\inst{1,2},
-H\'el\`ene \textsc{Seroussi}\inst{1,2}
-Chris      \textsc{Borstad}\inst{1},
-Feras      \textsc{Habbal}\inst{1,3},
-Daria      \textsc{Halkides}\inst{1,4},
-Behnaz     \textsc{Khakbaz}\inst{1},
-John       \textsc{Schiermeier}\inst{1},
-Nicole     \textsc{Schlegel}\inst{1}
-\vspace{1em}
-}
-\institute[Jet Propulsion Laboratory]{
-\inst{1}Jet Propulsion Laboratory - California Institute of Technology\\
-\inst{2}Laboratoire MSSMat, \'Ecole Centrale Paris, France\\
-\inst{3}University of California, Irvine\\
-\inst{4}Joint Institute for Regional Earth System Science \& Engineering, UCLA
-}
-\conference[ISSM Workshop 2011]{ISSM Workshop 2011}
-\date[]{\hspace{-15em}December 2011\hspace{3em}\copyright Copyright 2011. All rights reserved}
-\logo{\includegraphics[width=8em]{ISSMlogo}}
-%}}}
-\begin{document}
-
-%Title slide %{{{
-\begin{frame}[plain] %No headers or footers
-	%Do not change, this page is automatically generated
-	\ghostframe
-	\titlepage
-\end{frame} %}}}
-\begin{frame}{Outline}%{{{
-	\tableofcontents
-\end{frame}%}}}
-\section{Introduction}
-\begin{frame}\frametitle{Mesh generation in ISSM}%{{{
-	\begin{itemize}\itemsep=+1em
-		\item Mesh generation is crucial for ice sheet modeling
-		\item[$\rightarrow$] controls the space of solutions
-		\item Finer mesh more precise but more computationally intensive
-	\end{itemize}
-	\begin{itemize}\itemsep=+1em
-		\item ISSM has 3 main meshers:
-			\begin{enumerate}\itemsep=+.7em
-				\item squaremesh (for ISMIP tests)
-				\item triangle (from J. Shewchuk)
-				\item bamg (adapted from F. Hecht)
-			\end{enumerate}
-	\end{itemize}
-\end{frame}
-%}}}
-
-\section{Squaremesh}
-\subsection{Usage}
-\begin{frame}\frametitle{Usage}%{{{
-	{\tt squaremesh} generates structured uniform meshes for rectangular domain
-	\begin{itemize}
-		\item[$\rightarrow$] needed for ISMIP tests
-	\end{itemize}
-	\lstinputlisting[firstline=7,lastline=7]{Code/ex1.m}
-	Arguments:
-	\begin{enumerate}
-		\item model
-		\item x-length 
-		\item y-length 
-		\item number of nodes along the x axis
-		\item number of nodes along the y axis
-	\end{enumerate}
-\end{frame}
-%}}}
-\subsection{Example}
-\begin{frame}\frametitle{Example}%{{{
-	\lstinputlisting[firstline=7,lastline=7]{Code/ex1.m}
-	\begin{center}
-		\includegraphics[height=0.7\textheight]{Mesh_sq1}
-	\end{center}
-\end{frame}
-%}}}
-
-\section{Triangle}
-\subsection{Usage}
-\begin{frame}\frametitle{Usage}%{{{
-	{\tt triangle} is a very fast algorithm for mesh generation
-	\begin{itemize}
-		\item[+] excellent for uniform mesh
-		\item[-] bad at mesh refinement
-	\end{itemize}
-	\lstinputlisting[firstline=1,lastline=1]{Code/ex1.m}
-	Arguments:
-	\begin{enumerate}
-		\item model
-		\item ARGUS file of the domain outline
-			\lstinputlisting[frame=none,numbers=none]{Code/Square.exp}
-		\item average element size
-	\end{enumerate}
-\end{frame}
-%}}}
-\subsection{Example}
-\begin{frame}\frametitle{Example}%{{{
-	\lstinputlisting[firstline=1,lastline=1]{Code/ex1.m}
-	\begin{center}
-		\includegraphics[height=0.3\textheight]{Mesh1}
-	\end{center}
-	\lstinputlisting[firstline=3,lastline=3]{Code/ex1.m}
-	\begin{center}
-		\includegraphics[height=0.3\textheight]{Mesh2}
-	\end{center}
-\end{frame}
-%}}}
-
-\section{Bamg}
-\begin{frame}\frametitle{History}%{{{
-	Initial software:
-	\begin{itemize}
-		\item BAMG: Bidimensional Anisotropic Mesh Generator
-		\item developed by Fr\'ed\'eric Hecht (INRIA/universit\'e de Jussieux)
-		\item released in 2006 after more than 10 years of development
-		\item now part of FreeFEM++
-	\end{itemize}
-	\vspace{2em}
-
-	In ISSM:
-	\begin{itemize}
-		\item almost entirely rewritten
-		\item usual ISSM interface
-	\end{itemize}
-	\vspace{2em}
-
-	Advantages:
-	\begin{itemize}
-		\item[+] anisotropic mesh adaptation capability
-		\item[-] not good for uniform meshes
-	\end{itemize}
-\end{frame}
-%}}}
-\subsection{Uniform mesh}
-\begin{frame}\frametitle{Usage}%{{{
-	Arguments: 
-	\begin{enumerate}
-		\item model
-		\item pair of options (see help)
-	\end{enumerate}
-	To create a uniform mesh:
-	\begin{enumerate}
-		\item {\tt 'domain'} followed by the domain name
-		\item {\tt 'hmax'} followed by the triangle size
-	\end{enumerate}
-	\lstinputlisting[firstline=5,lastline=5]{Code/ex1.m}
-	\begin{center}
-		\includegraphics[height=0.3\textheight]{Mesh_bamg1}
-	\end{center}
-	\begin{itemize}
-		\item Not as randomly distributed as {\tt triangle}
-	\end{itemize}
-\end{frame}
-%}}}
-\subsection{Non-uniform mesh}
-\begin{frame}\frametitle{Usage}%{{{
-	To create a non-uniform mesh:
-	\begin{enumerate}
-		\item {\tt 'domain'} followed by the domain name
-		\item {\tt 'hvertices'} followed by the element size for each vertex of the domain outline
-	\end{enumerate}
-	\lstinputlisting[firstline=9,lastline=10]{Code/ex1.m}
-	\begin{center}
-		\includegraphics[height=0.4\textheight]{Mesh_bamg2}
-	\end{center}
-\end{frame}
-%}}}
-
-\section{Mesh adaptation}
-\begin{frame}\frametitle{Finite element method}%{{{
-	\begin{equation}
-		v = \sum_{i=1}^N v_i \, \Phi_i\left(x,y\right)
-	\end{equation}
-	\begin{center}
-		\includegraphics[width=0.8\textwidth]{ShapeFunction}
-	\end{center}
-\end{frame}
-%}}}
-\begin{frame}\frametitle{Interpolation error}%{{{
-	\begin{itemize}
-		\item We generally use piecewise linear elements ($P1$)
-		\item[$\rightarrow$] How to minimize interpolation error and the number of elements at the
-			same time?
-	\end{itemize}
-	\begin{center}
-		\includegraphics[width=0.8\textwidth]{error1d}
-	\end{center}
-\end{frame}
-%}}}
-\subsection{Mesh refinement strategy}
-\begin{frame}\frametitle{Costant field}%{{{
-	\begin{center}
-		\only<1>{\includegraphics[width=0.6\textwidth]{Interp1}}
-		\only<2>{\includegraphics[width=0.6\textwidth]{Interp2}}
-	\end{center}
-	\uncover<2>{
-	\begin{itemize}
-		\item Coarse elements OK for constant field
-	\end{itemize}
-	}
-\end{frame}
-%}}}
-\begin{frame}\frametitle{Linear field}%{{{
-	\begin{center}
-		\only<1>{\includegraphics[width=0.4\textwidth]{Interp3}}
-		\only<2>{\includegraphics[width=0.4\textwidth]{Interp4}}
-	\end{center}
-	\uncover<2>{
-	\begin{itemize}
-		\item Coarse elements OK for linear field
-	\end{itemize}
-	}
-\end{frame}
-%}}}
-\begin{frame}\frametitle{Non-Linear field}%{{{
-	\begin{center}
-		\only<1>{\includegraphics[width=0.8\textwidth]{Interp5}}
-		\only<2>{\includegraphics[width=0.8\textwidth]{Interp5b}}
-		\only<3>{\includegraphics[width=0.8\textwidth]{Interp6}}
-		\only<4>{\includegraphics[width=0.8\textwidth]{Interp7}}
-		\only<5>{\includegraphics[width=0.8\textwidth]{Interp8}}
-	\end{center}
-\end{frame}
-%}}}
-\begin{frame}\frametitle{Anisotropic mesh refinement}%{{{
-	Strategy:
-	\begin{itemize}
-		\item Minimize the interpolation error for a given field
-		\item Metric based on field's Hessian matrix (second derivative)
-	\end{itemize}
-	\pause
-	\begin{center}
-		\includegraphics[width=0.9\textwidth]{JksBamg}
-	\end{center}
-\end{frame}
-%}}}
-\subsection{Hands-on example}
-\begin{frame}\frametitle{Field to capture}%{{{
-	\scriptsize
-	\begin{equation*}
-		\begin{array}{r l}
-			f\left(x,y\right) &
-			= \exp\left( - \left(\dfrac{r - 0.75}{\varepsilon}\right)^2 \right) + 0.5 r^2 \\
-			&
-			\quad \text{ with }\quad \varepsilon=0.25 \quad \text{ and }\quad r=\left(x+0.1\right)^2 +
-			\left(y+0.1\right)^2
-		\end{array}
-	\end{equation*}
-	\begin{center}
-		\includegraphics[width=0.5\textwidth]{Bamgshock0}
-	\end{center}
-\end{frame}
-%}}}
-\begin{frame}\frametitle{Uniform mesh}%{{{
-	\lstinputlisting[firstline=9,lastline=11,basicstyle=\lstbasicfont\tiny]{Code/ex2.m}
-	\begin{center}
-		\includegraphics[width=0.45\textwidth]{Bamgshock1}\hspace{1em}
-		\includegraphics[width=0.45\textwidth]{Bamgshock1b}
-	\end{center}
-\end{frame}
-%}}}
-\begin{frame}\frametitle{Mesh refinement}%{{{
-	\lstinputlisting[firstline=16,lastline=20,basicstyle=\lstbasicfont\tiny]{Code/ex2.m}
-	\begin{center}
-		\includegraphics[width=0.45\textwidth]{Bamgshock2}\hspace{1em}
-		\includegraphics[width=0.45\textwidth]{Bamgshock2b}
-	\end{center}
-\end{frame}
-%}}}
-\begin{frame}\frametitle{Mesh refinement}%{{{
-	\lstinputlisting[firstline=25,lastline=29,basicstyle=\lstbasicfont\tiny]{Code/ex2.m}
-	\begin{center}
-		\includegraphics[width=0.45\textwidth]{Bamgshock3}\hspace{1em}
-		\includegraphics[width=0.45\textwidth]{Bamgshock3b}
-	\end{center}
-\end{frame}
-%}}}
-\begin{frame}\frametitle{Mesh refinement}%{{{
-	\lstinputlisting[firstline=34,lastline=38,basicstyle=\lstbasicfont\tiny]{Code/ex2.m}
-	\begin{center}
-		\includegraphics[width=0.45\textwidth]{Bamgshock4}\hspace{1em}
-		\includegraphics[width=0.45\textwidth]{Bamgshock4b}
-	\end{center}
-\end{frame}
-%}}}
-\begin{frame}\frametitle{Mesh refinement}%{{{
-	\lstinputlisting[firstline=43,lastline=47,basicstyle=\lstbasicfont\tiny]{Code/ex2.m}
-	\begin{center}
-		\includegraphics[width=0.45\textwidth]{Bamgshock5}\hspace{1em}
-		\includegraphics[width=0.45\textwidth]{Bamgshock5b}
-	\end{center}
-\end{frame}
-%}}}
-
-%Thanks slide{{{
-\usebackgroundtemplate{\includegraphics[width=\paperwidth,height=\paperheight]{Thanksbg}}
-\begin{frame}[plain]
-	\ghostframe
-	\begin{center}
-		\vspace*{-0.1\paperheight}
-		\hspace*{-0.15\paperwidth}\Huge{Thanks!}
-	\end{center}
-	\note{Thank you very much for your attention}
-\end{frame}
-\usebackgroundtemplate{}
-%}}}
-\end{document}
Index: sm/workshop/2012/Talks/06_Mesh_generation/Makefile
===================================================================
--- /issm/workshop/2012/Talks/06_Mesh_generation/Makefile	(revision 14032)
+++ 	(revision )
@@ -1,40 +1,0 @@
-#Makefile for beamer
-TARGET=06_Mesh_generation
-
-export TEXINPUTS=$(JPL_SVN)/publications/templates/beamer/Theme/Pasadena//:
-
-all: one
-
-one: 
-	pdflatex -halt-on-error -file-line-error $(TARGET).tex
-	open $(TARGET).pdf
-
-complete: 
-	pdflatex -halt-on-error -file-line-error -draftmode $(TARGET).tex
-#	bibtex $(TARGET)
-	pdflatex -halt-on-error -file-line-error -draftmode $(TARGET).tex
-	pdflatex -halt-on-error -file-line-error $(TARGET).tex
-	open $(TARGET).pdf
-
-bib:
-	bibtex $(TARGET)
-
-links:
-	ln -s $(ISSM_DIR)/publications/templates/beamer/Theme/Pasadena/*.sty .
-	ln -s $(ISSM_DIR)/publications/templates/beamer/Theme/Pasadena/general/*.sty .
-	ln -s $(ISSM_DIR)/publications/templates/beamer/Theme/Pasadena/subtheme/*.sty .
-	ln -s $(ISSM_DIR)/publications/templates/beamer/Theme/Pasadena/ML/*.sty .
-	ln -s $(ISSM_DIR)/publications/templates/beamer/Theme/Pasadena/graphics/JPL/*.pdf .
-
-unlinks: 
-	find . -maxdepth 1 -type l -print | xargs rm
-
-open:
-	open -a /Applications/Adobe\ Reader\ 9/Adobe\ Reader.app/ $(TARGET).pdf
-
-clean: 
-	rm -f ${TARGET}.{dvi,ps,pdf,toc,log,aux,out,nav,snm,bbl,blg,vrb}
-
-allclean: 
-	make clean
-	make unlinks
Index: sm/workshop/2012/Talks/06_Mesh_generation/mcode.sty
===================================================================
--- /issm/workshop/2012/Talks/06_Mesh_generation/mcode.sty	(revision 14032)
+++ 	(revision )
@@ -1,280 +1,0 @@
-%%
-%%   This is file `mcode.sty'
-%%
-%%   It is supposed to help you easily include MATLAB source code
-%%   into LaTeX document,  but have it nicely highlighted, using
-%%   the great listings package.
-%%
-%%   PLEASE NOTE that this package does nothing but save you from
-%%   figuring out some configurations  in setting up the LISTINGS
-%%   package. ALL the work is done by that package!  Thus, please
-%%   refer your questions to the listings package documentation.
-%%
-%%   Usage: You have three ways of including your MATLAB code. As
-%%   environment,  as inline object and directly from an external
-%%   file.
-%%
-%%   1) Environment:
-%%
-%%          \begin{lstlisting}
-%%             YOUR CODE HERE
-%%          \end{lstlisting}
-%%
-%%
-%%   2) Inline object:
-%%
-%%          Bla bla \mcode{CODEFRAGMENT} bla bla.
-%%
-%%
-%%   3) Include external file (in environment form)
-%%
-%%          \lstinputlisting{YOUR-FILE.m}
-%%
-%%
-%%   For your convenience this package has the following options:
-%%
-%%   - bw  if you intend to print the document (highlighting done
-%%         via text formatting (bold, italic) and shades of gray)
-%%   
-%%   - numbered  if you want line numbers
-%%
-%%   - autolinebreaks  if you want  the package to  automatically
-%%          wrap your  code.  This is buggy as it  may well break
-%%          break syntax and it  doesn't work well with comments.
-%%          You REALLY should wrap your code manually.
-%%
-%%   - useliterate   if you want  some characters / relations  in
-%%          your code to be replace with something more readable.
-%%          Example: ~= becomes $\neq$, >= becomes $\geq$,  delta
-%%          becomes $\delta$ and so on.
-%%
-%%   - framed  if you want a frame  around the source code blocks
-%%
-%%   - final  if you have  ``gloablly'' set the draft option, the
-%%         listings package will  not output the code at all.  to
-%%         force it to  do so anyway,  load this package with the
-%%         final option (passes the ``final'' on to listings).
-%%
-%%   For example, you may use \usepackage[numbered,framed]{mcode}
-%%   in your document preamble.
-%%   
-%%   Note:  Inside code blocks you  can escape to LaTeX text mode
-%%   using §...§.  For ex. §text and some math: $x^2$§,  which is
-%%   especially  useful  in comments  for putting  nicely typeset
-%%   equations etc.  To get the same  colour/style as in the rest
-%%   of the comment use \mcommentfont, i.e. §\mcommentfont $x^2$§
-%%
-%%   To change the font used,  edit the first line in the "custo-
-%%   mise below" section.  And feel free to  edit other things as
-%%   well.  Refer to the documentation of the listings package to
-%%   see what  else you could do.  If an extra small font  is re-
-%%   quired,  use  {\fontfamily{pcr}\fontsize{3}{4.6}\selectfont}
-%%   in the definition of \lstbasicfont.
-%%
-%%   Author:
-%%      Florian Knorn | florian@knorn.org | www.florian-knorn.com
-%%
-%%   Version history:
-%%      2.2  --  Bugfix (thanks Willi Gerbig!)
-%%      2.1  --  Finally automatic detection between end and end
-%%      2.0  --  New options for line breaking and literate prog.
-%%      1.8  --  Fixed typo in documentation regarding §...§
-%%      1.7  --  Added MATLAB block comment syntax %{ ...... %}
-%%      1.6  --  Added some infos, dealing with keyword ``end''
-%%      1.5  --  Tweaked check to see wether textcomp is loaded
-%%      1.4  --  Fixed misconfig (mathescape now set to false)
-%%      1.3  --  Purely cosmetic (tabs replaced by spaces)
-%%      1.2  --  Added \lstset{showstringspaces=false}
-%%      1.1  --  Added \mcode command and [final] option
-%%      1.0  --  Release
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%              D O N ' T    T O U C H    T H I S                %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\fileversion{2.2}
-\def\filedate{2011/08/26}
-
-\typeout{-- Package: `mcode' \fileversion\space <\filedate> --}
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{mcode}[\filedate\space\fileversion]
-
-% for bw-option
-\newif\ifbw
-\DeclareOption{bw}{\bwtrue}
-
-% numbered option
-\newif\ifnumbered
-\DeclareOption{numbered}{\numberedtrue}
-
-% final option
-\newif\iffinal
-\DeclareOption{final}{\finaltrue}
-
-% autolinebreaks option
-\newif\ifautolinebreaks
-\DeclareOption{autolinebreaks}{\autolinebreakstrue}
-
-% literate programming (replace certain characters/relations
-\newif\ifuseliterate
-\DeclareOption{useliterate}{\useliteratetrue}
-
-% framed option
-\newif\ifframed
-\DeclareOption{framed}{\framedtrue}
-
-\DeclareOption*{% default
-  \PackageWarning{mcode}{Unknown option `\CurrentOption' !}%
-}
-\ProcessOptions
-
-\ifbw\typeout{ - settings optimized for printing (bw formating)}
-\else\typeout{ - settings optimized for display (colour formating)}\fi
-\ifnumbered\typeout{ - line numbering enabled}\else\fi
-\ifuseliterate\typeout{ - literate programming (character replacements) enabled}\else\fi
-\ifautolinebreaks\typeout{ - automatic line breaking enabled (careful, buggy!)}\else\fi
-\ifframed\typeout{ - framed listings}\else\fi
-
-% This command allows you to typeset syntax highlighted Matlab
-% code ``inline''.  The font size \small seems to look best...
-\newcommand{\mcode}[1]{\lstinline[basicstyle=\lstbasicfont\small]|#1|}
-
-% check if color command exists
-\ifx\color\undefined%
-  \RequirePackage{xcolor}%
-\fi
-
-% check if listings has been loaded
-\ifx\lstset\undefined%
-  \iffinal
-    \RequirePackage[final]{listings}
-  \else
-    \RequirePackage{listings}
-  \fi
-\fi
-
-% Check if textcomp has been loaded (this package is needed for
-% upright quotes '' (instead of typographic ones `´)...
-\ifx\textquotesingle\undefined% 
-  \RequirePackage{textcomp}%
-\fi
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                C U S T O M I S E   B E L O W                  %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% ---------------------------------------------------------------------------------
-% default font
-\def\lstbasicfont{\fontfamily{pcr}\selectfont\footnotesize}
-
-% ---------------------------------------------------------------------------------
-% matlat languate definition
-\lstdefinelanguage{matlabfloz}{%
-  alsoletter={...},%
-  morekeywords={%                             % keywords
-  break,case,catch,continue,elseif,else,end,for,function,global,%
-  if,otherwise,persistent,return,switch,try,while,...},%
-  comment=[l]\%,                              % comments
-  morecomment=[l]...,                         % comments
-  morecomment=[s]{\%\{}{\%\}},                % block comments
-  morestring=[m]'                             % strings 
-}[keywords,comments,strings]%
-
-% ---------------------------------------------------------------------------------
-% general definitions
-\lstset{%
-  basicstyle={\lstbasicfont},                 % set font
-  showstringspaces=false,                     % do not emphasize spaces in strings
-  tabsize=3,                                  % number of spaces of a TAB
-  mathescape=false,escapechar=§,              % escape to latex with §...§
-  upquote=true,                               % upright quotes
-  aboveskip={1.5\baselineskip},               % a bit of space above listings
-  columns=fixed                               % nice spacing
-}
-
-% ---------------------------------------------------------------------------------
-% define colours and styles
-\ifbw % use font formating and gray 'colors'
-	\def\mcommentfont{\color[gray]{.75}\itshape} %comments light gray and italic
-  \lstset{language=matlabfloz,                % use our version of highlighting
-    keywordstyle=\bfseries,                   % keywords in bold
-    commentstyle=\mcommentfont,               % comments 
-    stringstyle=\color[gray]{0.5}             % strings darker gray
-  }
-\else% notbw => use colors : )
-	\def\mcommentfont{\color[rgb]{.133,.545,.133}} %comments in green
-  \lstset{language=matlabfloz,                % use our version of highlighting
-    keywordstyle=\color[rgb]{0,0,1},          % keywords in blue
-    commentstyle=\mcommentfont,               % comments
-    stringstyle=\color[rgb]{.627,.126,.941}   % strings in purple
-  } 
-\fi%bw
-
-% ---------------------------------------------------------------------------------
-% automatic line breaking --- warning, this is buggy and
-% doesn't break comments correctly!
-\ifautolinebreaks
-	\newsavebox{\lbreakdots}\sbox{\lbreakdots}{\lstbasicfont\mcommentfont...}
-	\lstset{breaklines=true,breakatwhitespace=true,prebreak=\usebox{\lbreakdots}}
-\fi
-
-% ---------------------------------------------------------------------------------
-% literate replacements
-% the following is for replacing some matlab relations like >= or ~=
-% by the corresponding LaTeX symbols, which are much easier to read ...
-\ifuseliterate
-	\lstset{%
-		literate=%
-			{~}{{$\neg$}}1 %               \neg
-			{<=}{{\tiny$\leq$}}1 %         \leq
-			{>=}{{\tiny$\geq$}}1 %         \geq
-			{~=}{{\tiny$\neq$}}1 %         \neq
-			{delta}{{\tiny$\Delta$}}1 %    \Delta
-			{(end)}{\lstbasicfont (end)}{5} % black ``end'' when indexing last vector element
-			{({ }end)}{\lstbasicfont ({ }end)}{6}
-			{(end{ })}{\lstbasicfont (end{ })}{6}
-			{({ }end{ })}{\lstbasicfont ({ }end{ })}{7}
-			{:end}{\lstbasicfont :end}{4}
-			{:{ }end}{\lstbasicfont :{ }end}{5}
-			{end:}{\lstbasicfont end:}{4}
-			{end{ }:}{\lstbasicfont end{ }:}{5}
-			{,end}{\lstbasicfont ,end}{4}
-			{,{ }end}{\lstbasicfont ,{ }end}{5}
-	}
-\else
-	\lstset{%
-		literate=%
-			{(end)}{\lstbasicfont (end)}{5} % black ``end'' when indexing last vector element
-			{({ }end)}{\lstbasicfont ({ }end)}{6}
-			{(end{ })}{\lstbasicfont (end{ })}{6}
-			{({ }end{ })}{\lstbasicfont ({ }end{ })}{7}
-			{:end}{\lstbasicfont :end}{4}
-			{:{ }end}{\lstbasicfont :{ }end}{5}
-			{end:}{\lstbasicfont end:}{4}
-			{end{ }:}{\lstbasicfont end{ }:}{5}
-			{,end}{\lstbasicfont ,end}{4}
-			{,{ }end}{\lstbasicfont ,{ }end}{5}
-	}
-\fi%literates
-
-% ---------------------------------------------------------------------------------
-% line numbering
-\ifnumbered% numbered option
-  \lstset{%
-    numbersep=3mm, numbers=left, numberstyle=\tiny, % number style
-  }
-\fi
-
-\ifframed%   framed option
-  \lstset{%
-    frame=single,                             % frame
-  }
-  \ifnumbered%
-    \lstset{%
-      framexleftmargin=6mm, xleftmargin=6mm   % tweak margins
-    }
-  \fi
-\fi
-
-\endinput
-%% End of file `mcode.sty'.
