Changeset 16137 for issm/trunk/src/m/classes/transient.m

Timestamp:

09/16/13 09:43:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16135

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/m/classes/transient.m (modified) (5 diffs)

issm/trunk

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

issm/trunk/src/m/classes/transient.m

@@ -6 +6 @@
 classdef transient
         properties (SetAccess=public) 
-                isprognostic      = 0;
-                isdiagnostic      = 0;
+                ismasstransport      = 0;
+                isstressbalance      = 0;
                 isthermal         = 0;
                 isgroundingline   = 0;
@@ -24 +24 @@
                 function obj = setdefaultparameters(obj) % {{{
 
-                        %full analysis: Diagnostic, Prognostic and Thermal but no groundingline migration for now
-                        obj.isprognostic=1;
-                        obj.isdiagnostic=1;
+                        %full analysis: Stressbalance, Masstransport and Thermal but no groundingline migration for now
+                        obj.ismasstransport=1;
+                        obj.isstressbalance=1;
                         obj.isthermal=1;
                         obj.isgroundingline=0;
@@ -37 +37 @@
                         if solution~=TransientSolutionEnum(), return; end
 
-                        md = checkfield(md,'transient.isprognostic','numel',[1],'values',[0 1]);
-                        md = checkfield(md,'transient.isdiagnostic','numel',[1],'values',[0 1]);
+                        md = checkfield(md,'transient.ismasstransport','numel',[1],'values',[0 1]);
+                        md = checkfield(md,'transient.isstressbalance','numel',[1],'values',[0 1]);
                         md = checkfield(md,'transient.isthermal','numel',[1],'values',[0 1]);
                         md = checkfield(md,'transient.isgroundingline','numel',[1],'values',[0 1]);
@@ -48 +48 @@
                         disp(sprintf('   transient solution parameters:'));
 
-                        fielddisplay(obj,'isprognostic','indicates if a prognostic solution is used in the transient');
-                        fielddisplay(obj,'isdiagnostic','indicates if a diagnostic solution is used in the transient');
+                        fielddisplay(obj,'ismasstransport','indicates if a masstransport solution is used in the transient');
+                        fielddisplay(obj,'isstressbalance','indicates if a stressbalance solution is used in the transient');
                         fielddisplay(obj,'isthermal','indicates if a thermal solution is used in the transient');
                         fielddisplay(obj,'isgroundingline','indicates if a groundingline migration is used in the transient');
@@ -57 +57 @@
                 end % }}}
                 function marshall(obj,md,fid) % {{{
-                        WriteData(fid,'object',obj,'fieldname','isprognostic','format','Boolean');
-                        WriteData(fid,'object',obj,'fieldname','isdiagnostic','format','Boolean');
+                        WriteData(fid,'object',obj,'fieldname','ismasstransport','format','Boolean');
+                        WriteData(fid,'object',obj,'fieldname','isstressbalance','format','Boolean');
                         WriteData(fid,'object',obj,'fieldname','isthermal','format','Boolean');
                         WriteData(fid,'object',obj,'fieldname','isgroundingline','format','Boolean');

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad