Ignore:
Timestamp:
07/24/12 10:36:19 (13 years ago)
Author:
Mathieu Morlighem
Message:

merged trunk-jpl and trunk for revision 12703

File:
1 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/objects/Kriging/ExponentialVariogram.cpp

    r12330 r12706  
    1717
    1818/*ExponentialVariogram constructors and destructor*/
    19 /*FUNCTION ExponentialVariogram::ExponentialVariogram(){{{1*/
     19/*FUNCTION ExponentialVariogram::ExponentialVariogram(){{{*/
    2020ExponentialVariogram::ExponentialVariogram(){
    2121        this->nugget = 0.2;
    … …  
    2525}
    2626/*}}}*/
    27 /*FUNCTION ExponentialVariogram::ExponentialVariogram(Options* options){{{1*/
     27/*FUNCTION ExponentialVariogram::ExponentialVariogram(Options* options){{{*/
    2828ExponentialVariogram::ExponentialVariogram(Options* options){
    2929
    … …  
    3939
    4040        /*Checks*/
    41         if(nugget==sill) _error_("nugget and sill cannot be equal (constant semivariogram not allowed)");
     41        if(nugget==sill) _error2_("nugget and sill cannot be equal (constant semivariogram not allowed)");
    4242}
    4343/*}}}*/
    44 /*FUNCTION ExponentialVariogram::~ExponentialVariogram(){{{1*/
     44/*FUNCTION ExponentialVariogram::~ExponentialVariogram(){{{*/
    4545ExponentialVariogram::~ExponentialVariogram(){
    4646        return;
    … …  
    4949
    5050/*Object virtual functions definitions:*/
    51 /*FUNCTION ExponentialVariogram::Echo {{{1*/
     51/*FUNCTION ExponentialVariogram::Echo {{{*/
    5252void ExponentialVariogram::Echo(void){
    53         printf("ExponentialVariogram\n");
    54         printf("   nugget: %g\n",this->nugget);
    55         printf("   sill  : %g\n",this->sill);
    56         printf("   range : %g\n",this->range);
     53        _printLine_("ExponentialVariogram");
     54        _printLine_("   nugget: " << this->nugget);
     55        _printLine_("   sill  : " << this->sill);
     56        _printLine_("   range : " << this->range);
    5757}
    5858/*}}}*/
    5959
    6060/*Variogram function*/
    61 /*FUNCTION ExponentialVariogram::Covariance{{{1*/
     61/*FUNCTION ExponentialVariogram::Covariance{{{*/
    6262double ExponentialVariogram::Covariance(double deltax,double deltay){
    6363        /*The covariance can be deduced from the variogram from the following
    … …  
    7171        h=sqrt(pow(deltax,2.)+pow(deltay,2.));
    7272
    73         /*return covariance*/
     73        /*If h is too small, return sill*/
     74        if(h<0.0000001) return sill;
     75
     76        /*compute covariance*/
    7477        a     = 1./3.;
    7578        cova = (sill-nugget)*exp(-h/(a*range));
    … …  
    7780}
    7881/*}}}*/
    79 /*FUNCTION ExponentialVariogram::SemiVariogram{{{1*/
     82/*FUNCTION ExponentialVariogram::SemiVariogram{{{*/
    8083double ExponentialVariogram::SemiVariogram(double deltax,double deltay){
    8184        /*http://en.wikipedia.org/wiki/Variogram*/
Note: See TracChangeset for help on using the changeset viewer.