Ignore:
Timestamp:
08/20/12 17:39:30 (13 years ago)
Author:
cborstad
Message:

merged trunk-jpl through revision 13099 into branch

Location:
issm/branches/trunk-jpl-damage
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/branches/trunk-jpl-damage

    • Property svn:ignore

      •  

        old new  
         1projects
        12autom4te.cache
        23aclocal.m4
    • Property svn:mergeinfo changed
      /issm/trunk-jplmerged: 12948-13099

  • issm/branches/trunk-jpl-damage/src/c/classes/objects/Inputs/IntInput.cpp

    r12832 r13101  
    9999ElementResult* IntInput::SpawnResult(int step, IssmDouble time){
    100100       
    101         _error2_("not supported yet!");
     101        _error_("not supported yet!");
    102102
    103103}
    … …  
    106106/*Object functions*/
    107107/*FUNCTION IntInput::GetInputValue(bool* pvalue) {{{*/
    108 void IntInput::GetInputValue(bool* pvalue){_error2_("not supported yet!");}
     108void IntInput::GetInputValue(bool* pvalue){_error_("not supported yet!");}
    109109/*}}}*/
    110110/*FUNCTION IntInput::GetInputValue(int* pvalue){{{*/
    … …  
    115115/*FUNCTION IntInput::GetInputValue(IssmDouble* pvalue){{{*/
    116116void IntInput::GetInputValue(IssmDouble* pvalue){
    117         _error2_("IntInput cannot return a IssmDouble in parallel");
     117        _error_("IntInput cannot return a IssmDouble in parallel");
    118118}
    119119/*}}}*/
    120120/*FUNCTION IntInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){{{*/
    121 void IntInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error2_("not supported yet!");}
     121void IntInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error_("not supported yet!");}
    122122/*}}}*/
    123123/*FUNCTION IntInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){{{*/
    124 void IntInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error2_("not supported yet!");}
     124void IntInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error_("not supported yet!");}
    125125/*}}}*/
    126126/*FUNCTION IntInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){{{*/
    127 void IntInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error2_("not supported yet!");}
     127void IntInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error_("not supported yet!");}
    128128/*}}}*/
    129129/*FUNCTION IntInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){{{*/
    130 void IntInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not supported yet!");}
     130void IntInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error_("not supported yet!");}
    131131/*}}}*/
    132132/*FUNCTION IntInput::ChangeEnum{{{*/
    … …  
    166166
    167167                default:
    168                         _error2_("not implemented yet");
     168                        _error_("not implemented yet");
    169169        }
    170170
    … …  
    182182void IntInput::GetVectorFromInputs(Vector* vector,int* doflist){
    183183
    184         _error2_("not supporte yet!");
     184        _error_("not supporte yet!");
    185185
    186186}
    … …  
    189189void IntInput::GetValuesPtr(IssmDouble** pvalues,int* pnum_values){
    190190
    191         _error2_("not supported yet!");
     191        _error_("not supported yet!");
    192192
    193193}
Note: See TracChangeset for help on using the changeset viewer.