Changeset 13438

Timestamp:

09/25/12 12:45:08 (12 years ago)

Author:

Eric.Larour

Message:

CHG:
-added test3015 to check on AD mode runs for prognostic mode and fos_forward driver.
-added RequestedOutputs in prognostic_core solution.
-fixed segfault in IoModel.cpp due to requested_independents not being initialized to 0.

Location:

issm/trunk-jpl

Files:

• src/c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• src/c/classes/IoModel.cpp (modified) (2 diffs)
• src/c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/CreateParameters.cpp (modified) (2 diffs)
• src/c/modules/StringToEnumx/StringToEnumx.cpp (modified) (4 diffs)
• src/c/solutions/diagnostic_core.cpp (modified) (1 diff)
• src/c/solutions/prognostic_core.cpp (modified) (3 diffs)
• src/m/classes/prognostic.m (modified) (4 diffs)
• src/m/enum/EnumDefinitions.py (modified) (2 diffs)
• src/m/enum/MaximumNumberOfEnums.m (modified) (1 diff)
• src/m/enum/PrognosticNumRequestedOutputsEnum.m (added)
• src/m/enum/PrognosticRequestedOutputsEnum.m (added)
• test/Archives/Archive3015.nc (added)
• test/NightlyRun/ad.m (modified) (2 diffs)
• test/NightlyRun/runme.m (modified) (1 diff)
• test/NightlyRun/test3015.m (added)

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

@@ -152 +152 @@
         PrognosticStabilizationEnum,
         PrognosticVertexPairingEnum,
+        PrognosticNumRequestedOutputsEnum,
+        PrognosticRequestedOutputsEnum,
         QmuIsdakotaEnum,
         QmuMassFluxSegmentsEnum,

issm/trunk-jpl/src/c/classes/IoModel.cpp

@@ -92 +92 @@
         xDelete<IssmDouble*>(this->data);
         xDelete<bool>(this->independents);
-        delete this->independent_objects;
+        if(this->independent_objects)delete this->independent_objects;
         xDelete<bool>(this->my_elements);
         xDelete<bool>(this->my_nodes);
@@ -252 +252 @@
                 #endif
         }
+        else this->independent_objects=NULL;
+
 
 }

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

@@ -157 +157 @@
                 case PrognosticStabilizationEnum : return "PrognosticStabilization";
                 case PrognosticVertexPairingEnum : return "PrognosticVertexPairing";
+                case PrognosticNumRequestedOutputsEnum : return "PrognosticNumRequestedOutputs";
+                case PrognosticRequestedOutputsEnum : return "PrognosticRequestedOutputs";
                 case QmuIsdakotaEnum : return "QmuIsdakota";
                 case QmuMassFluxSegmentsEnum : return "QmuMassFluxSegments";

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

@@ -127 +127 @@
         if(numoutputs)parameters->AddObject(new IntVecParam(DiagnosticRequestedOutputsEnum,requestedoutputs,numoutputs));
         iomodel->DeleteData(requestedoutputs,DiagnosticRequestedOutputsEnum);
+
         iomodel->FetchData(&requestedoutputs,&numoutputs,NULL,TransientRequestedOutputsEnum);
         parameters->AddObject(new IntParam(TransientNumRequestedOutputsEnum,numoutputs));
         if(numoutputs)parameters->AddObject(new IntVecParam(TransientRequestedOutputsEnum,requestedoutputs,numoutputs));
         iomodel->DeleteData(requestedoutputs,TransientRequestedOutputsEnum);
+
         iomodel->FetchData(&requestedoutputs,&numoutputs,NULL,SteadystateRequestedOutputsEnum);
         parameters->AddObject(new IntParam(SteadystateNumRequestedOutputsEnum,numoutputs));
@@ -136 +138 @@
         iomodel->DeleteData(requestedoutputs,SteadystateRequestedOutputsEnum);
         
+        iomodel->FetchData(&requestedoutputs,&numoutputs,NULL,PrognosticRequestedOutputsEnum);
+        parameters->AddObject(new IntParam(PrognosticNumRequestedOutputsEnum,numoutputs));
+        if(numoutputs)parameters->AddObject(new IntVecParam(PrognosticRequestedOutputsEnum,requestedoutputs,numoutputs));
+        iomodel->DeleteData(requestedoutputs,PrognosticRequestedOutputsEnum);
+
         /*Before returning, create parameters in case we are running Qmu or control types runs: */
         #ifdef _HAVE_CONTROL_

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

