Changeset 16298

Timestamp:

10/04/13 12:31:48 (11 years ago)

Author:

Eric.Larour

Message:

NEW: transferring to outputdefinitions framework.

Location:

issm/trunk-jpl/src

Files:

• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (2 diffs)
• c/shared/Enum/EnumDefinitions.h (modified) (2 diffs)
• c/shared/Enum/EnumToStringx.cpp (modified) (2 diffs)
• c/shared/Enum/StringToEnumx.cpp (modified) (3 diffs)
• m/classes/autodiff.m (modified) (2 diffs)
• m/classes/autodiff.py (modified) (2 diffs)
• m/classes/massfluxatgate.m (modified) (1 diff)
• m/classes/outputdefinition.m (modified) (3 diffs)
• m/enum/AutodiffMassFluxSegmentsPresentEnum.m (deleted)
• m/enum/EnumDefinitions.py (modified) (2 diffs)
• m/enum/MassfluxatgateNameEnum.m (added)
• m/enum/MassfluxatgateSegmentsEnum.m (added)
• m/enum/QmuMassFluxSegmentsPresentEnum.m (deleted)

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

@@ -28 +28 @@
         int          mass_flux_num_profiles     = 0;
         bool         qmu_mass_flux_present      = false;
-        bool         autodiff_mass_flux_present = false;
         bool         mass_flux_present          = false;
         IssmDouble **array                      = NULL;
@@ -153 +152 @@
         /*Deal with mass flux segments: {{{*/
         iomodel->FetchData(&qmu_mass_flux_present,QmuMassFluxSegmentsPresentEnum);
-        iomodel->FetchData(&autodiff_mass_flux_present,AutodiffMassFluxSegmentsPresentEnum);
-
-        if(qmu_mass_flux_present || autodiff_mass_flux_present)mass_flux_present=true;
+
+        if(qmu_mass_flux_present)mass_flux_present=true;
         else mass_flux_present=false;
         parameters->AddObject(new BoolParam(MassFluxSegmentsPresentEnum,mass_flux_present));

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

@@ -27 +27 @@
         AutodiffFovForwardIndicesEnum,
         AutodiffFosReverseIndexEnum,
-        AutodiffMassFluxSegmentsPresentEnum,
         AutodiffKeepEnum,
         AutodiffObufsizeEnum,
@@ -213 +212 @@
         MasstransportNumRequestedOutputsEnum,
         MasstransportRequestedOutputsEnum,
-        QmuIsdakotaEnum,
         MassFluxSegmentsEnum,
         MassFluxSegmentsPresentEnum,
-        QmuMassFluxSegmentsPresentEnum,
+        MassfluxatgateNameEnum,
+        MassfluxatgateSegmentsEnum,
+        QmuIsdakotaEnum,
         QmuNumberofpartitionsEnum,
         QmuNumberofresponsesEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -35 +35 @@
                 case AutodiffFovForwardIndicesEnum : return "AutodiffFovForwardIndices";
                 case AutodiffFosReverseIndexEnum : return "AutodiffFosReverseIndex";
-                case AutodiffMassFluxSegmentsPresentEnum : return "AutodiffMassFluxSegmentsPresent";
                 case AutodiffKeepEnum : return "AutodiffKeep";
                 case AutodiffObufsizeEnum : return "AutodiffObufsize";
@@ -221 +220 @@
                 case MasstransportNumRequestedOutputsEnum : return "MasstransportNumRequestedOutputs";
                 case MasstransportRequestedOutputsEnum : return "MasstransportRequestedOutputs";
-                case QmuIsdakotaEnum : return "QmuIsdakota";
                 case MassFluxSegmentsEnum : return "MassFluxSegments";
                 case MassFluxSegmentsPresentEnum : return "MassFluxSegmentsPresent";
-                case QmuMassFluxSegmentsPresentEnum : return "QmuMassFluxSegmentsPresent";
+                case MassfluxatgateNameEnum : return "MassfluxatgateName";
+                case MassfluxatgateSegmentsEnum : return "MassfluxatgateSegments";
+                case QmuIsdakotaEnum : return "QmuIsdakota";
                 case QmuNumberofpartitionsEnum : return "QmuNumberofpartitions";
                 case QmuNumberofresponsesEnum : return "QmuNumberofresponses";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -35 +35 @@
               else if (strcmp(name,"AutodiffFovForwardIndices")==0) return AutodiffFovForwardIndicesEnum;
               else if (strcmp(name,"AutodiffFosReverseIndex")==0) return AutodiffFosReverseIndexEnum;
