Changeset 1038 for trunk


Ignore:
Timestamp:
May 1, 2018, 5:11:39 PM (7 years ago)
Author:
g7moreau
Message:
  • Better comment, better format
Location:
trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/PARAM.xml.default

    r1037 r1038  
    11<?xml version="1.0"?>
    22<UvmatParam>
    3 <RunParam>
    4 <CivBin>bin/civ<!--binary for the new civx version (relative or
    5 absolute path)--></CivBin>
    6 <Civ1Bin>bin/civ1<!--binary for civ1 (relative or absolute path)
    7 --></Civ1Bin>
    8 <Civ2Bin>bin/civ2<!--binary for civ2 (relative or absolute path)
    9 --></Civ2Bin>
    10 <Civ3D3CBin>bin/civ3d3c</Civ3D3CBin>
    11 <FixBin>bin/fix_flag</FixBin>
    12 <PatchBin>bin/patch_up</PatchBin>
    13 </RunParam>
    14 <BatchParam>
    15 <CivBin>bin/civ</CivBin>
    16 <Civ1Bin>bin/civ1</Civ1Bin>
    17 <Civ2Bin>bin/civ2</Civ2Bin>
    18 <Civ3D3CBin>bin/civ3d3c</Civ3D3CBin>
    19 <FixBin>bin/fix_flag</FixBin>
    20 <PatchBin>bin/patch_up</PatchBin>
    21 </BatchParam>
     3  <RunParam>
     4    <CivBin>bin/civ</CivBin>             <!-- binary for the new civx version (relative or absolute path) -->
     5    <Civ1Bin>bin/civ1</Civ1Bin>          <!-- binary for civ1 (relative or absolute path) -->
     6    <Civ2Bin>bin/civ2</Civ2Bin>          <!-- binary for civ2 (relative or absolute path) -->
     7    <Civ3D3CBin>bin/civ3d3c</Civ3D3CBin>
     8    <FixBin>bin/fix_flag</FixBin>
     9    <PatchBin>bin/patch_up</PatchBin>
     10  </RunParam>
     11  <BatchParam>
     12    <CivBin>bin/civ</CivBin>
     13    <Civ1Bin>bin/civ1</Civ1Bin>
     14    <Civ2Bin>bin/civ2</Civ2Bin>
     15    <Civ3D3CBin>bin/civ3d3c</Civ3D3CBin>
     16    <FixBin>bin/fix_flag</FixBin>
     17    <PatchBin>bin/patch_up</PatchBin>
     18  </BatchParam>
    2219</UvmatParam>

  • trunk/src/dir_uvmat.m

    r1037 r1038  
    1 %'dir_uvmat': list the content of a folder, extending 'dir' to the case of OpenDap server
     1%'dir_uvmat': list the content of a folder, extending 'dir' to the case of OpeNDAP server
    22%--------------------------------------------------------------------
    33%[RootPath,SubDir,RootFile,i1,i2,j1,j2,Ext,NomType]=fileparts_uvmat(FileInput)
    … …  
    2727%=======================================================================
    2828
    29 function [ ListFiles,errormsg] = dir_uvmat(DirName)
     29function [ListFiles,errormsg] = dir_uvmat(DirName)
    3030errormsg='';
    3131if regexp(DirName,'^http://')
     32    % OpeNDAP case - read catalog.xml file
    3233    catalog=[DirName,'/catalog.xml'];
    3334    try
    … …  
    3839        return
    3940    end
    40     ListFiles=(regexp(str,'xlink:title="(?<name>[^"]+)"','names'))';%list subfolders
     41    ListFiles=(regexp(str,'xlink:title="(?<name>[^"]+)"','names'))'; % list subfolders
    4142    NumDir=numel(ListFiles);
    42     ListFiles=[ListFiles;(regexp(str,'dataset name="(?<name>[^"]+)"','names'))'];% append files to the list
     43    ListFiles=[ListFiles;(regexp(str,'dataset name="(?<name>[^"]+)"','names'))']; % append files to the list
    4344    for ilist=1:numel(ListFiles)
    4445        ListFiles(ilist).date=0;
    … …  
    5253    ListFiles(NumDir+1)=[];
    5354else
     55    % Standart case
    5456    ListFiles=dir(DirName);
    5557end

  • trunk/src/series.xml.default

    r1037 r1038  
    11<?xml version="1.0"?>
    22<SeriesParam>
    3    <DiskQuotaCmd>quota -s -g -A</DiskQuotaCmd>
    4 <ClusterParam>
    5 <ExistenceTest>oarstat</ExistenceTest>
    6   <NbCoreAdvised>16</NbCoreAdvised><!--proposed default number of parallel cores attributed for the computations -->
    7   <NbCoreMax>36</NbCoreMax><!--maximum number of cores allowed for the computations -->
    8   <JobCPUTimeAdvised unit="minute">20</JobCPUTimeAdvised><!--used to group the iterations into jobs of sufficient CPU time-->
    9   <JobNumberMax>500</JobNumberMax><!--maximum number of jobs allowed (will group the iterations to fit in)-->
    10   <WallTimeMax unit="hour">23</WallTimeMax> <!--maximum allowed time for a job --> 
    11   <JobStatCmd>oarstat |grep N=UVmat</JobStatCmd> <!--command to know the number of active and waiting job launches--> 
    12   <LaunchCmdFcn>cluster_command</LaunchCmdFcn> <!--name of the function used to create job launch commmand-->
    13 </ClusterParam>
     3  <DiskQuotaCmd>quota -s -g -A</DiskQuotaCmd>
     4  <ClusterParam>
     5    <ExistenceTest>oarstat</ExistenceTest>
     6    <NbCoreAdvised>16</NbCoreAdvised>                       <!-- proposed default number of parallel cores attributed for the computations -->
     7    <NbCoreMax>36</NbCoreMax>                               <!-- maximum number of cores allowed for the computations -->
     8    <JobCPUTimeAdvised unit="minute">20</JobCPUTimeAdvised> <!-- used to group the iterations into jobs of sufficient CPU time -->
     9    <JobNumberMax>500</JobNumberMax>                        <!-- maximum number of jobs allowed (will group the iterations to fit in) -->
     10    <WallTimeMax unit="hour">23</WallTimeMax>               <!-- maximum allowed time for a job -->
     11    <JobStatCmd>oarstat |grep N=UVmat</JobStatCmd>          <!-- command to know the number of active and waiting job launches -->
     12    <LaunchCmdFcn>cluster_command</LaunchCmdFcn>            <!-- name of the function used to create job launch commmand -->
     13  </ClusterParam>
    1414</SeriesParam>
Note: See TracChangeset for help on using the changeset viewer.