[cig-commits] commit: Change Inner2DGenerator to InnerGenerator and add mesh-Pm1 to EulerDeform to the cookbooks.

Mercurial hg at geodynamics.org
Tue Oct 4 15:19:48 PDT 2011


changeset:   373:dc54d3bd482d
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Tue Oct 04 15:18:13 2011 -0700
files:       Q2Pm1_input/cookbook/multi_material.xml Q2Pm1_input/cookbook/non_newtonian.xml Q2Pm1_input/cookbook/template.xml Q2Pm1_input/cookbook/thermal.xml Q2Pm1_input/cookbook/thermal_file.xml Q2Pm1_input/cookbook/tracers.xml Q2Pm1_input/cookbook/viscous.xml Q2Pm1_input/cookbook/viscous_bottom.xml Q2Pm1_input/cookbook/viscous_deformed_bottom.xml Q2Pm1_input/cookbook/viscous_extension.xml Q2Pm1_input/cookbook/viscous_extension3D.xml Q2Pm1_input/cookbook/viscous_file.xml Q2Pm1_input/cookbook/viscous_inflow.xml Q2Pm1_input/cookbook/viscous_normal_stress.xml Q2Pm1_input/cookbook/viscous_sinusoid.xml Q2Pm1_input/cookbook/viscous_split.xml Q2Pm1_input/cookbook/yielding.xml
description:
Change Inner2DGenerator to InnerGenerator and add mesh-Pm1 to EulerDeform to the cookbooks.


diff -r 0a19894a4229 -r dc54d3bd482d Q2Pm1_input/cookbook/multi_material.xml
--- a/Q2Pm1_input/cookbook/multi_material.xml	Fri Sep 30 14:40:45 2011 -0700
+++ b/Q2Pm1_input/cookbook/multi_material.xml	Tue Oct 04 15:18:13 2011 -0700
@@ -52,7 +52,7 @@
       <param name="elementType">linear-inner</param>
     </struct>
     <struct name="Pm1Mesh-generator">
-      <param name="Type">Inner2DGenerator</param>
+      <param name="Type">InnerGenerator</param>
       <param name="mesh">mesh-Pm1</param>
       <param name="elementMesh">mesh-Q2</param>
       <param name="dim">dim</param>
@@ -441,6 +441,7 @@
     <list name="systems">
       <struct>
         <param name="mesh">mesh-Q2</param>
+        <param name="innerMesh">mesh-Pm1</param>
         <param name="remesher">velocityRemesher</param>
         <param name="velocityField">VelocityField</param>
         <param name="wrapTop">True</param>
diff -r 0a19894a4229 -r dc54d3bd482d Q2Pm1_input/cookbook/non_newtonian.xml
--- a/Q2Pm1_input/cookbook/non_newtonian.xml	Fri Sep 30 14:40:45 2011 -0700
+++ b/Q2Pm1_input/cookbook/non_newtonian.xml	Tue Oct 04 15:18:13 2011 -0700
@@ -52,7 +52,7 @@
       <param name="elementType">linear-inner</param>
     </struct>
     <struct name="Pm1Mesh-generator">
-      <param name="Type">Inner2DGenerator</param>
+      <param name="Type">InnerGenerator</param>
       <param name="mesh">mesh-Pm1</param>
       <param name="elementMesh">mesh-Q2</param>
       <param name="dim">dim</param>
@@ -543,6 +543,7 @@
     <list name="systems">
       <struct>
         <param name="mesh">mesh-Q2</param>
+        <param name="innerMesh">mesh-Pm1</param>
         <param name="remesher">velocityRemesher</param>
         <param name="velocityField">VelocityField</param>
         <param name="wrapTop">True</param>
diff -r 0a19894a4229 -r dc54d3bd482d Q2Pm1_input/cookbook/template.xml
--- a/Q2Pm1_input/cookbook/template.xml	Fri Sep 30 14:40:45 2011 -0700
+++ b/Q2Pm1_input/cookbook/template.xml	Tue Oct 04 15:18:13 2011 -0700
@@ -52,7 +52,7 @@
       <param name="elementType">linear-inner</param>
     </struct>
     <struct name="Pm1Mesh-generator">
