diff --git a/src/geometry_mod.F90 b/src/geometry_mod.F90 index 1ee9153c994038d51631aab3e9cb61228c2c7894..7d6dd5d6cd18779e127938436361972d9c416848 100644 --- a/src/geometry_mod.F90 +++ b/src/geometry_mod.F90 @@ -121,6 +121,9 @@ CONTAINS call eval_zpinch_geometry SHEARED = .FALSE. shear = 0._xp + q0 = 0._xp + eps = 0._xp + kappa = 1._xp CASE('miller') CALL speak('Miller geometry') call set_miller_parameters(kappa,s_kappa,delta,s_delta,zeta,s_zeta) diff --git a/testcases/zpinch_example/fort_00.90 b/testcases/zpinch_example/fort_00.90 index b02fe749febe129cd9d6db5d9541d66655f54241..4c2f8a920232e171d6e784da7a2a590722c58b98 100644 --- a/testcases/zpinch_example/fort_00.90 +++ b/testcases/zpinch_example/fort_00.90 @@ -18,9 +18,9 @@ / &GEOMETRY geom = 'Z-pinch' - q0 = 1.4 - shear = 0.8 - eps = 0.18 + q0 = 0.0 + shear = 0.0 + eps = 0.0 kappa = 1.0 s_kappa= 0.0 delta = 0.0 diff --git a/wk/fast_analysis.m b/wk/fast_analysis.m index 8306684e3c9d510ae052963a151abb10c3759f80..3703d93bcf221841c216dd2ff738e198b3b4922a 100644 --- a/wk/fast_analysis.m +++ b/wk/fast_analysis.m @@ -1,8 +1,8 @@ % Directory of the code "mypathtogyacomo/gyacomo/" % Partition of the computer where the data have to be searched -PARTITION = '/misc/gyacomo23_outputs/'; +% PARTITION = '/misc/gyacomo23_outputs/'; % PARTITION = gyacomodir; - +PARTITION = '/home/ahoffman/gyacomo/'; %% CBC % resdir = 'paper_2_GYAC23/CBC/7x4x192x96x32_nu_0.05_muxy_0.5_muz_0.2'; % resdir = 'paper_2_GYAC23/CBC/7x4x192x96x32_nu_0.05_muxy_1.0_muz_1.0'; @@ -15,13 +15,16 @@ PARTITION = '/misc/gyacomo23_outputs/'; % resdir = 'paper_2_GYAC23/precision_study/5x3x128x64x24_sp'; % resdir = 'paper_2_GYAC23/precision_study/5x3x128x64x24_sp_clos_1'; % resdir = 'paper_2_GYAC23/precision_study/3x2x128x64x24_sp_muz_2.0'; -resdir = 'paper_2_GYAC23/precision_study/test_3x2x128x64x24_sp_muz_2.0'; +% resdir = 'paper_2_GYAC23/precision_study/test_3x2x128x64x24_sp_muz_2.0'; % resdir = 'paper_2_GYAC23/precision_study/3x2x128x64x24_sp_clos_1'; %% % resdir = 'paper_2_GYAC23/collisionless/kT_5.3/5x3x128x64x24_dp_muz_2.0'; % resdir = 'paper_2_GYAC23/collisionless/kT_5.3/5x3x128x64x24_dp_muz_2.0_full_NL'; % resdir = 'paper_2_GYAC23/collisionless/kT_5.3/5x3x128x64x24_dp_muz_2.0_muxy_0'; + +resdir = 'testcases/zpinch_example'; + %% J0 = 00; J1 = 10;