-              else if (strcmp(name,"AutodiffMassFluxSegmentsPresent")==0) return AutodiffMassFluxSegmentsPresentEnum;
               else if (strcmp(name,"AutodiffKeep")==0) return AutodiffKeepEnum;
               else if (strcmp(name,"AutodiffObufsize")==0) return AutodiffObufsizeEnum;
@@ -137 +136 @@
               else if (strcmp(name,"InversionCostFunctionsCoefficients")==0) return InversionCostFunctionsCoefficientsEnum;
               else if (strcmp(name,"InversionCostFunctions")==0) return InversionCostFunctionsEnum;
+              else if (strcmp(name,"InversionGradientScaling")==0) return InversionGradientScalingEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"InversionGradientScaling")==0) return InversionGradientScalingEnum;
-              else if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum;
+              if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum;
               else if (strcmp(name,"InversionTao")==0) return InversionTaoEnum;
               else if (strcmp(name,"InversionIncompleteAdjoint")==0) return InversionIncompleteAdjointEnum;
@@ -224 +223 @@
               else if (strcmp(name,"MasstransportNumRequestedOutputs")==0) return MasstransportNumRequestedOutputsEnum;
               else if (strcmp(name,"MasstransportRequestedOutputs")==0) return MasstransportRequestedOutputsEnum;
-              else if (strcmp(name,"QmuIsdakota")==0) return QmuIsdakotaEnum;
               else if (strcmp(name,"MassFluxSegments")==0) return MassFluxSegmentsEnum;
               else if (strcmp(name,"MassFluxSegmentsPresent")==0) return MassFluxSegmentsPresentEnum;
-              else if (strcmp(name,"QmuMassFluxSegmentsPresent")==0) return QmuMassFluxSegmentsPresentEnum;
+              else if (strcmp(name,"MassfluxatgateName")==0) return MassfluxatgateNameEnum;
+              else if (strcmp(name,"MassfluxatgateSegments")==0) return MassfluxatgateSegmentsEnum;
+              else if (strcmp(name,"QmuIsdakota")==0) return QmuIsdakotaEnum;
               else if (strcmp(name,"QmuNumberofpartitions")==0) return QmuNumberofpartitionsEnum;
               else if (strcmp(name,"QmuNumberofresponses")==0) return QmuNumberofresponsesEnum;

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

@@ -83 +83 @@
                         %early return
                         if ~obj.isautodiff,
-                                WriteData(fid,'data',false,'enum',AutodiffMassFluxSegmentsPresentEnum(),'format','Boolean');
                                 WriteData(fid,'data',false,'enum',AutodiffKeepEnum(),'format','Boolean');
                                 return;
@@ -198 +197 @@
                         end
                         %}}}
