add test data

DJ4Earth · Jan 11, 2024 · ae3e12f · ae3e12f
1 parent ea6130f
commit ae3e12f
Show file tree

Hide file tree

Showing 12 changed files with 1,185 additions and 9 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -44,11 +44,7 @@ jobs:
             ${{ runner.os }}-test-
             ${{ runner.os }}-
       - uses: julia-actions/julia-buildpkg@v1
-      - run: |
-          svn --username anon --password anon checkout https://issm.ess.uci.edu/svn/issm/issm/trunk
       - uses: julia-actions/julia-runtest@v1
-        env:
-          ISSM_DIR: ${{ './trunk/' }}
       - uses: julia-actions/julia-processcoverage@v1
       - uses: codecov/codecov-action@v1
         with:

diff --git a/src/usr/triangle.jl b/src/usr/triangle.jl
@@ -67,7 +67,7 @@ TRIANGLE - create model mesh using the triangle package
  - md=triangle(md,'DomainOutline.exp',1000);
  - md=triangle(md,'DomainOutline.exp','Rifts.exp',1500);
 """
-function triangle(md::model,domainname::String,resolution::Float64) #{{{
+function triangle2(md::model,domainname::String,resolution::Float64) #{{{
 
 	#read input file
 	contours = expread(domainname)

diff --git a/src/usr/triangle2.jl b/src/usr/triangle2.jl
@@ -16,7 +16,7 @@ TRIANGLE - create model mesh using the triangle package
  - md=triangle(md,'DomainOutline.exp',1000);
  - md=triangle(md,'DomainOutline.exp','Rifts.exp',1500);
 """
-function triangle2(md::model,domainname::String,resolution::Float64) #{{{
+function triangle(md::model,domainname::String,resolution::Float64) #{{{
 
 	#read input file
 	contours = expread(domainname)

diff --git a/src/usr/utils.jl b/src/usr/utils.jl
@@ -3,7 +3,8 @@ function issmdir() #{{{
 	issmdir = ENV["ISSM_DIR"]
 
 	if isempty(issmdir)
-		error("Could not determine the location of ISSM")
+		println(io, "Could not determine the location of ISSM, use dJUICE path instead")
+		return ENV["./"]
 	else
 		return issmdir
 	end

diff --git a/test/Data/Pig.arch b/test/Data/Pig.arch
diff --git a/test/Data/SquareShelfConstrained.arch b/test/Data/SquareShelfConstrained.arch
diff --git a/test/Exp/Pig.exp b/test/Exp/Pig.exp
@@ -0,0 +1,14 @@
+## Name:Pig
+## Icon:0
+# Points Count Value
+8 1.000000
+# X pos Y pos
+-1630726.5154549279 -324668.7721082006
+-1596284.8605673832 -324668.7721082006
+-1538422.8803563081 -314529.3627584913
+-1512247.2226417740 -243553.4973105265
+-1556332.5408978313 -148496.5346570023
+-1611439.1887179029 -151031.3869944296
+-1670678.8351244798 -235948.9402982446
+-1630726.5154549279 -324668.7721082006
+
diff --git a/test/Exp/PigIslands.exp b/test/Exp/PigIslands.exp
@@ -0,0 +1,68 @@
+## Name:Island
+## Icon:0
+# Points Count  Value
+7 1.000000
+# X pos Y pos
+-1788144.703034 -331058.869467
+-1790984.462389 -330247.509651
+-1790984.462389 -332073.069237
+-1789767.422665 -334507.148684
+-1787739.023126 -336129.868316
+-1786521.983402 -334912.828592
+-1788144.703034 -331058.869467
+
+## Name:Island
+## Icon:0
+# Points Count  Value
+9 1.000000
+# X pos Y pos
+-1751633.511323 -319902.672000
+-1753053.391000 -318279.952368
+-1756095.990310 -318077.112414
+-1754878.950586 -320916.871770
+-1754067.590770 -326190.710572
+-1752647.711092 -326190.710572
+-1751430.671369 -324365.150987
+-1752039.191231 -322133.911493
+-1751633.511323 -319902.672000
+
+## Name:Island
+## Icon:0
+# Points Count  Value
+7 1.000000
+# X pos Y pos
+-1644331.175683 -296576.077296
+-1645548.215407 -297995.956973
+-1645345.375453 -299415.836651
+-1643722.655821 -300024.356513
+-1641694.256282 -298807.316789
+-1642302.776144 -296576.077296
+-1644331.175683 -296576.077296
+
+## Name:Island
+## Icon:0
+# Points Count  Value
+8 1.000000
+# X pos Y pos
+-1641694.256282 -318077.112414
+-1641694.256282 -320105.511954
+-1639868.696696 -321728.231586
+-1637434.617249 -320916.871770
+-1637434.617249 -318685.632276
+-1638043.137111 -316454.392783
+-1640477.216558 -316657.232737
+-1641694.256282 -318077.112414
+
+## Name:Island
+## Icon:0
+# Points Count  Value
+7 1.000000
+# X pos Y pos
+-1658732.812414 -359253.623066
+-1660558.371999 -362499.062330
+-1658327.132506 -366961.541316
+-1652039.093933 -367164.381270
+-1652444.773841 -360673.502744
+-1655081.693242 -359050.783112
+-1658732.812414 -359253.623066
+