From 545a337457b5c4d9a64c360a3ed3be9f9106c760 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Thu, 18 Feb 2016 13:27:27 +0000
Subject: [PATCH] fix volume, volume_rho still just copy/paste from psi_axis
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@5485 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/AUG/aug_requests_mapping.m | 2 +-
crpptbx/AUG/gdat_aug.m | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/crpptbx/AUG/aug_requests_mapping.m b/crpptbx/AUG/aug_requests_mapping.m
index da601b3e..796d2926 100644
--- a/crpptbx/AUG/aug_requests_mapping.m
+++ b/crpptbx/AUG/aug_requests_mapping.m
@@ -280,7 +280,7 @@ switch lower(data_request)
case 'volume'
mapping.label = 'Volume';
mapping.timedim = 1;
- mapping.method = 'switchcase';
+ mapping.method = 'signal';
mapping.expression = [{'FPG'},{'Vol'},{'AUGD'}];
case 'volume_rho'
mapping.timedim = 2;
diff --git a/crpptbx/AUG/gdat_aug.m b/crpptbx/AUG/gdat_aug.m
index 60e0ccad..3b77c8a0 100644
--- a/crpptbx/AUG/gdat_aug.m
+++ b/crpptbx/AUG/gdat_aug.m
@@ -1619,7 +1619,7 @@ elseif strcmp(mapping_for_aug.method,'switchcase')
end
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- case {'rho_tor', 'rhotor_edge', 'rhovol', 'volume', 'volume_rho'}
+ case {'rho_tor', 'rhotor_edge', 'rhovol', 'volume_rho'}
if strcmp(upper(gdat_data.gdat_params.equil),'FPG')
gdat_params_prev = gdat_data.gdat_params; gdat_params_eff = gdat_params_prev;
gdat_params_eff.data_request = [{'FPG'},{'fax-bnd'},{'AUGD'}];
--
GitLab