Changeset 28022


Ignore:
Timestamp:
11/20/23 10:34:28 (16 months ago)
Author:
jdquinn
Message:

CHG: Cleanup

Location:
issm/trunk-jpl
Files:
6 deleted
11 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/etc/environment.sh

    r27879 r28022  
    303303        export HDF5_ROOT # Used in installation of NetCDF, GDAL
    304304        cpath_append "${HDF5_ROOT}/include"
    305         library_path_append "${HDF5_ROOT}/lib"
    306         dyld_library_path_append "${HDF5_ROOT}/lib"
    307         ld_library_path_append "${HDF5_ROOT}/lib"
     305        library_path_prepend "${HDF5_ROOT}/lib"
     306        dyld_library_path_prepend "${HDF5_ROOT}/lib"
     307        ld_library_path_prepend "${HDF5_ROOT}/lib"
    308308fi
    309309
    … …  
    494494        cpath_prepend "${NETCDF_ROOT}/include"
    495495        library_path_prepend "${NETCDF_ROOT}/lib"
     496        ld_library_path_prepend "${NETCDF_ROOT}/lib"
    496497        dyld_library_path_prepend "${NETCDF_ROOT}/lib"
    497         ld_library_path_prepend "${NETCDF_ROOT}/lib"
    498498fi
    499499
    … …  
    538538        export PROJ_ROOT # Used in installation of GDAL
    539539        path_append "${PROJ_ROOT}/bin"
    540         dyld_library_path_append "${PROJ_ROOT}/lib"
    541         ld_library_path_append "${PROJ_ROOT}/lib"
     540        ld_library_path_prepend "${PROJ_ROOT}/lib"
     541        dyld_library_path_prepend "${PROJ_ROOT}/lib"
     542        ld_library_path_prepend "${PROJ_ROOT}/lib"
    542543fi
    543544

  • issm/trunk-jpl/packagers/mac/sign-issm-mac-binaries-matlab.sh

    r27991 r28022  
    182182SUCCESS=0
    183183xcrun notarytool log ${UUID} --apple-id "$AD_USERNAME" --team-id "$TEAM_ID" --password "$NOTARY_PASSWORD" &> ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE}
    184 STATUS=$(grep 'status: Accepted' ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE} | wc -l)
     184STATUS=$(grep '"status": "Accepted"' ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE} | wc -l)
    185185
    186186if [[ ${STATUS} -gt 0 ]]; then

  • issm/trunk-jpl/packagers/mac/sign-issm-mac-binaries-python-3.sh

    r27991 r28022  
    191191SUCCESS=0
    192192xcrun notarytool log ${UUID} --apple-id "$AD_USERNAME" --team-id "$TEAM_ID" --password "$NOTARY_PASSWORD" &> ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE}
    193 STATUS=$(grep 'status: Accepted' ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE} | wc -l)
     193STATUS=$(grep '"status": "Accepted"' ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE} | wc -l)
    194194
    195195if [[ ${STATUS} -gt 0 ]]; then

  • issm/trunk-jpl/test/NightlyRun/test2110.m

    r27811 r28022  
    1313y_element=mean(md.mesh.y(index),2);
    1414rad_dist=sqrt(x_element.^2+y_element.^2)/1000;  % radial distance in km
    15 md.esa.deltathickness(rad_dist<=disc_radius)=-1;   % 1 m water withdrawl
     15md.esa.deltathickness(rad_dist<=disc_radius)=-1;   % 1 m water withdrawal
    1616
    1717%love numbers:

  • issm/trunk-jpl/test/NightlyRun/test2110.py

    r27811 r28022  
    2323y_element = np.mean(md.mesh.y[index - 1], 1)
    2424rad_dist = np.sqrt(x_element**2 + y_element**2) / 1000  # radial distance in km
    25 md.esa.deltathickness[np.where(rad_dist <= disc_radius)] = -1  # 1 m water withdrawl
     25md.esa.deltathickness[np.where(rad_dist <= disc_radius)] = -1  # 1 m water withdrawal
    2626
    2727#love numbers:

  • issm/trunk-jpl/test/NightlyRun/test2111.m

    r27811 r28022  
    1414rad_dist=sqrt(x_element.^2+y_element.^2)/1000;  % radial distance in km
    1515pos=find(rad_dist<=disc_radius);
    16 md.esa.deltathickness(pos)=-1;   % 1 m water withdrawl
     16md.esa.deltathickness(pos)=-1;   % 1 m water withdrawal
    1717% }}}
    1818%read in love numbers:{{{

  • issm/trunk-jpl/test/NightlyRun/test2111.py

    r27811 r28022  
    2424rad_dist = np.sqrt(x_element**2 + y_element**2) / 1000  # radial distance in km
    2525pos = np.where(rad_dist <= disc_radius)[0]
    26 md.esa.deltathickness[pos] = -1  # 1 m water withdrawl
     26md.esa.deltathickness[pos] = -1  # 1 m water withdrawal
    2727# }}}
    2828#love numbers: {{{

  • issm/trunk-jpl/test/NightlyRun/test2112.m

    r27811 r28022  
    1414rad_dist=sqrt(x_element.^2+y_element.^2)/1000;  % radial distance in km
    1515pos=find(rad_dist<=disc_radius);
    16 md.esa.deltathickness(pos)=-1;   % 1 m water withdrawl
     16md.esa.deltathickness(pos)=-1;   % 1 m water withdrawal
    1717% }}}
    1818%read in love numbers:{{{

  • issm/trunk-jpl/test/NightlyRun/test2112.py

    r27811 r28022  
    2424rad_dist = np.sqrt(x_element**2 + y_element**2) / 1000  # radial distance in km
    2525pos = np.where(rad_dist <= disc_radius)[0]
    26 md.esa.deltathickness[pos] = -1  # 1 m water withdrawl
     26md.esa.deltathickness[pos] = -1  # 1 m water withdrawal
    2727# }}}
    2828#love numbers: {{{

  • issm/trunk-jpl/test/NightlyRun/test2113.m

    r27811 r28022  
    1515rad_dist=sqrt(x_element.^2+y_element.^2)/1000;  % radial distance in km
    1616pos=find(rad_dist<=disc_radius);
    17 md.esa.deltathickness(pos)=-1;   % 1 m water withdrawl
     17md.esa.deltathickness(pos)=-1;   % 1 m water withdrawal
    1818% }}}
    1919%read in love numbers:{{{

  • issm/trunk-jpl/test/NightlyRun/test2113.py

    r27811 r28022  
    2525rad_dist = np.sqrt(x_element**2 + y_element**2) / 1000  # radial distance in km
    2626pos = np.where(rad_dist <= disc_radius)[0]
    27 md.esa.deltathickness[pos] = -1  # 1 m water withdrawl
     27md.esa.deltathickness[pos] = -1  # 1 m water withdrawal
    2828# }}}
    2929#love numbers: {{{
Note: See TracChangeset for help on using the changeset viewer.