Changeset 20453

Timestamp:

04/07/16 11:43:43 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: do not marshall NodeActivationMask, this is now done automatically by FemModel->InitFromFile. We also now alow positive levelsets for every solutions (presumably...)

Location:

issm/trunk-jpl/src

Files:

• c/analyses/DamageEvolutionAnalysis.cpp (modified) (2 diffs)
• c/analyses/EnthalpyAnalysis.cpp (modified) (2 diffs)
• c/analyses/MasstransportAnalysis.cpp (modified) (2 diffs)
• c/analyses/StressbalanceAnalysis.cpp (modified) (2 diffs)
• c/analyses/StressbalanceSIAAnalysis.cpp (modified) (2 diffs)
• c/analyses/ThermalAnalysis.cpp (modified) (2 diffs)
• c/classes/FemModel.cpp (modified) (3 diffs)
• m/classes/mask.js (modified) (1 diff)
• m/classes/mask.m (modified) (1 diff)
• m/classes/mask.py (modified) (1 diff)
• m/classes/maskpsl.js (modified) (1 diff)
• m/classes/maskpsl.m (modified) (1 diff)
• m/classes/maskpsl.py (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp

@@ -65 +65 @@
         iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
         iomodel->FetchDataToInput(elements,PressureEnum);
-
-        if(islevelset){
-                iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum);
-        }
 
 }/*}}}*/
@@ -669 +665 @@
 }/*}}}*/
 void           DamageEvolutionAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/
-        /*Default, do nothing*/
-        bool islevelset;
-        femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum);
-        if(islevelset){
-                SetActiveNodesLSMx(femmodel);
-        }
-        return;
+        SetActiveNodesLSMx(femmodel);
 }/*}}}*/
 

issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp

@@ -160 +160 @@
         InputUpdateFromConstantx(elements,0.,VzMeshEnum);
         if(islevelset){
-                iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum);
                 iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); // required for updating active nodes
         }
@@ -1585 +1584 @@
 }/*}}}*/
 void           EnthalpyAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/
-
-        bool islevelset;
-        femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum);
-        if(islevelset){
-                SetActiveNodesLSMx(femmodel);
-        }
-        return;
-}/*}}}*/
+        SetActiveNodesLSMx(femmodel);
+}/*}}}*/

issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp

@@ -167 +167 @@
                 iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum);
         }
-
-        if(islevelset){
-                iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum);
-        }
-
-        
-
 }/*}}}*/
 void MasstransportAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/
@@ -743 +736 @@
 }/*}}}*/
 void           MasstransportAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/
-
-        bool islevelset;
-        femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum);
-        if(islevelset){
-                SetActiveNodesLSMx(femmodel);
-        }
-        return;
+        SetActiveNodesLSMx(femmodel);
 }/*}}}*/
 

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

@@ -781 +781 @@
                 iomodel->FetchDataToInput(elements,BasalforcingsFloatingiceMeltingRateEnum,0.);
         }
-        if(islevelset){
-                iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum);
-        }
         /*LATH parameters*/
         iomodel->Constant(&fe_FS,FlowequationFeFSEnum);
@@ -1148 +1145 @@
 }/*}}}*/
 void           StressbalanceAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/
-        /*Default, do nothing*/
-        bool islevelset;
-        femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum);
-        if(islevelset){
-                SetActiveNodesLSMx(femmodel);
-        }
-        return;
+        SetActiveNodesLSMx(femmodel);
 }/*}}}*/
 

issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp

@@ -167 +167 @@
         iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum);
         if(islevelset){
-                iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum);
                 if(iomodel->domaintype!=Domain2DhorizontalEnum)
                         iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); // required for updating active nodes
@@ -637 +636 @@
 }/*}}}*/
 void           StressbalanceSIAAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/
-
-        bool islevelset;
-        femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum);
-        if(islevelset){
-                SetActiveNodesLSMx(femmodel);
-        }
-        return;
-}/*}}}*/
+        SetActiveNodesLSMx(femmodel);
+}/*}}}*/

issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp

@@ -117 +117 @@
         InputUpdateFromConstantx(elements,0.,VzMeshEnum);
         if(islevelset){
-                iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum);
                 iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); // required for updating active nodes
         }
@@ -798 +797 @@
 }/*}}}*/
 void           ThermalAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/
-
-        bool islevelset;
-        femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum);
-        if(islevelset){
-                SetActiveNodesLSMx(femmodel);
-        }
-        return;
-}/*}}}*/
+        SetActiveNodesLSMx(femmodel);
+}/*}}}*/

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

@@ -183 +183 @@
         ModelProcessorx(&this->elements,&this->nodes,&this->vertices,&this->materials,&this->constraints,&this->loads,&this->parameters,iomodel,toolkitsoptionsfid,rootpath,this->solution_type,this->nummodels,this->analysis_type_list);
 
+
         /*do the post-processing of the datasets to get an FemModel that can actually run analyses: */
         for(i=0;i<nummodels;i++){
@@ -190 +191 @@
                 this->SetCurrentConfiguration(analysis_type);
 
+                if(VerboseMProcessor()) _printf0_("      configuring element and loads\n");
+                ConfigureObjectsx(elements, loads, nodes, vertices, materials,parameters);
+
                 if(i==0){
                         if(VerboseMProcessor()) _printf0_("      creating vertex PIDs\n");
-                        VerticesDofx(vertices,parameters); //only call once, we only have one set of vertices
+                        VerticesDofx(vertices,parameters); 
+
+                        if(VerboseMProcessor()) _printf0_("      detecting active vertices\n");
+                        GetMaskOfIceVerticesLSMx(this);
                 }
 
@@ -200 +207 @@
                 if(VerboseMProcessor()) _printf0_("      creating nodal degrees of freedom\n");
                 NodesDofx(nodes,parameters,analysis_type);
-
-                if(VerboseMProcessor()) _printf0_("      configuring element and loads\n");
-                ConfigureObjectsx(elements, loads, nodes, vertices, materials,parameters);
         }
 

issm/trunk-jpl/src/m/classes/mask.js

@@ -54 +54 @@
                         WriteData(fid,'object',this,'fieldname','groundedice_levelset','format','DoubleMat','mattype',1);
                         WriteData(fid,'object',this,'fieldname','ice_levelset','format','DoubleMat','mattype',1);
