Changeset 14377

Timestamp:

02/23/13 10:02:01 (12 years ago)

Author:

Mathieu Morlighem

Message:

Renaming DomainOutlineRead ExpRead to be consistent

Location:

issm/trunk-jpl/src

Files:

• c/modules/Exp2Kmlx/Exp2Kmlx.cpp (modified) (1 diff)
• c/modules/Krigingx/pKrigingx.cpp (modified) (4 diffs)
• c/shared/Exp/exp.h (modified) (3 diffs)
• wrappers/ExpSimplify/ExpSimplify.cpp (modified) (1 diff)
• wrappers/matlab/io/FetchMatlabData.cpp (modified) (1 diff)
• wrappers/python/io/FetchPythonData.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp

@@ -54 +54 @@
         /*read exp file  */
 
-        if (!DomainOutlineRead(&nprof,&pnvert,&pprofx,&pprofy,&closed,filexp))
+        if (!ExpRead(&nprof,&pnvert,&pprofx,&pprofy,&closed,filexp))
                 _error_("Error reading exp file.");
         _pprintLine_("Exp2Kmlx -- Reading " << nprof << " exp profiles from file \"" << filexp << "\".");

issm/trunk-jpl/src/c/modules/Krigingx/pKrigingx.cpp

@@ -69 +69 @@
                 /*partition loop across threads: */
                 for(int idx=my_rank;idx<n_interp;idx+=num_procs){
-                        _pprintLine_("      interpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100.<<"%");
+                        _pprintLine_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<double(idx)/double(n_interp)*100.<<"%");
                         observations->InterpolationKriging(&predictions[idx],&error[idx],x_interp[idx],y_interp[idx],radius,mindata,maxdata,variogram);
                 }
-                _pprintLine_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
+                _pprintLine_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<100.<<"%");
 
 #ifdef _HAVE_MPI_
@@ -87 +87 @@
                 /*partition loop across threads: */
                 for(int idx=my_rank;idx<n_interp;idx+=num_procs){
-                        _pprintLine_("      interpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100.<<"%");
+                        _pprintLine_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<double(idx)/double(n_interp)*100.<<"%");
                         observations->InterpolationV4(&predictions[idx],x_interp[idx],y_interp[idx],radius,mindata,maxdata);
                 }
-                _pprintLine_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
+                _pprintLine_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<100.<<"%");
 
 #ifdef _HAVE_MPI_
@@ -102 +102 @@
                 /*partition loop across threads: */
                 for(int idx=my_rank;idx<n_interp;idx+=num_procs){
-                        _pprintLine_("      interpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100.<<"%");
+                        _pprintLine_("      interpolation progress: "<<setw(6)<<setprecision(4)<<double(idx)/double(n_interp)*100.<<"%");
                         observations->InterpolationNearestNeighbor(&predictions[idx],x_interp[idx],y_interp[idx],radius);
                 }
-                _pprintLine_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
+                _pprintLine_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<100.<<"%");
 
 #ifdef _HAVE_MPI_
@@ -119 +119 @@
                 /*partition loop across threads: */
                 for(int idx=my_rank;idx<n_interp;idx+=num_procs){
-                        _pprintLine_("      interpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100.<<"%");
+                        _pprintLine_("      interpolation progress: "<<setw(6)<<setprecision(4)<<double(idx)/double(n_interp)*100.<<"%");
                         observations->InterpolationIDW(&predictions[idx],x_interp[idx],y_interp[idx],radius,mindata,maxdata,power);
                 }
-                _pprintLine_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
+                _pprintLine_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<100.<<"%");
 
 #ifdef _HAVE_MPI_

issm/trunk-jpl/src/c/shared/Exp/exp.h

@@ -58 +58 @@
          return 1;
 }/*}}}*/
-/*DomainOutlineRead{{{*/
+/*int      ExpRead(int* pnprof,int** pprofnvertices,doubletype*** ppprofx,doubletype*** ppprofy,bool** pclosed,char* domainname){{{*/
 template <class doubletype>
-int DomainOutlineRead(int* pnprof,int** pprofnvertices,doubletype*** ppprofx,doubletype*** ppprofy,bool** pclosed,char* domainname){
+int ExpRead(int* pnprof,int** pprofnvertices,doubletype*** ppprofx,doubletype*** ppprofy,bool** pclosed,char* domainname){
 
         /*indexing: */
@@ -162 +162 @@
         else         xDelete<bool>(closed);
 } /*}}}*/
-/*DataSet* DomainOutlineRead(char* domainname){{{*/
+/*DataSet* ExpRead(char* domainname){{{*/
 template <class doubletype>
-DataSet* DomainOutlineRead(char* domainname){
+DataSet* ExpRead(char* domainname){
 
         /*intermediary: */
@@ -180 +180 @@
         }
         else{
-                DomainOutlineRead(&nprof,&profnvertices,&pprofx, &pprofy, NULL,domainname);
+                ExpRead(&nprof,&profnvertices,&pprofx, &pprofy, NULL,domainname);
         }
 

issm/trunk-jpl/src/wrappers/ExpSimplify/ExpSimplify.cpp

@@ -134 +134 @@
 
         /*Read old contours and allocate new contours*/
-        oldcontours=DomainOutlineRead<double>(expfile);
+        oldcontours=ExpRead<double>(expfile);
         newcontours=new DataSet(0);
         for(int counter=0;counter<oldcontours->Size();counter++){

issm/trunk-jpl/src/wrappers/matlab/io/FetchMatlabData.cpp

@@ -645 +645 @@
         if (mxIsClass(dataref,"char")){
                 FetchData(&contourname,dataref);
-                contours=DomainOutlineRead<double>(contourname);
+                contours=ExpRead<double>(contourname);
         }
         else if(mxIsClass(dataref,"struct")){

issm/trunk-jpl/src/wrappers/python/io/FetchPythonData.cpp

@@ -752 +752 @@
         if (PyString_Check(py_list)){
                 FetchData(&contourname,py_list);
-                contours=DomainOutlineRead<double>(contourname);
+                contours=ExpRead<double>(contourname);
         }
         else if(PyList_Check(py_list)){