@@ -161 +161 @@
               else if (strcmp(name,"PrognosticStabilization")==0) return PrognosticStabilizationEnum;
               else if (strcmp(name,"PrognosticVertexPairing")==0) return PrognosticVertexPairingEnum;
+              else if (strcmp(name,"PrognosticNumRequestedOutputs")==0) return PrognosticNumRequestedOutputsEnum;
+              else if (strcmp(name,"PrognosticRequestedOutputs")==0) return PrognosticRequestedOutputsEnum;
               else if (strcmp(name,"QmuIsdakota")==0) return QmuIsdakotaEnum;
               else if (strcmp(name,"QmuMassFluxSegments")==0) return QmuMassFluxSegmentsEnum;
@@ -259 +261 @@
               else if (strcmp(name,"Approximation")==0) return ApproximationEnum;
               else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
-              else if (strcmp(name,"HutterApproximation")==0) return HutterApproximationEnum;
-              else if (strcmp(name,"MacAyealApproximation")==0) return MacAyealApproximationEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"MacAyealPattynApproximation")==0) return MacAyealPattynApproximationEnum;
+              if (strcmp(name,"HutterApproximation")==0) return HutterApproximationEnum;
+              else if (strcmp(name,"MacAyealApproximation")==0) return MacAyealApproximationEnum;
+              else if (strcmp(name,"MacAyealPattynApproximation")==0) return MacAyealPattynApproximationEnum;
               else if (strcmp(name,"MacAyealStokesApproximation")==0) return MacAyealStokesApproximationEnum;
               else if (strcmp(name,"L1L2Approximation")==0) return L1L2ApproximationEnum;
@@ -382 +384 @@
               else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum;
               else if (strcmp(name,"TemperatureSurface")==0) return TemperatureSurfaceEnum;
-              else if (strcmp(name,"TemperatureBasal")==0) return TemperatureBasalEnum;
-              else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"Type")==0) return TypeEnum;
+              if (strcmp(name,"TemperatureBasal")==0) return TemperatureBasalEnum;
+              else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum;
+              else if (strcmp(name,"Type")==0) return TypeEnum;
               else if (strcmp(name,"Vel")==0) return VelEnum;
               else if (strcmp(name,"Velocity")==0) return VelocityEnum;
@@ -505 +507 @@
               else if (strcmp(name,"GenericOption")==0) return GenericOptionEnum;
               else if (strcmp(name,"OptionCell")==0) return OptionCellEnum;
-              else if (strcmp(name,"OptionChar")==0) return OptionCharEnum;
-              else if (strcmp(name,"OptionStruct")==0) return OptionStructEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"OptionDouble")==0) return OptionDoubleEnum;
+              if (strcmp(name,"OptionChar")==0) return OptionCharEnum;
+              else if (strcmp(name,"OptionStruct")==0) return OptionStructEnum;
+              else if (strcmp(name,"OptionDouble")==0) return OptionDoubleEnum;
               else if (strcmp(name,"OptionLogical")==0) return OptionLogicalEnum;
               else if (strcmp(name,"Paterson")==0) return PatersonEnum;

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

@@ -105 +105 @@
                 RequestedOutputsx(femmodel->results,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,requested_outputs,numoutputs);
         }
+        
+        if(solution_type==DiagnosticSolutionEnum)RequestedDependentsx(femmodel->results,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
 
         /*Free ressources:*/

issm/trunk-jpl/src/c/solutions/prognostic_core.cpp

@@ -18 +18 @@
         bool issmbgradients,ispdd,isdelta18o;
         int  solution_type;
+        int  *requested_outputs = NULL;
+        int  numoutputs=0;
 
         /*activate formulation: */
@@ -28 +30 @@
         femmodel->parameters->FindParam(&isdelta18o,SurfaceforcingsIsdelta18oEnum);
         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
+        femmodel->parameters->FindParam(&numoutputs,PrognosticNumRequestedOutputsEnum);
+        if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,PrognosticRequestedOutputsEnum);
 
         if(issmbgradients){
@@ -47 +51 @@
                 if(VerboseSolution()) _pprintLine_("   saving results");
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ThicknessEnum);
+                RequestedOutputsx(femmodel->results,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,requested_outputs,numoutputs);
         }
         
