Changeset 9680

Timestamp:

Sep 8, 2011, 8:24:13 AM (15 years ago)

Author:

seroussi

Message:

removed useless RequestedOutputs

Location:

issm/trunk/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (3 diffs)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (3 diffs)
• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (2 diffs)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (3 diffs)
• c/solutions/diagnostic_core.cpp (modified) (2 diffs)
• c/solutions/steadystate_core.cpp (modified) (2 diffs)
• c/solutions/transient_core.cpp (modified) (4 diffs)
• m/classes/balancethickness.m (modified) (1 diff)
• m/classes/prognostic.m (modified) (1 diff)
• m/classes/thermal.m (modified) (1 diff)
• m/enum/BalancethicknessNumRequestedOutputsEnum.m (deleted)
• m/enum/BalancethicknessRequestedOutputsEnum.m (deleted)
• m/enum/PrognosticNumRequestedOutputsEnum.m (deleted)
• m/enum/PrognosticRequestedOutputsEnum.m (deleted)
• m/enum/ThermalNumRequestedOutputsEnum.m (deleted)
• m/enum/ThermalRequestedOutputsEnum.m (deleted)
• m/utils/BC/SetIceShelfBC.m (modified) (1 diff)

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

@@ -41 +41 @@
         ThermalStabilizationEnum,
         ThermalPenaltyFactorEnum,
-        ThermalRequestedOutputsEnum,
-        ThermalNumRequestedOutputsEnum,
         MiscellaneousNameEnum, //FIXME: only used by qmu, should not be marshalled (already in queueing script)
         TimesteppingTimeStepEnum,
@@ -53 +51 @@
         PrognosticVertexPairingEnum,
         PrognosticPenaltyFactorEnum,
-        PrognosticRequestedOutputsEnum,
-        PrognosticNumRequestedOutputsEnum,
         MaterialsRheologyBEnum,
         MaterialsRheologyBbarEnum,
@@ -84 +80 @@
         BalancethicknessThickeningRateEnum,
         BalancethicknessStabilizationEnum,
-        BalancethicknessRequestedOutputsEnum,
-        BalancethicknessNumRequestedOutputsEnum,
         FlowequationIshutterEnum,
         FlowequationIsmacayealpattynEnum,

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

@@ -45 +45 @@
                 case ThermalStabilizationEnum : return "ThermalStabilization";
                 case ThermalPenaltyFactorEnum : return "ThermalPenaltyFactor";
-                case ThermalRequestedOutputsEnum : return "ThermalRequestedOutputs";
-                case ThermalNumRequestedOutputsEnum : return "ThermalNumRequestedOutputs";
                 case MiscellaneousNameEnum : return "MiscellaneousName";
                 case TimesteppingTimeStepEnum : return "TimesteppingTimeStep";
@@ -57 +55 @@
                 case PrognosticVertexPairingEnum : return "PrognosticVertexPairing";
                 case PrognosticPenaltyFactorEnum : return "PrognosticPenaltyFactor";
-                case PrognosticRequestedOutputsEnum : return "PrognosticRequestedOutputs";
-                case PrognosticNumRequestedOutputsEnum : return "PrognosticNumRequestedOutputs";
                 case MaterialsRheologyBEnum : return "MaterialsRheologyB";
                 case MaterialsRheologyBbarEnum : return "MaterialsRheologyBbar";
@@ -88 +84 @@
                 case BalancethicknessThickeningRateEnum : return "BalancethicknessThickeningRate";
                 case BalancethicknessStabilizationEnum : return "BalancethicknessStabilization";
-                case BalancethicknessRequestedOutputsEnum : return "BalancethicknessRequestedOutputs";
-                case BalancethicknessNumRequestedOutputsEnum : return "BalancethicknessNumRequestedOutputs";
                 case FlowequationIshutterEnum : return "FlowequationIshutter";
                 case FlowequationIsmacayealpattynEnum : return "FlowequationIsmacayealpattyn";

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

