Changeset 596 for trunk/src/series


Ignore:
Timestamp:
Mar 30, 2013, 11:34:27 AM (12 years ago)
Author:
sommeria
Message:

corrections done in civ

Location:
trunk/src/series
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/series/aver_stat.m

    r595 r596  
    55%%%%%%%%%%% GENERAL TO ALL SERIES ACTION FCTS %%%%%%%%%%%%%%%%%%%%%%%%%%%
    66%
    7 % This function is used in four modes by the GUI series:
    8 %           1) config GUI: with no input argument, the function determine the suitable GUI configuration
    9 %           2) interactive input: the function is used to interactively introduce input parameters, and then stops
    10 %           3) RUN: the function itself runs, when an appropriate input  structure Param has been introduced.
    11 %           4) BATCH: the function itself proceeds in BATCH mode, using an xml file 'Param' as input.
    12 %
    13 % This function is used in four modes by the GUI series:
    14 %           1) config GUI: with no input argument, the function determine the suitable GUI configuration
    15 %           2) interactive input: the function is used to interactively introduce input parameters, and then stops
    16 %           3) RUN: the function itself runs, when an appropriate input  structure Param has been introduced.
    17 %           4) BATCH: the function itself proceeds in BATCH mode, using an xml file 'Param' as input.
    18 %
    197%OUTPUT
    20 % GUI_input=list of options in the GUI series.fig needed for the function
     8% ParamOut: sets options in the GUI series.fig needed for the function
    219%
    2210%INPUT:
    2311% In run mode, the input parameters are given as a Matlab structure Param copied from the GUI series.
    2412% In batch mode, Param is the name of the corresponding xml file containing the same information
    25 % In the absence of input (as activated when the current Action is selected
    26 % in series), the function ouput GUI_input set the activation of the needed GUI elements
     13% when Param.Action.RUN=0 (as activated when the current Action is selected
     14% in series), the function ouput paramOut set the activation of the needed GUI elements
    2715%
    28 % Param contains the elements:(use the menu bar command 'export/GUI config' in series to see the current structure Param)
     16% Param contains the elements:(use the menu bar command 'export/GUI config' in series to
     17% see the current structure Param)
    2918%    .InputTable: cell of input file names, (several lines for multiple input)
    3019%                      each line decomposed as {RootPath,SubDir,Rootfile,NomType,Extension}
    … …  
    3322%    .Action: .ActionName: name of the current activated function
    3423%             .ActionPath:   path of the current activated function
     24%             .ActionExt: fct extension ('.m', Matlab fct, '.sh', compiled   Matlab fct
     25%             .RUN =0 for GUI input, =1 for function activation
     26%             .RunMode='local','background', 'cluster': type of function  use
     27%             
    3528%    .IndexRange: set the file or frame indices on which the action must be performed
    3629%    .FieldTransform: .TransformName: name of the selected transform function
    3730%                     .TransformPath:   path  of the selected transform function
    38 %                     .TransformHandle: corresponding function handle
    3931%    .InputFields: sub structure describing the input fields withfields
    40 %              .FieldName: name of the field
     32%              .FieldName: name(s) of the field
    4133%              .VelType: velocity type
    4234%              .FieldName_1: name of the second field in case of two input series
    4335%              .VelType_1: velocity type of the second field in case of two input series
     36%              .Coord_y: name of y coordinate variable
     37%              .Coord_x: name of x coordinate variable
    4438%    .ProjObject: %sub structure describing a projection object (read from ancillary GUI set_object)
    4539%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

  • trunk/src/series/merge_proj.m

    r595 r596  
    33% function ParamOut=merge_proj(Param)
    44%------------------------------------------------------------------------
    5 
    65%%%%%%%%%%% GENERAL TO ALL SERIES ACTION FCTS %%%%%%%%%%%%%%%%%%%%%%%%%%%
    76%
    8 % This function is used in four modes by the GUI series:
    9 %           1) config GUI: with no input argument, the function determine the suitable GUI configuration
    10 %           2) interactive input: the function is used to interactively introduce input parameters, and then stops
    11 %           3) RUN: the function itself runs, when an appropriate input  structure Param has been introduced.
    12 %           4) BATCH: the function itself proceeds in BATCH mode, using an xml file 'Param' as input.
    13 %
    14 % This function is used in four modes by the GUI series:
    15 %           1) config GUI: with no input argument, the function determine the suitable GUI configuration
    16 %           2) interactive input: the function is used to interactively introduce input parameters, and then stops
    17 %           3) RUN: the function itself runs, when an appropriate input  structure Param has been introduced.
    18 %           4) BATCH: the function itself proceeds in BATCH mode, using an xml file 'Param' as input.
    19 %
    207%OUTPUT
    21 % GUI_input=list of options in the GUI series.fig needed for the function
     8% ParamOut: sets options in the GUI series.fig needed for the function
    229%
    2310%INPUT:
    2411% In run mode, the input parameters are given as a Matlab structure Param copied from the GUI series.
    2512% In batch mode, Param is the name of the corresponding xml file containing the same information
    26 % In the absence of input (as activated when the current Action is selected
    27 % in series), the function ouput GUI_input set the activation of the needed GUI elements
     13% when Param.Action.RUN=0 (as activated when the current Action is selected
     14% in series), the function ouput paramOut set the activation of the needed GUI elements
    2815%
    29 % Param contains the elements:(use the menu bar command 'export/GUI config' in series to see the current structure Param)
     16% Param contains the elements:(use the menu bar command 'export/GUI config' in series to
     17% see the current structure Param)
    3018%    .InputTable: cell of input file names, (several lines for multiple input)
    3119%                      each line decomposed as {RootPath,SubDir,Rootfile,NomType,Extension}
    … …  
    3422%    .Action: .ActionName: name of the current activated function
    3523%             .ActionPath:   path of the current activated function
     24%             .ActionExt: fct extension ('.m', Matlab fct, '.sh', compiled   Matlab fct
     25%             .RUN =0 for GUI input, =1 for function activation
     26%             .RunMode='local','background', 'cluster': type of function  use
     27%             
    3628%    .IndexRange: set the file or frame indices on which the action must be performed
    3729%    .FieldTransform: .TransformName: name of the selected transform function
    3830%                     .TransformPath:   path  of the selected transform function
    39 %                     .TransformHandle: corresponding function handle
    4031%    .InputFields: sub structure describing the input fields withfields
    41 %              .FieldName: name of the field
     32%              .FieldName: name(s) of the field
    4233%              .VelType: velocity type
    4334%              .FieldName_1: name of the second field in case of two input series
    4435%              .VelType_1: velocity type of the second field in case of two input series
     36%              .Coord_y: name of y coordinate variable
     37%              .Coord_x: name of x coordinate variable
    4538%    .ProjObject: %sub structure describing a projection object (read from ancillary GUI set_object)
    4639%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

  • trunk/src/series/sub_background.m

    r592 r596  
    1818%%%%%%%%%%% GENERAL TO ALL SERIES ACTION FCTS %%%%%%%%%%%%%%%%%%%%%%%%%%%
    1919%
    20 % This function is used in four modes by the GUI series:
    21 %           1) config GUI: with no input argument, the function determine the suitable GUI configuration
    22 %           2) interactive input: the function is used to interactively introduce input parameters, and then stops
    23 %           3) RUN: the function itself runs, when an appropriate input  structure Param has been introduced.
    24 %           4) BATCH: the function itself proceeds in BATCH mode, using an xml file 'Param' as input.
    25 %
    2620%OUTPUT
    27 % GUI_series_config=list of options in the GUI series.fig needed for the function
     21% ParamOut: sets options in the GUI series.fig needed for the function
    2822%
    2923%INPUT:
    3024% In run mode, the input parameters are given as a Matlab structure Param copied from the GUI series.
    3125% In batch mode, Param is the name of the corresponding xml file containing the same information
    32 % In the absence of input (as activated when the current Action is selected
    33 % in series), the function ouput GUI_series_config set the activation of the needed GUI elements
     26% when Param.Action.RUN=0 (as activated when the current Action is selected
     27% in series), the function ouput paramOut set the activation of the needed GUI elements
    3428%
    35 % Param contains the elements:(use the menu bar command 'export/GUI config' in series to see the current structure Param)
     29% Param contains the elements:(use the menu bar command 'export/GUI config' in series to
     30% see the current structure Param)
    3631%    .InputTable: cell of input file names, (several lines for multiple input)
    3732%                      each line decomposed as {RootPath,SubDir,Rootfile,NomType,Extension}
    3833%    .OutputSubDir: name of the subdirectory for data outputs
    39 %    .OutputDirExt: extension for the directory for data outputs
     34%    .OutputDirExt: directory extension for data outputs
    4035%    .Action: .ActionName: name of the current activated function
    4136%             .ActionPath:   path of the current activated function
     37%             .ActionExt: fct extension ('.m', Matlab fct, '.sh', compiled   Matlab fct
     38%             .RUN =0 for GUI input, =1 for function activation
     39%             .RunMode='local','background', 'cluster': type of function  use
     40%             
    4241%    .IndexRange: set the file or frame indices on which the action must be performed
    4342%    .FieldTransform: .TransformName: name of the selected transform function
    4443%                     .TransformPath:   path  of the selected transform function
    45 %                     .TransformHandle: corresponding function handle
    4644%    .InputFields: sub structure describing the input fields withfields
    47 %              .FieldName: name of the field
     45%              .FieldName: name(s) of the field
    4846%              .VelType: velocity type
    4947%              .FieldName_1: name of the second field in case of two input series
    5048%              .VelType_1: velocity type of the second field in case of two input series
     49%              .Coord_y: name of y coordinate variable
     50%              .Coord_x: name of x coordinate variable
    5151%    .ProjObject: %sub structure describing a projection object (read from ancillary GUI set_object)
    5252%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    53 
    54    
     53   
    5554function ParamOut=sub_background (Param)
    5655

  • trunk/src/series/time_series.m

    r592 r596  
    66%%%%%%%%%%% GENERAL TO ALL SERIES ACTION FCTS %%%%%%%%%%%%%%%%%%%%%%%%%%%
    77%
    8 % This function is used in four modes by the GUI series:
    9 %           1) config GUI: with no input argument, the function determine the suitable GUI configuration
    10 %           2) interactive input: the function is used to interactively introduce input parameters, and then stops
    11 %           3) RUN: the function itself runs, when an appropriate input  structure Param has been introduced.
    12 %           4) BATCH: the function itself proceeds in BATCH mode, using an xml file 'Param' as input.
    13 %
    14 % This function is used in four modes by the GUI series:
    15 %           1) config GUI: with no input argument, the function determine the suitable GUI configuration
    16 %           2) interactive input: the function is used to interactively introduce input parameters, and then stops
    17 %           3) RUN: the function itself runs, when an appropriate input  structure Param has been introduced.
    18 %           4) BATCH: the function itself proceeds in BATCH mode, using an xml file 'Param' as input.
    19 %
    208%OUTPUT
    21 % GUI_input=list of options in the GUI series.fig needed for the function
     9% ParamOut: sets options in the GUI series.fig needed for the function
    2210%
    2311%INPUT:
    2412% In run mode, the input parameters are given as a Matlab structure Param copied from the GUI series.
    2513% In batch mode, Param is the name of the corresponding xml file containing the same information
    26 % In the absence of input (as activated when the current Action is selected
    27 % in series), the function ouput GUI_input set the activation of the needed GUI elements
     14% when Param.Action.RUN=0 (as activated when the current Action is selected
     15% in series), the function ouput paramOut set the activation of the needed GUI elements
    2816%
    29 % Param contains the elements:(use the menu bar command 'export/GUI config' in series to see the current structure Param)
     17% Param contains the elements:(use the menu bar command 'export/GUI config' in series to
     18% see the current structure Param)
    3019%    .InputTable: cell of input file names, (several lines for multiple input)
    3120%                      each line decomposed as {RootPath,SubDir,Rootfile,NomType,Extension}
    … …  
    3423%    .Action: .ActionName: name of the current activated function
    3524%             .ActionPath:   path of the current activated function
     25%             .ActionExt: fct extension ('.m', Matlab fct, '.sh', compiled   Matlab fct
     26%             .RUN =0 for GUI input, =1 for function activation
     27%             .RunMode='local','background', 'cluster': type of function  use
     28%             
    3629%    .IndexRange: set the file or frame indices on which the action must be performed
    3730%    .FieldTransform: .TransformName: name of the selected transform function
    3831%                     .TransformPath:   path  of the selected transform function
    39 %                     .TransformHandle: corresponding function handle
    4032%    .InputFields: sub structure describing the input fields withfields
    41 %              .FieldName: name of the field
     33%              .FieldName: name(s) of the field
    4234%              .VelType: velocity type
    4335%              .FieldName_1: name of the second field in case of two input series
    4436%              .VelType_1: velocity type of the second field in case of two input series
     37%              .Coord_y: name of y coordinate variable
     38%              .Coord_x: name of x coordinate variable
    4539%    .ProjObject: %sub structure describing a projection object (read from ancillary GUI set_object)
    4640%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    47 %
     41
    4842function ParamOut=time_series(Param)
    4943
Note: See TracChangeset for help on using the changeset viewer.