Changeset 9356 for issm/trunk/src/c/objects/Loads/Icefront.cpp

Timestamp:

08/19/11 18:04:03 (14 years ago)

Author:

Eric.Larour

Message:

Major rewrite of the code so that IoModel now has a parameters dataset, which gets
loaded with all the int,char and double objects in the input file.
This is a lot more flexible, as anyone can add a field to the model, and it will
automatically appear in the IoModel parameters dataset.

Not debugged with respect to nightly runs yet. Trying to get the whole change finished.

File:

• issm/trunk/src/c/objects/Loads/Icefront.cpp (modified) (3 diffs)

issm/trunk/src/c/objects/Loads/Icefront.cpp

@@ -43 +43 @@
         int segment_width;
         int element;
-        int num_nodes;
+        int num_nodes; 
+        int dim;
+        int numberofelements;
 
         /*icefront constructor data: */
@@ -50 +52 @@
         int  icefront_node_ids[NUMVERTICESQUA]; //initialize with largest size
         int  icefront_fill;
+        
+        /*find parameters: */
+        iomodel->parameters->FindParam(&dim,DimEnum);
+        iomodel->parameters->FindParam(&numberofelements,NumberOfElementsEnum);
 
         /*First, retrieve element index and element type: */
-        if (iomodel->dim==2){
+        if (dim==2){
                 segment_width=4;
         }
@@ -62 +68 @@
         /*Build ids for hook constructors: */
         icefront_eid=(int) *(iomodel->pressureload+segment_width*i+segment_width-2); //matlab indexing
-        icefront_mparid=iomodel->numberofelements+1; //matlab indexing
+        icefront_mparid=numberofelements+1; //matlab indexing
 
         if (in_icefront_type==MacAyeal2dIceFrontEnum || in_icefront_type==MacAyeal3dIceFrontEnum){