GIT: resolve conflict
Showing
- applications/test/ODE/Test-ODE.C 19 additions, 17 deletionsapplications/test/ODE/Test-ODE.C
- src/ODE/Make/files 15 additions, 16 deletionssrc/ODE/Make/files
- src/ODE/ODESolvers/Euler/Euler.C 88 additions, 0 deletionssrc/ODE/ODESolvers/Euler/Euler.C
- src/ODE/ODESolvers/Euler/Euler.H 114 additions, 0 deletionssrc/ODE/ODESolvers/Euler/Euler.H
- src/ODE/ODESolvers/EulerSI/EulerSI.C 108 additions, 0 deletionssrc/ODE/ODESolvers/EulerSI/EulerSI.C
- src/ODE/ODESolvers/EulerSI/EulerSI.H 40 additions, 38 deletionssrc/ODE/ODESolvers/EulerSI/EulerSI.H
- src/ODE/ODESolvers/KRR4/KRR4.C 0 additions, 224 deletionssrc/ODE/ODESolvers/KRR4/KRR4.C
- src/ODE/ODESolvers/ODESolver/ODESolver.C 57 additions, 36 deletionssrc/ODE/ODESolvers/ODESolver/ODESolver.C
- src/ODE/ODESolvers/ODESolver/ODESolver.H 53 additions, 20 deletionssrc/ODE/ODESolvers/ODESolver/ODESolver.H
- src/ODE/ODESolvers/ODESolver/ODESolverNew.C 9 additions, 8 deletionssrc/ODE/ODESolvers/ODESolver/ODESolverNew.C
- src/ODE/ODESolvers/RKCK45/RKCK45.C 167 additions, 0 deletionssrc/ODE/ODESolvers/RKCK45/RKCK45.C
- src/ODE/ODESolvers/RKCK45/RKCK45.H 140 additions, 0 deletionssrc/ODE/ODESolvers/RKCK45/RKCK45.H
- src/ODE/ODESolvers/RKDP45/RKDP45.C 176 additions, 0 deletionssrc/ODE/ODESolvers/RKDP45/RKDP45.C
- src/ODE/ODESolvers/RKDP45/RKDP45.H 144 additions, 0 deletionssrc/ODE/ODESolvers/RKDP45/RKDP45.H
- src/ODE/ODESolvers/RKF45/RKF45.C 172 additions, 0 deletionssrc/ODE/ODESolvers/RKF45/RKF45.C
- src/ODE/ODESolvers/RKF45/RKF45.H 168 additions, 0 deletionssrc/ODE/ODESolvers/RKF45/RKF45.H
- src/ODE/ODESolvers/Rosenbrock21/Rosenbrock21.C 139 additions, 0 deletionssrc/ODE/ODESolvers/Rosenbrock21/Rosenbrock21.C
- src/ODE/ODESolvers/Rosenbrock21/Rosenbrock21.H 131 additions, 0 deletionssrc/ODE/ODESolvers/Rosenbrock21/Rosenbrock21.H
- src/ODE/ODESolvers/Rosenbrock43/Rosenbrock43.C 221 additions, 0 deletionssrc/ODE/ODESolvers/Rosenbrock43/Rosenbrock43.C
- src/ODE/ODESolvers/Rosenbrock43/Rosenbrock43.H 142 additions, 0 deletionssrc/ODE/ODESolvers/Rosenbrock43/Rosenbrock43.H
Please register or sign in to comment