Changeset 20676


Ignore:
Timestamp:
05/31/16 17:50:46 (9 years ago)
Author:
felicity
Message:

NEW: Budd and Jacka (1989) A values

Location:
issm/trunk-jpl/src/c
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/Makefile.am

    r20663 r20676  
    116116                                        ./shared/Sorting/binary_search.cpp\
    117117                                        ./shared/Elements/Cuffey.cpp\
     118                                        ./shared/Elements/BuddJacka.cpp\
    118119                                        ./shared/Elements/CuffeyTemperate.cpp\
    119120                                        ./shared/Elements/StressIntensityIntegralWeight.cpp\

  • issm/trunk-jpl/src/c/shared/Elements/elements.h

    r20625 r20676  
    99
    1010IssmDouble Cuffey(IssmDouble temperature);
     11IssmDouble BuddJacka(IssmDouble temperature);
    1112IssmDouble CuffeyTemperate(IssmDouble temperature, IssmDouble waterfraction, IssmDouble stressexp);
    1213IssmDouble Paterson(IssmDouble temperature);

  • issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

    r20663 r20676  
    10441044        /*Rheology law (move to Material) {{{*/
    10451045        CuffeyEnum,
     1046        BuddJackaEnum,
    10461047        CuffeyTemperateEnum,
    10471048        PatersonEnum,

  • issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

    r20663 r20676  
    10001000                case OptionStructEnum : return "OptionStruct";
    10011001                case CuffeyEnum : return "Cuffey";
     1002                case BuddJackaEnum : return "BuddJacka";
    10021003                case CuffeyTemperateEnum : return "CuffeyTemperate";
    10031004                case PatersonEnum : return "Paterson";

  • issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

    r20663 r20676  
    10241024              else if (strcmp(name,"OptionStruct")==0) return OptionStructEnum;
    10251025              else if (strcmp(name,"Cuffey")==0) return CuffeyEnum;
     1026              else if (strcmp(name,"BuddJacka")==0) return BuddJackaEnum;
    10261027              else if (strcmp(name,"CuffeyTemperate")==0) return CuffeyTemperateEnum;
    10271028              else if (strcmp(name,"Paterson")==0) return PatersonEnum;

  • issm/trunk-jpl/src/c/solutionsequences/solutionsequence_linear.cpp

    r20601 r20676  
    4747        nF=pf->Norm(NORM_TWO);
    4848        solver_residue=nKUF/nF;
    49         if(solver_residue>pow(10,-6))_error_("   solver residue too high!: norm(KU-F)/norm(F)=" << solver_residue << "\n");
     49        if(solver_residue>1.e-6)_error_("   solver residue too high!: norm(KU-F)/norm(F)=" << solver_residue << "\n");
    5050
    5151        //clean up
Note: See TracChangeset for help on using the changeset viewer.