Changeset 993

Timestamp:

06/13/09 20:21:11 (16 years ago)

Author:

seroussi

Message:

compute B with temperature average when collapsed elements

File:

• issm/trunk/src/m/classes/@pentaelem/CreatePVector.m (modified) (4 diffs)

issm/trunk/src/m/classes/@pentaelem/CreatePVector.m

@@ -607 +607 @@
         [bed_param bed_is_present]=recover_input(inputs,'bed');
         [temperature_param temperature_is_present]=recover_input(inputs,'temperature');
+        [temperature_average_param temperature_average_is_present]=recover_input(inputs,'temperature_average');
         [dt dt_is_present]=recover_input(inputs,'dt');
         [pressure_param pressure_is_present]=recover_input(inputs,'pressure');
@@ -635 +636 @@
         bed_list=zeros(numgrids,1);
         temperature_list=zeros(numgrids,1);
+        temperature_average_list=zeros(numgrids,1);
         pressure_list=zeros(numgrids,1);
 
@@ -653 +655 @@
                 if(bed_is_present) bed_list(i)=bed_param(dof);end;
                 if(temperature_is_present) temperature_list(i)=temperature_param(dof);end;
+                if(temperature_average_is_present) temperature_average_list(i)=temperature_average_param(dof);end;
                 if (pressure_is_present) pressure_list(i)=pressure_param(dof); end;
         end
@@ -658 +661 @@
 
         %Update material if temperature is provided
-        if temperature_is_present,
+        if temperature_is_present & ~pentaelem.collapse,
                 temperature=1/6*[1 1 1 1 1 1]*temperature_list;
                 matice.B=paterson(temperature);
         end
  
+        %Update material if temperature_average is provided
+        if temperature_average_is_present & pentaelem.collapse,
+                temperature=1/6*[1 1 1 1 1 1]*temperature_average_list;
+                matice.B=paterson(temperature);
+        end
+
         % Get gaussian points and weights. Penta is an extrusion of a Tria, we therefore 
         %get tria gaussian points as well as segment gaussian points. For tria gaussian