@@ -80 +80 @@
         if(numoutputs)parameters->AddObject(new IntVecParam(DiagnosticRequestedOutputsEnum,requestedoutputs,numoutputs));
         xfree((void**)&requestedoutputs);
-        iomodel->FetchData(&requestedoutputs,&numoutputs,NULL,PrognosticRequestedOutputsEnum);
-        parameters->AddObject(new IntParam(PrognosticNumRequestedOutputsEnum,numoutputs));
-        if(numoutputs)parameters->AddObject(new IntVecParam(PrognosticRequestedOutputsEnum,requestedoutputs,numoutputs));
-        xfree((void**)&requestedoutputs);
-        iomodel->FetchData(&requestedoutputs,&numoutputs,NULL,ThermalRequestedOutputsEnum);
-        parameters->AddObject(new IntParam(ThermalNumRequestedOutputsEnum,numoutputs));
-        if(numoutputs)parameters->AddObject(new IntVecParam(ThermalRequestedOutputsEnum,requestedoutputs,numoutputs));
-        xfree((void**)&requestedoutputs);
         iomodel->FetchData(&requestedoutputs,&numoutputs,NULL,TransientRequestedOutputsEnum);
         parameters->AddObject(new IntParam(TransientNumRequestedOutputsEnum,numoutputs));
@@ -95 +87 @@
         parameters->AddObject(new IntParam(SteadystateNumRequestedOutputsEnum,numoutputs));
         if(numoutputs)parameters->AddObject(new IntVecParam(SteadystateRequestedOutputsEnum,requestedoutputs,numoutputs));
-        xfree((void**)&requestedoutputs);
-        iomodel->FetchData(&requestedoutputs,&numoutputs,NULL,BalancethicknessRequestedOutputsEnum);
-        parameters->AddObject(new IntParam(BalancethicknessNumRequestedOutputsEnum,numoutputs));
-        if(numoutputs)parameters->AddObject(new IntVecParam(BalancethicknessRequestedOutputsEnum,requestedoutputs,numoutputs));
         xfree((void**)&requestedoutputs);
         

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

@@ -43 +43 @@
         else if (strcmp(name,"ThermalStabilization")==0) return ThermalStabilizationEnum;
         else if (strcmp(name,"ThermalPenaltyFactor")==0) return ThermalPenaltyFactorEnum;
-        else if (strcmp(name,"ThermalRequestedOutputs")==0) return ThermalRequestedOutputsEnum;
-        else if (strcmp(name,"ThermalNumRequestedOutputs")==0) return ThermalNumRequestedOutputsEnum;
         else if (strcmp(name,"MiscellaneousName")==0) return MiscellaneousNameEnum;
         else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum;
@@ -55 +53 @@
         else if (strcmp(name,"PrognosticVertexPairing")==0) return PrognosticVertexPairingEnum;
         else if (strcmp(name,"PrognosticPenaltyFactor")==0) return PrognosticPenaltyFactorEnum;
-        else if (strcmp(name,"PrognosticRequestedOutputs")==0) return PrognosticRequestedOutputsEnum;
-        else if (strcmp(name,"PrognosticNumRequestedOutputs")==0) return PrognosticNumRequestedOutputsEnum;
         else if (strcmp(name,"MaterialsRheologyB")==0) return MaterialsRheologyBEnum;
         else if (strcmp(name,"MaterialsRheologyBbar")==0) return MaterialsRheologyBbarEnum;
@@ -86 +82 @@
         else if (strcmp(name,"BalancethicknessThickeningRate")==0) return BalancethicknessThickeningRateEnum;
         else if (strcmp(name,"BalancethicknessStabilization")==0) return BalancethicknessStabilizationEnum;
