Skip to content

Commit 6af8ec2

Browse files
author
Junbin Zhao
committed
small fix [ci skip]
1 parent ea6d12f commit 6af8ec2

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

R/Load.R

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,32 +40,32 @@ LoadLGR <- function(file,
4040
}
4141

4242
# check the CO2 column names
43-
flux$X.CO2.d_ppm <- try(flux$X.CO2.d_ppm,silent = TRUE)
43+
flux$X.CO2.d_ppm <- try(flux[,"X.CO2.d_ppm"],silent = TRUE)
4444
# if column name is not found, try find "wet" CO2 instead
45-
if (class(flux$X.CO2.d_ppm[1])=="try-error"){
46-
flux$X.CO2.d_ppm <- try(flux$X.CO2._ppm,silent = TRUE)
45+
if (class(flux$X.CO2.d_ppm[1])=="character" | class(flux$X.CO2.d_ppm[1])=="try-error"){
46+
flux$X.CO2.d_ppm <- try(flux[,"X.CO2._ppm"],silent = TRUE)
4747
}
4848
# error if column name is not found
49-
if (class(flux$X.CO2.d_ppm[1])=="try-error"){
49+
if (class(flux$X.CO2.d_ppm[1])=="character" | class(flux$X.CO2.d_ppm[1])=="try-error"){
5050
stop("Column names do not match! Use 'LoadOther()' function to load data.")
5151
}
5252

5353
# check the CH4 column names
54-
flux$X.CH4.d_ppm <- try(flux$X.CH4.d_ppm,silent = TRUE)
54+
flux$X.CH4.d_ppm <- try(flux[,"X.CH4.d_ppm"],silent = TRUE)
5555
# if column name is not found, try find "wet" CH4 instead
56-
if (class(flux$X.CH4.d_ppm[1])=="try-error"){
57-
flux$X.CH4.d_ppm <- try(flux$X.CH4._ppm,silent = TRUE)
56+
if (class(flux$X.CH4.d_ppm[1])=="character" | class(flux$X.CH4.d_ppm[1])=="try-error"){
57+
flux$X.CH4.d_ppm <- try(flux[,"X.CH4._ppm"],silent = TRUE)
5858
}
5959
# error if column name is not found
60-
if (class(flux$X.CH4.d_ppm[1])=="try-error"){
60+
if (class(flux$X.CH4.d_ppm[1])=="character" | class(flux$X.CH4.d_ppm[1])=="try-error"){
6161
stop("Column names do not match! Use 'LoadOther()' function to load data.")
6262
}
6363

6464
# check the air temperature column name if it is not ignored
6565
if (Ta_ignore == FALSE) {
66-
flux$AmbT_C <- try(flux$AmbT_C,silent = TRUE)
66+
flux$AmbT_C <- try(flux[,"AmbT_C"],silent = TRUE)
6767
# error if column name is not found
68-
if (class(flux$AmbT_C[1])=="try-error"){
68+
if (class(flux$AmbT_C[1])=="character" | class(flux$AmbT_C[1])=="try-error"){
6969
stop("Column names do not match! Use 'LoadOther()' function to load data.")
7070
}
7171
}
@@ -154,7 +154,7 @@ LoadOther <- function(file,
154154
if (!is.null(CO2)){
155155
X.CO2.d_ppm <- try(flux1[,CO2],silent = TRUE)
156156
# error if column name is not found
157-
if (class(X.CO2.d_ppm)=="try-error"){
157+
if (class(X.CO2.d_ppm[1])=="try-error" | class(X.CO2.d_ppm[1])=="character"){
158158
stop("Error: check if column name for CO2 is correct!")
159159
}
160160
flux <- data.frame(flux,X.CO2.d_ppm)
@@ -163,7 +163,7 @@ LoadOther <- function(file,
163163
if (!is.null(CH4)){
164164
X.CH4.d_ppm <- try(flux1[,CH4],silent = TRUE)
165165
# error if column name is not found
166-
if (class(X.CH4.d_ppm)=="try-error"){
166+
if (class(X.CH4.d_ppm[1])=="try-error" | class(X.CH4.d_ppm[1])=="character"){
167167
stop("Error: check if column name for CH4 is correct!")
168168
}
169169
flux <- data.frame(flux,X.CH4.d_ppm)

0 commit comments

Comments
 (0)