-      <param name="Type">Inner2DGenerator</param>
+      <param name="Type">InnerGenerator</param>
       <param name="mesh">mesh-Pm1</param>
       <param name="elementMesh">mesh-Q2</param>
       <param name="dim">dim</param>
@@ -390,6 +390,7 @@
     <list name="systems">
       <struct>
         <param name="mesh">mesh-Q2</param>
+        <param name="innerMesh">mesh-Pm1</param>
         <param name="remesher">velocityRemesher</param>
         <param name="velocityField">VelocityField</param>
         <param name="wrapTop">True</param>
diff -r 0a19894a4229 -r dc54d3bd482d Q2Pm1_input/cookbook/thermal.xml
--- a/Q2Pm1_input/cookbook/thermal.xml	Fri Sep 30 14:40:45 2011 -0700
+++ b/Q2Pm1_input/cookbook/thermal.xml	Tue Oct 04 15:18:13 2011 -0700
@@ -52,7 +52,7 @@
       <param name="elementType">linear-inner</param>
     </struct>
     <struct name="Pm1Mesh-generator">
-      <param name="Type">Inner2DGenerator</param>
+      <param name="Type">InnerGenerator</param>
       <param name="mesh">mesh-Pm1</param>
       <param name="elementMesh">mesh-Q2</param>
       <param name="dim">dim</param>
@@ -534,6 +534,7 @@
     <list name="systems">
       <struct>
         <param name="mesh">mesh-Q2</param>
+        <param name="innerMesh">mesh-Pm1</param>
         <param name="remesher">velocityRemesher</param>
         <param name="velocityField">VelocityField</param>
         <param name="wrapTop">True</param>
diff -r 0a19894a4229 -r dc54d3bd482d Q2Pm1_input/cookbook/thermal_file.xml
--- a/Q2Pm1_input/cookbook/thermal_file.xml	Fri Sep 30 14:40:45 2011 -0700
+++ b/Q2Pm1_input/cookbook/thermal_file.xml	Tue Oct 04 15:18:13 2011 -0700
@@ -52,7 +52,7 @@
       <param name="elementType">linear-inner</param>
     </struct>
     <struct name="Pm1Mesh-generator">
-      <param name="Type">Inner2DGenerator</param>
+      <param name="Type">InnerGenerator</param>
       <param name="mesh">mesh-Pm1</param>
       <param name="elementMesh">mesh-Q2</param>
       <param name="dim">dim</param>
@@ -534,6 +534,7 @@
     <list name="systems">
       <struct>
         <param name="mesh">mesh-Q2</param>
+        <param name="innerMesh">mesh-Pm1</param>
         <param name="remesher">velocityRemesher</param>
         <param name="velocityField">VelocityField</param>
         <param name="wrapTop">True</param>
diff -r 0a19894a4229 -r dc54d3bd482d Q2Pm1_input/cookbook/tracers.xml
--- a/Q2Pm1_input/cookbook/tracers.xml	Fri Sep 30 14:40:45 2011 -0700
+++ b/Q2Pm1_input/cookbook/tracers.xml	Tue Oct 04 15:18:13 2011 -0700
@@ -52,7 +52,7 @@
       <param name="elementType">linear-inner</param>
     </struct>
     <struct name="Pm1Mesh-generator">
-      <param name="Type">Inner2DGenerator</param>
+      <param name="Type">InnerGenerator</param>
       <param name="mesh">mesh-Pm1</param>
       <param name="elementMesh">mesh-Q2</param>
       <param name="dim">dim</param>
@@ -474,6 +474,7 @@
     <list name="systems">
       <struct>
         <param name="mesh">mesh-Q2</param>
+        <param name="innerMesh">mesh-Pm1</param>
         <param name="remesher">velocityRemesher</param>
         <param name="velocityField">VelocityField</param>
         <param name="wrapTop">True</param>
