Changeset 608 for trunk/src/wave_equations_integrator.F90

Timestamp:

08/17/11 16:06:08 (22 months ago)

Author:

micael

Message:

• Renamed some constants to have a more consistent naming scheme.

File:

• trunk/src/wave_equations_integrator.F90 (modified) (3 diffs)

trunk/src/wave_equations_integrator.F90

@@ -72 +72 @@
                         SCALAR_REL  = EQ3
 
-  integer, parameter :: M_RK2   = 1, &
-                        M_RK4   = 2, &
-                        M_RKF4  = 3, &
-                        M_RKCK4 = 4, &
-                        M_RKPD8 = 5
+  integer, parameter :: ODE_RK2   = 1, &
+                        ODE_RK4   = 2, &
+                        ODE_RKF4  = 3, &
+                        ODE_RKCK4 = 4, &
+                        ODE_RKPD8 = 5
 
 
@@ -98 +98 @@
             SCHRODINGER_FINF, &
             DIRAC_FINF, &
-            M_RK2, &
-            M_RK4, &
-            M_RKF4, &
-            M_RKCK4, &
-            M_RKPD8
+            ODE_RK2, &
+            ODE_RK4, &
+            ODE_RKF4, &
+            ODE_RKCK4, &
+            ODE_RKPD8
 
 contains
@@ -130 +130 @@
     call oct_parse_int('SteppingFunction', 5, stepping_func)
     select case (stepping_func)
-    case (M_RK2)
+    case (ODE_RK2)
       message(1) = "  Stepping function: Embedded 2nd order Runge-Kutta"
       message(2) = "                     with 3rd order error estimate"
       call write_info(2,20)
-    case (M_RK4)
+    case (ODE_RK4)
       message(1) = "  Stepping function: 4th order (classical) Runge-Kutta method"
       call write_info(1,20)
-    case (M_RKF4)
+    case (ODE_RKF4)
       message(1) = "  Stepping function: Embedded 4th order Runge-Kutta-Fehlberg "
       message(2) = "                     method with 5th order error estimate"
       call write_info(2,20)
-    case (M_RKCK4)
+    case (ODE_RKCK4)
       message(1) = "  Stepping function: Embedded 4th order Runge-Kutta Cash-Karp"
       message(2) = "                     method with 5th order error estimate"
       call write_info(2,20)
-    case (M_RKPD8)
+    case (ODE_RKPD8)
       message(1) = "  Stepping function: Embedded 8th order Runge-Kutta Prince-Dormand"
       message(2) = "                     method with 9th order error estimate"