Changeset 2611 for XIOS3/branches


Ignore:
Timestamp:
01/30/24 09:31:18 (11 months ago)
Author:
jderouillat
Message:

Fix in detecting if the environment enables parallel compression

File:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS3/branches/xios-3.0-beta/make_xios

    r2530 r2611  
    257257        done 
    258258    fi 
    259     HDF5_VERSION=`grep "HDF5 Version" $hdf5_settings_file | awk -F  ':' '{ print $2 }'` 
    260     HDF5_MAJOR_VERSION=`echo $HDF5_VERSION | awk -F  '.' '{ print $2 }'` 
    261     HDF5_MINOR_VERSION=`echo $HDF5_VERSION | awk -F  '.' '{ print $3 }'` 
    262     HDF5_PARALLEL=`grep "Parallel HDF5" $hdf5_settings_file | awk -F  ':' '{ print $2 }'` 
    263     HDF5_DEFLATE=`grep "I/O filters (external)" $hdf5_settings_file | awk -F  ':' '{ print $2 }'` 
    264     if ( [[ "$HDF5_MAJOR_VERSION" -ge 11 || ( "$HDF5_MAJOR_VERSION" -eq 10 &&  "$HDF5_MINOR_VERSION" -ge 3 ) ]] ) 
    265     then 
    266         if [[ "$HDF5_PARALLEL" =~ "yes" && "$HDF5_DEFLATE" =~ "zlib" ]] 
    267         then  
    268             XIOS_CPPKEY="$XIOS_CPPKEY PARALLEL_COMPRESSION" 
    269         fi 
    270     fi           
     259    if [[ ! -z $hdf5_settings_file ]] 
     260    then 
     261        HDF5_VERSION=`grep "HDF5 Version" $hdf5_settings_file | awk -F  ':' '{ print $2 }'` 
     262        HDF5_MAJOR_VERSION=`echo $HDF5_VERSION | awk -F  '.' '{ print $2 }'` 
     263        HDF5_MINOR_VERSION=`echo $HDF5_VERSION | awk -F  '.' '{ print $3 }'` 
     264        HDF5_PARALLEL=`grep "Parallel HDF5" $hdf5_settings_file | awk -F  ':' '{ print $2 }'` 
     265        HDF5_DEFLATE=`grep "I/O filters (external)" $hdf5_settings_file | awk -F  ':' '{ print $2 }'` 
     266        if ( [[ "$HDF5_MAJOR_VERSION" -ge 11 || ( "$HDF5_MAJOR_VERSION" -eq 10 &&  "$HDF5_MINOR_VERSION" -ge 3 ) ]] ) 
     267        then 
     268            if [[ "$HDF5_PARALLEL" =~ "yes" && "$HDF5_DEFLATE" =~ "zlib" ]] 
     269            then  
     270                XIOS_CPPKEY="$XIOS_CPPKEY PARALLEL_COMPRESSION" 
     271            fi 
     272        fi           
     273    fi # hdf5_settings_file  
    271274fi 
    272275if [[ "$XIOS_CPPKEY" =~ "PARALLEL_COMPRESSION" ]] 
Note: See TracChangeset for help on using the changeset viewer.