-        else if (strcmp(name,"BalancethicknessRequestedOutputs")==0) return BalancethicknessRequestedOutputsEnum;
-        else if (strcmp(name,"BalancethicknessNumRequestedOutputs")==0) return BalancethicknessNumRequestedOutputsEnum;
         else if (strcmp(name,"FlowequationIshutter")==0) return FlowequationIshutterEnum;
         else if (strcmp(name,"FlowequationIsmacayealpattyn")==0) return FlowequationIsmacayealpattynEnum;

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

@@ -35 +35 @@
         femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum);
         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
+        femmodel->parameters->FindParam(&numoutputs,DiagnosticNumRequestedOutputsEnum);
+        if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,DiagnosticRequestedOutputsEnum);
 
         /*for qmu analysis, reinitialize velocity so that fake sensitivities do not show up as a result of a different restart of the convergence at each trial.*/
@@ -89 +91 @@
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureEnum);
                 if(dim==3) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VzEnum);
-                femmodel->parameters->FindParam(&numoutputs,DiagnosticNumRequestedOutputsEnum);
-                if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,DiagnosticRequestedOutputsEnum);
                 RequestedOutputsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,requested_outputs,numoutputs);
         }

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

@@ -30 +30 @@
         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
         femmodel->parameters->FindParam(&maxiter,SteadystateMaxiterEnum);
+        femmodel->parameters->FindParam(&numoutputs,SteadystateNumRequestedOutputsEnum);
+        if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,SteadystateRequestedOutputsEnum);
 
         /*intialize counters: */
@@ -71 +73 @@
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum);
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalforcingsMeltingRateEnum);
-                femmodel->parameters->FindParam(&numoutputs,SteadystateNumRequestedOutputsEnum);
-                if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,SteadystateRequestedOutputsEnum);
                 RequestedOutputsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,requested_outputs,numoutputs);
         }

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

@@ -22 +22 @@
         int    output_frequency;
         int    dim,groundingline_migration;
+        int    numoutputs         = 0;
+        int    *requested_outputs = NULL;
         
         /*intermediary: */
@@ -40 +42 @@
         femmodel->parameters->FindParam(&isprognostic,TransientIsprognosticEnum);
         femmodel->parameters->FindParam(&isthermal,TransientIsthermalEnum);
+        femmodel->parameters->FindParam(&numoutputs,TransientNumRequestedOutputsEnum);
+        if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,TransientRequestedOutputsEnum);
 
         /*initialize: */
@@ -97 +101 @@
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceforcingsMassBalanceEnum,step,time);
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MaskElementonfloatingiceEnum,step,time);
+                        RequestedOutputsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,requested_outputs,numoutputs);
 
                         /*unload results*/
@@ -103 +108 @@
                 }
         }
+
+        /*Free ressources:*/
+        xfree((void**)&requested_outputs);
 }

issm/trunk/src/m/classes/balancethickness.m

@@ -9 +9 @@
                 thickening_rate   = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
                 stabilization     = modelfield('default',0,'marshall',true,'format','Integer');
-                requested_outputs = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3);
         end
         methods

issm/trunk/src/m/classes/prognostic.m

@@ -11 +11 @@
                  vertex_pairing         = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3);
                  penalty_factor         = modelfield('default',0,'marshall',true,'format','Double');
-                 requested_outputs      = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3);
         end
         methods

issm/trunk/src/m/classes/thermal.m

@@ -12 +12 @@
                 penalty_lock      = modelfield('default',0,'marshall',true,'format','Integer');
                 penalty_factor    = modelfield('default',0,'marshall',true,'format','Double');
-                requested_outputs = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3);
         end
         methods

issm/trunk/src/m/utils/BC/SetIceShelfBC.m

@@ -88 +88 @@
 
 md.prognostic.spcthickness=NaN*ones(md.numberofnodes,1);
+md.balancethickness.spcthickness=NaN*ones(md.numberofnodes,1);
 
 if (length(md.temperature)==md.numberofnodes),