<p><b>mpetersen@lanl.gov</b> 2011-10-28 15:22:04 -0600 (Fri, 28 Oct 2011)</p><p>add option to set the visc (del2 and del4) parameters to be different for div and vor, this time in the newer branch split_explicit_mrp<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/split_explicit_mrp/src/core_ocean/Registry
===================================================================
--- branches/ocean_projects/split_explicit_mrp/src/core_ocean/Registry        2011-10-28 18:28:25 UTC (rev 1156)
+++ branches/ocean_projects/split_explicit_mrp/src/core_ocean/Registry        2011-10-28 21:22:04 UTC (rev 1157)
@@ -42,6 +42,8 @@
 namelist real      hmix     config_h_mom_eddy_visc2     0.0
 namelist real      hmix     config_h_mom_eddy_visc4     0.0
 namelist logical   hmix     config_visc_vorticity_term true
+namelist real      hmix     config_visc_vorticity_visc2_scale 1.0
+namelist real      hmix     config_visc_vorticity_visc4_scale 1.0
 namelist real      hmix     config_h_tracer_eddy_diff2  0.0
 namelist real      hmix     config_h_tracer_eddy_diff4  0.0
 namelist real      hmix     config_apvm_upwinding       0.5

Modified: branches/ocean_projects/split_explicit_mrp/src/core_ocean/mpas_ocn_mpas_core.F
===================================================================
--- branches/ocean_projects/split_explicit_mrp/src/core_ocean/mpas_ocn_mpas_core.F        2011-10-28 18:28:25 UTC (rev 1156)
+++ branches/ocean_projects/split_explicit_mrp/src/core_ocean/mpas_ocn_mpas_core.F        2011-10-28 21:22:04 UTC (rev 1157)
@@ -300,6 +300,7 @@
       call mpas_get_time(curr_time=currTime, dateTimeString=timeStamp, ierr=ierr)
       write(0,*) 'Initial time ', timeStamp
 
+      ! Comment out the next line to avoid the initial write of output
       call write_output_frame(output_obj, output_frame, domain)
 
       ! During integration, time level 1 stores the model state at the beginning of the

Modified: branches/ocean_projects/split_explicit_mrp/src/core_ocean/mpas_ocn_vel_hmix_del2.F
===================================================================
--- branches/ocean_projects/split_explicit_mrp/src/core_ocean/mpas_ocn_vel_hmix_del2.F        2011-10-28 18:28:25 UTC (rev 1156)
+++ branches/ocean_projects/split_explicit_mrp/src/core_ocean/mpas_ocn_vel_hmix_del2.F        2011-10-28 21:22:04 UTC (rev 1157)
@@ -206,7 +206,7 @@
 
 
       if (config_visc_vorticity_term) then
-         viscVortCoef = 1.0
+         viscVortCoef = config_visc_vorticity_visc2_scale
       else
          viscVortCoef = 0.0
       endif

Modified: branches/ocean_projects/split_explicit_mrp/src/core_ocean/mpas_ocn_vel_hmix_del4.F
===================================================================
--- branches/ocean_projects/split_explicit_mrp/src/core_ocean/mpas_ocn_vel_hmix_del4.F        2011-10-28 18:28:25 UTC (rev 1156)
+++ branches/ocean_projects/split_explicit_mrp/src/core_ocean/mpas_ocn_vel_hmix_del4.F        2011-10-28 21:22:04 UTC (rev 1157)
@@ -281,7 +281,7 @@
       hmixDel4On = .true.
       eddyVisc4 = config_h_mom_eddy_visc4
       if (config_visc_vorticity_term) then
-         viscVortCoef = 1.0
+         viscVortCoef = config_visc_vorticity_visc4_scale
       else
          viscVortCoef = 0.0
       endif

</font>
</pre>