Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk

  • issm/trunk/test/NightlyRun

    • Property svn:ignore

      •  

        old new  
         1__pycache__
        12*.tar.gz
        23*.bin
        … …  
        56*.errlog
        67*.queue
         8*.lock
         9*settings*
         10startup.m
         11*.bat
         12*.outbin
         13qmu*
         14*.bin

  • issm/trunk/test/NightlyRun/test142.m

    r11527 r11995  
    66md.cluster=generic('name',oshostname(),'np',3);
    77md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1);
    8 %md=solve(md,ThermalSolutionEnum);
    9 md=solve(md,EnthalpySolutionEnum);
     8md.transient.isdiagnostic=0;
     9md.transient.isprognostic=0;
     10md.transient.isthermal=1;
     11md.transient.isgroundingline=0;
     12md.thermal.isenthalpy=1;
     13md=solve(md,TransientSolutionEnum);
    1014
    1115%Fields and tolerances to track changes
    … …  
    1519field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-10,1e-13};
    1620field_values={...
    17         (md.results.EnthalpySolution(1).Enthalpy),...
    18         (md.results.EnthalpySolution(1).Waterfraction),...
    19         (md.results.EnthalpySolution(1).Temperature),...
    20         (md.results.EnthalpySolution(2).Enthalpy),...
    21         (md.results.EnthalpySolution(2).Waterfraction),...
    22         (md.results.EnthalpySolution(2).Temperature),...
    23         (md.results.EnthalpySolution(3).Enthalpy),...
    24         (md.results.EnthalpySolution(3).Waterfraction),...
    25         (md.results.EnthalpySolution(3).Temperature),...
     21        (md.results.TransientSolution(1).Enthalpy),...
     22        (md.results.TransientSolution(1).Waterfraction),...
     23        (md.results.TransientSolution(1).Temperature),...
     24        (md.results.TransientSolution(2).Enthalpy),...
     25        (md.results.TransientSolution(2).Waterfraction),...
     26        (md.results.TransientSolution(2).Temperature),...
     27        (md.results.TransientSolution(3).Enthalpy),...
     28        (md.results.TransientSolution(3).Waterfraction),...
     29        (md.results.TransientSolution(3).Temperature),...
    2630        };
Note: See TracChangeset for help on using the changeset viewer.