diff -r 0a19894a4229 -r dc54d3bd482d Q2Pm1_input/cookbook/viscous.xml
--- a/Q2Pm1_input/cookbook/viscous.xml	Fri Sep 30 14:40:45 2011 -0700
+++ b/Q2Pm1_input/cookbook/viscous.xml	Tue Oct 04 15:18:13 2011 -0700
@@ -52,7 +52,7 @@
       <param name="elementType">linear-inner</param>
     </struct>
     <struct name="Pm1Mesh-generator">
-      <param name="Type">Inner2DGenerator</param>
+      <param name="Type">InnerGenerator</param>
       <param name="mesh">mesh-Pm1</param>
       <param name="elementMesh">mesh-Q2</param>
       <param name="dim">dim</param>
@@ -414,6 +414,7 @@
     <list name="systems">
       <struct>
         <param name="mesh">mesh-Q2</param>
+        <param name="innerMesh">mesh-Pm1</param>
         <param name="remesher">velocityRemesher</param>
         <param name="velocityField">VelocityField</param>
         <param name="wrapTop">True</param>
diff -r 0a19894a4229 -r dc54d3bd482d Q2Pm1_input/cookbook/viscous_bottom.xml
--- a/Q2Pm1_input/cookbook/viscous_bottom.xml	Fri Sep 30 14:40:45 2011 -0700
+++ b/Q2Pm1_input/cookbook/viscous_bottom.xml	Tue Oct 04 15:18:13 2011 -0700
@@ -52,7 +52,7 @@
       <param name="elementType">linear-inner</param>
     </struct>
     <struct name="Pm1Mesh-generator">
-      <param name="Type">Inner2DGenerator</param>
+      <param name="Type">InnerGenerator</param>
       <param name="mesh">mesh-Pm1</param>
       <param name="elementMesh">mesh-Q2</param>
       <param name="dim">dim</param>
@@ -423,6 +423,7 @@
     <list name="systems">
       <struct>
         <param name="mesh">mesh-Q2</param>
+        <param name="innerMesh">mesh-Pm1</param>
         <param name="remesher">velocityRemesher</param>
         <param name="velocityField">VelocityField</param>
         <param name="wrapTop">True</param>
diff -r 0a19894a4229 -r dc54d3bd482d Q2Pm1_input/cookbook/viscous_deformed_bottom.xml
--- a/Q2Pm1_input/cookbook/viscous_deformed_bottom.xml	Fri Sep 30 14:40:45 2011 -0700
+++ b/Q2Pm1_input/cookbook/viscous_deformed_bottom.xml	Tue Oct 04 15:18:13 2011 -0700
@@ -52,7 +52,7 @@
       <param name="elementType">linear-inner</param>
     </struct>
     <struct name="Pm1Mesh-generator">
-      <param name="Type">Inner2DGenerator</param>
+      <param name="Type">InnerGenerator</param>
       <param name="mesh">mesh-Pm1</param>
       <param name="elementMesh">mesh-Q2</param>
       <param name="dim">dim</param>
@@ -427,6 +427,7 @@
     <list name="systems">
       <struct>
         <param name="mesh">mesh-Q2</param>
+        <param name="innerMesh">mesh-Pm1</param>
         <param name="remesher">velocityRemesher</param>
         <param name="velocityField">VelocityField</param>
         <param name="wrapTop">True</param>
diff -r 0a19894a4229 -r dc54d3bd482d Q2Pm1_input/cookbook/viscous_extension.xml
--- a/Q2Pm1_input/cookbook/viscous_extension.xml	Fri Sep 30 14:40:45 2011 -0700
+++ b/Q2Pm1_input/cookbook/viscous_extension.xml	Tue Oct 04 15:18:13 2011 -0700
@@ -52,7 +52,7 @@
       <param name="elementType">linear-inner</param>
     </struct>
     <struct name="Pm1Mesh-generator">
-      <param name="Type">Inner2DGenerator</param>
+      <param name="Type">InnerGenerator</param>
       <param name="mesh">mesh-Pm1</param>
       <param name="elementMesh">mesh-Q2</param>
       <param name="dim">dim</param>
@@ -414,6 +414,7 @@
     <list name="systems">
       <struct>
         <param name="mesh">mesh-Q2</param>
+        <param name="innerMesh">mesh-Pm1</param>
         <param name="remesher">velocityRemesher</param>
         <param name="velocityField">VelocityField</param>
         <param name="wrapTop">True</param>
