Skip to content

Commit

Permalink
Added the folder Rstox_1.0_StoXLib_1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Holmin authored and Holmin committed Feb 1, 2019
1 parent 6321c28 commit 0c2d23e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
8 changes: 8 additions & 0 deletions Procedure for Rstox development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ Change also the line "# go to ftp://ftp.imr.no/StoX/Download/Rstox/Examples/Rsto

# Change direcotry to the local Rstox git repository:
cd THE_LOCAL_RSTOX_REPOSITORY

# Always work on the develop branch!!:
git checkout develop

# Check changes:
git status
Expand Down Expand Up @@ -109,6 +112,11 @@ Change also the line "# go to ftp://ftp.imr.no/StoX/Download/Rstox/Examples/Rsto


7. Pull the new tag with git pull in any branch.

git pull

# Always work on the develop branch!!:
git checkout develop


8. Download the "Source code (tar.gz)" of the release to you local system. Rename the file to using underscore instead of hyphen, e.g., rename "Rstox-1.7.2.tar.gz" to "Rstox_1.7.2.tar.gz".
Expand Down
1 change: 1 addition & 0 deletions Rstox_utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,7 @@ getTestFolderStructure <- function(x){
list(
Staged_Projects_original = file.path(x, "Staged_Projects_original"),
Projects_original = file.path(x, platformFolderName, "Projects_original"),
Projects_original1 = file.path(x, platformFolderName, "Projects_original", "Rstox_1.0_StoXLib_1.0"),
Projects = file.path(x, platformFolderName, "Projects"),
Output = file.path(x, platformFolderName, "Output"),
Diff = file.path(x, platformFolderName, "Diff"))
Expand Down
3 changes: 2 additions & 1 deletion TestRstox.R
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ system.time(automatedRstoxTest(dir="~/workspace/stox/project/Automated_testing",
###### RESTART R/Rstudio!!! ######

##### Install the latest develop version of Rstox: #####
devtools::install_github("Sea2Data/Rstox", ref="develop")
# devtools::install_github("Sea2Data/Rstox", ref="develop")
install.packages("ftp://ftp.imr.no/StoX/Download/Rstox/Versions/Alpha/Rstox_1.9.1/Rstox_1.9.1.tar.gz", repos=NULL)
# Load Rstox:
library(Rstox)

Expand Down

0 comments on commit 0c2d23e

Please sign in to comment.