Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
vlr
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
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
vaclab
vlr
Commits
b720ae90
Commit
b720ae90
authored
5 years ago
by
Thomas Bock
Browse files
Options
Downloads
Patches
Plain Diff
.
parent
bed74ee1
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cal/fm3.conductance.r
+1
-1
1 addition, 1 deletion
cal/fm3.conductance.r
cal/fm3.pressure_fill.r
+3
-3
3 additions, 3 deletions
cal/fm3.pressure_fill.r
with
4 additions
and
4 deletions
cal/fm3.conductance.r
+
1
−
1
View file @
b720ae90
...
@@ -12,7 +12,7 @@ fm3.conductance <- function(doc){
...
@@ -12,7 +12,7 @@ fm3.conductance <- function(doc){
c.B
<-
0.9
## Grenze Korrelation SZ<<<<<<< HEAD
c.B
<-
0.9
## Grenze Korrelation SZ<<<<<<< HEAD
d.B
<-
0.9
## Grenze Korrelation Drift
d.B
<-
0.9
## Grenze Korrelation Drift
sz.border
<-
1e-3
t2mm
<-
getConstVal
(
a
$
cs
,
"turn_2_mm"
)
t2mm
<-
getConstVal
(
a
$
cs
,
"turn_2_mm"
)
ms2s
<-
getConstVal
(
a
$
cc
,
"ms_2_s"
)
ms2s
<-
getConstVal
(
a
$
cc
,
"ms_2_s"
)
mm32l
<-
getConstVal
(
a
$
cc
,
"mm^3_2_l"
)
mm32l
<-
getConstVal
(
a
$
cc
,
"mm^3_2_l"
)
...
...
This diff is collapsed.
Click to expand it.
cal/fm3.pressure_fill.r
+
3
−
3
View file @
b720ae90
...
@@ -14,11 +14,11 @@ fm3.pressure.fill <- function(doc){
...
@@ -14,11 +14,11 @@ fm3.pressure.fill <- function(doc){
gas
<-
a
$
cma
$
Gas
gas
<-
a
$
cma
$
Gas
if
(
length
(
gas
)
>
0
&
(
gas
==
"N2"
|
gas
==
"Ar"
)
){
#
if(length(gas) > 0 & (gas == "N2" | gas == "Ar") ){
}
else
{
#
}else{
gas
<-
"N2"
gas
<-
"N2"
}
#
}
paste
(
msg
,
"assume gas to be: "
,
gas
)
paste
(
msg
,
"assume gas to be: "
,
gas
)
p.lw
<-
list
()
p.lw
<-
list
()
...
...
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