Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
ocean-mixing
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
ocean-mixing
Commits
42fa7fef
Commit
42fa7fef
authored
7 months ago
by
Evgeny Mortikov
Browse files
Options
Downloads
Patches
Plain Diff
time dependent forcing implementation update
parent
204f95ff
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
obl_math.f90
+2
-1
2 additions, 1 deletion
obl_math.f90
obl_tforcing.f90
+13
-10
13 additions, 10 deletions
obl_tforcing.f90
with
15 additions
and
11 deletions
obl_math.f90
+
2
−
1
View file @
42fa7fef
...
...
@@ -21,6 +21,7 @@ module obl_math
public
::
is_finite
! --------------------------------------------------------------------------------
contains
! --------------------------------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
obl_tforcing.f90
+
13
−
10
View file @
42fa7fef
...
...
@@ -28,18 +28,18 @@ module obl_tforcing
contains
! --------------------------------------------------------------------------------
subroutine
set_const_tforcing
(
tforcing
,
f
value_
const
)
subroutine
set_const_tforcing
(
tforcing
,
fconst
)
!> @brief setting const forcing
! ----------------------------------------------------------------------------
type
(
timeForcingDataType
),
intent
(
in
out
)
::
tforcing
type
(
timeForcingDataType
),
intent
(
out
)
::
tforcing
real
,
intent
(
in
)
::
f
value_
const
real
,
intent
(
in
)
::
fconst
real
,
dimension
(
1
)
::
tval
,
fval
! ----------------------------------------------------------------------------
tval
(
1
)
=
0.0
fval
(
1
)
=
f
value_
const
fval
(
1
)
=
fconst
call
set_generic_tforcing
(
tforcing
,
tval
,
fval
,
1
)
...
...
@@ -49,7 +49,7 @@ module obl_tforcing
subroutine
set_external_tforcing
(
tforcing
,
filename
)
!> @brief setting forcing using file data
! ----------------------------------------------------------------------------
type
(
timeForcingDataType
),
intent
(
in
out
)
::
tforcing
type
(
timeForcingDataType
),
intent
(
out
)
::
tforcing
character
(
*
),
intent
(
in
)
::
filename
...
...
@@ -78,7 +78,9 @@ module obl_tforcing
close
(
io
)
if
(
num
>
0
)
then
allocate
(
tval
(
num
),
fval
(
num
))
endif
! --- read input data
open
(
newunit
=
io
,
file
=
filename
,
iostat
=
status
,
status
=
'old'
)
...
...
@@ -115,10 +117,10 @@ module obl_tforcing
if
(
num
>
0
)
then
allocate
(
tforcing
%
time
(
num
),
tforcing
%
fvalue
(
num
))
endif
tforcing
%
time
(:)
=
tval
(
1
:
num
)
tforcing
%
fvalue
(:)
=
fval
(
1
:
num
)
endif
end
subroutine
set_generic_tforcing
...
...
@@ -138,6 +140,7 @@ module obl_tforcing
end
subroutine
get_value_tforcing
! --------------------------------------------------------------------------------
subroutine
deallocate_tforcing
(
tforcing
)
!> @brief free time forcing data
! ----------------------------------------------------------------------------
...
...
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