Changeset 11995 for issm/trunk/test/NightlyRun/test414.m

Timestamp:

04/16/12 14:57:18 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 11994M

Location:

issm/trunk

Files:

• . (modified) (2 props)
• test/NightlyRun (modified) (1 prop)
• test/NightlyRun/test414.m (modified) (2 diffs)

issm/trunk

@@ -7 +7 @@
 config.status
 configure
-doxygen
 ISSM.paf
 ISSM.ppf
 ISSM.ppf_cache
 libtool
-list
 Makefile
 Makefile.in

@@ -7 +7 @@
 config.status
 configure
-doxygen
 ISSM.paf
 ISSM.ppf
 ISSM.ppf_cache
 libtool
-list
 Makefile
 Makefile.in

issm/trunk/test/NightlyRun

@@ +1 @@
+__pycache__
 *.tar.gz
 *.bin 
@@ -5 +6 @@
 *.errlog
 *.queue
+*.lock
+*settings*
+startup.m
+*.bat
+*.outbin
+qmu*
+*.bin

@@ +1 @@
+__pycache__
 *.tar.gz
 *.bin 
@@ -5 +6 @@
 *.errlog
 *.queue
+*.lock
+*settings*
+startup.m
+*.bat
+*.outbin
+qmu*
+*.bin

issm/trunk/test/NightlyRun/test414.m

@@ -5 +5 @@
 md=setflowequation(md,'pattyn','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,ThermalSolutionEnum);
+md.transient.isdiagnostic=0;
+md.transient.isprognostic=0;
+md.transient.isthermal=1;
+md.transient.isgroundingline=0;
+md=solve(md,TransientSolutionEnum);
 
 %Fields and tolerances to track changes
@@ -11 +15 @@
 field_tolerances={1e-13,1e-13};
 field_values={...
-        (md.results.ThermalSolution(1).Temperature),...
-        (md.results.ThermalSolution(1).BasalforcingsMeltingRate),...
+        (md.results.TransientSolution(1).Temperature),...
+        (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
         };

@@ -7 +7 @@
 config.status
 configure
-doxygen
 ISSM.paf
 ISSM.ppf
 ISSM.ppf_cache
 libtool
-list
 Makefile
 Makefile.in

@@ +1 @@
+__pycache__
 *.tar.gz
 *.bin 
@@ -5 +6 @@
 *.errlog
 *.queue
+*.lock
+*settings*
+startup.m
+*.bat
+*.outbin
+qmu*
+*.bin