<p><b>dwj07@fsu.edu</b> 2013-03-12 15:48:33 -0600 (Tue, 12 Mar 2013)</p><p><br>
-- BRANCH COMMIT --<br>
<br>
Adding variables and namelist options to all core's registry files.<br>
This are required to have advection routines in operators directory build.<br>
<br>
Currently all cores build.<br>
Ocean core provides bit identical (with FCT) results compared with trunk.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/advection_operators/src/core_hyd_atmos/Registry
===================================================================
--- branches/ocean_projects/advection_operators/src/core_hyd_atmos/Registry 2013-03-12 21:20:35 UTC (rev 2593)
+++ branches/ocean_projects/advection_operators/src/core_hyd_atmos/Registry 2013-03-12 21:48:33 UTC (rev 2594)
@@ -18,10 +18,15 @@
namelist integer sw_model config_theta_adv_order 2
namelist integer sw_model config_scalar_adv_order 2
namelist logical sw_model config_positive_definite false
-namelist logical sw_model config_monotonic true
+namelist integer sw_model config_vert_tracer_adv_order 3
+namelist integer sw_model config_horiz_tracer_adv_order 3
+namelist real sw_model config_coef_3rd_order 0.25
+namelist logical sw_model config_monotonic .true.
+namelist logical sw_model config_check_tracer_monotonicity .true.
namelist integer sw_model config_mp_physics 0
namelist real sw_model config_apvm_upwinding 0.5
namelist integer sw_model config_num_halos 2
+namelist logical sw_model config_dzdk_positive true
namelist integer dimensions config_nvertlevels 26
namelist character io config_input_name grid.nc
namelist character io config_output_name output.nc
@@ -189,3 +194,9 @@
% Arrays required for reconstruction of velocity field
var persistent real coeffs_reconstruct ( R3 maxEdges nCells ) 0 - coeffs_reconstruct mesh - -
+% Added for monotonic advection scheme
+var persistent real adv_coefs ( maxEdges2 nEdges ) 0 - adv_coefs mesh - -
+var persistent real adv_coefs_3rd ( maxEdges2 nEdges ) 0 - adv_coefs_3rd mesh - -
+var persistent integer advCellsForEdge ( maxEdges2 nEdges ) 0 - advCellsForEdge mesh - -
+var persistent integer nAdvCellsForEdge ( nEdges ) 0 - nAdvCellsForEdge mesh - -
+var persistent integer highOrderAdvectionMask ( nVertLevels nEdges ) 0 - highOrderAdvectionMask mesh - -
Modified: branches/ocean_projects/advection_operators/src/core_init_nhyd_atmos/Registry
===================================================================
--- branches/ocean_projects/advection_operators/src/core_init_nhyd_atmos/Registry 2013-03-12 21:20:35 UTC (rev 2593)
+++ branches/ocean_projects/advection_operators/src/core_init_nhyd_atmos/Registry 2013-03-12 21:48:33 UTC (rev 2594)
@@ -6,8 +6,13 @@
namelist character nhyd_model config_start_time none
namelist character nhyd_model config_stop_time none
namelist integer nhyd_model config_theta_adv_order 3
-namelist real nhyd_model config_coef_3rd_order 0.25
namelist integer nhyd_model config_num_halos 2
+namelist logical nhyd_model config_dzdk_positive true
+namelist integer nhyd_model config_vert_tracer_adv_order 3
+namelist integer nhyd_model config_horiz_tracer_adv_order 3
+namelist real nhyd_model config_coef_3rd_order 0.25
+namelist logical nhyd_model config_monotonic .true.
+namelist logical nhyd_model config_check_tracer_monotonicity .true.
namelist character dcmip config_dcmip_case 2-0-0
namelist real dcmip config_planet_scale 1.0
namelist real dcmip config_rotation_rate_scale 1.0
@@ -254,3 +259,9 @@
% Arrays required for reconstruction of velocity field
var persistent real coeffs_reconstruct ( R3 maxEdges nCells ) 0 io coeffs_reconstruct mesh - -
+% Added for monotonic advection scheme
+var persistent real adv_coefs ( maxEdges2 nEdges ) 0 - adv_coefs mesh - -
+var persistent real adv_coefs_3rd ( maxEdges2 nEdges ) 0 - adv_coefs_3rd mesh - -
+var persistent integer advCellsForEdge ( maxEdges2 nEdges ) 0 - advCellsForEdge mesh - -
+var persistent integer nAdvCellsForEdge ( nEdges ) 0 - nAdvCellsForEdge mesh - -
+var persistent integer highOrderAdvectionMask ( nVertLevels nEdges ) 0 - highOrderAdvectionMask mesh - -
Modified: branches/ocean_projects/advection_operators/src/core_nhyd_atmos/Registry
===================================================================
--- branches/ocean_projects/advection_operators/src/core_nhyd_atmos/Registry 2013-03-12 21:20:35 UTC (rev 2593)
+++ branches/ocean_projects/advection_operators/src/core_nhyd_atmos/Registry 2013-03-12 21:48:33 UTC (rev 2594)
@@ -23,10 +23,13 @@
namelist integer nhyd_model config_w_vadv_order 3
namelist integer nhyd_model config_theta_vadv_order 3
namelist integer nhyd_model config_scalar_vadv_order 3
-namelist real nhyd_model config_coef_3rd_order 0.25
namelist logical nhyd_model config_scalar_advection true
namelist logical nhyd_model config_positive_definite false
-namelist logical nhyd_model config_monotonic true
+namelist integer nhyd_model config_vert_tracer_adv_order 3
+namelist integer nhyd_model config_horiz_tracer_adv_order 3
+namelist real nhyd_model config_coef_3rd_order 0.25
+namelist logical nhyd_model config_monotonic .true.
+namelist logical nhyd_model config_check_tracer_monotonicity .true.
namelist logical nhyd_model config_mix_full true
namelist real nhyd_model config_len_disp 120000.0
namelist real nhyd_model config_epssm 0.1
@@ -35,6 +38,7 @@
namelist real nhyd_model config_apvm_upwinding 0.5
namelist logical nhyd_model config_h_ScaleWithMesh false
namelist integer nhyd_model config_num_halos 2
+namelist logical nhyd_model config_dzdk_positive true
namelist real damping config_zd 22000.0
namelist real damping config_xnutr 0.0
namelist character io config_input_name init.nc
Modified: branches/ocean_projects/advection_operators/src/core_ocean/Registry
===================================================================
--- branches/ocean_projects/advection_operators/src/core_ocean/Registry 2013-03-12 21:20:35 UTC (rev 2593)
+++ branches/ocean_projects/advection_operators/src/core_ocean/Registry 2013-03-12 21:48:33 UTC (rev 2594)
@@ -223,12 +223,10 @@
% Added for monotonic advection scheme
var persistent real adv_coefs ( nAdvectionCells nEdges ) 0 - adv_coefs mesh - -
-var persistent real adv_coefs_2nd ( nAdvectionCells nEdges ) 0 - adv_coefs_2nd mesh - -
var persistent real adv_coefs_3rd ( nAdvectionCells nEdges ) 0 - adv_coefs_3rd mesh - -
var persistent integer advCellsForEdge ( nAdvectionCells nEdges ) 0 - advCellsForEdge mesh - -
var persistent integer nAdvCellsForEdge ( nEdges ) 0 - nAdvCellsForEdge mesh - -
var persistent integer highOrderAdvectionMask ( nVertLevels nEdges ) 0 - highOrderAdvectionMask mesh - -
-var persistent integer lowOrderAdvectionMask ( nVertLevels nEdges ) 0 - lowOrderAdvectionMask mesh - -
% !! NOTE: the following arrays are needed to allow the use
% !! of the module_advection.F w/o alteration
Modified: branches/ocean_projects/advection_operators/src/core_sw/Registry
===================================================================
--- branches/ocean_projects/advection_operators/src/core_sw/Registry 2013-03-12 21:20:35 UTC (rev 2593)
+++ branches/ocean_projects/advection_operators/src/core_sw/Registry 2013-03-12 21:48:33 UTC (rev 2594)
@@ -16,12 +16,17 @@
namelist real sw_model config_h_tracer_eddy_diff4 0.0
namelist integer sw_model config_thickness_adv_order 2
namelist integer sw_model config_tracer_adv_order 2
+namelist integer sw_model config_vert_tracer_adv_order 3
+namelist integer sw_model config_horiz_tracer_adv_order 3
+namelist real sw_model config_coef_3rd_order 0.25
+namelist logical sw_model config_monotonic .true.
+namelist logical sw_model config_check_tracer_monotonicity .true.
namelist logical sw_model config_positive_definite false
-namelist logical sw_model config_monotonic false
namelist logical sw_model config_wind_stress false
namelist logical sw_model config_bottom_drag false
namelist real sw_model config_apvm_upwinding 0.5
namelist integer sw_model config_num_halos 2
+namelist logical sw_model config_dzdk_positive 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
@@ -43,6 +48,7 @@
dim nEdges nEdges
dim maxEdges maxEdges
dim maxEdges2 maxEdges2
+dim nAdvectionCells maxEdges2+0
dim nVertices nVertices
dim TWO 2
dim R3 3
@@ -163,3 +169,9 @@
var persistent real gradPVn ( nVertLevels nEdges Time ) 2 - gradPVn state - -
var persistent real h_vertex ( nVertLevels nVertices Time ) 2 - h_vertex state - -
+% Added for monotonic advection scheme
+var persistent real adv_coefs ( nAdvectionCells nEdges ) 0 - adv_coefs mesh - -
+var persistent real adv_coefs_3rd ( nAdvectionCells nEdges ) 0 - adv_coefs_3rd mesh - -
+var persistent integer advCellsForEdge ( nAdvectionCells nEdges ) 0 - advCellsForEdge mesh - -
+var persistent integer nAdvCellsForEdge ( nEdges ) 0 - nAdvCellsForEdge mesh - -
+var persistent integer highOrderAdvectionMask ( nVertLevels nEdges ) 0 - highOrderAdvectionMask mesh - -
</font>
</pre>