Changeset 2959

Timestamp:

02/04/10 11:59:17 (15 years ago)

Author:

seroussi

Message:

remove pressureloadstokes from the model (useless)

Location:

issm/trunk/src

Files:

• c/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (modified) (1 diff)
• c/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp (modified) (5 diffs)
• c/ModelProcessorx/IoModel.cpp (modified) (2 diffs)
• c/ModelProcessorx/IoModel.h (modified) (1 diff)
• m/classes/@model/model.m (modified) (1 diff)
• m/classes/public/marshall.m (modified) (1 diff)
• m/classes/public/modelextract.m (modified) (1 diff)
• m/classes/public/setelementstype.m (modified) (1 diff)

issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp

@@ -108 +108 @@
                 #endif
         
-                /*Do not create ice front if Hutter elements*/
-                if ((int)*(iomodel->elements_type+2*element+0)==HutterFormulationEnum()){ 
+                /*Do not create ice front if Hutter or Stokes elements*/
+                if ((int)*(iomodel->elements_type+2*element+0)==(HutterFormulationEnum() || StokesFormulationEnum())){ 
                         continue;
                 }

issm/trunk/src/c/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp

@@ -51 +51 @@
         int pengrid_stabilize_constraints=0;
 
-        int numberofpressureloads_stokes;
+        int numberofpressureloads;
         int count;
 
@@ -63 +63 @@
         /*Create pressure loads as boundary conditions. Pay attention to the partitioning if we are running in parallel (the grids
          * referenced by a certain load must belong to the cluster node): */
-        IoModelFetchData(&iomodel->pressureload_stokes,&numberofpressureloads_stokes,NULL,iomodel_handle,"pressureload_stokes");
+        IoModelFetchData(&iomodel->pressureload,&numberofpressureloads,NULL,iomodel_handle,"pressureload");
         IoModelFetchData(&iomodel->elements_type,NULL,NULL,iomodel_handle,"elements_type");
         IoModelFetchData(&iomodel->thickness,NULL,NULL,iomodel_handle,"thickness");
@@ -71 +71 @@
 
         /*First load data:*/
-        for (i=0;i<numberofpressureloads_stokes;i++){
+        for (i=0;i<numberofpressureloads;i++){
                 
                 segment_width=5;
 
-                element=(int)(*(iomodel->pressureload_stokes+segment_width*i+segment_width-1)-1); //element is in the last column
+                element=(int)(*(iomodel->pressureload+segment_width*i+segment_width-1)-1); //element is in the last column
 
                 #ifdef _PARALLEL_
@@ -85 +85 @@
                 #endif
         
+                /*Do not create ice front if it is not a Stokes element*/
+                if (!(int)*(iomodel->elements_type+2*element+1)==StokesFormulationEnum()){ 
+                        continue;
+                }
+
                 icefront_mparid=iomodel->numberofelements+1; //matlab indexing
                 icefront_sid=count+1; //matlab indexing
-                icefront_eid=(int)*(iomodel->pressureload_stokes+segment_width*i+segment_width-1); //matlab indexing
+                icefront_eid=(int)*(iomodel->pressureload+segment_width*i+segment_width-1); //matlab indexing
                 icefront_element_type=PentaEnum();
 
-                i1=(int)*(iomodel->pressureload_stokes+segment_width*i+0);
-                i2=(int)*(iomodel->pressureload_stokes+segment_width*i+1);
-                i3=(int)*(iomodel->pressureload_stokes+segment_width*i+2);
-                i4=(int)*(iomodel->pressureload_stokes+segment_width*i+3);
+                i1=(int)*(iomodel->pressureload+segment_width*i+0);
+                i2=(int)*(iomodel->pressureload+segment_width*i+1);
+                i3=(int)*(iomodel->pressureload+segment_width*i+2);
+                i4=(int)*(iomodel->pressureload+segment_width*i+3);
         
                 icefront_node_ids[0]=i1;
@@ -117 +122 @@
         }
         /*Free data: */
-        xfree((void**)&iomodel->pressureload_stokes);
+        xfree((void**)&iomodel->pressureload);
         xfree((void**)&iomodel->elements_type);
         xfree((void**)&iomodel->thickness);

issm/trunk/src/c/ModelProcessorx/IoModel.cpp

@@ -91 +91 @@
         
         iomodel->numberofpressureloads=0;
-        iomodel->numberofpressureloads_stokes=0;
         iomodel->pressureload=NULL;
-        iomodel->pressureload_stokes=NULL;
         iomodel-> spcvelocity=NULL;
         iomodel-> spctemperature=NULL;
@@ -243 +241 @@
         xfree((void**)&iomodel->gridoniceshelf);
         xfree((void**)&iomodel->pressureload);
-        xfree((void**)&iomodel->pressureload_stokes);
         xfree((void**)&iomodel->spcvelocity);
         xfree((void**)&iomodel->spcthickness);

issm/trunk/src/c/ModelProcessorx/IoModel.h

@@ -90 +90 @@
         /*boundary conditions: */
         int     numberofpressureloads;
-        int     numberofpressureloads_stokes;
         double* pressureload;
-        double* pressureload_stokes;
         double* spcvelocity;
         double* spctemperature;

issm/trunk/src/m/classes/@model/model.m

@@ -141 +141 @@
         md.gridonboundary=NaN;
         md.pressureload=NaN;
-        md.pressureload_stokes=NaN;
         md.spcvelocity=NaN;
         md.spctemperature=NaN;

issm/trunk/src/m/classes/public/marshall.m

@@ -82 +82 @@
 
 WriteData(fid,md.pressureload,'Mat','pressureload');
-WriteData(fid,md.pressureload_stokes,'Mat','pressureload_stokes');
 
 WriteData(fid,md.geothermalflux,'Mat','geothermalflux');

issm/trunk/src/m/classes/public/modelextract.m

@@ -234 +234 @@
                 end
                 md2.pressureload=md2.pressureload(find(md2.pressureload(:,1) & md2.pressureload(:,2) & md2.pressureload(:,end)),:);
-        end
-        if ~isnan(md2.pressureload_stokes)
-                md2.pressureload_stokes(:,1)=Pgrid(md1.pressureload_stokes(:,1)); 
-                md2.pressureload_stokes(:,2)=Pgrid(md1.pressureload_stokes(:,2)); 
-                md2.pressureload_stokes(:,end)=Pelem(md1.pressureload_stokes(:,end)); 
-                if strcmpi(md1.type,'3d')
-                        md2.pressureload_stokes(:,3)=Pgrid(md1.pressureload_stokes(:,3)); 
-                        md2.pressureload_stokes(:,4)=Pgrid(md1.pressureload_stokes(:,4)); 
-                end
-                md2.pressureload_stokes=md2.pressureload_stokes(find(md2.pressureload_stokes(:,1) & md2.pressureload_stokes(:,2) &  md2.pressureload_stokes(:,end)),:);
         end
 

issm/trunk/src/m/classes/public/setelementstype.m

@@ -126 +126 @@
 md.borderstokes=borderflags-md.gridonstokes; %remove stokes grids from this list
 
-%icefront for stokes
-if ~isnan(md.pressureload),
-        md.pressureload_stokes=md.pressureload(find(md.elements_type(md.pressureload(:,end),2)==StokesFormulationEnum()),:);
-end
-
 %figure out solution types
 md.ishutter=double(any(md.elements_type(:,1)==HutterFormulationEnum));