Changeset 11026

Timestamp:

12/09/11 20:35:38 (13 years ago)

Author:

Eric.Larour

Message:

merged trunk and trunk-jpl

Location:

issm/trunk-jpl

Files:

• . (modified) (1 prop)
• AUTHORS (modified) (1 diff)
• ChangeLog (copied) (copied from issm/trunk/ChangeLog )
• awards (deleted)
• configure.ac (modified) (1 diff)
• contributors.txt (deleted)
• doc/issmdoc.m (modified) (1 diff)
• src/c/Container/Elements.cpp (modified) (1 diff)
• tidbits (deleted)

issm/trunk-jpl/AUTHORS

@@ -8 +8 @@
    Eric Larour <eric.larour@jpl.nasa.gov>
 
-Current developers:
+Current core developers:
    * Eric Larour <eric.larour@jpl.nasa.gov>
         * Helene Seroussi <helene.seroussi@jpl.nasa.gov>
    * Mathieu Morlighem <mathieu.morlighem@jpl.nasa.gov>
+
+
+Contributors:
+        We thank the following contributors for their help in making ISSM better!
+
+        Robert Crippen, Jet Propulsion Laboratory.  robbert.crippen@jpl.nasa.gov
+        HoleFiller routines to plug incomplete datasets. See HoleFiller module in src/m/matlab/utils
+
+        Point Inclusion in Polygon Test (pnpoly.c used in Utils/Arguscontourtomesh/IsInPoly.c)
+        W. Randolph Franklin (WRF)
+        http://www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html
+
+        DACE: A Matlab Kriging toolbox, Søren N.Lophaen, Hans Bruun Nielsen and Jacob
+        Søndergaard (Technical University of Denmark)
+        http://www2.imm.dtu.dk/~hbn/dace/

issm/trunk-jpl/configure.ac

@@ -1 @@
-AC_INIT(ISSM,[1.0], [Eric Larour <eric.larour@jpl.nasa.gov>])
+AC_INIT(ISSM,4.0,issm@jpl.nasa.gov)
 AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_TARGET

issm/trunk-jpl/doc/issmdoc.m

@@ -4 +4 @@
 ISSM_TIER=issmtier;
 
-disp(sprintf('\n%s%s%s','  The following documentations are available in ',ISSM_TIER,'/doc/'));
-disp(sprintf('%s','        userguide: how to use ISSM, quick tutorial'));
-disp(sprintf('%s','        theoryguide: theory behind the ISSM models'));
-disp(sprintf('%s','        validation: test results of ISSM'));
-disp(sprintf('\n%s','  Website: a comprehensive documentation is available on http://www.issm.jpl.nasa.gov'));
+disp(sprintf('\n%s','  A comprehensive documentation is available on http://issm.jpl.nasa.gov'));
 disp(sprintf('\n%s','  Example: how to create a square ice shelf'));
 disp(sprintf('%s','        go to ',ISSM_TIER,'/examples/SquareIceshelf'));

issm/trunk-jpl/src/c/Container/Elements.cpp

@@ -187 +187 @@
 
         if(!results_as_patches){
+                /*No patch here, we prepare vectors*/
 
                 /*see what the first element of this partition has in stock (this is common to all partitions)*/