Changeset 10949

Timestamp:

11/29/11 07:55:49 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk and trunk-jpl

Location:

issm/trunk-jpl

Files:

• . (modified) (1 prop)
• scripts/SyncBranches.sh (copied) (copied from issm/trunk/scripts/SyncBranches.sh )
• src/m/classes/clusters/generic.m (modified) (1 diff)
• src/mex/InterpFromGridToMesh/InterpFromGridToMesh.cpp (modified) (1 diff)
• src/mex/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp (modified) (1 diff)
• src/mex/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp (modified) (1 diff)

issm/trunk-jpl/src/m/classes/clusters/generic.m

@@ -15 +15 @@
                  interactive=1;
                  codepath=[issmtier() '/bin'];
-                 executionpath=[issmdir() '/execution'];
+                 executionpath=[issmtier() '/execution'];
                  valgrind=[issmtier() '/externalpackages/valgrind/install/bin/valgrind'];
                  valgrindlib=[issmtier() '/externalpackages/valgrind/install/lib/libmpidebug.so'];

issm/trunk-jpl/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.cpp

@@ -91 +91 @@
         _printf_(true,"   Example:\n");
         _printf_(true,"      load('velocities.mat');\n");
-        _printf_(true,"      md.vx_obs=InterpFromGridToMesh(x_n,y_m,vx,md.x,md.y,0);\n");
+        _printf_(true,"      md.inversion.vx_obs=InterpFromGridToMesh(x_n,y_m,vx,md.mesh.x,md.mesh.y,0);\n");
         _printf_(true,"\n");
 }

issm/trunk-jpl/src/mex/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp

@@ -157 +157 @@
         _printf_(true,"   Example:\n");
         _printf_(true,"      load('temperature.mat');\n");
-        _printf_(true,"      md.temperature=InterpFromMeshToMesh2d(index,x,y,temperature,md.x,md.y);\n");
-        _printf_(true,"      md.temperature=InterpFromMeshToMesh2d(index,x,y,temperature,md.x,md.y,253,'Contour.exp');\n");
+        _printf_(true,"      md.initialization.temperature=InterpFromMeshToMesh2d(index,x,y,temperature,md.mesh.x,md.mesh.y);\n");
+        _printf_(true,"      md.initialization.temperature=InterpFromMeshToMesh2d(index,x,y,temperature,md.mesh.x,md.mesh.y,253,'Contour.exp');\n");
         _printf_(true,"\n");
 }

issm/trunk-jpl/src/mex/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp

@@ -115 +115 @@
         _printf_(true,"   Example:\n");
         _printf_(true,"      load('temperature.mat');\n");
-        _printf_(true,"      md.temperature=InterpFromMeshToMesh3d(index,x,y,z,temperature,md.x,md.y,md.z,253);\n");
+        _printf_(true,"      md.initialization.temperature=InterpFromMeshToMesh3d(index,x,y,z,temperature,md.mesh.x,md.mesh.y,md.mesh.z,253);\n");
         _printf_(true,"\n");
 }