Changeset 28127


Ignore:
Timestamp:
03/01/24 12:59:21 (13 months ago)
Author:
jdquinn
Message:

CHG: Adjusted tolerances; test suite adjustments; clean up

Location:
issm/trunk-jpl
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/jenkins/linux64_caladan

    r28079 r28127  
    1 
    2 #-------------------------------#
    3 # 1: ISSM general configuration #
    4 #-------------------------------#
    5 
    6 #MATLAB path
    71MATLAB_PATH="/usr/local/MATLAB/R2015a"
    82
    9 #ISSM CONFIGURATION
    10 ISSM_CONFIG='--prefix=$ISSM_DIR\
     3#--------------------#
     4# ISSM Configuration #
     5#--------------------#
     6
     7ISSM_CONFIG='\
    118        --disable-static \
    129        --with-matlab-dir=$MATLAB_PATH \
     
    3128        --enable-debugging '
    3229
    33 #PYTHON and MATLAB testing
     30#-------------------#
     31# External Packages #
     32#-------------------#
     33
     34EXTERNALPACKAGES="
     35        autotools       install.sh
     36        cmake           install.sh
     37        mpich           install-3.2-linux64.sh
     38        petsc           install-3.7-linux64.sh
     39        triangle        install-linux64.sh
     40        boost           install-1.7-linux.sh
     41        dakota          install-6.2-linux64.sh
     42        chaco           install-linux.sh
     43        m1qn3           install-linux.sh
     44        shell2junit     install.sh
     45"
     46
     47#---------#
     48# Testing #
     49#---------#
     50
     51# Test suites
    3452MATLAB_TEST=1
    3553PYTHON_TEST=1
     54JAVASCRIPT_TEST=0
     55EXAMPLES_TEST=0
    3656
    37 #-----------------------------------#
    38 # 3: External packages installation #
    39 #-----------------------------------#
    40 
    41 #List of external packages to be installed and their installation scripts
    42 EXTERNALPACKAGES="autotools     install.sh
    43                                                 cmake        install.sh
    44                                                 mpich         install-3.2-linux64.sh
    45                                                 petsc         install-3.7-linux64.sh
    46                                                 triangle      install-linux64.sh
    47                                                 boost         install-1.7-linux.sh
    48                                                 dakota        install-6.2-linux64.sh
    49                                                 chaco         install-linux.sh
    50                                                 m1qn3         install-linux.sh
    51                                                 shell2junit   install.sh"
    52 
    53 #-----------------#
    54 # 4: Test options #
    55 #-----------------#
    56 
    57 #number of cpus used in ISSM installation and compilation (one is usually
    58 #safer as some packages are very sensitive to parallel compilation)
     57# Number of CPUs used in ISSM compilation
     58#
     59# NOTE: One is usually safer as some packages are very sensitive to parallel
     60#               compilation
     61#
    5962NUMCPUS_INSTALL=4
    6063
    61 #number of cpus used in the nightly runs.
     64# Number of CPUs used in the nightly runs
    6265NUMCPUS_RUN=2
    6366
    64 #Nightly run options. The matlab routine runme.m will be called
    65 #as follows: runme($MATLAB_NROPTIONS). The options must be understandable
    66 #by Matlab and runme.m
    67 #ex: "'id',[101 102 103]"
     67# Nightly run options
     68#
     69# See documentation in test/NightlyRun/runme.* for more information
     70#
    6871PYTHON_NROPTIONS="--exclude 701 702 435"
    6972MATLAB_NROPTIONS="'exclude',[701,702,435]"
  • issm/trunk-jpl/jenkins/linux64_caladan_ad

    r27567 r28127  
    1 #
    2 #-------------------------------#
    3 # 1: ISSM general configuration #
    4 #-------------------------------#
    5 
    6 #MATLAB path
    71MATLAB_PATH="/usr/local/MATLAB/R2015a"
    82
    9 #ISSM CONFIGURATION
     3#--------------------#
     4# ISSM Configuration #
     5#--------------------#
     6
    107ISSM_CONFIG='\
    118        --prefix=$ISSM_DIR\
     
    2118'
    2219
    23 #PYTHON and MATLAB testing
    24 MATLAB_TEST=1
    25 PYTHON_TEST=0
     20#-------------------#
     21# External Packages #
     22#-------------------#
    2623
    27 #-----------------------------------#
    28 # 3: External packages installation #
    29 #-----------------------------------#
    30 
    31 #List of external packages to be installed and their installation scripts
    3224EXTERNALPACKAGES="
    3325        autotools       install-linux.sh
     
    4133"
    4234
    43 #-----------------#
    44 # 4: test options #
    45 #-----------------#
     35#---------#
     36# Testing #
     37#---------#
    4638
    47 #number of cpus used in ISSM installation and compilation (one is usually
    48 #safer as some packages are very sensitive to parallel compilation)
     39# Test suites
     40MATLAB_TEST=1
     41PYTHON_TEST=0
     42JAVASCRIPT_TEST=0
     43EXAMPLES_TEST=0
     44
     45# Number of CPUs used in ISSM compilation
     46#
     47# NOTE: One is usually safer as some packages are very sensitive to parallel
     48#               compilation
     49#
    4950NUMCPUS_INSTALL=2
    5051
    51 #number of cpus used in the nightly runs.
     52# Number of CPUs used in the nightly runs
    5253NUMCPUS_RUN=1
    5354
    54 #Nightly run options. The matlab routine runme.m will be called
    55 #as follows: runme($MATLAB_NROPTIONS). The options must be understandable
    56 #by Matlab and runme.m
    57 #ex: "'id',[101 102 103]"
     55# Nightly run options
     56#
     57# See documentation in test/NightlyRun/runme.* for more information
     58#
    5859MATLAB_NROPTIONS="'benchmark','adolc','id',[3001:3019]"
    5960PYTHON_NROPTIONS=""
  • issm/trunk-jpl/jenkins/linux64_caladan_ampi

    r27567 r28127  
    1 
    2 #-------------------------------#
    3 # 1: ISSM general configuration #
    4 #-------------------------------#
    5 
    6 #MATLAB path
    71MATLAB_PATH="/usr/local/MATLAB/R2015a"
    82
    9 #ISSM CONFIGURATION
     3#--------------------#
     4# ISSM Configuration #
     5#--------------------#
     6
    107ISSM_CONFIG='\
    118        --prefix=$ISSM_DIR \
     
    3128'
    3229
    33 #PYTHON and MATLAB testing
    34 MATLAB_TEST=1
    35 PYTHON_TEST=0
     30#-------------------#
     31# External Packages #
     32#-------------------#
    3633
    37 #-----------------------------------#
    38 # 3: External packages installation #
    39 #-----------------------------------#
    40 
    41 #List of external packages to be installed and their installation scripts
    4234EXTERNALPACKAGES="
    4335        autotools               install-linux.sh
     
    5244"
    5345
    54 #-----------------#
    55 # 4: test options #
    56 #-----------------#
     46#---------#
     47# Testing #
     48#---------#
    5749
    58 #number of cpus used in ISSM installation and compilation (one is usually
    59 #safer as some packages are very sensitive to parallel compilation)
     50# Test suites
     51MATLAB_TEST=1
     52PYTHON_TEST=0
     53JAVASCRIPT_TEST=0
     54EXAMPLES_TEST=0
     55
     56# Number of CPUs used in ISSM compilation
     57#
     58# NOTE: One is usually safer as some packages are very sensitive to parallel
     59#               compilation
     60#
    6061NUMCPUS_INSTALL=2
    6162
    62 #number of cpus used in the nightly runs.
     63# Number of CPUs used in the nightly runs
    6364NUMCPUS_RUN=1
    6465
    65 #Nightly run options. The matlab routine runme.m will be called
    66 #as follows: runme($MATLAB_NROPTIONS). The options must be understandable
    67 #by Matlab and runme.m
    68 #ex: "'id',[101 102 103]"
     66# Nightly run options
     67#
     68# See documentation in test/NightlyRun/runme.* for more information
     69#
    6970MATLAB_NROPTIONS="'benchmark','adolc','id',[3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3101, 3102, 3103, 3104, 3105, 3106, 3107, 3108, 3109, 3119]"
    7071PYTHON_NROPTIONS=""
  • issm/trunk-jpl/jenkins/mac-intel-basic

    r28079 r28127  
    3030#-------------------#
    3131
    32 # List of external packages to be installed and their installation scripts
    3332EXTERNALPACKAGES="
    3433        autotools       install-mac.sh
  • issm/trunk-jpl/jenkins/mac-intel-dakota

    r28079 r28127  
    4444#-------------------#
    4545
    46 #List of external packages to be installed and their installation scripts
    4746EXTERNALPACKAGES="
    4847        autotools       install-mac.sh
  • issm/trunk-jpl/jenkins/mac-silicon-basic

    r28120 r28127  
    3030#-------------------#
    3131
    32 # List of external packages to be installed and their installation scripts
    3332EXTERNALPACKAGES="
    3433        autotools       install-mac.sh
     
    6665#
    6766# NOTE:
    68 # - Tests 216, 274, 430, 435, 441:442, 456, 470:476, 517 are excluded because of large errors
    69 # - Tests 119, 423, 433, 448, 462:464, 508, 544, 546, 808 are excluded because of failure "Arrays have incompatible sizes for this operation."
     67# - Tests 216, 274, 430, 435, 441:442, 517 are excluded because of large errors
     68# - Tests 119, 423, 433, 448, 462:464, 508, 544, 546, 702:703, 808 are excluded because of failure "Arrays have incompatible sizes for this operation."
    7069#
    71 MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),119,216,274,423,430,433,435,441:442,448,456,462:464,470:476,508,517,544,546,808]"
     70MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),119,216,274,423,430,433,435,441:442,448,462:464,508,517,544,546,702:703,808]"
    7271PYTHON_NROPTIONS=""
  • issm/trunk-jpl/jenkins/mac-silicon-python

    r28124 r28127  
    6363#
    6464# See documentation in test/NightlyRun/runme.* for more information
    65 #
     65
    6666# NOTE:
    67 # - Tests 234, 418, and 420 are excluded because of large errors
     67# - Tests 216, 274, 430, 435, 441:442 517 are excluded because of large errors
     68# - Tests 119, 423, 433, 448, 462:464, 508, 544, 546, 702:703, 808 are excluded because of failure "Arrays have incompatible sizes for this operation."
    6869#
    6970MATLAB_NROPTIONS=""
    70 PYTHON_NROPTIONS="--exclude 234 418 420"
     71PYTHON_NROPTIONS="--exclude_name 'Dakota'--exclude 119 216 274 423 430 433 435 441:442 448 462:464 508 517 544 546 702:703 808"
    7172
  • issm/trunk-jpl/jenkins/ross-win-msys2-gcc-msmpi-basic

    r28038 r28127  
    2626#-------------------#
    2727
    28 #List of external packages to be installed and their installation scripts
    2928EXTERNALPACKAGES="
    3029        metis           install-5-win-msys2-gcc.sh
  • issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-basic

    r28083 r28127  
    2727#-------------------#
    2828
    29 #List of external packages to be installed and their installation scripts
    3029EXTERNALPACKAGES="
    3130        msmpi           install.sh
  • issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-binaries-matlab

    r28079 r28127  
    2828#-------------------#
    2929
    30 #List of external packages to be installed and their installation scripts
    3130EXTERNALPACKAGES="
    3231        msmpi           install-static.sh
  • issm/trunk-jpl/test/NightlyRun/test504.m

    r22331 r28127  
    1212
    1313%Fields and tolerances to track changes
    14 field_names     ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','IceVolume1','IceVolumeScaled1','GroundedArea1','GroundedAreaScaled1','FloatingArea1','FloatingAreaScaled1','TotalSmb1','TotalSmbScaled1','TotalFloatingBmb1','TotalFloatingBmbScaled1',...
    15         'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','IceVolume2','IceVolumeScaled2','GroundedArea2','GroundedAreaScaled2','FloatingArea2','FloatingAreaScaled2','TotalSmb2','TotalSmbScaled2','TotalFloatingBmb2','TotalFloatingBmbScaled2'};
    16 field_tolerances={1e-12,2e-12,2e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
    17         1e-12,1e-12,1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
     14field_names     ={'Vx1','Vy1','Vel1','Pressure1',...
     15                  'Bed1','Surface1','Thickness1',...
     16                  'IceVolume1','IceVolumeScaled1',...
     17                  'GroundedArea1','GroundedAreaScaled1',...
     18                  'FloatingArea1','FloatingAreaScaled1',...
     19                  'TotalSmb1','TotalSmbScaled1',...
     20                  'TotalFloatingBmb1','TotalFloatingBmbScaled1',...
     21                  'Vx2','Vy2','Vel2','Pressure2',...
     22                  'Bed2','Surface2','Thickness2',...
     23                  'IceVolume2','IceVolumeScaled2',...
     24                  'GroundedArea2','GroundedAreaScaled2',...
     25                  'FloatingArea2','FloatingAreaScaled2',...
     26                  'TotalSmb2','TotalSmbScaled2',...
     27                  'TotalFloatingBmb2','TotalFloatingBmbScaled2'};
     28field_tolerances={1e-12,2e-12,2e-12,1e-13,...
     29                  1e-13,1e-13,1e-13,...
     30                  1e-13,1e-13,...
     31                  1e-13,1e-13,...
     32                  1e-13,1e-13,...
     33                  1e-13,1e-13,...
     34                  1e-13,1e-13,...
     35                  3e-13,4e-13,4e-13,1e-13,...
     36                  1e-13,1e-13,1e-13,...
     37                  1e-13,1e-13,...
     38                  1e-13,1e-13,...
     39                  1e-13,1e-13,...
     40                  1e-13,1e-13,...
     41                  1e-13,1e-13};
    1842field_values={...
    1943        (md.results.TransientSolution(1).Vx),...
  • issm/trunk-jpl/test/NightlyRun/test504.py

    r23793 r28127  
    3737                    1e-13, 1e-13,
    3838                    1e-13, 1e-13,
    39                     1e-12, 1e-12,
    40                     1e-12, 1e-13,
    4139                    1e-13, 1e-13,
    42                     1e-13, 1e-13, 1e-13, 1e-13,
     40                    1e-13, 1e-13,
     41                    1e-13, 1e-13,
     42                    3e-13, 4e-13, 4e-13, 1e-13,
    4343                    1e-13, 1e-13, 1e-13,
    4444                    1e-13, 1e-13,
  • issm/trunk-jpl/test/NightlyRun/test519.m

    r27031 r28127  
    1313
    1414%Fields and tolerances to track changes
    15 field_names     ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','IceVolume1','IceVolumeScaled1','GroundedArea1','GroundedAreaScaled1','FloatingArea1','FloatingAreaScaled1','TotalSmb1','TotalSmbScaled1','TotalFloatingBmb1','TotalFloatingBmbScaled1',...
    16         'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','IceVolume2','IceVolumeScaled2','GroundedArea2','GroundedAreaScaled2','FloatingArea2','FloatingAreaScaled2','TotalSmb2','TotalSmbScaled2','TotalFloatingBmb2','TotalFloatingBmbScaled2'};
    17 field_tolerances={1e-12,2e-12,2e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
    18         1e-12,1e-12,1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
     15field_names     ={'Vx1','Vy1','Vel1','Pressure1',...
     16                  'Bed1','Surface1','Thickness1',...
     17                  'IceVolume1','IceVolumeScaled1',...
     18                  'GroundedArea1','GroundedAreaScaled1',...
     19                  'FloatingArea1','FloatingAreaScaled1',...
     20                  'TotalSmb1','TotalSmbScaled1',...
     21                  'TotalFloatingBmb1','TotalFloatingBmbScaled1',...
     22                  'Vx2','Vy2','Vel2','Pressure2',...
     23                  'Bed2','Surface2','Thickness2',...
     24                  'IceVolume2','IceVolumeScaled2',...
     25                  'GroundedArea2','GroundedAreaScaled2',...
     26                  'FloatingArea2','FloatingAreaScaled2',...
     27                  'TotalSmb2','TotalSmbScaled2',...
     28                  'TotalFloatingBmb2','TotalFloatingBmbScaled2'};
     29field_tolerances={1e-12,2e-12,2e-12,1e-13,...
     30                  1e-13,1e-13,1e-13,...
     31                  1e-13,1e-13,...
     32                  1e-13,1e-13,...
     33                  1e-13,1e-13,...
     34                  1e-13,1e-13,...
     35                  1e-13,1e-13,...
     36                  4e-13,4e-13,4e-13,1e-13,...
     37                  1e-13,1e-13,1e-13,...
     38                  1e-13,1e-13,...
     39                  1e-13,1e-13,...
     40                  1e-13,1e-13,...
     41                  1e-13,1e-13,...
     42                  1e-13,1e-13};
    1943field_values={...
    2044        (md.results.TransientSolution(1).Vx),...
  • issm/trunk-jpl/test/NightlyRun/test519.py

    r27031 r28127  
    4343                    1e-12, 1e-13,
    4444                    1e-13, 1e-13,
    45                     1e-13, 1e-13, 1e-13, 1e-13,
     45                    4e-13, 4e-13, 4e-13, 1e-13,
    4646                    1e-13, 1e-13, 1e-13,
    4747                    1e-13, 1e-13,
Note: See TracChangeset for help on using the changeset viewer.