@@ -460,4 +461,10 @@
   </struct>
   <param name="checkpointEvery">1</param>
   <param name="gravity">1.0</param>
+
+  <param name="journal.info">True</param>
+  <param name="journal.debug">True</param>
+  <param name="journal-level.info">2</param>
+  <param name="journal-level.debug">2</param>
+
 </StGermainData>
diff -r 0a19894a4229 -r dc54d3bd482d Q2Pm1_input/cookbook/viscous_extension3D.xml
--- a/Q2Pm1_input/cookbook/viscous_extension3D.xml	Fri Sep 30 14:40:45 2011 -0700
+++ b/Q2Pm1_input/cookbook/viscous_extension3D.xml	Tue Oct 04 15:18:13 2011 -0700
@@ -52,7 +52,7 @@
       <param name="elementType">linear-inner</param>
     </struct>
     <struct name="Pm1Mesh-generator">
-      <param name="Type">Inner2DGenerator</param>
+      <param name="Type">InnerGenerator</param>
       <param name="mesh">mesh-Pm1</param>
       <param name="elementMesh">mesh-Q2</param>
       <param name="dim">dim</param>
@@ -428,6 +428,7 @@
     <list name="systems">
       <struct>
         <param name="mesh">mesh-Q2</param>
+        <param name="innerMesh">mesh-Pm1</param>
         <param name="remesher">velocityRemesher</param>
         <param name="velocityField">VelocityField</param>
         <param name="wrapTop">True</param>
diff -r 0a19894a4229 -r dc54d3bd482d Q2Pm1_input/cookbook/viscous_file.xml
--- a/Q2Pm1_input/cookbook/viscous_file.xml	Fri Sep 30 14:40:45 2011 -0700
+++ b/Q2Pm1_input/cookbook/viscous_file.xml	Tue Oct 04 15:18:13 2011 -0700
@@ -52,7 +52,7 @@
       <param name="elementType">linear-inner</param>
     </struct>
     <struct name="Pm1Mesh-generator">
-      <param name="Type">Inner2DGenerator</param>
+      <param name="Type">InnerGenerator</param>
       <param name="mesh">mesh-Pm1</param>
       <param name="elementMesh">mesh-Q2</param>
       <param name="dim">dim</param>
@@ -414,6 +414,7 @@
     <list name="systems">
       <struct>
         <param name="mesh">mesh-Q2</param>
+        <param name="innerMesh">mesh-Pm1</param>
         <param name="remesher">velocityRemesher</param>
         <param name="velocityField">VelocityField</param>
         <param name="wrapTop">True</param>
diff -r 0a19894a4229 -r dc54d3bd482d Q2Pm1_input/cookbook/viscous_inflow.xml
--- a/Q2Pm1_input/cookbook/viscous_inflow.xml	Fri Sep 30 14:40:45 2011 -0700
+++ b/Q2Pm1_input/cookbook/viscous_inflow.xml	Tue Oct 04 15:18:13 2011 -0700
@@ -52,7 +52,7 @@
       <param name="elementType">linear-inner</param>
     </struct>
     <struct name="Pm1Mesh-generator">
-      <param name="Type">Inner2DGenerator</param>
+      <param name="Type">InnerGenerator</param>
       <param name="mesh">mesh-Pm1</param>
       <param name="elementMesh">mesh-Q2</param>
       <param name="dim">dim</param>
@@ -415,6 +415,7 @@
     <list name="systems">
       <struct>
         <param name="mesh">mesh-Q2</param>
+        <param name="innerMesh">mesh-Pm1</param>
         <param name="remesher">velocityRemesher</param>
         <param name="velocityField">VelocityField</param>
         <param name="wrapTop">True</param>
diff -r 0a19894a4229 -r dc54d3bd482d Q2Pm1_input/cookbook/viscous_normal_stress.xml
--- a/Q2Pm1_input/cookbook/viscous_normal_stress.xml	Fri Sep 30 14:40:45 2011 -0700
+++ b/Q2Pm1_input/cookbook/viscous_normal_stress.xml	Tue Oct 04 15:18:13 2011 -0700
@@ -52,7 +52,7 @@
       <param name="elementType">linear-inner</param>
     </struct>
     <struct name="Pm1Mesh-generator">
