<p><b>mpetersen@lanl.gov</b> 2012-01-06 08:28:01 -0700 (Fri, 06 Jan 2012)</p><p>Removing implicit version of Rayleigh friction.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/rayleigh/namelist.input.ocean
===================================================================
--- branches/ocean_projects/rayleigh/namelist.input.ocean        2012-01-05 23:20:46 UTC (rev 1304)
+++ branches/ocean_projects/rayleigh/namelist.input.ocean        2012-01-06 15:28:01 UTC (rev 1305)
@@ -48,8 +48,8 @@
    config_visc_vorticity_term = .true.
    config_h_tracer_eddy_diff2 = 1.0e4
    config_h_tracer_eddy_diff4 = 0.0
-   config_mom_decay      = .false.
-   config_mom_decay_time = 3600.0
+   config_rayleigh_friction  = .false.
+   config_rayleigh_damping_coeff = 2.78e-4
 /
 &amp;vmix
    config_vert_visc_type  = 'rich'

Modified: branches/ocean_projects/rayleigh/src/core_ocean/Registry
===================================================================
--- branches/ocean_projects/rayleigh/src/core_ocean/Registry        2012-01-05 23:20:46 UTC (rev 1304)
+++ branches/ocean_projects/rayleigh/src/core_ocean/Registry        2012-01-06 15:28:01 UTC (rev 1305)
@@ -48,8 +48,6 @@
 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
-namelist logical   hmix     config_mom_decay            false 
-namelist real      hmix     config_mom_decay_time       3600.0
 namelist logical   hmix     config_rayleigh_friction    false
 namelist real      hmix     config_rayleigh_damping_coeff 0.0
 namelist character vmix     config_vert_visc_type       const

Modified: branches/ocean_projects/rayleigh/src/core_ocean/mpas_ocn_time_integration_rk4.F
===================================================================
--- branches/ocean_projects/rayleigh/src/core_ocean/mpas_ocn_time_integration_rk4.F        2012-01-05 23:20:46 UTC (rev 1304)
+++ branches/ocean_projects/rayleigh/src/core_ocean/mpas_ocn_time_integration_rk4.F        2012-01-06 15:28:01 UTC (rev 1305)
@@ -318,29 +318,6 @@
             call ocn_tracer_vmix_tend_implicit(block % mesh, dt, vertdifftopofcell, h, tracers, err)
          end if
 
-         ! mrp 110725 momentum decay term
-         if (config_mom_decay) then
-             call mpas_timer_start(&quot;RK4-momentum decay&quot;)
-
-            !
-            !  Implicit solve for momentum decay
-            !
-            !  Add term to RHS of momentum equation: -1/gamma u
-            !
-            !  This changes the solve to:
-            !  u^{n+1} = u_provis^{n+1}/(1+dt/gamma)
-            !
-            coef = 1.0/(1.0 + dt/config_mom_decay_time)
-            do iEdge=1,block % mesh % nEdges
-               do k=1,maxLevelEdgeTop(iEdge)
-                  u(k,iEdge) = coef*u(k,iEdge) 
-               end do
-            end do
-
-            call mpas_timer_stop(&quot;RK4-momentum decay&quot;)
-         end if
-
-
          if (config_test_case == 1) then    ! For case 1, wind field should be fixed
             block % state % time_levs(2) % state % u % array(:,:) = block % state % time_levs(1) % state % u % array(:,:)
          end if

Modified: branches/ocean_projects/rayleigh/src/core_ocean/mpas_ocn_time_integration_split.F
===================================================================
--- branches/ocean_projects/rayleigh/src/core_ocean/mpas_ocn_time_integration_split.F        2012-01-05 23:20:46 UTC (rev 1304)
+++ branches/ocean_projects/rayleigh/src/core_ocean/mpas_ocn_time_integration_split.F        2012-01-06 15:28:01 UTC (rev 1305)
@@ -1217,26 +1217,6 @@
             call ocn_tracer_vmix_tend_implicit(block % mesh, dt, vertdifftopofcell, h, tracers, err)
          end if
 
-         ! mrp 110725 adding momentum decay term
-         if (config_mom_decay) then
-
-            !
-            !  Implicit solve for momentum decay
-            !
-            !  Add term to RHS of momentum equation: -1/gamma u
-            !
-            !  This changes the solve to:
-            !  u^{n+1} = u_provis^{n+1}/(1+dt/gamma)
-            !
-            coef = 1.0/(1.0 + dt/config_mom_decay_time)
-            do iEdge=1,block % mesh % nEdges
-               do k=1,maxLevelEdgeTop(iEdge)
-                  u(k,iEdge) = coef*u(k,iEdge) 
-               end do
-            end do
-
-         end if
-
          if (config_test_case == 1) then    ! For case 1, wind field should be fixed
             block % state % time_levs(2) % state % u % array(:,:) = block % state % time_levs(1) % state % u % array(:,:)
          end if

</font>
</pre>