Index: sm/trunk/src/c/parallel/.vimrc =================================================================== --- /issm/trunk/src/c/parallel/.vimrc (revision 2551) +++ (revision ) @@ -1,90 +1,0 @@ - -" Use Vim settings, rather then Vi settings (much better!). -" This must be first, because it changes other options as a side effect. -set nocompatible - -" allow backspacing over everything in insert mode -set backspace=indent,eol,start - -set autoindent " always set autoindenting on -set history=50 " keep 50 lines of command line history -set ruler " show the cursor position all the time -set showcmd " display incomplete commands -set incsearch " do incremental searching -set softtabstop=3 -set uc=0 " disable swap files -set shell=/bin/bash -set nobackup - -" For Win32 GUI: remove 't' flag from 'guioptions': no tearoff menu entries -" let &guioptions = substitute(&guioptions, "t", "", "g") - -" Don't use Ex mode, use Q for formatting -map Q gq - -" Make p in Visual mode replace the selected text with the "" register. -vnoremap p :let current_reg = @"gvs=current_reg - -" This is an alternative that also works in block mode, but the deleted -" text is lost and it only works for putting the current register. -"vnoremap p "_dp - -" Switch syntax highlighting on, when the terminal has colors -" Also switch on highlighting the last used search pattern. -syntax on -set hlsearch - -" Only do this part when compiled with support for autocommands. -if has("autocmd") - - " Enable file type detection. - " Use the default filetype settings, so that mail gets 'tw' set to 72, - " 'cindent' is on in C files, etc. - " Also load indent files, to automatically do language-dependent indenting. - filetype plugin indent on - - " For all text files set 'textwidth' to 78 characters. - autocmd FileType text setlocal textwidth=0 - - " When editing a file, always jump to the last known cursor position. - " Don't do it when the position is invalid or when inside an event handler - " (happens when dropping a file on gvim). - autocmd BufReadPost * - \ if line("'\"") > 0 && line("'\"") <= line("$") | - \ exe "normal g`\"" | - \ endif - -endif " has("autocmd") -colo default - - -"execute "source ~/.vim/plugin/FeralToggleCommentify.vim" -"map : call ToggleCommentify()j -"imap :call ToggleCommentify()j - - - -function! InsertTabWrapper(direction) -let col = col('.') - 1 -if !col || getline('.')[col - 1] !~ '\k' - return "\" -elseif "backward" == a:direction - return "\" -else - return "\" -endif -endfunction - -inoremap =InsertTabWrapper ("forward") -inoremap =InsertTabWrapper ("backward") - -source ~/.exrc -set wildmenu -set background=dark - -"Do local Makefile -map :!/home/larour/bin/cs -"Compile server code -map :!/home/larour/bin/c -"Change to directory of current file automatically -autocmd BufEnter * lcd %:p:h Index: /issm/trunk/src/c/toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp =================================================================== --- /issm/trunk/src/c/toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp (revision 2551) +++ /issm/trunk/src/c/toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp (revision 2552) @@ -4,5 +4,5 @@ when launching a Petsc executable (option -mat_type EXTERNALMATRIXTYPE). - We do not use this feature, because once the Cielo server is launched, we cannot go back and modify + We do not use this feature, because once the jpl-package server is launched, we cannot go back and modify the command line arguments. We rely therefore on the use of the options_string sent from the Solver_client module to the server Solver/ module. On the server side, we receive this options_string and plug it into the Index: /issm/trunk/src/c/toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp.petsc2 =================================================================== --- /issm/trunk/src/c/toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp.petsc2 (revision 2551) +++ /issm/trunk/src/c/toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp.petsc2 (revision 2552) @@ -4,5 +4,5 @@ when launching a Petsc executable (option -mat_type EXTERNALMATRIXTYPE). - We do not use this feature, because once the Cielo server is launched, we cannot go back and modify + We do not use this feature, because once the jpl-package server is launched, we cannot go back and modify the command line arguments. We rely therefore on the use of the options_string sent from the Solver_client module to the server Solver/ module. On the server side, we receive this options_string and plug it into the Index: /issm/trunk/src/c/toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp.petsc3 =================================================================== --- /issm/trunk/src/c/toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp.petsc3 (revision 2551) +++ /issm/trunk/src/c/toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp.petsc3 (revision 2552) @@ -4,5 +4,5 @@ when launching a Petsc executable (option -mat_type EXTERNALMATRIXTYPE). - We do not use this feature, because once the Cielo server is launched, we cannot go back and modify + We do not use this feature, because once the jpl-package server is launched, we cannot go back and modify the command line arguments. We rely therefore on the use of the options_string sent from the Solver_client module to the server Solver/ module. On the server side, we receive this options_string and plug it into the