Fix sign of work of intertia

geodynamics · Aug 22, 2023 · 72b9308 · 72b9308
1 parent 88f666f
commit 72b9308
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 20 deletions.
diff --git a/doc/CALYPSO.pdf b/doc/CALYPSO.pdf
diff --git a/doc/tex_src/controls_CALYPSO.tex b/doc/tex_src/controls_CALYPSO.tex
@@ -415,10 +415,10 @@ \subsection{\tt phys\_values\_ctl}
 \tt sym\_composite\_buoyancy &  $ -\alpha_{C} C_{sym} \bvec{g}  $ \\
 \tt asym\_composite\_buoyancy &  $ -\alpha_{C} C_{asym} \bvec{g}  $ \\ \hline
 %
-\tt wsym\_x\_usym  &  $ \bvec{\omega}_{sym} \times \bvec{u}_{sym} $ \\
-\tt wasym\_x\_uasym  &  $ \bvec{\omega}_{asym} \times \bvec{u}_{asym} $ \\
-\tt wsym\_x\_uasym  &  $ \bvec{\omega}_{sym} \times \bvec{u}_{asym} $ \\
-\tt wasym\_x\_usym  &  $ \bvec{\omega}_{asym} \times \bvec{u}_{sym} $ \\ \hline
+\tt wsym\_x\_usym  &  $   - \bvec{\omega}_{sym} \times \bvec{u}_{sym} $ \\
+\tt wasym\_x\_uasym  &  $ - \bvec{\omega}_{asym} \times \bvec{u}_{asym} $ \\
+\tt wsym\_x\_uasym  &  $ - \bvec{\omega}_{sym} \times \bvec{u}_{asym} $ \\
+\tt wasym\_x\_usym  &  $ - \bvec{\omega}_{asym} \times \bvec{u}_{sym} $ \\ \hline
 %
 \tt Jsym\_x\_Bsym  &  $ \bvec{J}_{sym} \times \bvec{B}_{sym} $ \\
 \tt Jasym\_x\_Basym  &  $ \bvec{J}_{asym} \times \bvec{B}_{asym} $ \\
@@ -446,10 +446,10 @@ \subsection{\tt phys\_values\_ctl}
 % \tt sym\_composite\_buoyancy &  $ -\alpha_{C}  \cdot   C_{sym} \bvec{g}  $ \\
 % \tt asym\_composite\_buoyancy &  $ -\alpha_{C}  \cdot   C_{asym} \bvec{g}  $ \\ \hline
 %
-\tt -ua\_d\_ws\_x\_us &  $  \bvec{u}_{asym} \cdot \left( \bvec{\omega}_{sym} \times \bvec{u}_{sym} \right)$ \\
-\tt -ua\_d\_wa\_x\_ua  &  $ \bvec{u}_{asym} \cdot  \left( \bvec{\omega}_{asym} \times \bvec{u}_{asym} \right)$ \\
-\tt -us\_d\_ws\_x\_ua  &  $ \bvec{u}_{sym} \cdot  \left( \bvec{\omega}_{sym} \times \bvec{u}_{asym} \right)$ \\
-\tt -us\_d\_wa\_x\_us &  $ \bvec{u}_{sym} \cdot  \left( \bvec{\omega}_{asym} \times \bvec{u}_{sym} \right)$ \\ \hline
+\tt -ua\_d\_ws\_x\_us &  $ -\bvec{u}_{asym} \cdot \left( \bvec{\omega}_{sym} \times \bvec{u}_{sym} \right)$ \\
+\tt -ua\_d\_wa\_x\_ua  &  $ -\bvec{u}_{asym} \cdot  \left( \bvec{\omega}_{asym} \times \bvec{u}_{asym} \right)$ \\
+\tt -us\_d\_ws\_x\_ua  &  $ -\bvec{u}_{sym} \cdot  \left( \bvec{\omega}_{sym} \times \bvec{u}_{asym} \right)$ \\
+\tt -us\_d\_wa\_x\_us &  $ -\bvec{u}_{sym} \cdot  \left( \bvec{\omega}_{asym} \times \bvec{u}_{sym} \right)$ \\ \hline
 %
 \tt ua\_d\_js\_x\_bs  &  $ \bvec{u}_{asym} \cdot \left(\bvec{J}_{sym} \times \bvec{B}_{sym} \right) $ \\
 \tt ua\_d\_ja\_x\_ba  &  $ \bvec{u}_{asym}  \cdot  \left(\bvec{J}_{asym} \times \bvec{B}_{asym} \right) $ \\

