Changeset 11447

Timestamp:

02/14/12 16:35:08 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added incomplete_adjoint flag (1 default for now)

Location:

issm/trunk-jpl/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Control/CreateParametersControl.cpp (modified) (1 diff)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (4 diffs)
• m/enum/InversionIncompleteAdjointEnum.m (added)

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

@@ -73 +73 @@
         InversionIscontrolEnum,
         InversionTaoEnum,
+        InversionIncompleteAdjointEnum,
         InversionMaxParametersEnum,
         InversionMaxiterPerStepEnum,

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

@@ -77 +77 @@
                 case InversionIscontrolEnum : return "InversionIscontrol";
                 case InversionTaoEnum : return "InversionTao";
+                case InversionIncompleteAdjointEnum : return "InversionIncompleteAdjoint";
                 case InversionMaxParametersEnum : return "InversionMaxParameters";
                 case InversionMaxiterPerStepEnum : return "InversionMaxiterPerStep";

issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp

@@ -40 +40 @@
                 parameters->AddObject(iomodel->CopyConstantObject(InversionCostFunctionThresholdEnum));
                 parameters->AddObject(iomodel->CopyConstantObject(InversionGradientOnlyEnum));
+                parameters->AddObject(iomodel->CopyConstantObject(InversionIncompleteAdjointEnum));
 
                 /*What solution type?*/

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

@@ -78 +78 @@
               else if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum;
               else if (strcmp(name,"InversionTao")==0) return InversionTaoEnum;
+              else if (strcmp(name,"InversionIncompleteAdjoint")==0) return InversionIncompleteAdjointEnum;
               else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum;
               else if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum;
@@ -136 +137 @@
               else if (strcmp(name,"PrognosticPenaltyFactor")==0) return PrognosticPenaltyFactorEnum;
               else if (strcmp(name,"PrognosticSpcthickness")==0) return PrognosticSpcthicknessEnum;
-              else if (strcmp(name,"PrognosticStabilization")==0) return PrognosticStabilizationEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"PrognosticVertexPairing")==0) return PrognosticVertexPairingEnum;
+              if (strcmp(name,"PrognosticStabilization")==0) return PrognosticStabilizationEnum;
+              else if (strcmp(name,"PrognosticVertexPairing")==0) return PrognosticVertexPairingEnum;
               else if (strcmp(name,"QmuIsdakota")==0) return QmuIsdakotaEnum;
               else if (strcmp(name,"QmuMassFluxSegments")==0) return QmuMassFluxSegmentsEnum;
@@ -259 +260 @@
               else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
               else if (strcmp(name,"Param")==0) return ParamEnum;
-              else if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"Pengrid")==0) return PengridEnum;
+              if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum;
+              else if (strcmp(name,"Pengrid")==0) return PengridEnum;
               else if (strcmp(name,"Penpair")==0) return PenpairEnum;
               else if (strcmp(name,"Penta")==0) return PentaEnum;
@@ -382 +383 @@
               else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
               else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
-              else if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum;
+              if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum;
+              else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum;
               else if (strcmp(name,"J")==0) return JEnum;
               else if (strcmp(name,"Patch")==0) return PatchEnum;