Changeset 5196

Timestamp:

08/12/10 12:17:51 (15 years ago)

Author:

seroussi

Message:

output_frequency in c

Location:

issm/trunk/src/c

Files:

• EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• EnumDefinitions/EnumToString.cpp (modified) (1 diff)
• EnumDefinitions/StringToEnum.cpp (modified) (1 diff)
• modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• objects/IoModel.cpp (modified) (2 diffs)
• objects/IoModel.h (modified) (1 diff)
• solutions/transient2d_core.cpp (modified) (3 diffs)
• solutions/transient3d_core.cpp (modified) (3 diffs)

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

@@ -268 +268 @@
         PatchNodesEnum,
         TimeEnum,
+        OutputFrequencyEnum,
         /*}}}*/
         /*Convergence{{{1*/

issm/trunk/src/c/EnumDefinitions/EnumToString.cpp

@@ -238 +238 @@
                 case PatchNodesEnum : return "PatchNodes";
                 case TimeEnum : return "Time";
+                case OutputFrequencyEnum : return "OutputFrequency";
                 case RelativeEnum : return "Relative";
                 case ResidualEnum : return "Residual";

issm/trunk/src/c/EnumDefinitions/StringToEnum.cpp

@@ -236 +236 @@
         else if (strcmp(name,"PatchNodes")==0) return PatchNodesEnum;
         else if (strcmp(name,"Time")==0) return TimeEnum;
+        else if (strcmp(name,"OutputFrequency")==0) return OutputFrequencyEnum;
         else if (strcmp(name,"Relative")==0) return RelativeEnum;
         else if (strcmp(name,"Residual")==0) return ResidualEnum;

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

@@ -39 +39 @@
         parameters->AddObject(new BoolParam(IsStokesEnum,iomodel->isstokes));
         parameters->AddObject(new IntParam(VerboseEnum,iomodel->verbose));
+        parameters->AddObject(new IntParam(OutputFrequencyEnum,iomodel->output_frequency));
         parameters->AddObject(new DoubleParam(EpsResEnum,iomodel->eps_res));
         parameters->AddObject(new DoubleParam(EpsRelEnum,iomodel->eps_rel));

issm/trunk/src/c/objects/IoModel.cpp

@@ -162 +162 @@
         IoModelFetchData(&this->verbose,iomodel_handle,"verbose");
         IoModelFetchData(&this->plot,iomodel_handle,"plot");
+        IoModelFetchData(&this->output_frequency,iomodel_handle,"output_frequency");
         IoModelFetchData(&this->prognostic_DG,iomodel_handle,"prognostic_DG");
         IoModelFetchData(&this->nsteps,iomodel_handle,"nsteps");
@@ -318 +319 @@
         this->verbose=0;
         this->plot=0;
+        this->output_frequency=0;
         this->eps_res=0;
         this->eps_rel=0;

issm/trunk/src/c/objects/IoModel.h

@@ -137 +137 @@
                 int     verbose;
                 int     plot;
+                int     output_frequency;
                 double  eps_res;
                 double  eps_rel;

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

@@ -20 +20 @@
         double dt,yts;
         int    solution_type;
+        int    output_frequency;
         
         /*intermediary: */
@@ -31 +32 @@
         femmodel->parameters->FindParam(&yts,YtsEnum);
         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
+        femmodel->parameters->FindParam(&output_frequency,OutputFrequencyEnum);
 
         /*initialize: */
@@ -54 +56 @@
 
                 if(verbose)_printf_("%s\n","saving results:\n");
-                if(solution_type==Transient2DSolutionEnum){
+                if(solution_type==Transient2DSolutionEnum && step%output_frequency==0){
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum,step,time); 
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum,step,time);

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

@@ -20 +20 @@
         double dt,yts;
         int    solution_type;
+        int    output_frequency;
         
         /*intermediary: */
@@ -30 +31 @@
         femmodel->parameters->FindParam(&dt,DtEnum);
         femmodel->parameters->FindParam(&yts,YtsEnum);
-        femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
+        femmodel->parameters->FindParam(&output_frequency,OutputFrequencyEnum);
 
         /*initialize: */
@@ -60 +61 @@
 
                 if(verbose)_printf_("%s\n","saving results:\n");
-                if(solution_type==Transient3DSolutionEnum){
+                if(solution_type==Transient3DSolutionEnum && step%output_frequency==0){
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum,step,time);
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum,step,time);