Changeset 9678 for issm/trunk

Timestamp:

09/07/11 16:51:21 (14 years ago)

Author:

seroussi

Message:

created transient class

Location:

issm/trunk

Files:

• src/c/EnumDefinitions/EnumDefinitions.h (modified) (2 diffs)
• src/c/modules/EnumToStringx/EnumToStringx.cpp (modified) (2 diffs)
• src/c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• src/c/modules/StringToEnumx/StringToEnumx.cpp (modified) (2 diffs)
• src/c/solutions/transient_core.cpp (modified) (1 diff)
• src/m/classes/model/model.m (modified) (6 diffs)
• src/m/classes/transient.m (added)
• src/m/enum/IsdiagnosticEnum.m (deleted)
• src/m/enum/IsprognosticEnum.m (deleted)
• src/m/enum/IsthermalEnum.m (deleted)
• src/m/enum/TransientIsdiagnosticEnum.m (added)
• src/m/enum/TransientIsgroundinglineEnum.m (added)
• src/m/enum/TransientIsprognosticEnum.m (added)
• src/m/enum/TransientIsthermalEnum.m (added)
• src/m/enum/TransientRequestedOutputsEnum.m (added)
• src/m/model/display/displaytransient.m (deleted)
• src/m/model/ismodelselfconsistent.m (modified) (1 diff)
• src/m/solutions/transient_core.m (modified) (1 diff)
• template (modified) (1 diff)

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

@@ -94 +94 @@
         SteadystateReltolEnum,
         SteadystateMaxiterEnum,
+        TransientIsprognosticEnum,
+        TransientIsdiagnosticEnum,
+        TransientIsthermalEnum,
+        TransientIsgroundinglineEnum,
+        TransientRequestedOutputsEnum,
         /*}}}*/
         /*Datasets {{{1*/
@@ -460 +465 @@
         StokesreconditioningEnum,
         LowerelementsEnum,
-        IsprognosticEnum,
-        IsdiagnosticEnum,
-        IsthermalEnum,
         NstepsEnum,
         MaxiterEnum,

issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -98 +98 @@
                 case SteadystateReltolEnum : return "SteadystateReltol";
                 case SteadystateMaxiterEnum : return "SteadystateMaxiter";
+                case TransientIsprognosticEnum : return "TransientIsprognostic";
+                case TransientIsdiagnosticEnum : return "TransientIsdiagnostic";
+                case TransientIsthermalEnum : return "TransientIsthermal";
+                case TransientIsgroundinglineEnum : return "TransientIsgroundingline";
+                case TransientRequestedOutputsEnum : return "TransientRequestedOutputs";
                 case ConstraintsEnum : return "Constraints";
                 case ElementsEnum : return "Elements";
@@ -404 +409 @@
                 case StokesreconditioningEnum : return "Stokesreconditioning";
                 case LowerelementsEnum : return "Lowerelements";
-                case IsprognosticEnum : return "Isprognostic";
-                case IsdiagnosticEnum : return "Isdiagnostic";
-                case IsthermalEnum : return "Isthermal";
                 case NstepsEnum : return "Nsteps";
                 case MaxiterEnum : return "Maxiter";

issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -63 +63 @@
         parameters->AddObject(iomodel->CopyConstantObject(SettingsIoGatherEnum));
         parameters->AddObject(iomodel->CopyConstantObject(GroundinglineMigrationEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(IsdiagnosticEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(IsprognosticEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(IsthermalEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(TransientIsdiagnosticEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(TransientIsprognosticEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(TransientIsthermalEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(TransientIsgroundinglineEnum));
         parameters->AddObject(iomodel->CopyConstantObject(MaterialsRheologyLawEnum));
 

issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -96 +96 @@
         else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum;
         else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;
+        else if (strcmp(name,"TransientIsprognostic")==0) return TransientIsprognosticEnum;
+        else if (strcmp(name,"TransientIsdiagnostic")==0) return TransientIsdiagnosticEnum;
+        else if (strcmp(name,"TransientIsthermal")==0) return TransientIsthermalEnum;
+        else if (strcmp(name,"TransientIsgroundingline")==0) return TransientIsgroundinglineEnum;
+        else if (strcmp(name,"TransientRequestedOutputs")==0) return TransientRequestedOutputsEnum;
         else if (strcmp(name,"Constraints")==0) return ConstraintsEnum;
         else if (strcmp(name,"Elements")==0) return ElementsEnum;
@@ -402 +407 @@
         else if (strcmp(name,"Stokesreconditioning")==0) return StokesreconditioningEnum;
         else if (strcmp(name,"Lowerelements")==0) return LowerelementsEnum;
-        else if (strcmp(name,"Isprognostic")==0) return IsprognosticEnum;
-        else if (strcmp(name,"Isdiagnostic")==0) return IsdiagnosticEnum;
-        else if (strcmp(name,"Isthermal")==0) return IsthermalEnum;
         else if (strcmp(name,"Nsteps")==0) return NstepsEnum;
         else if (strcmp(name,"Maxiter")==0) return MaxiterEnum;

issm/trunk/src/c/solutions/transient_core.cpp

@@ -37 +37 @@
         femmodel->parameters->FindParam(&time_adapt,TimesteppingTimeAdaptEnum);
         femmodel->parameters->FindParam(&groundingline_migration,GroundinglineMigrationEnum);
-        femmodel->parameters->FindParam(&isdiagnostic,IsdiagnosticEnum);
-        femmodel->parameters->FindParam(&isprognostic,IsprognosticEnum);
-        femmodel->parameters->FindParam(&isthermal,IsthermalEnum);
+        femmodel->parameters->FindParam(&isdiagnostic,TransientIsdiagnosticEnum);
+        femmodel->parameters->FindParam(&isprognostic,TransientIsprognosticEnum);
+        femmodel->parameters->FindParam(&isthermal,TransientIsthermalEnum);
 
         /*initialize: */

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

@@ -34 +34 @@
                  flowequation = modelfield('default',0,'marshall',true);
                  steadystate = modelfield('default',0,'marshall',true);
+                 transient = modelfield('default',0,'marshall',true);
 
                  %FIXME: all other fields should belong to other classes
@@ -124 +125 @@
                  viscosity_overshoot      = modelfield('default',0,'marshall',true,'format','Double');
 
-                 %Transient 
-                 isprognostic = modelfield('default',0,'marshall',true,'format','Boolean');
-                 isdiagnostic = modelfield('default',0,'marshall',true,'format','Boolean');
-                 isthermal    = modelfield('default',0,'marshall',true,'format','Boolean');
                  %Control
                  control_analysis = modelfield('default',0,'marshall',true,'format','Boolean');
@@ -381 +378 @@
                          if isfield(structmd,'eps_rel'), md.flowequation.reltol=structmd.eps_rel; end
                          if isfield(structmd,'max_steadystate_iterations'), md.flowequation.maxiter=structmd.max_steadystate_iterations; end
+                         if isfield(structmd,'isdiagnostic'), md.transient.isdiagnostic=structmd.isdiagnostic; end
+                         if isfield(structmd,'isprognostic'), md.transient.isprognostic=structmd.isprognostic; end
+                         if isfield(structmd,'isthermal'), md.transient.isthermal=structmd.isthermal; end
 
                          %Field changes
@@ -506 +506 @@
                          md.flowequation=flowequation;
                          md.steadystate=steadystate;
+                         md.transient=transient;
 
                          %Solver parameters
@@ -562 +563 @@
                          md.min_mechanical_constraints=0;
 
-                         %Solution activated for transient runs. By default we do a
-                         %full analysis: Diagnostic, Prognostic and Thermal
-                         md.isprognostic=1;
-                         md.isdiagnostic=1;
-                         md.isthermal=1;
-
                          %Control
 
@@ -630 +625 @@
                                  if(strcmp(index1.subs,'obs')), displayobservations(md);return; end
                                  if(strcmp(index1.subs,'diagnostic')), displaydiagnostic(md);return; end
-                                 if(strcmp(index1.subs,'transient')), displaytransient(md);return; end
                                  if(strcmp(index1.subs,'control')), displaycontrol(md);return; end
                                  if(strcmp(index1.subs,'parallel')), displayparallel(md);return; end

issm/trunk/src/m/model/ismodelselfconsistent.m

@@ -303 +303 @@
                 message(['model not consistent: model ' md.miscellaneous.name ' cfl_coefficient field should between  0 and 1']);
         end
-        if ~ismember(md.isdiagnostic,[0 1]),
-                message('model not consistent: isdiagnostic should be a scalar (1 or 0)');
-        end
-        if ~ismember(md.isprognostic,[0 1]),
-                message('model not consistent: isprognostic should be a scalar (1 or 0)');
-        end
-        if ~ismember(md.isthermal,[0 1]),
-                message('model not consistent: isthermal should be a scalar (1 or 0)');
+        if ~ismember(md.transient.isdiagnostic,[0 1]),
+                message('model not consistent: transient.isdiagnostic should be a scalar (1 or 0)');
+        end
+        if ~ismember(md.transient.isprognostic,[0 1]),
+                message('model not consistent: transient.isprognostic should be a scalar (1 or 0)');
+        end
+        if ~ismember(md.transient.isthermal,[0 1]),
+                message('model not consistent: transient.isthermal should be a scalar (1 or 0)');
+        end
+        if ~ismember(md.transient.isgroundingline,[0 1]),
+                message('model not consistent: transient.isgroundingline should be a scalar (1 or 0)');
         end
 end

issm/trunk/src/m/solutions/transient_core.m

@@ -14 +14 @@
         output_frequency=femmodel.parameters.OutputFrequency;
         time_adapt=femmodel.parameters.TimesteppingTimeAdapt;
-        isdiagnostic=femmodel.parameters.Isdiagnostic;
-        isprognostic=femmodel.parameters.Isprognostic;
-        isthermal=femmodel.parameters.Isthermal;
+        isdiagnostic=femmodel.parameters.TransientIsdiagnostic;
+        isprognostic=femmodel.parameters.TransientIsprognostic;
+        isthermal=femmodel.parameters.TransientIsthermal;
 
         %Initialize

issm/trunk/template

@@ -82 +82 @@
         requested_outputs
 }}}
-transient{{{
-   isdiagnostic
-   isprognostic
-   isthermal
-   isgroundingline -> add
-   requested_outputs
-}}}
 inversion{{{ 
         private: