Changeset 8309

Timestamp:

05/16/11 16:14:14 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added fields to activate/deactivate analyses

Location:

issm/trunk/src/m

Files:

• classes/model.m (modified) (2 diffs)
• model/display/displaytransient.m (modified) (1 diff)
• model/display/fielddisplay.m (modified) (4 diffs)
• model/marshall.m (modified) (1 diff)

issm/trunk/src/m/classes/model.m

@@ -207 +207 @@
                  timedec=0;
                  hydrostatic_adjustment=0;
+
+                 %Analysis
+                 md.prognostic_analysis=0;
+                 md.diagnostic_analysis=0;
+                 md.thermal_analysis=0;
 
                  %Control
@@ -647 +652 @@
                          md.timedec=.5;
 
+                         %Solution activated for transient runs. By default we do a
+                         %full analysis: Diagnostic, Prognostic and Thermal
+                         md.prognostic_analysis=1;
+                         md.diagnostic_analysis=1;
+                         md.thermal_analysis=1;
+
                          %Control
 

issm/trunk/src/m/model/display/displaytransient.m

@@ -10 +10 @@
 
 disp('Transient parameters on a pure solution basis:');
-disp(' ');
-displaydiagnostic(md);
-disp(' ');
-displaythermal(md);
-disp(' ');
-displayprognostic(md);
-disp(' ');
+if md.diagnostic_analysis,
+        displaydiagnostic(md);
+else
+        disp(sprintf('         %s','no scheduled diagnostic. activate by doing md.diagnostic_analysis=1'));
+end
+if md.prognostic_analysis,
+        displayprognostic(md);
+else
+        disp(sprintf('         %s','no scheduled prognostic. activate by doing md.prognostic_analysis=1'));
+end
+if md.thermal_analysis,
+        displaythermal(md);
+else
+        disp(sprintf('         %s','no scheduled thermal. activate by doing md.thermal_analysis=1'));
+end
 
 disp(sprintf('   Transient solution parameters:\n'));

issm/trunk/src/m/model/display/fielddisplay.m

@@ -55 +55 @@
 
         end
-end %function
+end
 
-function struct_display(structure,offset)
+function struct_display(structure,offset) % {{{
 
         structure_fields=fields(structure);
@@ -76 +76 @@
                 end
         end
-end
-
-function cell_display(offset,name,field,comment)
+end% }}}
+function cell_display(offset,name,field,comment) % {{{
 
         %initialization
@@ -104 +103 @@
         %call displayunit
         displayunit(offset,name,string,comment);
-end
-
-function displayunit(offset,name,caracterization,comment),
+end% }}}
+function displayunit(offset,name,caracterization,comment),% {{{
 
         %take care of name
@@ -127 +125 @@
                 disp(sprintf('%s%-23s: %-15s -- %s',offset,name,caracterization,comment));
         end
-end
+end% }}}

issm/trunk/src/m/model/marshall.m

@@ -98 +98 @@
 WriteData(fid,md.dhdt,'Mat','dhdt');
 WriteData(fid,md.watercolumn,'Mat','watercolumn');
+
+%Transient
+WriteData(fid,md.diagnostic_analysis,'Scalar','diagnostic_analysis');
+WriteData(fid,md.prognostic_analysis,'Scalar','prognostic_analysis');
+WriteData(fid,md.thermal_analysis,'Scalar','thermal_analysis');
 
 %Get materials