source: issm/oecreview/Archive/25834-26739/ISSM-26028-26029.diff@ 26740

Last change on this file since 26740 was 26740, checked in by Mathieu Morlighem, 3 years ago

CHG: added 25834-26739
File size: 1.7 KB
RevLine 
[26740]1Index: ../trunk-jpl/examples/ISMIP/IsmipF.par
2===================================================================
3--- ../trunk-jpl/examples/ISMIP/IsmipF.par (revision 26028)
4+++ ../trunk-jpl/examples/ISMIP/IsmipF.par (revision 26029)
5@@ -27,7 +27,7 @@
6
7 %These parameters will not be used but need to be fixed #md.friction
8 %one friciton coefficient per node (md.mesh.numberofvertices,1)
9-%conversion form year to seconds with #md.constants.yts
10+%conversion from year to seconds with #md.constants.yts
11 %->
12
13 %one friciton exponent (p,q) per element
14Index: ../trunk-jpl/jenkins/examples_tests.sh
15===================================================================
16--- ../trunk-jpl/jenkins/examples_tests.sh (revision 26028)
17+++ ../trunk-jpl/jenkins/examples_tests.sh (revision 26029)
18@@ -464,7 +464,7 @@
19 %Define the geometry of the simulation #md.geometry\n\
20 %surface is [-x*tan(3.0*pi/180)] #md.mesh\n\
21 %->\n\
22- md.geometry.surface=md.mesh.x*tan(3.0*pi/180.0);\n\
23+ md.geometry.surface=-md.mesh.x*tan(3.0*pi/180.0);\n\
24 %base is [surface-1000+100*exp(-((x-L/2).^2+(y-L/2).^2)/(10000.^2))]\n\
25 %L is the size of the side of the square #max(md.mesh.x)-min(md.mesh.x)\n\
26 %->\n\
27@@ -482,7 +482,7 @@
28 \n\
29 %These parameters will not be used but need to be fixed #md.friction\n\
30 %one friciton coefficient per node (md.mesh.numberofvertices,1)\n\
31- %conversion form year to seconds with #md.constants.yts\n\
32+ %conversion from year to seconds with #md.constants.yts\n\
33 %->\n\
34 md.friction.coefficient=sqrt(md.constants.yts/(1000*2.140373*10^-7))*ones(md.mesh.numberofvertices,1);\n\
35 %one friciton exponent (p,q) per element\n\
Note: See TracBrowser for help on using the repository browser.