-
-                        // get mask of vertices of elements with ice
-                        var isice= NewArrayFill(md.mesh.numberofvertices,0);
-                        for(var i=0;i<md.mesh.numberofvertices;i++)if(md.mask.ice_levelset[i]<=0)isice[i]=1;
-                        
-                        var vlist = NewArrayFill(md.mesh.numberofvertices,0);
-                        var pos=[];
-                        for(var i=0;i<md.mesh.numberofelements;i++){
-                                var sum=0;
-                                for(var j=0;j<md.mesh.elements[0].length;j++){
-                                        sum+=isice[md.mesh.elements[i][j]-1];
-                                }
-                                if(sum>0)pos.push(i);
-                        }
-                        for(var i=0;i<pos.length;i++){
-                                for(var j=0;j<md.mesh.elements[0].length;j++){
-                                        vlist[md.mesh.elements[pos[i]][j]-1]=1;
-                                }
-                        }
-                        WriteData(fid,'data',vlist,'enum',IceMaskNodeActivationEnum(),'format','DoubleMat','mattype',1);
                 }//}}}
                 this.fix=function() { //{{{

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

@@ -61 +61 @@
                 function marshall(self,md,fid) % {{{
                         WriteData(fid,'object',self,'fieldname','groundedice_levelset','format','DoubleMat','mattype',1);
-                        WriteData(fid,'object',self,'fieldname','ice_levelset','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
-
-                        % get mask of vertices of elements with ice
-                        if size(md.mask.ice_levelset,1)==md.mesh.numberofvertices,
-                                isice=md.mask.ice_levelset<=0.;
-                                vlist = zeros(md.mesh.numberofvertices,1);
-                                pos=find(sum(isice(md.mesh.elements),2)>0);
-                                vlist(md.mesh.elements(pos,:))=1;
-                                WriteData(fid,'data',vlist,'enum',IceMaskNodeActivationEnum(),'format','DoubleMat','mattype',1);
-                        else
-                                isice=md.mask.ice_levelset(1:end-1,1)<=0.;
-                                vlist = zeros(md.mesh.numberofvertices,1);
-                                pos=find(sum(isice(md.mesh.elements),2)>0);
-                                vlist(md.mesh.elements(pos,:))=1;
-                                WriteData(fid,'data',vlist,'enum',IceMaskNodeActivationEnum(),'format','DoubleMat','mattype',1);
-                        end
-
+                        WriteData(fid,'object',self,'fieldname','ice_levelset','format','DoubleMat','mattype',1,'NaN',1);
                 end % }}}
                 function savemodeljs(self,fid,modelname) % {{{

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

@@ -54 +54 @@
                 WriteData(fid,'object',self,'fieldname','groundedice_levelset','format','DoubleMat','mattype',1)
                 WriteData(fid,'object',self,'fieldname','ice_levelset','format','DoubleMat','mattype',1)
-
-                # get mask of vertices of elements with ice
-                isice=numpy.array(md.mask.ice_levelset<0.,int)
-                vlist = numpy.zeros((md.mesh.numberofvertices,1), dtype=int)
-                pos=numpy.nonzero(numpy.sum(isice[md.mesh.elements-1],axis=1))[0]
-                vlist[md.mesh.elements[pos,:]-1]=1
-                WriteData(fid,'data',vlist,'enum',IceMaskNodeActivationEnum(),'format','DoubleMat','mattype',1);
         # }}}

issm/trunk-jpl/src/m/classes/maskpsl.js

@@ -63 +63 @@
                         WriteData(fid,'object',this,'class','mask','fieldname','ocean_levelset','format','DoubleMat','mattype',1);
                         WriteData(fid,'object',this,'class','mask','fieldname','land_levelset','format','DoubleMat','mattype',1);
-
-                        // get mask of vertices of elements with ice
-                        var isice= NewArrayFill(md.mesh.numberofvertices,0);
-                        for(var i=0;i<md.mesh.numberofvertices;i++)if(md.mask.ice_levelset[i]<=0)isice[i]=1;
-                        
-                        var vlist = NewArrayFill(md.mesh.numberofvertices,0);
-                        var pos=[];
-                        for(var i=0;i<md.mesh.numberofelements;i++){
-                                var sum=0;
-                                for(var j=0;j<md.mesh.elements[0].length;j++){
-                                        sum+=isice[md.mesh.elements[i][j]-1];
-                                }
-                                if(sum>0)pos.push(i);
-                        }
-                        for(var i=0;i<pos.length;i++){
-                                for(var j=0;j<md.mesh.elements[0].length;j++){
-                                        vlist[md.mesh.elements[pos[i]][j]-1]=1;
-                                }
-                        }
-                        WriteData(fid,'data',vlist,'enum',IceMaskNodeActivationEnum(),'format','DoubleMat','mattype',1);
                 }//}}}
                 this.fix=function() { //{{{

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

@@ -72 +72 @@
                         WriteData(fid,'object',self,'class','mask','fieldname','ocean_levelset','format','DoubleMat','mattype',1);
                         WriteData(fid,'object',self,'class','mask','fieldname','land_levelset','format','DoubleMat','mattype',1);
-
-                        % get mask of vertices of elements with ice
-                        isice=md.mask.ice_levelset<=0.;
-                        vlist = zeros(md.mesh.numberofvertices,1);
-                        pos=find(sum(isice(md.mesh.elements),2)>0);
-                        vlist(md.mesh.elements(pos,:))=1;
-                        WriteData(fid,'data',vlist,'enum',IceMaskNodeActivationEnum(),'format','DoubleMat','mattype',1);
-
                 end % }}}
                 function savemodeljs(self,fid,modelname) % {{{

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

@@ -84 +84 @@
                 WriteData(fid,'object',self,'class','mask','fieldname','ocean_levelset','format','DoubleMat','mattype',1)
                 WriteData(fid,'object',self,'class','mask','fieldname','land_levelset','format','DoubleMat','mattype',1)
-
-                # get mask of vertices of elements with ice
-                isice=md.mask.ice_levelset<=0.
-                vlist = numpy.zeros((md.mesh.numberofvertices,1), dtype=int)
-                
-                elements=md.mesh.elements-1; elements=elements.astype(numpy.int32, copy=False);
-                pos=numpy.nonzero(numpy.sum(isice[elements],axis=1))[0]
-                vlist[elements[pos,:]-1]=1
-                WriteData(fid,'data',vlist,'enum',IceMaskNodeActivationEnum(),'format','DoubleMat','mattype',1)
-
         # }}}
         def savemodeljs(self,fid,modelname): # {{{