Changeset 24241


Ignore:
Timestamp:
10/17/19 06:28:40 (5 years ago)
Author:
bdef
Message:

BUG: fixing unwanted commits

Location:
issm/trunk-jpl/src
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/shared/Enum/Enum.vim

    r24205 r24241  
    188188syn keyword cConstant HydrologydcRelTolEnum
    189189syn keyword cConstant HydrologydcSedimentCompressibilityEnum
     190syn keyword cConstant HydrologydcSedimentlimitEnum
     191syn keyword cConstant HydrologydcSedimentlimitFlagEnum
    190192syn keyword cConstant HydrologydcSedimentPorosityEnum
    191193syn keyword cConstant HydrologydcSedimentThicknessEnum
    192 syn keyword cConstant HydrologydcSedimentlimitEnum
    193 syn keyword cConstant HydrologydcSedimentlimitFlagEnum
    194194syn keyword cConstant HydrologydcTransferFlagEnum
    195195syn keyword cConstant HydrologydcUnconfinedFlagEnum
    196196syn keyword cConstant HydrologydcWaterCompressibilityEnum
    197 syn keyword cConstant HydrologydtEnum
    198197syn keyword cConstant HydrologyshreveStabilizationEnum
    199198syn keyword cConstant IcecapToEarthCommEnum
    … …  
    337336syn keyword cConstant SmbAccurefEnum
    338337syn keyword cConstant SmbAdThreshEnum
     338syn keyword cConstant SmbDesfacEnum
     339syn keyword cConstant SmbDpermilEnum
     340syn keyword cConstant SmbDsnowIdxEnum
    339341syn keyword cConstant SmbCldFracEnum
    340342syn keyword cConstant SmbDelta18oEnum
    341343syn keyword cConstant SmbDelta18oSurfaceEnum
    342344syn keyword cConstant SmbDenIdxEnum
    343 syn keyword cConstant SmbDesfacEnum
    344 syn keyword cConstant SmbDpermilEnum
    345 syn keyword cConstant SmbDsnowIdxEnum
    346345syn keyword cConstant SmbDtEnum
    347346syn keyword cConstant SmbEnum
    … …  
    375374syn keyword cConstant SmbRunoffrefEnum
    376375syn keyword cConstant SmbSealevEnum
     376syn keyword cConstant SmbStepsPerStepEnum
    377377syn keyword cConstant SmbSwIdxEnum
    378378syn keyword cConstant SmbT0dryEnum
    … …  
    517517syn keyword cConstant DrivingStressYEnum
    518518syn keyword cConstant EffectivePressureEnum
    519 syn keyword cConstant EffectivePressureHydrostepEnum
    520 syn keyword cConstant EffectivePressureStackedEnum
     519syn keyword cConstant EffectivePressureSubstepEnum
     520syn keyword cConstant EffectivePressureTransientEnum
    521521syn keyword cConstant EnthalpyEnum
    522522syn keyword cConstant EnthalpyPicardEnum
    523523syn keyword cConstant EplHeadEnum
    524 syn keyword cConstant EplHeadHydrostepEnum
    525524syn keyword cConstant EplHeadOldEnum
    526525syn keyword cConstant EplHeadSlopeXEnum
    527526syn keyword cConstant EplHeadSlopeYEnum
    528 syn keyword cConstant EplHeadStackedEnum
     527syn keyword cConstant EplHeadSubstepEnum
     528syn keyword cConstant EplHeadTransientEnum
    529529syn keyword cConstant EsaDeltathicknessEnum
    530530syn keyword cConstant EsaEmotionEnum
    … …  
    568568syn keyword cConstant HydrologyBumpHeightEnum
    569569syn keyword cConstant HydrologyBumpSpacingEnum
     570syn keyword cConstant HydrologydcBasalMoulinInputEnum
     571syn keyword cConstant HydrologydcEplThicknessEnum
     572syn keyword cConstant HydrologydcEplThicknessOldEnum
     573syn keyword cConstant HydrologydcEplThicknessSubstepEnum
     574syn keyword cConstant HydrologydcEplThicknessTransientEnum
     575syn keyword cConstant HydrologydcMaskEplactiveEltEnum
     576syn keyword cConstant HydrologydcMaskEplactiveNodeEnum
     577syn keyword cConstant HydrologydcMaskThawedEltEnum
     578syn keyword cConstant HydrologydcMaskThawedNodeEnum
     579syn keyword cConstant HydrologydcSedimentTransmitivityEnum
    570580syn keyword cConstant HydrologyDrainageRateEnum
    571581syn keyword cConstant HydrologyEnglacialInputEnum
    … …  
    579589syn keyword cConstant HydrologySheetThicknessEnum
    580590syn keyword cConstant HydrologySheetThicknessOldEnum
     591syn keyword cConstant HydrologyWatercolumnMaxEnum
    581592syn keyword cConstant HydrologyWaterVxEnum
    582593syn keyword cConstant HydrologyWaterVyEnum
    583 syn keyword cConstant HydrologyWatercolumnMaxEnum
    584 syn keyword cConstant HydrologydcBasalMoulinInputEnum
    585 syn keyword cConstant HydrologydcEplThicknessEnum
    586 syn keyword cConstant HydrologydcEplThicknessHydrostepEnum
    587 syn keyword cConstant HydrologydcEplThicknessOldEnum
    588 syn keyword cConstant HydrologydcEplThicknessStackedEnum
    589 syn keyword cConstant HydrologydcMaskEplactiveEltEnum
    590 syn keyword cConstant HydrologydcMaskEplactiveNodeEnum
    591 syn keyword cConstant HydrologydcMaskThawedEltEnum
    592 syn keyword cConstant HydrologydcMaskThawedNodeEnum
    593 syn keyword cConstant HydrologydcSedimentTransmitivityEnum
    594594syn keyword cConstant IceEnum
    595595syn keyword cConstant IceMaskNodeActivationEnum
    … …  
    664664syn keyword cConstant SealevelriseStericRateEnum
    665665syn keyword cConstant SedimentHeadEnum
    666 syn keyword cConstant SedimentHeadHydrostepEnum
    667666syn keyword cConstant SedimentHeadOldEnum
     667syn keyword cConstant SedimentHeadSubstepEnum
     668syn keyword cConstant SedimentHeadTransientEnum
    668669syn keyword cConstant SedimentHeadResidualEnum
    669670syn keyword cConstant SedimentHeadStackedEnum
    … …  
    712713syn keyword cConstant SmbMassBalanceClimateEnum
    713714syn keyword cConstant SmbMassBalanceEnum
     715syn keyword cConstant SmbMassBalanceSubstepEnum
     716syn keyword cConstant SmbMassBalanceTransientEnum
    714717syn keyword cConstant SmbMeanLHFEnum
    715718syn keyword cConstant SmbMeanSHFEnum
    … …  
    732735syn keyword cConstant SmbReiniEnum
    733736syn keyword cConstant SmbRunoffEnum
     737syn keyword cConstant SmbRunoffSubstepEnum
     738syn keyword cConstant SmbRunoffTransientEnum
    734739syn keyword cConstant SmbS0gcmEnum
    735740syn keyword cConstant SmbS0pEnum
    … …  
    12981303syn keyword cType Cfsurfacesquare
    12991304syn keyword cType Channel
     1305syn keyword cType classes
    13001306syn keyword cType Constraint
    13011307syn keyword cType Constraints
    … …  
    13041310syn keyword cType ControlInput
    13051311syn keyword cType Covertree
     1312syn keyword cType DatasetInput
    13061313syn keyword cType DataSetParam
    1307 syn keyword cType DatasetInput
    13081314syn keyword cType Definition
    13091315syn keyword cType DependentObject
    … …  
    13181324syn keyword cType ElementHook
    13191325syn keyword cType ElementMatrix
     1326syn keyword cType Elements
    13201327syn keyword cType ElementVector
    1321 syn keyword cType Elements
    13221328syn keyword cType ExponentialVariogram
    13231329syn keyword cType ExternalResult
    … …  
    13261332syn keyword cType Friction
    13271333syn keyword cType Gauss
     1334syn keyword cType GaussianVariogram
     1335syn keyword cType gaussobjects
    13281336syn keyword cType GaussPenta
    13291337syn keyword cType GaussSeg
    13301338syn keyword cType GaussTetra
    13311339syn keyword cType GaussTria
    1332 syn keyword cType GaussianVariogram
    13331340syn keyword cType GenericExternalResult
    13341341syn keyword cType GenericOption
    … …  
    13451352syn keyword cType IssmDirectApplicInterface
    13461353syn keyword cType IssmParallelDirectApplicInterface
     1354syn keyword cType krigingobjects
    13471355syn keyword cType Load
    13481356syn keyword cType Loads
    … …  
    13551363syn keyword cType Matice
    13561364syn keyword cType Matlitho
     1365syn keyword cType matrixobjects
    13571366syn keyword cType MatrixParam
    13581367syn keyword cType Misfit
    … …  
    13671376syn keyword cType Observations
    13681377syn keyword cType Option
     1378syn keyword cType Options
    13691379syn keyword cType OptionUtilities
    1370 syn keyword cType Options
    13711380syn keyword cType Param
    13721381syn keyword cType Parameters
    … …  
    13821391syn keyword cType Regionaloutput
    13831392syn keyword cType Results
     1393syn keyword cType Riftfront
    13841394syn keyword cType RiftStruct
    1385 syn keyword cType Riftfront
    13861395syn keyword cType Seg
    13871396syn keyword cType SegInput
     1397syn keyword cType Segment
    13881398syn keyword cType SegRef
    1389 syn keyword cType Segment
    13901399syn keyword cType SpcDynamic
    13911400syn keyword cType SpcStatic
    … …  
    13941403syn keyword cType StringArrayParam
    13951404syn keyword cType StringParam
     1405syn keyword cType temp
    13961406syn keyword cType Tetra
    13971407syn keyword cType TetraInput
    … …  
    14071417syn keyword cType Vertex
    14081418syn keyword cType Vertices
    1409 syn keyword cType classes
    1410 syn keyword cType gaussobjects
    1411 syn keyword cType krigingobjects
    1412 syn keyword cType matrixobjects
    14131419syn keyword cType AdjointBalancethickness2Analysis
    14141420syn keyword cType AdjointBalancethicknessAnalysis
    … …  
    14291435syn keyword cType FreeSurfaceBaseAnalysis
    14301436syn keyword cType FreeSurfaceTopAnalysis
     1437syn keyword cType GiaIvinsAnalysis
    14311438syn keyword cType GLheightadvectionAnalysis
    1432 syn keyword cType GiaIvinsAnalysis
    14331439syn keyword cType HydrologyDCEfficientAnalysis
    14341440syn keyword cType HydrologyDCInefficientAnalysis

  • issm/trunk-jpl/src/c/shared/Enum/Synchronize.sh

    r24240 r24241  
    66
    77#Removed existing files
    8 rm $ISSM_DEV_DIR/src/c/shared/Enum/EnumToStringx.cpp
    9 rm $ISSM_DEV_DIR/src/c/shared/Enum/StringToEnumx.cpp
     8rm $ISSM_DIR/src/c/shared/Enum/EnumToStringx.cpp
     9rm $ISSM_DIR/src/c/shared/Enum/StringToEnumx.cpp
    1010
    1111#Get number of enums
    … …  
    1616#Build EnumToAnalysis.cpp {{{
    1717#Header
    18 cat <<END > $ISSM_DEV_DIR/src/c/analyses/EnumToAnalysis.cpp
     18cat <<END > $ISSM_DIR/src/c/analyses/EnumToAnalysis.cpp
    1919/*
    2020* \file EnumToAnalysis.cpp
    … …  
    3737        grep -v DefaultAnalysis | grep -v FlaimAnalysis | grep -v SurfaceSlopeAnalysis | grep -v BedSlopeAnalysis | \
    3838        awk '{print "\t\t#ifdef _HAVE_"toupper(substr($1,1,length($1)-12))"_\n\t\t" "case " $1" : return new " substr($1,1,length($1)-4) "();\n\t\t#endif"}' \
    39                 >> $ISSM_DEV_DIR/src/c/analyses/EnumToAnalysis.cpp
     39                >> $ISSM_DIR/src/c/analyses/EnumToAnalysis.cpp
    4040
    4141#Footer
    42 cat <<END >> $ISSM_DEV_DIR/src/c/analyses/EnumToAnalysis.cpp
     42cat <<END >> $ISSM_DIR/src/c/analyses/EnumToAnalysis.cpp
    4343                default : _error_("enum provided not supported ("<<EnumToStringx(analysis_enum)<<")");
    4444        }
    … …  
    4848#Build analyses.m4{{{
    4949#Header
    50 cat <<END > $ISSM_DEV_DIR/m4/analyses.m4
     50cat <<END > $ISSM_DIR/m4/analyses.m4
    5151
    5252dnl   WARNING: DO NOT MODIFY THIS FILE
    … …  
    7878AC_MSG_RESULT($HAVE_" toupper($1)")\n\
    7979dnl }}}"}' \
    80         >> $ISSM_DEV_DIR/m4/analyses.m4
     80        >> $ISSM_DIR/m4/analyses.m4
    8181
    8282#Footer
    83 cat <<END >> $ISSM_DEV_DIR/m4/analyses.m4
     83cat <<END >> $ISSM_DIR/m4/analyses.m4
    8484
    8585])
    … …  
    9191#Build EnumToStringx.cpp {{{
    9292#Header
    93 cat <<END >  $ISSM_DEV_DIR/src/c/shared/Enum/EnumToStringx.cpp
     93cat <<END >  $ISSM_DIR/src/c/shared/Enum/EnumToStringx.cpp
    9494/*
    9595* \file EnumToStringx.cpp:
    … …  
    112112END
    113113#core
    114 cat temp |  awk '{print "\t\t" "case " $1" : return \"" substr($1,1,length($1)-4) "\";"}' >> $ISSM_DEV_DIR/src/c/shared/Enum/EnumToStringx.cpp
     114cat temp |  awk '{print "\t\t" "case " $1" : return \"" substr($1,1,length($1)-4) "\";"}' >> $ISSM_DIR/src/c/shared/Enum/EnumToStringx.cpp
    115115#Footer
    116 cat <<END >> $ISSM_DEV_DIR/src/c/shared/Enum/EnumToStringx.cpp
     116cat <<END >> $ISSM_DIR/src/c/shared/Enum/EnumToStringx.cpp
    117117                default : return "unknown";
    118118
    … …  
    144144#Build StringToEnumx.cpp {{{
    145145#Header
    146 cat <<END > $ISSM_DEV_DIR/src/c/shared/Enum/StringToEnumx.cpp
     146cat <<END > $ISSM_DIR/src/c/shared/Enum/StringToEnumx.cpp
    147147/*
    148148* \file StringToEnumx.cpp:
    … …  
    168168i2=120;
    169169for (( i=1 ; i<=100 ; i++ )); do
    170         echo "   if(stage==$i){" >> $ISSM_DEV_DIR//src/c/shared/Enum/StringToEnumx.cpp
     170        echo "   if(stage==$i){" >> $ISSM_DIR//src/c/shared/Enum/StringToEnumx.cpp
    171171        awk -v i1=$i1 -v i2=$i2 '{if(NR>=i1 && NR<=i2) print $0 }' temp |
    172         awk '{print "\t" ((NR==1)?"      if":"      else if") " (strcmp(name,\"" substr($1,1,length($1)-4) "\")==0) return " $1 ";"}' >> $ISSM_DEV_DIR//src/c/shared/Enum/StringToEnumx.cpp
    173         echo "         else stage=$(($i+1));" >> $ISSM_DEV_DIR//src/c/shared/Enum/StringToEnumx.cpp
    174         echo "   }" >> $ISSM_DEV_DIR//src/c/shared/Enum/StringToEnumx.cpp
     172        awk '{print "\t" ((NR==1)?"      if":"      else if") " (strcmp(name,\"" substr($1,1,length($1)-4) "\")==0) return " $1 ";"}' >> $ISSM_DIR//src/c/shared/Enum/StringToEnumx.cpp
     173        echo "         else stage=$(($i+1));" >> $ISSM_DIR//src/c/shared/Enum/StringToEnumx.cpp
     174        echo "   }" >> $ISSM_DIR//src/c/shared/Enum/StringToEnumx.cpp
    175175
    176176        if [ $i2 -ge $NUMENUMS ]; then break; fi
    … …  
    180180
    181181#footer
    182 cat <<END >> $ISSM_DEV_DIR/src/c/shared/Enum/StringToEnumx.cpp
     182cat <<END >> $ISSM_DIR/src/c/shared/Enum/StringToEnumx.cpp
    183183        /*If we reach this point, the string provided has not been found*/
    184184        if(notfounderror)

  • issm/trunk-jpl/src/m/contrib/defleurian/netCDF/export_netCDF.py

    r24240 r24241  
    175175        print(('WARNING type "{}" is unknown for "{}.{}"'.format(val_type, Group.name, field)))
    176176    return DimDict
    177 
    178     # ============================================================================
     177# ============================================================================
    179178    # retriev the dimension tuple from a dictionnary
    180179

  • issm/trunk-jpl/src/m/contrib/defleurian/paraview/exportVTK.py

    r24213 r24241  
    120120        saved_cells = {}
    121121        timestep = step
    122         fid = open((filename + '/Timestep.vtk' + str(timestep) + '.vtk'), 'w + ')
    123         fid.write('  # vtk DataFile Version 3.0 \n')
     122        fid = open((filename + '/Timestep.vtk' + str(timestep) + '.vtk'), 'w+')
     123        fid.write('# vtk DataFile Version 3.0 \n')
    124124        fid.write('Data for run {} \n'.format(md.miscellaneous.name))
    125125        fid.write('ASCII \n')

  • issm/trunk-jpl/src/m/dev/devpath.py

    r24240 r24241  
    55
    66#Recover ISSM_DIR and USERNAME
    7 ISSM_DIR = os.getenv('ISSM_DEV_DIR')
     7ISSM_DIR = os.getenv('ISSM_DIR')
    88USERNAME = os.getenv('USER')
    99JPL_SVN = os.getenv('JPL_SVN')
    1010if ISSM_DIR is None:
    11     raise NameError('"ISSM_DEV_DIR" environment variable is empty! You should define ISSM_DEV_DIR in your .cshrc or .bashrc!')
     11    raise NameError('"ISSM_DIR" environment variable is empty! You should define ISSM_DIR in your .cshrc or .bashrc!')
    1212
    1313    #Go through src / m and append any directory that contains a * .py file to PATH

  • issm/trunk-jpl/src/m/miscellaneous/parallelrange.py

    r24213 r24241  
    1 #! / usr / bin / env python
     1#!/usr/bin/env python
    22def parallelrange(rank, numprocs, globalsize):
    33    """

  • issm/trunk-jpl/src/m/qmu/importancefactors.py

    r24213 r24241  
    1818    found = -1
    1919    for i in range(len(responsefunctions)):
    20         if strcmpi(responsefunctions[i].descriptor, responsename):
     20        if responsefunctions[i].descriptor == responsename:
    2121            found = i
    2222            break
Note: See TracChangeset for help on using the changeset viewer.