+        if(solution_type==PrognosticSolutionEnum)RequestedDependentsx(femmodel->results,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
         
-        if(solution_type==PrognosticSolutionEnum)RequestedDependentsx(femmodel->results,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
+        /*Free ressources:*/
+        xDelete<int>(requested_outputs);
 }

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

@@ -12 +12 @@
                  vertex_pairing         = NaN;
                  penalty_factor         = 0;
+                 requested_outputs       = NaN;
         end
         methods
@@ -45 +46 @@
                         md = checkfield(md,'prognostic.stabilization','values',[0 1 2 3]);
                         md = checkfield(md,'prognostic.min_thickness','>',0);
+                        if ~isempty(md.prognostic.requested_outputs),
+                                md = checkfield(md,'prognostic.requested_outputs','size',[NaN 1]);
+                        end
+
 
                 end % }}}
@@ -57 +62 @@
                         fielddisplay(obj,'penalty_factor','offset used by penalties: penalty = Kmax*10^offset');
                         fielddisplay(obj,'vertex_pairing','pairs of vertices that are penalized');
+                        fielddisplay(obj,'requested_outputs','additional outputs requested');
 
                 end % }}}
@@ -66 +72 @@
                         WriteData(fid,'object',obj,'fieldname','vertex_pairing','format','DoubleMat','mattype',3);
                         WriteData(fid,'object',obj,'fieldname','penalty_factor','format','Double');
+                        WriteData(fid,'object',obj,'fieldname','requested_outputs','format','DoubleMat','mattype',3);
                 end % }}}
         end

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -1409 +1409 @@
         return StringToEnum('PrognosticVertexPairing')[0]
 
+def PrognosticNumRequestedOutputsEnum():
+        """
+        PROGNOSTICNUMREQUESTEDOUTPUTSENUM - Enum of PrognosticNumRequestedOutputs
+
+           Usage:
+              macro=PrognosticNumRequestedOutputsEnum()
+        """
+
+        return StringToEnum('PrognosticNumRequestedOutputs')[0]
+
+def PrognosticRequestedOutputsEnum():
+        """
+        PROGNOSTICREQUESTEDOUTPUTSENUM - Enum of PrognosticRequestedOutputs
+
+           Usage:
+              macro=PrognosticRequestedOutputsEnum()
+        """
+
+        return StringToEnum('PrognosticRequestedOutputs')[0]
+
 def QmuIsdakotaEnum():
         """
@@ -4857 +4877 @@
         """
 
-        return 484
-
+        return 486
+

issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m

@@ -9 +9 @@
 %      macro=MaximumNumberOfEnums()
 
-macro=484;
+macro=486;

issm/trunk-jpl/test/NightlyRun/ad.m

@@ -4 +4 @@
 md=setflowequation(md,'macayeal','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md.diagnostic.requested_outputs=StressTensorEnum;
+
 md.autodiff.isautodiff=true;
-md.verbose=verbose('autodiff',true);
-
+index=1;
 md.autodiff.independents={...
-        independent('name','Thickness','type','vertex','nods',md.mesh.numberofvertices,'fos_forward_index',1), ...
-        independent('name','Surface','type','vertex','nods',md.mesh.numberofvertices)...
+        independent('name','Thickness','type','vertex','nods',md.mesh.numberofvertices,'fos_forward_index',index)
         };
 
@@ -18 +16 @@
 md.autodiff.driver='fos_forward';
 
-md=solve(md,PrognosticSolutionEnum);
-%md=solve(md,TransientSolutionEnum);
+md=solve(md,TransientSolutionEnum);

issm/trunk-jpl/test/NightlyRun/runme.m

@@ -106 +106 @@
         test_ids=intersect(test_ids,[1401:1499]);
 elseif strcmpi(benchmark,'adolc'),
-        test_ids=intersect(test_ids,[3001:3010]);
+        test_ids=intersect(test_ids,[3001:3020]);
 elseif strcmpi(benchmark,'validation'),
         test_ids=intersect(test_ids,[1001:1999]);