-      <param name="Type">Inner2DGenerator</param>
+      <param name="Type">InnerGenerator</param>
       <param name="mesh">mesh-Pm1</param>
       <param name="elementMesh">mesh-Q2</param>
       <param name="dim">dim</param>
@@ -423,6 +423,7 @@
     <list name="systems">
       <struct>
         <param name="mesh">mesh-Q2</param>
+        <param name="innerMesh">mesh-Pm1</param>
         <param name="remesher">velocityRemesher</param>
         <param name="velocityField">VelocityField</param>
         <param name="wrapTop">True</param>
diff -r 0a19894a4229 -r dc54d3bd482d Q2Pm1_input/cookbook/viscous_sinusoid.xml
--- a/Q2Pm1_input/cookbook/viscous_sinusoid.xml	Fri Sep 30 14:40:45 2011 -0700
+++ b/Q2Pm1_input/cookbook/viscous_sinusoid.xml	Tue Oct 04 15:18:13 2011 -0700
@@ -52,7 +52,7 @@
       <param name="elementType">linear-inner</param>
     </struct>
     <struct name="Pm1Mesh-generator">
-      <param name="Type">Inner2DGenerator</param>
+      <param name="Type">InnerGenerator</param>
       <param name="mesh">mesh-Pm1</param>
       <param name="elementMesh">mesh-Q2</param>
       <param name="dim">dim</param>
@@ -420,6 +420,7 @@
     <list name="systems">
       <struct>
         <param name="mesh">mesh-Q2</param>
+        <param name="innerMesh">mesh-Pm1</param>
         <param name="remesher">velocityRemesher</param>
         <param name="velocityField">VelocityField</param>
         <param name="wrapTop">True</param>
diff -r 0a19894a4229 -r dc54d3bd482d Q2Pm1_input/cookbook/viscous_split.xml
--- a/Q2Pm1_input/cookbook/viscous_split.xml	Fri Sep 30 14:40:45 2011 -0700
+++ b/Q2Pm1_input/cookbook/viscous_split.xml	Tue Oct 04 15:18:13 2011 -0700
@@ -52,7 +52,7 @@
       <param name="elementType">linear-inner</param>
     </struct>
     <struct name="Pm1Mesh-generator">
-      <param name="Type">Inner2DGenerator</param>
+      <param name="Type">InnerGenerator</param>
       <param name="mesh">mesh-Pm1</param>
       <param name="elementMesh">mesh-Q2</param>
       <param name="dim">dim</param>
@@ -414,6 +414,7 @@
     <list name="systems">
       <struct>
         <param name="mesh">mesh-Q2</param>
+        <param name="innerMesh">mesh-Pm1</param>
         <param name="remesher">velocityRemesher</param>
         <param name="velocityField">VelocityField</param>
         <param name="wrapTop">True</param>
diff -r 0a19894a4229 -r dc54d3bd482d Q2Pm1_input/cookbook/yielding.xml
--- a/Q2Pm1_input/cookbook/yielding.xml	Fri Sep 30 14:40:45 2011 -0700
+++ b/Q2Pm1_input/cookbook/yielding.xml	Tue Oct 04 15:18:13 2011 -0700
@@ -52,7 +52,7 @@
       <param name="elementType">linear-inner</param>
     </struct>
     <struct name="Pm1Mesh-generator">
-      <param name="Type">Inner2DGenerator</param>
+      <param name="Type">InnerGenerator</param>
       <param name="mesh">mesh-Pm1</param>
       <param name="elementMesh">mesh-Q2</param>
       <param name="dim">dim</param>
@@ -464,6 +464,7 @@
     <list name="systems">
       <struct>
         <param name="mesh">mesh-Q2</param>
+        <param name="innerMesh">mesh-Pm1</param>
         <param name="remesher">velocityRemesher</param>
         <param name="velocityField">VelocityField</param>
         <param name="wrapTop">True</param>



More information about the CIG-COMMITS mailing list