From 230b4cf268913f4050ca1ecb335757a4fa1fe86a Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Mon, 13 May 2019 13:52:18 +0000
Subject: [PATCH] mkdir -p
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@11878 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/AUG/gdat_aug.m | 27 ++++++++++++++++++--
crpptbx/AUG/torbeam_prepare_inputs_and_run.m | 2 +-
2 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/crpptbx/AUG/gdat_aug.m b/crpptbx/AUG/gdat_aug.m
index 172c6e05..850049c0 100644
--- a/crpptbx/AUG/gdat_aug.m
+++ b/crpptbx/AUG/gdat_aug.m
@@ -1331,9 +1331,32 @@ elseif strcmp(mapping_for_aug.method,'switchcase')
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
case {'ne_rho', 'te_rho', 'nete_rho'}
+ sources_available = {'VTA','IDA','TRA'}; % TRA to be included
+ gdat_data.gdat_params.source = upper(gdat_data.gdat_params.source);
+ if strcmp(gdat_data.gdat_params.source(1:2),'EQ');
+ warning('set equilibrium choice in ''equil'' parameter and not source, moved to equil')
+ gdat_data.gdat_params.equil = gdat_data.gdat_params.source;
+ gdat_data.gdat_params.source = [];
+ end
+ if ~isempty(intersect({'THOMSON'},gdat_data.gdat_params.source)); gdat_data.gdat_params.source = 'VTA'; end
+ if ~isempty(intersect({'TRANSP'},gdat_data.gdat_params.source)); gdat_data.gdat_params.source = 'TRA'; end
+ if ~isempty(intersect({'IDE'},gdat_data.gdat_params.source)); gdat_data.gdat_params.source = 'IDA'; end
+ if ~isfield(gdat_data.gdat_params,'source') || isempty(gdat_data.gdat_params.source)
+ gdat_data.gdat_params.source = 'VTA'; % default source
+ elseif isempty(intersect(sources_available,upper(gdat_data.gdat_params.source)))
+ error(['available source choices: ' sources_available{:} char(10) ' source: ' gdat_data.gdat_params.source ...
+ ' not implemented, ask O. Sauter' char(10)]);
+ elseif ~strcmp(upper(gdat_data.gdat_params.source),'VTA')
+ disp(['At this stage .te, .ne, .fit refer to VTA projected on given equil choice. ' char(10) ...
+ 'IDA or TRA profiles are added in .ida or .transp respectively']);
+ end
if ~isfield(gdat_data.gdat_params,'fit') || isempty(gdat_data.gdat_params.fit) || ~isnumeric(gdat_data.gdat_params.fit)
- gdat_data.gdat_params.fit = 1; % default do fit
+ if strcmp(upper(gdat_data.gdat_params.source),'VTA')
+ gdat_data.gdat_params.fit = 1; % default do fit (only with VTA source requested)
+ else
+ gdat_data.gdat_params.fit = 0;
end
+ %
params_eff = gdat_data.gdat_params;
params_eff.data_request=data_request_eff(1:2); % start with ne if nete_rho
% get raw data
@@ -1606,7 +1629,7 @@ elseif strcmp(mapping_for_aug.method,'switchcase')
end
end
end
-
+ keyboard
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
case {'pgyro'}
diff --git a/crpptbx/AUG/torbeam_prepare_inputs_and_run.m b/crpptbx/AUG/torbeam_prepare_inputs_and_run.m
index 30b4aaf7..20be22b0 100644
--- a/crpptbx/AUG/torbeam_prepare_inputs_and_run.m
+++ b/crpptbx/AUG/torbeam_prepare_inputs_and_run.m
@@ -62,7 +62,7 @@ end
if doload,
torbeam_in.eqd_all=gdat(shot,'eqdsk','time',torbeam_in.inbeam.t_some_beam_on,'write',0);
torbeam_in.dir_torbeam = ['/tmp/' getenv('USER') '/' num2str(shot) '_torbeam'];
- unix(['mkdir ' torbeam_in.dir_torbeam]);
+ unix(['mkdir -p ' torbeam_in.dir_torbeam]);
else
if ~isfield(torbeam_in,'eqd_all') || isempty(torbeam_in.eqd_all)
error('expects eqd_all as field of torbeam_in (varargin{1}) from gdat(shot,''eqdsk'',''time'',torbeam_in.inbeam.t_some_beam_on,''write'',0);')
--
GitLab