Changeset 24132

Timestamp:

09/03/19 17:41:22 (6 years ago)

Author:

felicity

Message:

NEW: allow channel area initialization in GlaDS

Location:

issm/trunk-jpl/src

Files:

• c/analyses/HydrologyGlaDSAnalysis.cpp (modified) (2 diffs)
• c/classes/Loads/Channel.cpp (modified) (2 diffs)
• c/classes/Loads/Channel.h (modified) (1 diff)
• m/classes/initialization.m (modified) (5 diffs)

issm/trunk-jpl/src/c/analyses/HydrologyGlaDSAnalysis.cpp ¶

@@ -29 +29 @@
 
         /*Add channels?*/
+        int K,L;
         bool ischannels;
+        IssmDouble* channelarea;
         iomodel->FindConstant(&ischannels,"md.hydrology.ischannels");
+        iomodel->FetchData(&channelarea,&K,&L,"md.initialization.channelarea");
         if(ischannels){
                 /*Get faces (edges in 2d)*/
@@ -42 +45 @@
                         if(!iomodel->my_elements[element]) continue;
 
-                        /* Add load */
-                        loads->AddObject(new Channel(i+1,i,i,iomodel));
+                        /*Add channelarea from initialization if exists*/
+                        if(K!=0 && K!=iomodel->numberoffaces){
+                                _error_("Unknown dimension for channel area initialization.");
+                        }
+                        if(K==0){
+                                loads->AddObject(new Channel(i+1,0.,i,iomodel));
+                        }
+                        else{
+                                loads->AddObject(new Channel(i+1,channelarea[i],i,iomodel));
+                        }
+                        iomodel->DeleteData(1,"md.initialization.channelarea");
                 }
         }

issm/trunk-jpl/src/c/classes/Loads/Channel.cpp ¶

@@ -39 +39 @@
 }
 /*}}}*/
-Channel::Channel(int channel_id,int i,int index,IoModel* iomodel){/*{{{*/
+Channel::Channel(int channel_id,IssmDouble channelarea,int index,IoModel* iomodel){/*{{{*/
+//Channel::Channel(int channel_id,int i,int index,IoModel* iomodel)
 
         this->id=channel_id;
@@ -48 +49 @@
 
         /*Set channel cross section to 0*/
-        this->S    = 0.;
-        this->Sold = 0.;
+        //this->S    = 0.;
+        //this->Sold = 0.;
+        this->S    = channelarea;
+        this->Sold = channelarea;
 
         /*Get edge info*/

issm/trunk-jpl/src/c/classes/Loads/Channel.h ¶

@@ -40 +40 @@
                 /*Channel constructors,destructors {{{*/
                 Channel();
-                Channel(int numericalflux_id,int i,int index,IoModel* iomodel);
+                Channel(int numericalflux_id,IssmDouble channelarea,int index,IoModel* iomodel);
+                //Channel(int numericalflux_id,int i,int index,IoModel* iomodel);
                 ~Channel();
                 /*}}}*/

issm/trunk-jpl/src/m/classes/initialization.m ¶

@@ -19 +19 @@
                 watercolumn         = NaN;
                 hydraulic_potential = NaN;
+                channelarea         = NaN;
         end
         methods
@@ -94 +95 @@
                                         md = checkfield(md,'fieldname','initialization.watercolumn','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
                                         md = checkfield(md,'fieldname','initialization.hydraulic_potential','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
+                                        md = checkfield(md,'fieldname','initialization.channelarea','NaN',1,'Inf',1,'>=',0,'size',[md.mesh.numberofedges 1]);
                                 end
                         end
@@ -126 +128 @@
                         fielddisplay(self,'watercolumn','subglacial water sheet thickness (for Shreve and GlaDS) [m]');
                         fielddisplay(self,'hydraulic_potential','Hydraulic potential (for GlaDS) [Pa]');
+                        fielddisplay(self,'channelarea','subglacial water channel area (for GlaDS) [m2]');
 
                 end % }}}
@@ -142 +145 @@
                         WriteData(fid,prefix,'object',self,'fieldname','epl_thickness','format','DoubleMat','mattype',1);
                         WriteData(fid,prefix,'object',self,'fieldname','watercolumn','format','DoubleMat','mattype',1);
+                        WriteData(fid,prefix,'object',self,'fieldname','channelarea','format','DoubleMat','mattype',1);
                         WriteData(fid,prefix,'object',self,'fieldname','hydraulic_potential','format','DoubleMat','mattype',1);
 
@@ -172 +176 @@
                         writejs1Darray(fid,[modelname '.initialization.watercolumn'],self.watercolumn);
                         writejs1Darray(fid,[modelname '.initialization.hydraulic_potential'],self.hydraulic_potential);
+                        writejs1Darray(fid,[modelname '.initialization.channel'],self.channelarea);
 
                 end % }}}