-                        %deal with mass fluxes:  {{{
-                        mass_flux_segments=cell(0,1);
-                        for i=1:num_dependent_objects,
-                                dep=obj.dependents{i};
-                                if strcmpi(dep.name,'MassFlux'),
-                                        mass_flux_segments{end+1,1}=dep.segments;
-                                end
-                        end
-                        if ~isempty(mass_flux_segments), 
-                                WriteData(fid,'data',mass_flux_segments,'enum',MassFluxSegmentsEnum(),'format','MatArray');
-                                flag=true;
-                        else
-                                flag=false;
-                        end
-                        WriteData(fid,'data',flag,'enum',AutodiffMassFluxSegmentsPresentEnum(),'format','Boolean');
-                        %}}}
                         %deal with trace keep on: {{{
                         keep=false;

issm/trunk-jpl/src/m/classes/autodiff.py

@@ -86 +86 @@
                 #early return
                 if not self.isautodiff:
-                        WriteData(fid,'data',False,'enum',AutodiffMassFluxSegmentsPresentEnum(),'format','Boolean')
                         WriteData(fid,'data',False,'enum',AutodiffKeepEnum(),'format','Boolean')
                         return
@@ -182 +181 @@
                         WriteData(fid,'data',indices,'enum',AutodiffFovForwardIndicesEnum(),'format','IntMat','mattype',3)
                 #}}}
-                #deal with mass fluxes:  {{{
-                mass_flux_segments=[dep.segments for dep in self.dependents if strcmpi(dep.name,'MassFlux')]
-
-                if mass_flux_segments:
-                        WriteData(fid,'data',mass_flux_segments,'enum',MassFluxSegmentsEnum(),'format','MatArray')
-                        flag=True
-                else:
-                        flag=False
-                WriteData(fid,'data',flag,'enum',AutodiffMassFluxSegmentsPresentEnum(),'format','Boolean')
-                #}}}
                 #deal with trace keep on: {{{
                 keep=False

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

@@ -31 +31 @@
                 function md = checkconsistency(obj,md,solution,analyses) % {{{
                         
-                        md = checkfield(md,'massfluxatgate.name','empty',1);
-                        md = checkfield(md,'massfluxatgate.profilename','empty',1);
+                        if ~ischar(obj.name),
+                                error('massfluxatgate error message: ''name'' field should be a string!');
+                        end
+                        if ~ischar(obj.profilename),
+                                error('massfluxatgate error message: ''profilename'' field should be a string!');
+                        end
 
                         %check the profilename points to a file!: 
-                        if exist(profilename,'file'),
+                        if exist(obj.profilename,'file')~=2,
                                 error('massfluxatgate error message: file name for profile corresponding to gate does not point to a legitimate file on disk!');
                         end

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

@@ -6 +6 @@
 classdef outputdefinition
         properties (SetAccess=public) 
-                list                 = {};
+                definitions                 = {};
+        end
+        properties (SetAccess=private) 
+                enums                 = {};
         end
         methods
@@ -19 +22 @@
                 function obj = setdefaultparameters(obj) % {{{
 
-                        obj.list={};
+                        obj.definitions={};
+                        obj.enums=NaN;
 
                 end % }}}
                 function md = checkconsistency(obj,md,solution,analyses) % {{{
 
-                        md = checkfield(md,'outputdefinition.list','cell',1);
+                        md = checkfield(md,'outputdefinition.definitions','cell',1);
 
-                        for i=1:length(obj.list),
-                                md=checkconsistency(obj.list{i},md,solution,analyses);
+                        for i=1:length(obj.definitions),
+                                md=checkconsistency(obj.definitions{i},md,solution,analyses);
                         end
 
@@ -33 +37 @@
                 function disp(obj) % {{{
                         disp(sprintf('   outputdefinition:'));
-                        fielddisplay(obj,'list','list of potential outputs that can be requested, but which need additional data to be defined');
+                        fielddisplay(obj,'definitions','list of potential outputs that can be requested, but which need additional data to be defined');
 
                 end % }}}
                 function marshall(obj,md,fid) % {{{
 
-                for i=1:length(obj.list),
-                        obj.list{i}.marshall(md,fid);
+                enums=zeros(length(obj.definitions),1);
+                for i=1:length(obj.definitions),
+                        obj.definitions{i}.marshall(md,fid);
+                        obj.enums(i)=StringToEnum(class(obj.definitions{i}));
                 end
+                WriteData(fid,'object',obj,'fieldname','enums','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1);
                 end % }}}
         end

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

@@ -27 +27 @@
 def AutodiffFovForwardIndicesEnum(): return StringToEnum("AutodiffFovForwardIndices")[0]
 def AutodiffFosReverseIndexEnum(): return StringToEnum("AutodiffFosReverseIndex")[0]
-def AutodiffMassFluxSegmentsPresentEnum(): return StringToEnum("AutodiffMassFluxSegmentsPresent")[0]
 def AutodiffKeepEnum(): return StringToEnum("AutodiffKeep")[0]
 def AutodiffObufsizeEnum(): return StringToEnum("AutodiffObufsize")[0]
@@ -213 +212 @@
 def MasstransportNumRequestedOutputsEnum(): return StringToEnum("MasstransportNumRequestedOutputs")[0]
 def MasstransportRequestedOutputsEnum(): return StringToEnum("MasstransportRequestedOutputs")[0]
-def QmuIsdakotaEnum(): return StringToEnum("QmuIsdakota")[0]
 def MassFluxSegmentsEnum(): return StringToEnum("MassFluxSegments")[0]
 def MassFluxSegmentsPresentEnum(): return StringToEnum("MassFluxSegmentsPresent")[0]
-def QmuMassFluxSegmentsPresentEnum(): return StringToEnum("QmuMassFluxSegmentsPresent")[0]
+def MassfluxatgateNameEnum(): return StringToEnum("MassfluxatgateName")[0]
+def MassfluxatgateSegmentsEnum(): return StringToEnum("MassfluxatgateSegments")[0]
+def QmuIsdakotaEnum(): return StringToEnum("QmuIsdakota")[0]
 def QmuNumberofpartitionsEnum(): return StringToEnum("QmuNumberofpartitions")[0]
 def QmuNumberofresponsesEnum(): return StringToEnum("QmuNumberofresponses")[0]