Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
CTDAS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
Florentie, Liesbeth
CTDAS
Commits
444c3ce6
Commit
444c3ce6
authored
12 years ago
by
ivar
Browse files
Options
Downloads
Patches
Plain Diff
reintroduced R-scaling factor in obspack
parent
113a22eb
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
da/ctc13/obspack.py
+5
-3
5 additions, 3 deletions
da/ctc13/obspack.py
with
5 additions
and
3 deletions
da/ctc13/obspack.py
+
5
−
3
View file @
444c3ce6
...
...
@@ -128,7 +128,7 @@ class ObsPackObservations(Observation):
alts
=
ncf
.
GetVariable
(
'
altitude
'
).
take
(
subselect
,
axis
=
0
)
obs
=
ncf
.
GetVariable
(
'
value
'
).
take
(
subselect
,
axis
=
0
)
if
obsspecie
==
self
.
ObsPackCo2Dir
:
obs
=
obs
*
1.e6
#IV convert to ppm
obs
=
obs
#
*1.e6 #IV convert to ppm
species
=
ncf
.
GetAttribute
(
'
dataset_parameter
'
)
#strategy = ncf.GetVariable('sampling_strategy').take(subselect,axis=0)
strategy
=
1
...
...
@@ -186,7 +186,7 @@ class ObsPackObservations(Observation):
tr_species
=
array
(
tr_species
)
if
self
.
Co2_only
:
simulated
=
simulated
*
1.e6
simulated
=
simulated
#
*1.e6
if
self
.
C13_only
:
simulated
=
mtp
.
MixingratioToPermil
(
filename
,
simulated
)
if
self
.
Co2_C13_together
:
...
...
@@ -414,10 +414,12 @@ class ObsPackObservations(Observation):
if
SiteInfo
.
has_key
(
identifier
):
msg
=
"
Observation found (%s, %s)
"
%
(
obs
.
code
,
identifier
,)
;
logging
.
debug
(
msg
)
obs
.
mdm
=
SiteInfo
[
identifier
][
'
error
'
]
#
obs.mdm = SiteInfo[identifier]['error']
if
species
==
'
co2c13
'
:
# obs.mdmc13 = SiteInfo[identifier]['error_c13']
obs
.
mdm
=
SiteInfo
[
identifier
][
'
error_c13
'
]
else
:
obs
.
mdm
=
SiteInfo
[
identifier
][
'
error
'
]
*
self
.
global_R_scaling
print
obs
,
obs
.
mdm
,
species
obs
.
may_localize
=
SiteInfo
[
identifier
][
'
may_localize
'
]
obs
.
may_reject
=
SiteInfo
[
identifier
][
'
may_reject
'
]
...
...
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