Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
sfx
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
inmcm-mirror
sfx
Commits
30f0af95
Commit
30f0af95
authored
5 months ago
by
数学の武士
Browse files
Options
Downloads
Patches
Plain Diff
Move phys_contsnts and sfx_parameters:
from ModelBase to EsmModelBase
parent
8d86a986
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
includeCXX/model_base.h
+0
-4
0 additions, 4 deletions
includeCXX/model_base.h
includeCXX/sfx_esm.h
+2
-2
2 additions, 2 deletions
includeCXX/sfx_esm.h
srcCXX/model_base.cpp
+0
-4
0 additions, 4 deletions
srcCXX/model_base.cpp
srcCXX/sfx_esm.cpp
+3
-2
3 additions, 2 deletions
srcCXX/sfx_esm.cpp
with
5 additions
and
12 deletions
includeCXX/model_base.h
+
0
−
4
View file @
30f0af95
...
...
@@ -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
This diff is collapsed.
Click to expand it.
includeCXX/sfx_esm.h
+
2
−
2
View file @
30f0af95
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
srcCXX/model_base.cpp
+
0
−
4
View file @
30f0af95
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
srcCXX/sfx_esm.cpp
+
3
−
2
View file @
30f0af95
...
...
@@ -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
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment