Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Méso-NH code
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RODIER Quentin
Méso-NH code
Commits
57c4ac34
Commit
57c4ac34
authored
4 years ago
by
WAUTELET Philippe
Browse files
Options
Downloads
Patches
Plain Diff
Philippe 08/10/2020: IO: add clessource in tbudgetdata type
parent
c4f74a62
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/MNH/budget.f90
+8
-0
8 additions, 0 deletions
src/MNH/budget.f90
src/MNH/modd_budget.f90
+2
-0
2 additions, 0 deletions
src/MNH/modd_budget.f90
with
10 additions
and
0 deletions
src/MNH/budget.f90
+
8
−
0
View file @
57c4ac34
...
@@ -48,6 +48,8 @@ subroutine Budget_store_init( tpbudget, hsource, pvars )
...
@@ -48,6 +48,8 @@ subroutine Budget_store_init( tpbudget, hsource, pvars )
allocate
(
tpbudget
%
xtmplesstore
(
Size
(
pvars
,
1
),
Size
(
pvars
,
2
),
Size
(
pvars
,
3
)
)
)
allocate
(
tpbudget
%
xtmplesstore
(
Size
(
pvars
,
1
),
Size
(
pvars
,
2
),
Size
(
pvars
,
3
)
)
)
end
if
end
if
tpbudget
%
xtmplesstore
(:,
:,
:)
=
pvars
(:,
:,
:)
tpbudget
%
xtmplesstore
(:,
:,
:)
=
pvars
(:,
:,
:)
tpbudget
%
clessource
=
hsource
end
if
end
if
! Nothing else to do if budgets are not enabled
! Nothing else to do if budgets are not enabled
...
@@ -106,6 +108,12 @@ subroutine Budget_store_end( tpbudget, hsource, pvars )
...
@@ -106,6 +108,12 @@ subroutine Budget_store_end( tpbudget, hsource, pvars )
call
Print_msg
(
NVERB_DEBUG
,
'BUD'
,
'Budget_store_end'
,
trim
(
tpbudget
%
cname
)//
':'
//
trim
(
hsource
)
)
call
Print_msg
(
NVERB_DEBUG
,
'BUD'
,
'Budget_store_end'
,
trim
(
tpbudget
%
cname
)//
':'
//
trim
(
hsource
)
)
if
(
lles_call
)
then
if
(
lles_call
)
then
if
(
hsource
/
=
tpbudget
%
clessource
)
&
call
Print_msg
(
NVERB_FATAL
,
'BUD'
,
'Budget_store_end'
,
'hsource not the same as in Budget_store_init ('
&
//
Trim
(
hsource
)
//
' / '
//
Trim
(
tpbudget
%
clessource
)
//
')'
)
tpbudget
%
clessource
=
'reset'
if
(
allocated
(
tpbudget
%
xtmplesstore
)
)
then
if
(
allocated
(
tpbudget
%
xtmplesstore
)
)
then
! Do the call to Les_budget with oadd=.true.
! Do the call to Les_budget with oadd=.true.
! This is necessary when the call to Budget_store_init was done with pvars not strictly
! This is necessary when the call to Budget_store_init was done with pvars not strictly
...
...
This diff is collapsed.
Click to expand it.
src/MNH/modd_budget.f90
+
2
−
0
View file @
57c4ac34
...
@@ -55,6 +55,7 @@
...
@@ -55,6 +55,7 @@
! P. Wautelet 23/04/2020: add nid in tbudgetdata datatype
! P. Wautelet 23/04/2020: add nid in tbudgetdata datatype
! P. Wautelet 30/06/2020: add NNETURSV, NNEADVSV and NNECONSV variables
! P. Wautelet 30/06/2020: add NNETURSV, NNEADVSV and NNECONSV variables
! P. Wautelet 17/08/2020: add xtmplesstore in tbudgetdata datatype
! P. Wautelet 17/08/2020: add xtmplesstore in tbudgetdata datatype
! P. Wautelet 08/10/2020: add clessource in tbudgetdata datatype
!-------------------------------------------------------------------------------
!-------------------------------------------------------------------------------
!
!
!* 0. DECLARATIONS
!* 0. DECLARATIONS
...
@@ -88,6 +89,7 @@ integer :: nbudgets ! Number of budget categories
...
@@ -88,6 +89,7 @@ integer :: nbudgets ! Number of budget categories
type
tbudgetdata
type
tbudgetdata
character
(
len
=
NBUNAMELGTMAX
)
::
cname
=
''
character
(
len
=
NBUNAMELGTMAX
)
::
cname
=
''
character
(
len
=
NCOMMENTLGTMAX
)
::
ccomment
=
''
character
(
len
=
NCOMMENTLGTMAX
)
::
ccomment
=
''
character
(
len
=
100
)
::
clessource
=
''
! Last source stored
integer
::
nid
=
-1
!Identifier number (based on parameters NBUDGET_*)
integer
::
nid
=
-1
!Identifier number (based on parameters NBUDGET_*)
integer
::
ngroups
=
0
!Number of groups of source terms to store
integer
::
ngroups
=
0
!Number of groups of source terms to store
integer
::
nsources
=
0
!Number of source terms
integer
::
nsources
=
0
!Number of source terms
...
...
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