Changeset 12707

Timestamp:

07/24/12 10:36:46 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 12703

Location:

issm/trunk

Files:

• . (modified) (view diffs)
• configs/config-arm-linux.sh (modified) (view diffs)
• configs/config-discover.sh (modified) (view diffs)
• configs/config-greenplanet.sh (modified) (view diffs)
• configs/config-linux64-ad.sh (modified) (view diffs)
• configs/config-linux64-astrid-petscdev.sh (copied) (copied from issm/trunk-jpl/configs/config-linux64-astrid-petscdev.sh ) (view diffs)
• configs/config-linux64-astrid-python.sh (copied) (copied from issm/trunk-jpl/configs/config-linux64-astrid-python.sh ) (view diffs)
• configs/config-macosx-snowleopard-bothapis.sh (copied) (copied from issm/trunk-jpl/configs/config-macosx-snowleopard-bothapis.sh ) (view diffs)
• configs/config-macosx-snowleopard-python.sh (copied) (copied from issm/trunk-jpl/configs/config-macosx-snowleopard-python.sh ) (view diffs)
• configs/config-macosx64-chris.sh (copied) (copied from issm/trunk-jpl/configs/config-macosx64-chris.sh ) (view diffs)
• configs/config-macosx64-larour-ad.sh (modified) (view diffs)
• configs/config-pleiades-petscdev.sh (copied) (copied from issm/trunk-jpl/configs/config-pleiades-petscdev.sh ) (view diffs)
• configure.ac (modified) (view diffs)
• etc/environment.csh (modified) (view diffs)
• etc/environment.sh (modified) (view diffs)
• etc/environment_variables.csh (modified) (view diffs)
• etc/environment_variables.sh (modified) (view diffs)
• externalpackages/adolc/install-macosx64.sh (copied) (copied from issm/trunk-jpl/externalpackages/adolc/install-macosx64.sh ) (view diffs)
• externalpackages/adolc/install.sh (modified) (view diffs)
• externalpackages/android/android-ndk/install.sh (modified) (view diffs)
• externalpackages/android/android-sdk/install.sh (modified) (view diffs)
• externalpackages/android/android_variables.sh (copied) (copied from issm/trunk-jpl/externalpackages/android/android_variables.sh ) (view diffs)
• externalpackages/aspell (copied) (copied from issm/trunk-jpl/externalpackages/aspell ) (view diffs)
• externalpackages/aspell/install.sh (copied) (copied from issm/trunk-jpl/externalpackages/aspell/install.sh ) (view diffs)
• externalpackages/dakota/install-discover.sh (modified) (view diffs)
• externalpackages/esmf (copied) (copied from issm/trunk-jpl/externalpackages/esmf ) (view diffs)
• externalpackages/esmf/doc (copied) (copied from issm/trunk-jpl/externalpackages/esmf/doc ) (view diffs)
• externalpackages/esmf/doc/ESMF_refdoc.pdf (copied) (copied from issm/trunk-jpl/externalpackages/esmf/doc/ESMF_refdoc.pdf ) (view diffs)
• externalpackages/esmf/doc/ESMF_usrdoc.pdf (copied) (copied from issm/trunk-jpl/externalpackages/esmf/doc/ESMF_usrdoc.pdf ) (view diffs)
• externalpackages/esmf/install.sh (copied) (copied from issm/trunk-jpl/externalpackages/esmf/install.sh ) (view diffs)
• externalpackages/export_fig/export_fig.m (modified) (view diffs)
• externalpackages/export_fig/print2array.m (modified) (view diffs)
• externalpackages/export_fig/print2eps.m (modified) (view diffs)
• externalpackages/gsl/install-android-4.0.sh (deleted)
• externalpackages/gsl/install-android.sh (copied) (copied from issm/trunk-jpl/externalpackages/gsl/install-android.sh ) (view diffs)
• externalpackages/h5py (copied) (copied from issm/trunk-jpl/externalpackages/h5py ) (view diffs)
• externalpackages/h5py/install.sh (copied) (copied from issm/trunk-jpl/externalpackages/h5py/install.sh ) (view diffs)
• externalpackages/hdf5 (copied) (copied from issm/trunk-jpl/externalpackages/hdf5 ) (view diffs)
• externalpackages/hdf5/install.sh (copied) (copied from issm/trunk-jpl/externalpackages/hdf5/install.sh ) (view diffs)
• externalpackages/matlab/install.sh (modified) (view diffs)
• externalpackages/modules (copied) (copied from issm/trunk-jpl/externalpackages/modules ) (view diffs)
• externalpackages/modules/install.sh (copied) (copied from issm/trunk-jpl/externalpackages/modules/install.sh ) (view diffs)
• externalpackages/ncview/install.sh (modified) (view diffs)
• externalpackages/netcdf-python (copied) (copied from issm/trunk-jpl/externalpackages/netcdf-python ) (view diffs)
• externalpackages/netcdf-python/install.sh (copied) (copied from issm/trunk-jpl/externalpackages/netcdf-python/install.sh ) (view diffs)
• externalpackages/netcdf/install.sh (modified) (view diffs)
• externalpackages/petsc/install-3.2-discover.sh (modified) (view diffs)
• externalpackages/petsc/install-dev-pleiades.sh (copied) (copied from issm/trunk-jpl/externalpackages/petsc/install-dev-pleiades.sh ) (view diffs)
• externalpackages/python/install-linux64-astrid.sh (modified) (view diffs)
• externalpackages/python/install-macosx-snowleopard.sh (modified) (view diffs)
• externalpackages/scipy/README (modified) (view diffs)
• externalpackages/scipy/install-macosx-snowleopard.sh (modified) (view diffs)
• externalpackages/triangle/configs/android/android-4.0 (deleted)
• externalpackages/triangle/configs/android/configure.make (copied) (copied from issm/trunk-jpl/externalpackages/triangle/configs/android/configure.make ) (view diffs)
• externalpackages/triangle/install-android-4.0.sh (deleted)
• externalpackages/triangle/install-android.sh (copied) (copied from issm/trunk-jpl/externalpackages/triangle/install-android.sh ) (view diffs)
• externalpackages/triangle/install-discover.sh (copied) (copied from issm/trunk-jpl/externalpackages/triangle/install-discover.sh ) (view diffs)
• externalpackages/vim/addons/vim/syntax/c.vim (modified) (view diffs)
• m4/issm_options.m4 (modified) (view diffs)
• scripts/automakererun.sh (modified) (view diffs)
• scripts/getloc.sh (modified) (view diffs)
• startup.py (modified) (view diffs)
• test/Archives/Archive268.mat (copied) (copied from issm/trunk-jpl/test/Archives/Archive268.mat ) (view diffs)
• test/Archives/Archive270.mat (copied) (copied from issm/trunk-jpl/test/Archives/Archive270.mat ) (view diffs)
• test/Archives/Archive306.mat (modified) (view diffs)
• test/Archives/Archive312.mat (modified) (view diffs)
• test/Archives/Archive356.mat (copied) (copied from issm/trunk-jpl/test/Archives/Archive356.mat ) (view diffs)
• test/Archives/Archive358.mat (copied) (copied from issm/trunk-jpl/test/Archives/Archive358.mat ) (view diffs)
• test/Archives/Archive436.mat (copied) (copied from issm/trunk-jpl/test/Archives/Archive436.mat ) (view diffs)
• test/Archives/Archive999.hdf5 (copied) (copied from issm/trunk-jpl/test/Archives/Archive999.hdf5 ) (view diffs)
• test/Archives/Archive999.nc (copied) (copied from issm/trunk-jpl/test/Archives/Archive999.nc ) (view diffs)
• test/NightlyRun/IdFromString.m (modified) (view diffs)
• test/NightlyRun/IdFromString.py (copied) (copied from issm/trunk-jpl/test/NightlyRun/IdFromString.py ) (view diffs)
• test/NightlyRun/IdToName.m (modified) (view diffs)
• test/NightlyRun/IdToName.py (copied) (copied from issm/trunk-jpl/test/NightlyRun/IdToName.py ) (view diffs)
• test/NightlyRun/dak.m (deleted)
• test/NightlyRun/runme.m (modified) (view diffs)
• test/NightlyRun/runme.py (copied) (copied from issm/trunk-jpl/test/NightlyRun/runme.py ) (view diffs)
• test/NightlyRun/test102.py (modified) (view diffs)
• test/NightlyRun/test268.m (copied) (copied from issm/trunk-jpl/test/NightlyRun/test268.m ) (view diffs)
• test/NightlyRun/test270.m (copied) (copied from issm/trunk-jpl/test/NightlyRun/test270.m ) (view diffs)
• test/NightlyRun/test356.m (copied) (copied from issm/trunk-jpl/test/NightlyRun/test356.m ) (view diffs)
• test/NightlyRun/test358.m (copied) (copied from issm/trunk-jpl/test/NightlyRun/test358.m ) (view diffs)
• test/NightlyRun/test436.m (copied) (copied from issm/trunk-jpl/test/NightlyRun/test436.m ) (view diffs)
• test/NightlyRun/test999.py (copied) (copied from issm/trunk-jpl/test/NightlyRun/test999.py ) (view diffs)