summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlhan Özgen Xian <iozgen@lbl.gov>2021-06-03 18:12:20 -0700
committerIlhan Özgen Xian <iozgen@lbl.gov>2021-06-03 18:12:20 -0700
commit2ebc62d44c12056846555ac48043e3f4d6e82b54 (patch)
treebdd48d3dbc9fd868d89fa14617e37a56610198e5
parent2301e6585df79b4cc59da6705fe194fb0751ef57 (diff)
minor changes to how agent advects
-rw-r--r--agent.cpp9
-rw-r--r--header.hpp2
2 files changed, 1 insertions, 10 deletions
diff --git a/agent.cpp b/agent.cpp
index 87f793b..2a5a183 100644
--- a/agent.cpp
+++ b/agent.cpp
@@ -103,13 +103,8 @@ void Agent::advance_surface(Mesh* mesh, double rel_dt, size_t step)
velocity[i] = location->get_velocity(i);
velocity_slope[i] = rel_dt * (location->get_velocity_next(i) - velocity[i]);
velocity[i] = velocity[i] + velocity_slope[i];
- // std::cout << "v0[" << i << "] = " << velocity[i] << " v1[" << i << "] = " << location->get_velocity_next(i) << std::endl;
- // std::cout << "rel_dt: " << rel_dt << std::endl;
- // std::cout << "interpolated velocity " << i << " on surface: " << velocity[i] << " m/s" << std::endl;
}
-
-
// CFL criteria
double length = location->get_characteristic_length();
double velocity_norm = sqrt(velocity[0]*velocity[0] + velocity[1]*velocity[1]);
@@ -203,10 +198,6 @@ void Agent::advance_subsurface(Mesh* mesh, double rel_dt, size_t step)
velocity[i] = location->get_velocity(i);
velocity_slope[i] = rel_dt * (location->get_velocity_next(i) - velocity[i]);
velocity[i] = velocity[i] + velocity_slope[i];
- // std::cout << "v0[" << i << "] = " << velocity[i] << " v1[" << i << "] = " << location->get_velocity_next(i) << std::endl;
- // std::cout << "dv0[" << i << "] = " << velocity_slope[i] << std::endl;
- // std::cout << "rel_dt: " << rel_dt << std::endl;
- // std::cout << "interpolated velocity " << i << " on subsurface: " << velocity[i] << " m/s" << std::endl;
}
// CFL criteria
diff --git a/header.hpp b/header.hpp
index 5bebc11..28777fe 100644
--- a/header.hpp
+++ b/header.hpp
@@ -19,7 +19,7 @@
#define CLASSIC_SCHEME 1
-#define MAXTIMESTEP 86400.0 // (s) one day
+#define MAXTIMESTEP 864000.0 // (s) ten days
#define EPS 1.0e-10
#define CFL 0.5