diff --git a/Homework3/src/input_generator.py b/Homework3/src/input_generator.py index b3da2f8..4afc566 100644 --- a/Homework3/src/input_generator.py +++ b/Homework3/src/input_generator.py @@ -1,49 +1,49 @@ import numpy as np # nb of grid points in x and y directions -N = 10 +N = 32 # Positions over -1 to 1 interval x = np.linspace(-1.0, 1.0, N, endpoint= True) y = np.linspace(-1.0, 1.0, N, endpoint= True) X, Y = np.meshgrid(x, y) """ Z = np.zeros((N, N)) # Velocities and forces are set to 0 (material points) V_x = np.zeros((N, N)) V_y = np.zeros((N, N)) V_z = np.zeros((N, N)) F_x = np.zeros((N, N)) F_y = np.zeros((N, N)) F_z = np.zeros((N, N)) """ # Temperature and heat source T = np.ones((N,N)) # uniform T H_v = np.zeros((N,N)) # no heat source # Rearrange the data to be written into the input csv file X = X.flatten(order='C') Y = Y.flatten(order='C') """ Z = Z.flatten(order='C') V_x = V_x.flatten(order='C') V_y = V_y.flatten(order='C') V_z = V_z.flatten(order='C') F_x = F_x.flatten(order='C') F_y = F_y.flatten(order='C') F_z = F_z.flatten(order='C') """ T = T.flatten(order='C') H_v = H_v.flatten(order='C') #output = np.column_stack((X, Y, Z, V_x, V_y, V_z, F_x, F_y, F_z, T, H_v)) output = np.column_stack((X, Y, T, H_v)) -np.savetxt('input.csv', output, delimiter=' ') +np.savetxt('input.csv', output, delimiter=',') diff --git a/Homework3/src/material_point.cc b/Homework3/src/material_point.cc index f721731..7bad8bf 100644 --- a/Homework3/src/material_point.cc +++ b/Homework3/src/material_point.cc @@ -1,14 +1,14 @@ #include "material_point.hh" /* -------------------------------------------------------------------------- */ void MaterialPoint::printself(std::ostream& stream) const { Particle::printself(stream); - stream << x << " " << y << " " << temperature << " " << heat_rate; + stream << " " << temperature << " " << heat_rate; } /* -------------------------------------------------------------------------- */ void MaterialPoint::initself(std::istream& sstr) { Particle::initself(sstr); - sstr >> x >> y >> temperature >> heat_rate;; + sstr >> temperature >> heat_rate;; } diff --git a/Homework3/src/material_point.hh b/Homework3/src/material_point.hh index e9a552c..383f7d5 100644 --- a/Homework3/src/material_point.hh +++ b/Homework3/src/material_point.hh @@ -1,27 +1,26 @@ #ifndef __MATERIAL_POINT__HH__ #define __MATERIAL_POINT__HH__ /* -------------------------------------------------------------------------- */ #include "particle.hh" //! Class for MaterialPoint class MaterialPoint : public Particle { /* ------------------------------------------------------------------------ */ /* Methods */ /* ------------------------------------------------------------------------ */ public: void printself(std::ostream& stream) const override; void initself(std::istream& sstr) override; Real & getTemperature(){return temperature;}; Real & getHeatRate(){return heat_rate;}; private: Real temperature; Real heat_rate; - Real x, y; }; /* -------------------------------------------------------------------------- */ #endif //__MATERIAL_POINT__HH__