Changeset 3362


Ignore:
Timestamp:
04/01/10 07:44:18 (15 years ago)
Author:
Mathieu Morlighem
Message:

readded src/m/enum/SteadyAnalysisEnum.m for nightly runs

Location:
issm/trunk
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/etc/cluster.rc

    r3146 r3362  
    2323
    2424cluster_name=cosmos
    25 cluster_codepath=/work00/edw/larour/issm-2.0/bin
    26 cluster_executionpath=/work00/edw/larour/Execution
    27 cluster_login=larour
     25cluster_codepath=/work00/edw/morlighe/trunk/bin
     26cluster_executionpath=/work00/edw/morlighe/Execution
     27cluster_login=morlighe
    2828cluster_port=0
    2929
    3030cluster_name=mustang
    31 cluster_codepath=/proj/ice/larour/Ice/tier2_ice/cluster_delivery
    32 cluster_executionpath=/proj/ice/larour/Testing_ice/Execution
    33 cluster_login=larour
     31cluster_codepath=/proj/ice/morlighe/Ice/tier2_ice/cluster_delivery
     32cluster_executionpath=/proj/ice/morlighe/Testing_ice/Execution
     33cluster_login=morlighe
    3434cluster_port=0
    3535
    3636cluster_name=metro
    37 cluster_codepath=/home/larour/Ice/tier2_ice/cluster_delivery
    38 cluster_executionpath=/home/larour/Testing/Execution
    39 cluster_login=larour
     37cluster_codepath=/home/morlighe/Ice/tier2_ice/cluster_delivery
     38cluster_executionpath=/home/morlighe/Testing/Execution
     39cluster_login=morlighe
    4040cluster_port=0
    4141
    4242cluster_name=wilkes
    43 cluster_codepath=/u/astrid-r1b/larour/issm/trunk/bin
    44 cluster_executionpath=/u/astrid-r1b/larour/Testing/Execution
    45 cluster_login=larour
     43cluster_codepath=/u/wilkes-r1b/morlighe/svn/issm/trunk/bin
     44cluster_executionpath=/u/wilkes-r1b/morlighe/ExecutionWilkes
     45cluster_login=morlighe
    4646cluster_port=0
    4747
    4848cluster_name=astrid
    49 cluster_codepath=/u/astrid-r1b/larour/issm/trunk/bin
    50 cluster_executionpath=/u/astrid-r1b/larour/Testing/Execution
    51 cluster_login=larour
     49cluster_codepath=/u/wilkes-r1b/morlighe/svn/issm/trunk/bin
     50cluster_executionpath=/u/wilkes-r1b/morlighe/ExecutionAstrid
     51cluster_login=morlighe
    5252cluster_port=0
    5353
    5454cluster_name=larsen
    55 cluster_codepath=/u/astrid-r1b/larour/issm/trunk/bin
    56 cluster_executionpath=/u/astrid-r1b/larour/Testing/Execution
    57 cluster_login=larour
     55cluster_codepath=/u/wilkes-r1b/morlighe/svn/issm/trunk/bin
     56cluster_executionpath=/u/wilkes-r1b/morlighe/ExecutionLarsen
     57cluster_login=morlighe
    5858cluster_port=0
    5959
    6060cluster_name=gemini
    61 cluster_codepath=/workg/edw/larour/issm-2.0/bin
    62 cluster_executionpath=/workg/edw/larour/Testing/Execution
    63 cluster_login=larour
     61cluster_codepath=/workg/edw/morlighe/issm-2.0/bin
     62cluster_executionpath=/workg/edw/morlighe/Testing/Execution
     63cluster_login=morlighe
    6464cluster_port=0
    6565
    6666cluster_name=castor
    67 cluster_codepath=/workc/edw/larour/issm-2.0/bin
    68 cluster_executionpath=/workc/edw/larour/Testing/Execution
    69 cluster_login=larour
     67cluster_codepath=/workc/edw/morlighe/issm-2.0/bin
     68cluster_executionpath=/workc/edw/morlighe/Testing/Execution
     69cluster_login=morlighe
    7070cluster_port=0
    7171
    … …  
    7373cluster_codepath=/home/elarour/issm/trunk/bin
    7474cluster_executionpath=/home/elarour/Testing/Execution
    75 cluster_login=larour
     75cluster_login=morlighe
    7676cluster_port=0
    7777
    7878cluster_name=pollux
    79 cluster_codepath=/workp/edw/larour/issm-2.0/bin
    80 cluster_executionpath=/workp/edw/larour/Testing/Execution
    81 cluster_login=larour
     79cluster_codepath=/workp/edw/morlighe/issm-2.0/bin
     80cluster_executionpath=/workp/edw/morlighe/Testing/Execution
     81cluster_login=morlighe
    8282cluster_port=0
    8383
    … …  
    9191cluster_codepath=/proj/ice/larour/issm/trunk/bin
    9292cluster_executionpath=/proj/ice/larour/Testing/Execution
    93 cluster_login=larour
     93cluster_login=morlighe
    9494cluster_port=0
    9595

  • issm/trunk/externalpackages/petsc/install.sh

    r3216 r3362  
    99
    1010#version of petsc?
    11 version='2.3.2-p3';
     11version='3.0.0-p11'
    1212
    1313#Some cleanup

  • issm/trunk/src/c/EnumDefinitions/EnumDefinitions.cpp

    r3359 r3362  
    3333//transient
    3434int TransientAnalysisEnum(void){            return          231; }
     35int SteadyAnalysisEnum(void){               return          232; } //NEEDED by nightly runs
    3536//slope
    3637int SlopecomputeAnalysisEnum(void){         return          240; }

  • issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

    r3359 r3362  
    3434//transient
    3535int TransientAnalysisEnum(void);
     36int SteadyAnalysisEnum(void);
    3637//slope
    3738int SlopecomputeAnalysisEnum(void);

  • issm/trunk/src/m/enum/AnalysisTypeFromEnum.m

    r3354 r3362  
    6161end
    6262
     63if enum==SteadyAnalysisEnum(),
     64        string='steady';
     65end
     66
    6367if enum==SlopecomputeAnalysisEnum(),
    6468        string='slopecompute';
Note: See TracChangeset for help on using the changeset viewer.