<p><b>mpetersen@lanl.gov</b> 2010-10-12 15:07:20 -0600 (Tue, 12 Oct 2010)</p><p>Updated and tested sw core in advection branch.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/advection/src/core_sw/Registry
===================================================================
--- branches/ocean_projects/advection/src/core_sw/Registry        2010-10-12 17:37:54 UTC (rev 545)
+++ branches/ocean_projects/advection/src/core_sw/Registry        2010-10-12 21:07:20 UTC (rev 546)
@@ -8,6 +8,10 @@
namelist integer sw_model config_output_interval 500
namelist integer sw_model config_stats_interval 100
namelist real sw_model config_visc 0.0
+namelist integer sw_model config_thickness_adv_order 2
+namelist integer sw_model config_tracer_adv_order 2
+namelist logical sw_model config_positive_definite false
+namelist logical sw_model config_monotonic false
namelist character io config_input_name grid.nc
namelist character io config_output_name output.nc
namelist character io config_restart_name restart.nc
@@ -25,6 +29,8 @@
dim nVertices nVertices
dim TWO 2
dim R3 3
+dim FIFTEEN 15
+dim TWENTYONE 21
dim vertexDegree vertexDegree
dim nVertLevels nVertLevels
dim nTracers nTracers
@@ -83,12 +89,24 @@
var persistent real fCell ( nCells ) 0 iro fCell mesh - -
var persistent real h_s ( nCells ) 0 iro h_s mesh - -
+# Space needed for advection
+var persistent real deriv_two ( FIFTEEN TWO nEdges ) 0 o deriv_two mesh - -
+var persistent integer advCells ( TWENTYONE nCells ) 0 - advCells mesh - -
+
+# !! NOTE: the following arrays are needed to allow the use
+# !! of the module_advection.F w/o alteration
+# Space needed for deformation calculation weights
+var persistent real defc_a ( maxEdges nCells ) 0 - defc_a mesh - -
+var persistent real defc_b ( maxEdges nCells ) 0 - defc_b mesh - -
+var persistent real kdiff ( nVertLevels nCells Time ) 0 - kdiff mesh - -
+
# Arrays required for reconstruction of velocity field
var persistent real coeffs_reconstruct ( R3 maxEdges nCells ) 0 - coeffs_reconstruct mesh - -
# Boundary conditions: read from input, saved in restart and written to output
var persistent integer boundaryEdge ( nVertLevels nEdges ) 0 iro boundaryEdge mesh - -
var persistent integer boundaryVertex ( nVertLevels nVertices ) 0 iro boundaryVertex mesh - -
+var persistent integer boundaryCell ( nVertLevels nCells ) 0 iro boundaryCell mesh - -
# Prognostic variables: read from input, saved in restart, and written to output
var persistent real u ( nVertLevels nEdges Time ) 2 iro u state - -
Modified: branches/ocean_projects/advection/src/core_sw/module_advection.F
===================================================================
--- branches/ocean_projects/advection/src/core_sw/module_advection.F        2010-10-12 17:37:54 UTC (rev 545)
+++ branches/ocean_projects/advection/src/core_sw/module_advection.F        2010-10-12 21:07:20 UTC (rev 546)
@@ -17,7 +17,7 @@
!
implicit none
- type (grid_meta), intent(in) :: grid
+ type (mesh_type), intent(in) :: grid
real (kind=RKIND), dimension(:,:,:), pointer :: deriv_two
integer, dimension(:,:), pointer :: advCells
@@ -750,7 +750,7 @@
!
implicit none
- type (grid_meta), intent(in) :: grid
+ type (mesh_type), intent(in) :: grid
real (kind=RKIND), dimension(:,:), pointer :: defc_a, defc_b
integer, dimension(:,:), pointer :: cellsOnEdge, edgesOnCell
</font>
</pre>