Changeset 26361


Ignore:
Timestamp:
07/25/21 16:00:15 (4 years ago)
Author:
jdquinn
Message:

BUG: Gmsh only produces *similar* meshes at certain resolutions with changes. reverting to excluding tests that call gmshplanet under Linux for now. Will add precomputed mesh for Python later and reactivate tests.

Location:
issm/trunk-jpl
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth

    r26358 r26361  
    8787# NOTE:
    8888# - Excluding 2006 until it can be debugged (PETSc crash)
     89# - Tests 2002, 2003, 2005, 2008, 2010, 2011, 2021, 2090, and 2101, are
     90#   excluded as Gmsh produces different meshes on macOS and Linux for (archives
     91#   are generated on macOS).
    8992#
    90 MATLAB_NROPTIONS="'benchmark','slc','exclude',[2004 2006 2007 2051 2052 2053 2084 2085 2424 2425]"
    91 PYTHON_NROPTIONS="--benchmark slc --exclude 2004 2006 2007 2051 2052 2053 2084 2085 2424 2425"
     93MATLAB_NROPTIONS="'benchmark','slc','exclude',[2002 2003 2004 2005 2006 2007 2008 2010 2011 2021 2051 2052 2053 2084 2085 2090 2101 2424 2425]"
     94PYTHON_NROPTIONS="--benchmark slc --exclude 2002 2003 2004 2005 2006 2007 2008 2010 2011 2021 2051 2052 2053 2084 2085 2090 2101 2424 2425"

  • issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh

    r26358 r26361  
    3030LIBGFORTRAN="/usr/lib/x86_64-linux-gnu/libgfortran.so.5.0.0" # Important that this is the library itself
    3131LIBGFORTRAN_DIST="${ISSM_DIR}/lib/libgfortran.so.5" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
    32 MATLAB_NROPTIONS="'benchmark','all','exclude',[125,126,234,235,418,420,435,444,445,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2004,2006,2007,2011,2051,2052,2053,2084,2085,2424,2425,3001:3200,3201,3202,3300,3480,3481,4001,4002,4003]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
     32MATLAB_NROPTIONS="'benchmark','all','exclude',[125,126,234,235,418,420,435,444,445,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,2006,2007,2008,2010,2011,2021,2051,2052,2053,2084,2085,2090,2101,2424,2425,3001:3200,3201,3202,3300,3480,3481,4001,4002,4003]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
    3333MATLAB_PATH="/usr/local/MATLAB/R2019b"
    3434

  • issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python.sh

    r26358 r26361  
    3030LIBGFORTRAN="/usr/lib/x86_64-linux-gnu/libgfortran.so.5.0.0" # Important that this is the library itself
    3131LIBGFORTRAN_DIST="${ISSM_DIR}/lib/libgfortran.so.5" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
    32 PYTHON_NROPTIONS="--benchmark all --exclude 125 126 234 235 418 420 435 444 445 701 702 703 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1201 1202 1203 1204 1205 1206 1207 1208 1301 1302 1303 1304 1401 1402 1601 1602 2004 2006 2007 2051 2052 2053 2084 2085 2424 2425 3001:3200 3201 3202 3300 3480 3481 4001 4002 4003" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
     32PYTHON_NROPTIONS="--benchmark all --exclude 125 126 234 235 418 420 435 444 445 701 702 703 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1201 1202 1203 1204 1205 1206 1207 1208 1301 1302 1303 1304 1401 1402 1601 1602 2002 2003 2004 2005 2006 2007 2008 2010 2011 2021 2051 2052 2053 2084 2085 2090 2101 2424 2425 3001:3200 3201 3202 3300 3480 3481 4001 4002 4003" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
    3333
    3434## Environment

  • issm/trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.m

    r26358 r26361  
    3939        fid=fopen('sphere.geo','w');
    4040
     41        % NOTE:
     42        % - The default format in Gmsh 3 is "msh2". Rather than conditionally
     43        % modifying our parsing scheme for Gmsh 4, for now, we simply set the
     44        % 'Mesh.MshFileVersion' option.
     45        % - Decreasing the value of the 'Mesh.RandomFactor' option leads to an
     46        % equal number of nodes and elements being produced under macOS and Linux
     47        % at certain resolutions using certain meshing algorithms.
     48        %
    4149        fprintf(fid,'Mesh.Algorithm = 1;\n'); % MeshAdapt
     50        fprintf(fid,'Mesh.MshFileVersion = 2;\n');
    4251        fprintf(fid,'Mesh.RandomFactor = 1e-10;\n');
    4352        if  exist(options,'refine'),
    4453                fprintf(fid,'Mesh.Algorithm = 7;\n'); % BAMG
    4554                fprintf(fid,'Mesh.CharacteristicLengthFromPoints = 0;\n');
    46                 fprintf(fid,'Mesh.SmoothRatio = 3;\n');
    4755                if gmshmajorversion == 3,
    4856                        fprintf(fid,'Mesh.RemeshAlgorithm = 1;\n');
    … …  
    123131
    124132        % Call gmsh
    125         %
    126         % NOTE: The default format in Gmsh 3 is "msh2". Rather than conditionally
    127         %               modifying our parsing scheme for Gmsh 4, for now, we simply set the
    128         %               "-format" option.
    129         %
    130133        if  exist(options,'refine'),
    131                 system(['gmsh -tol 1e-8 -2 -format msh2 sphere.geo -bgm sphere.pos']);
     134                system(['gmsh -2 sphere.geo -bgm sphere.pos']);
    132135        else
    133                 system(['gmsh -tol 1e-8 -2 -format msh2 sphere.geo']);
     136                system(['gmsh -2 sphere.geo']);
    134137        end
    135138

  • issm/trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py

    r26358 r26361  
    4747    fid = open('sphere.geo', 'w')
    4848
     49    # Call gmsh
     50    #
     51    # NOTE:
     52    # - The default format in Gmsh 3 is "msh2". Rather than conditionally
     53    # modifying our parsing scheme for Gmsh 4, for now, we simply set the
     54    # 'Mesh.MshFileVersion' option.
     55    # - Decreasing the value of the 'Mesh.RandomFactor' option leads to an
     56    # equal number of nodes and elements being produced under macOS and Linux
     57    # at certain resolutions using certain meshing algorithms.
     58    #
    4959    fid.write('Mesh.Algorithm = 1;\n') # MeshAdapt
     60    fid.write('Mesh.MshFileVersion = 2;\n')
    5061    fid.write('Mesh.RandomFactor = 1e-10;\n')
    5162    if options.exist('refine'):
    5263        fid.write('Mesh.Algorithm = 7;\n') # BAMG
    5364        fid.write('Mesh.CharacteristicLengthFromPoints = 0;\n')
    54         fid.write('Mesh.SmoothRatio = 3;\n')
    5565        if gmshmajorversion == 3:
    5666            fid.write('Mesh.RemeshAlgorithm = 1;\n')
    … …  
    123133        #}}}
    124134
    125     # Call gmsh
    126     #
    127     # NOTE: The default format in Gmsh 3 is "msh2". Rather than conditionally
    128     #       modifying our parsing scheme for Gmsh 4, for now, we simply set the
    129     #       "-format" option.
    130     #
    131135    if options.exist('refine'):
    132         subprocess.call('gmsh -tol 1e-8 -2 -format msh2 sphere.geo -bgm sphere.pos', shell=True)
     136        subprocess.call('gmsh -2 sphere.geo -bgm sphere.pos', shell=True)
    133137    else:
    134         subprocess.call('gmsh -tol 1e-8 -2 -format msh2 sphere.geo', shell=True)
     138        subprocess.call('gmsh -2 sphere.geo', shell=True)
    135139
    136140    # Import mesh  {{{
Note: See TracChangeset for help on using the changeset viewer.