Changeset 17211

Timestamp:

02/04/14 16:11:55 (11 years ago)

Author:

jbondzio

Message:

minor: partial correction of revert

Location:

issm/trunk-jpl

Files:

• externalpackages/ipython/install.sh (modified) (1 diff)
• externalpackages/matplotlib/install-linux64.sh (modified) (1 diff)
• externalpackages/vim/addons/vimrc (modified) (2 diffs)
• src/c/analyses/EnthalpyAnalysis.cpp (modified) (1 diff)

issm/trunk-jpl/externalpackages/ipython/install.sh

@@ -7 +7 @@
 mkdir src 
 
-if [ ! -f ipython-1.0.0.tar.gz ]; then
-        #Download from ISSM server
-        $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/ipython-1.0.0.tar.gz' 'ipython-1.0.0.tar.gz'
-fi
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/ipython-1.0.0.tar.gz' 'ipython-1.0.0.tar.gz'
 
 #Untar 

issm/trunk-jpl/externalpackages/matplotlib/install-linux64.sh

@@ -8 +8 @@
 export FFLAGS=-ff2c
 
-if [ ! -d src ]; then
-        git clone https://github.com/matplotlib/matplotlib
-        mv matplotlib src
-fi
+git clone https://github.com/matplotlib/matplotlib
+mv matplotlib src
 cd src
 python setup.py build 

issm/trunk-jpl/externalpackages/vim/addons/vimrc

@@ -100 +100 @@
 
 " save & "make" the current file in all modes
-map <F6> :w <Enter> :make <Enter><Enter>
-map! <F6>  <ESC> :w <Enter> :make <Enter><Enter>
+map <F8> :w <Enter> :make <Enter><Enter>
+map! <F8>  <ESC> :w <Enter> :make <Enter><Enter>
 " make update: nice for longer documents
-map <F5> :w <Enter> :make update <Enter><Enter>
-map! <F5> <ESC> :w <Enter> :make update <Enter><Enter>
-
-" switch between tabs
-nmap <F7> :tabp <CR>
-nmap <F8> :tabn <CR>
+map <F7> :w <Enter> :make update <Enter><Enter>
+map! <F7> <ESC> :w <Enter> :make update <Enter><Enter>
 
 
@@ -145 +141 @@
   autocmd BufWritePost   *.sh         !chmod +x %
 
-        " Commenting blocks of code.
-        autocmd FileType c,cpp,java,scala let b:comment_leader = '// '
-        autocmd FileType sh,ruby,python   let b:comment_leader = '# '
-        autocmd FileType conf,fstab       let b:comment_leader = '# '
-        autocmd FileType tex              let b:comment_leader = '% '
-        autocmd FileType mail             let b:comment_leader = '> '
-        autocmd FileType vim              let b:comment_leader = '" '
-        noremap <silent> ,cc :<C-B>silent <C-E>s/^/<C-R>=escape(b:comment_leader,'\/')<CR>/<CR>:nohlsearch<CR>
-        noremap <silent> ,cu :<C-B>silent <C-E>s/^\V<C-R>=escape(b:comment_leader,'\/')<CR>//e<CR>:nohlsearch<CR>
 endif " has("autocmd")
 " ----------------------------------------------------------------------}}}

issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp

@@ -826 +826 @@
         int solution_type, i;
         bool computebasalmeltingrates=true;
-        bool isdrainage=false;
+        bool isdrainage=true;
         bool updatebasalconstraints=true;