diff --git a/src/Jupyter/Calypso_control_glossary.ipynb b/src/Jupyter/Calypso_control_glossary.ipynb
@@ -435,7 +435,7 @@
    "source": [
     "|`[Label]` | Field name | `     `Math expression`     ` |\n",
     "|:-|:-|:-|\n",
-    "|`rot_inertia` | Curl of inertia |  $ \\nabla \\times \\left({\\bf \\omega} \\times {\\bf u}\\right) $|\n",
+    "|`rot_inertia` | Curl of inertia |  $- \\nabla \\times \\left({\\bf \\omega} \\times {\\bf u}\\right) $|\n",
     "|`rot_Lorentz_force` | Curl of Lorentz force |  $ \\nabla \\times \\left({\\bf J} \\times {\\bf B}\\right) $|\n",
     "|`rot_Coriolis_force` | Curl of Coriolis force |  $ -2 \\Omega \\nabla \\times \\left(\\hat{z} \\times {\\bf u} \\right) $|\n",
     "|`rot_buoyancy` | Curl of thermal buoyancy |  $ - \\nabla \\times \\left(\\alpha_{T} T {\\bf g}\\right)  $|\n",
@@ -456,7 +456,6 @@
    "cell_type": "markdown",
    "id": "b5c583c0-c2c8-46c8-b95c-f286414cc552",
    "metadata": {
-    "jp-MarkdownHeadingCollapsed": true,
     "tags": []
    },
    "source": [
@@ -492,7 +491,6 @@
    "cell_type": "markdown",
    "id": "bdc523c8-2a11-424d-83cf-24d41470e983",
    "metadata": {
-    "jp-MarkdownHeadingCollapsed": true,
     "tags": []
    },
    "source": [
@@ -510,10 +508,10 @@
     "|`asym_thermal_buoyancy` |  $ -\\alpha_{T} T_{asym} {\\bf g}  $|\n",
     "|`sym_composite_buoyancy` |  $ -\\alpha_{C} C_{sym} {\\bf g}  $ |\n",
     "|`asym_composite_buoyancy` |  $ -\\alpha_{C} C_{asym} {\\bf g}  $|\n",
-    "|`wsym_x_usym`  |$ {\\bf \\omega}_{sym} \\times {\\bf u}_{sym} $ |\n",
-    "|`wasym_x_uasym`  |$ {\\bf \\omega}_{asym} \\times {\\bf u}_{asym} $|\n",
-    "|`wsym_x_uasym`  |$ {\\bf \\omega}_{sym} \\times {\\bf u}_{asym} $ |\n",
-    "|`wasym_x_usym`  |$ {\\bf \\omega}_{asym} \\times {\\bf u}_{sym} $|\n",
+    "|`wsym_x_usym`  |$ {\\bf -\\omega}_{sym} \\times {\\bf u}_{sym} $ |\n",
+    "|`wasym_x_uasym`  |$ {\\bf -\\omega}_{asym} \\times {\\bf u}_{asym} $|\n",
+    "|`wsym_x_uasym`  |$ {\\bf -\\omega}_{sym} \\times {\\bf u}_{asym} $ |\n",
+    "|`wasym_x_usym`  |$ {\\bf -\\omega}_{asym} \\times {\\bf u}_{sym} $|\n",
     "|`Jsym_x_Bsym`  |$ {\\bf J}_{sym} \\times {\\bf B}_{sym} $ |\n",
     "|`Jasym_x_Basym`  |$ {\\bf J}_{asym} \\times {\\bf B}_{asym} $|\n",
     "|`Jsym_x_Basym`  |$ {\\bf J}_{sym} \\times {\\bf B}_{asym} $|\n",
@@ -528,7 +526,6 @@
    "cell_type": "markdown",
    "id": "5451dc1f-4045-45d1-910e-042d251e5a19",
    "metadata": {
-    "jp-MarkdownHeadingCollapsed": true,
     "tags": []
    },
    "source": [
@@ -546,10 +543,10 @@
     "|`asym_buoyancy_flux`  | $ - {\\bf u}_{asym}  \\cdot  \\alpha_{T} T_{asym} {\\bf g}  $ |\n",
     "|`sym_composite_buoyancy` | $ -\\alpha_{C}  \\cdot   C_{sym} {\\bf g}  $ |\n",
     "|`asym_composite_buoyancy` | $ -\\alpha_{C}  \\cdot   C_{asym} {\\bf g}  $ |\n",
-    "|`-ua_d_ws_x_us` | $  {\\bf u}_{asym} \\cdot \\left( {\\bf \\omega}_{sym} \\times {\\bf u}_{sym} \\right)$ |\n",
-    "|`-ua_d_wa_x_ua`  | $ {\\bf u}_{asym} \\cdot  \\left( {\\bf \\omega}_{asym} \\times {\\bf u}_{asym} \\right)$ |\n",
-    "|`-us_d_ws_x_ua`  | $ {\\bf u}_{sym} \\cdot  \\left( {\\bf \\omega}_{sym} \\times {\\bf u}_{asym} \\right)$ |\n",
-    "|`-us_d_wa_x_us` | $ {\\bf u}_{sym} \\cdot  \\left( {\\bf \\omega}_{asym} \\times {\\bf u}_{sym} \\right)$ |\n",
+    "|`-ua_d_ws_x_us` | $  -{\\bf u}_{asym} \\cdot \\left( {\\bf \\omega}_{sym} \\times {\\bf u}_{sym} \\right)$ |\n",
+    "|`-ua_d_wa_x_ua`  | $ -{\\bf u}_{asym} \\cdot  \\left( {\\bf \\omega}_{asym} \\times {\\bf u}_{asym} \\right)$ |\n",
+    "|`-us_d_ws_x_ua`  | $ -{\\bf u}_{sym} \\cdot  \\left( {\\bf \\omega}_{sym} \\times {\\bf u}_{asym} \\right)$ |\n",
+    "|`-us_d_wa_x_us` | $ -{\\bf u}_{sym} \\cdot  \\left( {\\bf \\omega}_{asym} \\times {\\bf u}_{sym} \\right)$ |\n",
     "|`ua_d_js_x_bs`  | $ {\\bf u}_{asym} \\cdot \\left({\\bf J}_{sym} \\times {\\bf B}_{sym} \\right) $ |\n",
     "|`ua_d_ja_x_ba`  | $ {\\bf u}_{asym}  \\cdot  \\left({\\bf J}_{asym} \\times {\\bf B}_{asym} \\right) $ |\n",
     "|`us_d_js_x_ba`  | $ {\\bf u}_{sym}  \\cdot  \\left({\\bf J}_{sym} \\times {\\bf B}_{asym} \\right) $ |\n",