Skip to content
Snippets Groups Projects
Commit 30f0af95 authored by 数学の武士's avatar 数学の武士
Browse files

Move phys_contsnts and sfx_parameters:

from ModelBase to EsmModelBase
parent 8d86a986
No related branches found
No related tags found
No related merge requests found
......@@ -10,8 +10,6 @@ public:
sfxDataVecTypeC* res_sfx;
sfxDataVecTypeC sfx;
meteoDataVecTypeC meteo;
sfx_surface_param surface_param;
sfx_phys_constants phys_constants;
int grid_size;
bool ifAllocated;
......@@ -19,8 +17,6 @@ public:
ModelBase(sfxDataVecTypeC* sfx,
meteoDataVecTypeC* meteo,
const sfx_surface_param surface_param,
const sfx_phys_constants phys_constants,
const int grid_size);
~ModelBase();
};
\ No newline at end of file
......@@ -10,12 +10,12 @@ public:
using ModelBase<T, memIn, memOut, RunMem>::res_sfx;
using ModelBase<T, memIn, memOut, RunMem>::sfx;
using ModelBase<T, memIn, memOut, RunMem>::meteo;
using ModelBase<T, memIn, memOut, RunMem>::surface_param;
using ModelBase<T, memIn, memOut, RunMem>::phys_constants;
using ModelBase<T, memIn, memOut, RunMem>::grid_size;
using ModelBase<T, memIn, memOut, RunMem>::ifAllocated;
using ModelBase<T, memIn, memOut, RunMem>::allocated_size;
sfx_surface_param surface_param;
sfx_phys_constants phys_constants;
sfx_esm_param model_param;
sfx_esm_numericsTypeC numerics;
......
......@@ -8,14 +8,10 @@
template<typename T, MemType memIn, MemType memOut, MemType RunMem >
ModelBase<T, memIn, memOut, RunMem>::ModelBase(sfxDataVecTypeC* sfx_in,
meteoDataVecTypeC* meteo_in,
const sfx_surface_param surface_param_in,
const sfx_phys_constants phys_constants_in,
const int grid_size_in)
{
ifAllocated = false;
grid_size = grid_size_in;
surface_param = surface_param_in;
phys_constants = phys_constants_in;
if(RunMem != memOut)
res_sfx = sfx_in;
......
......@@ -17,9 +17,10 @@ FluxEsmBase<T, memIn, memOut, RunMem>::FluxEsmBase(sfxDataVecTypeC* sfx_in,
const sfx_surface_param surface_param_in,
const sfx_esm_numericsTypeC numerics_in,
const sfx_phys_constants phys_constants_in,
const int grid_size_in) : ModelBase<T, memIn, memOut, RunMem>(sfx_in, meteo_in,
surface_param_in, phys_constants_in, grid_size_in)
const int grid_size_in) : ModelBase<T, memIn, memOut, RunMem>(sfx_in, meteo_in, grid_size_in)
{
surface_param = surface_param_in;
phys_constants = phys_constants_in;
model_param = model_param_in;
numerics = numerics_in;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment