Changeset 21143


Ignore:
Timestamp:
08/16/16 14:46:36 (9 years ago)
Author:
ayfeng
Message:

CHG: solve casts solutionstring to upper instead of lowercase in comparison

The solve function was casting the given solution string
to uppercase and then comparing against a lowercase string,
this caused all input strings to be invalid.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/m/solve/solve.js

    r21139 r21143  
    3737
    3838        //recover and process solve options
    39         if((solutionstring.toUpperCase() === 'sb') || (solutionstring.toUpperCase() === 'stressbalance')){
     39        if((solutionstring.toLowerCase() === 'sb') || (solutionstring.toLowerCase() === 'stressbalance')){
    4040                solutionstring = 'StressbalanceSolution';
    41         }else if((solutionstring.toUpperCase() === 'mt') || (solutionstring.toUpperCase() === 'masstransport')){
     41        }else if((solutionstring.toLowerCase() === 'mt') || (solutionstring.toLowerCase() === 'masstransport')){
    4242                solutionstring = 'MasstransportSolution';       
    43         }else if((solutionstring.toUpperCase() === 'th') || (solutionstring.toUpperCase() === 'thermal')){
     43        }else if((solutionstring.toLowerCase() === 'th') || (solutionstring.toLowerCase() === 'thermal')){
    4444                solutionstring = 'ThermalSolution';
    45         }else if((solutionstring.toUpperCase() === 'st') || (solutionstring.toUpperCase() === 'steadystate')){
     45        }else if((solutionstring.toLowerCase() === 'st') || (solutionstring.toLowerCase() === 'steadystate')){
    4646                solutionstring = 'SteadystateSolution';
    47         }else if((solutionstring.toUpperCase() === 'tr') || (solutionstring.toUpperCase() === 'transient')){
     47        }else if((solutionstring.toLowerCase() === 'tr') || (solutionstring.toLowerCase() === 'transient')){
    4848                solutionstring = 'TransientSolution';
    49         }else if((solutionstring.toUpperCase() === 'mc') || (solutionstring.toUpperCase() === 'balancethickness')){
     49        }else if((solutionstring.toLowerCase() === 'mc') || (solutionstring.toLowerCase() === 'balancethickness')){
    5050                solutionstring = 'BalancethicknessSolution';
    51         }else if((solutionstring.toUpperCase() === 'bv') || (solutionstring.toUpperCase() === 'balancevelocity')){
     51        }else if((solutionstring.toLowerCase() === 'bv') || (solutionstring.toLowerCase() === 'balancevelocity')){
    5252                solutionstring = 'BalancevelocitySolution';
    53         }else if((solutionstring.toUpperCase() === 'bsl') || (solutionstring.toUpperCase() === 'bedslope')){
     53        }else if((solutionstring.toLowerCase() === 'bsl') || (solutionstring.toLowerCase() === 'bedslope')){
    5454                solutionstring = 'BedSlopeSolution';
    55         }else if((solutionstring.toUpperCase() === 'ssl') || (solutionstring.toUpperCase() === 'surfaceslope')){
     55        }else if((solutionstring.toLowerCase() === 'ssl') || (solutionstring.toLowerCase() === 'surfaceslope')){
    5656                solutionstring = 'SurfaceSlopeSolution';
    57         }else if((solutionstring.toUpperCase() === 'hy') || (solutionstring.toUpperCase() === 'hydrology')){
     57        }else if((solutionstring.toLowerCase() === 'hy') || (solutionstring.toLowerCase() === 'hydrology')){
    5858                solutionstring = 'HydrologySolution';
    59         }else if((solutionstring.toUpperCase() === 'da') || (solutionstring.toUpperCase() === 'damageevolution')){
     59        }else if((solutionstring.toLowerCase() === 'da') || (solutionstring.toLowerCase() === 'damageevolution')){
    6060                solutionstring = 'DamageEvolutionSolution';
    61         }else if((solutionstring.toUpperCase() === 'gia') || (solutionstring.toUpperCase() === 'gia')){
     61        }else if((solutionstring.toLowerCase() === 'gia') || (solutionstring.toLowerCase() === 'gia')){
    6262                solutionstring = 'GiaSolution';
    63         }else if((solutionstring.toUpperCase() === 'slr') || (solutionstring.toUpperCase() === 'sealevelrise')){
     63        }else if((solutionstring.toLowerCase() === 'slr') || (solutionstring.toLowerCase() === 'sealevelrise')){
    6464                solutionstring = 'SealevelriseSolution';
    6565        }else{
Note: See TracChangeset for help on using the changeset viewer.