From 55ecacf04965477dc271ea1adc61281ef1fefe7d Mon Sep 17 00:00:00 2001
From: Antoine Hoffmann <antoine.hoffmann@epfl.ch>
Date: Fri, 14 Oct 2022 16:58:45 +0200
Subject: [PATCH] testcases are reorganized
---
testcases/cyclone_example/cyclone_example.txt | 4 +++
testcases/cyclone_example/fort.90 | Bin 0 -> 1378 bytes
testcases/kobayashi_2015_linear_results.m | 19 -----------
.../{ => matlab_testscripts}/Hallenbert.m | 0
.../benchmark_HeLaZ_gene_transport_zpinch.m | 0
.../benchmark_HeLaZ_molix.m | 0
.../benchmark_linear_1D_entropy_mode.m | 0
.../cyclone_test_case.m | 0
.../linear_1D_entropy_mode.m | 0
.../{ => matlab_testscripts}/linear_damping.m | 0
testcases/miller_example/fort_00.90 | Bin 0 -> 1392 bytes
fort.90 => testcases/zpinch_example/fort.90 | 31 +++++++++---------
12 files changed, 20 insertions(+), 34 deletions(-)
create mode 100644 testcases/cyclone_example/cyclone_example.txt
create mode 100644 testcases/cyclone_example/fort.90
delete mode 100644 testcases/kobayashi_2015_linear_results.m
rename testcases/{ => matlab_testscripts}/Hallenbert.m (100%)
rename testcases/{ => matlab_testscripts}/benchmark_HeLaZ_gene_transport_zpinch.m (100%)
rename testcases/{ => matlab_testscripts}/benchmark_HeLaZ_molix.m (100%)
rename testcases/{ => matlab_testscripts}/benchmark_linear_1D_entropy_mode.m (100%)
rename testcases/{ => matlab_testscripts}/cyclone_test_case.m (100%)
rename testcases/{ => matlab_testscripts}/linear_1D_entropy_mode.m (100%)
rename testcases/{ => matlab_testscripts}/linear_damping.m (100%)
create mode 100644 testcases/miller_example/fort_00.90
rename fort.90 => testcases/zpinch_example/fort.90 (76%)
diff --git a/testcases/cyclone_example/cyclone_example.txt b/testcases/cyclone_example/cyclone_example.txt
new file mode 100644
index 00000000..b38bfef6
--- /dev/null
+++ b/testcases/cyclone_example/cyclone_example.txt
@@ -0,0 +1,4 @@
+This is a testcase reproducing the cyclone base case of Dimits 2000
+Adiabatic electrons, s-alpha geometry, gradlnN = 2.22, gradlnT = 6.96
+With a small P,J=4,2 polynomial basis, one should observe the secondary instability (KHI) at t~50R/cs.
+The saturated heat flux should be located around Qx ~ 30, i.e. Qx/QGB ~ 2 which is close to Dimits results.
diff --git a/testcases/cyclone_example/fort.90 b/testcases/cyclone_example/fort.90
new file mode 100644
index 0000000000000000000000000000000000000000..d562465a47ad3fcff4858ddad9ea05cd9b707fec
GIT binary patch
literal 1378
zcmY#$at!u#=2B3|D=N)XP*AW{Ff@PyE(L{@5(N;jRWQ&qFyvBDD9KH%04p*zFyK;9
z$W5#$D$Og&%uQ9WRWLR+GchpW(&tih5At;3Qcx(!O{_=-nP|eLppXUQ7(rz+k!8Rf
zkc=P5c#w>tkp-86f)9*qW~66fY-q`)px{>ta*=|qf*HtI9~jTj4CElcDyXEP8AxeC
zeh%2RAg2erL#6c65_5`E^}r5w_4joR35w)WP)JYB&jqVhFV;=WDac4v=TcB8G=S<c
z)B{;ooROMX1ah2#9>{U21;rp~P~aF^fQ<7G4G9Phi4SlL0)=OBVp(duL5hN{f+@&p
zd0@UFh_4HB4}@<7;(O+$!8I6z1PsBU3sGST5`YAEc~NFbYJ5t5X;MyVK~ZXQW^rbI
zo`S6c%ts0e5Ebc(xw(lT@sgs_R6Q=3a7G%$xq7I=1sR!OkE03uB^nrj{E8u5kcCA!
zI1wrg4P2O=DXDqISd^Ef<`$p`XXPgu<>V)(KwPM62ntSLe-~FDXlN=bIOpf&fIXa;
zlUY*9rJ&&K;~xxB4hmjBpLno<tpbSW<LT$>7~~lesbH(1o|m7OlbM&ASOkhvZ%@B?
zSBQV%PR%Wi2d6V|OoEbiX*@Vt!T5gh9xf1@KuI*WG#;GFY!!_3Kz8Mp#uq?jp}Z^v
zFRv8D2Km%L&%hLvff7sOQ^D4Q(m+XKX*?wGLA>J3^xVXFP*yU~GcYnXHU=d!h+rlt
zUxE@OSTo2xa2hHE>jrT_`n}`*K!z!R9A*S^sdsz`RKQHn5+dLSvRnZYNZ#=wNIdtV
z#1tpE%bZJ#$`HJq#N4EmL>I6=eJ(X;e;*&uU{8NPXyhcrq9#5!KP5E>6y`4OpukSA
zEXvQ$%!_yShXn&7sb=Ptq!twyq$X#kLbDM(rR64;#HVHEfE@?Y2#UkfoE&vfqVV+d
z4DodIiFfw*<5Exn@#6ghLO`lO!JuA{kqNTc(K#gE-!C4Nf`Y-~3?R|Wyv&mLq{QUx
z^rHOIycCcGD9XUXdHI>esX1jJ#~Y^V8gnTqWEQ8Ug3}||a9afvBar<ep1!W}o_-;&
i?m><rh#<%-%}p)JOis*+FHX)#1(%2FLEa`HCj$U@R$3VV
literal 0
HcmV?d00001
diff --git a/testcases/kobayashi_2015_linear_results.m b/testcases/kobayashi_2015_linear_results.m
deleted file mode 100644
index 82f33912..00000000
--- a/testcases/kobayashi_2015_linear_results.m
+++ /dev/null
@@ -1,19 +0,0 @@
-% results for blue triangles in Kobayashi 2015
-% x_ = [0.06 0.4 0.6];
-% y_ = [0.0 0.1 0.0];
-% plot(x_,y_,'^b','DisplayName','Kobayashi et al. 2015');
-
-
-% results for red squares in Kobayashi 2015
-% x_ = [0.065 0.15 0.35];
-% y_ = [0.0 0.15 0.0];
-% plot(x_,y_,'sr','DisplayName','Kobayashi et al. 2015');
-
-
-% results for green triangles in Kobayashi 2015
-x_ = [0.06 0.5 1.8];
-y_ = [0.0 0.2 0.0];
-plot(x_,y_,'dg','DisplayName','Kobayashi et al. 2015');
-
-
-
diff --git a/testcases/Hallenbert.m b/testcases/matlab_testscripts/Hallenbert.m
similarity index 100%
rename from testcases/Hallenbert.m
rename to testcases/matlab_testscripts/Hallenbert.m
diff --git a/testcases/benchmark_HeLaZ_gene_transport_zpinch.m b/testcases/matlab_testscripts/benchmark_HeLaZ_gene_transport_zpinch.m
similarity index 100%
rename from testcases/benchmark_HeLaZ_gene_transport_zpinch.m
rename to testcases/matlab_testscripts/benchmark_HeLaZ_gene_transport_zpinch.m
diff --git a/testcases/benchmark_HeLaZ_molix.m b/testcases/matlab_testscripts/benchmark_HeLaZ_molix.m
similarity index 100%
rename from testcases/benchmark_HeLaZ_molix.m
rename to testcases/matlab_testscripts/benchmark_HeLaZ_molix.m
diff --git a/testcases/benchmark_linear_1D_entropy_mode.m b/testcases/matlab_testscripts/benchmark_linear_1D_entropy_mode.m
similarity index 100%
rename from testcases/benchmark_linear_1D_entropy_mode.m
rename to testcases/matlab_testscripts/benchmark_linear_1D_entropy_mode.m
diff --git a/testcases/cyclone_test_case.m b/testcases/matlab_testscripts/cyclone_test_case.m
similarity index 100%
rename from testcases/cyclone_test_case.m
rename to testcases/matlab_testscripts/cyclone_test_case.m
diff --git a/testcases/linear_1D_entropy_mode.m b/testcases/matlab_testscripts/linear_1D_entropy_mode.m
similarity index 100%
rename from testcases/linear_1D_entropy_mode.m
rename to testcases/matlab_testscripts/linear_1D_entropy_mode.m
diff --git a/testcases/linear_damping.m b/testcases/matlab_testscripts/linear_damping.m
similarity index 100%
rename from testcases/linear_damping.m
rename to testcases/matlab_testscripts/linear_damping.m
diff --git a/testcases/miller_example/fort_00.90 b/testcases/miller_example/fort_00.90
new file mode 100644
index 0000000000000000000000000000000000000000..6958e7ad349208316d3f2e9cb71f5bb53d47b7f5
GIT binary patch
literal 1392
zcmY#$at!u#=2B3|D=N)XP*AW{Ff@PyE(L{@5(N;jRWQ&qFyvBDD9KH%fGOfqP{>WJ
zC@Re>$;?evuvIWNH8U|V;L_((a}V-#;Zjg2$W5$B1(|5XrJ#@n<A96-$z&qSfH@!;
zKalYt8ABrrE(HZ27}v~5&%)Tyl1o9suM*@UkUJqNU|b_p1CVSLOx6s<E6C4*IG0O7
zA=n)%rI(hNQ=F;?cB!ksuWLw9B$t9hdTM?ySgm?)W=>9Okvf-xLZJavi=mzgmx4lZ
zMrvXa$Z-aGAiGivib2w#z%jG{ndToF5)c{^AK(}S3eV!ivebBk6a`xau*>qmd_xdl
z7vxh2-w4F_%u9o7Fa`-28i34)s4xWyn1Th$i!w`6<5TiWlX6lEic*s^i!<}{6l@h>
z9#T+%s7O!D%}oS}mlTzz>T$t@GtwZ=)k767$jAiy8%@|R(ZB%YR}A5TEG)voiBMr^
z*uv~gNzE(9qP!$Ew*W;rD?iC7CqFR-;zC_RP;mPCySVy5LsL<~IX@={?BT?m%#unj
z1qEjx|6qu6P+<A_#DfKF6~LkE<LT$>7~~lesbH(1o|m7OlbM&A2#!;4PrrCqh=<{B
z%`J@wCp2(Wg3@(qJUCgw_<r#oE)c6g$so5h9-PWRvY@1$TN+;gkp(#<w=_Nr!OJTJ
zu|Zxn&;zM0Ni2;|1=|iv10WtG@Ik!d%=FyEcu-a{&@(VHHZ}(30El2FD7}LcBv>=Z
zIIu4Z<3YMXT#$b6ct0@LR>4Tm2xOUed<ay)OwSS`;0Ll?!Bzp}Qt$W>B%XUwVu};o
zWzMBVWe8qQVs27Oq6<`CQff&e$X6g!^tsfW{e65qgFXHIpiz|!i>UbA{FKxjPz1QR
zgK|@PWl?^1W?sCrKS(#o)rf?fnOBlpR9ujnoS6#ERPc0{n^+Q`mYD-~Do7(JLQ8XU
z)Imwa)6X-+)6pm1+24;#K>@^z_YVjGsR9|VUXYOqve?l%B;MaI9+aMf!Qu=c(agNe
zlK7;=<m~jK{L;J>kOU}Hz`}X?nZ>C&Wgy2Jrs^7VDJWzXr>25aC)jXX1rsBX{UM&d
ouJN9JA+GL0jv<I3$SciFEy_$z%!w~f&PWB9j_N_)CLkvR09dVE2LJ#7
literal 0
HcmV?d00001
diff --git a/fort.90 b/testcases/zpinch_example/fort.90
similarity index 76%
rename from fort.90
rename to testcases/zpinch_example/fort.90
index ae9af96c..f769f6b8 100644
--- a/fort.90
+++ b/testcases/zpinch_example/fort.90
@@ -1,7 +1,7 @@
&BASIC
nrun = 100000000
- dt = 0.01
- tmax = 400
+ dt = 0.005
+ tmax = 100
maxruntime = 356400
/
&GRID
@@ -10,23 +10,23 @@
pmaxi = 4
jmaxi = 2
Nx = 128
- Lx = 120
- Ny = 40
+ Lx = 200
+ Ny = 48
Ly = 60
Nz = 1
SG = .f.
/
&GEOMETRY
geom = 'Z-pinch'
- q0 = 1.4
+ q0 = 0
shear = 0
- eps = 0.18
+ eps = 0
/
&OUTPUT_PAR
nsave_0d = 10
nsave_1d = -1
nsave_2d = -1
- nsave_3d = 20
+ nsave_3d = 100
nsave_5d = 1000
write_doubleprecision = .f.
write_gamma = .t.
@@ -42,9 +42,9 @@
&MODEL_PAR
! Collisionality
CLOS = 0
- NL_CLOS = 0
+ NL_CLOS = -1
LINEARITY = 'nonlinear'
- KIN_E = .f.
+ KIN_E = .t.
mu_x = 1.0
mu_y = 1.0
N_HD = 4
@@ -58,22 +58,23 @@
sigma_i = 1
q_e = -1
q_i = 1
- K_n = 2.22
- K_T = 6.96
- K_E = 0
+ K_Ne = 2.22
+ K_Te = 6.96
+ K_Ni = 2.22
+ K_Ti = 6.96
GradB = 1
CurvB = 1
lambdaD = 0
+ beta = 1e-4
/
&COLLISION_PAR
collision_model = 'SG' !DG/SG/PA/LD (dougherty, sugama, pitch angle, landau)
gyrokin_CO = .false.
interspecies = .true.
- mat_file = 'iCa/gk_sugama_P_20_J_10_N_150_kpm_8.0.h5'
-! mat_file = 'iCa/gk_pitchangle_8_P_20_J_10_N_150_kpm_8.0.h5'
+ mat_file = 'gk_sugama_P_20_J_10_N_150_kpm_8.0.h5'
/
&INITIAL_CON
- INIT_OPT = 'ppj'
+ INIT_OPT = 'phi'
ACT_ON_MODES = 'donothing'
init_background = 0
init_noiselvl = 0.00005
--
GitLab