Changeset 13975 for issm/trunk/src/c/solutions/kriging.cpp

Timestamp:

11/16/12 08:10:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13974

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/solutions/kriging.cpp (modified) (6 diffs)

issm/trunk/src/c/solutions/kriging.cpp

@@ -4 +4 @@
 
 #include "../issm.h"
-#include "../include/globals.h"
 
 /*Local prototypes*/
 void ProcessArguments2(char** pbinfilename,char** poutbinfilename,char** plockfilename,char** prootpath,int argc,char **argv);
 void ProcessInputfile(IssmDouble **px,IssmDouble **py,IssmDouble **pdata,int *pnobs,IssmDouble **px_interp,IssmDouble **py_interp,int *pninterp,Options **poptions,FILE* fid);
+
+int my_rank;
+int num_procs;
 
 int main(int argc,char **argv){
@@ -23 +25 @@
         char *rootpath       = NULL;
 
+        MPI_Comm comm;
+        extern int my_rank;
+        extern int num_procs;
+
         /*Input*/
         int         ninterp,nobs;
@@ -36 +42 @@
         IssmDouble *error       = NULL;
 
-        ISSMBOOT();
+        /*Initialize exception trapping: */
+        ExceptionTrapBegin();
 
-        /*Initialize environments: Petsc, MPI, etc...: */
-#ifdef _HAVE_PETSC_
-        int ierr=PetscInitialize(&argc,&argv,(char*)0,"");  
-        if(ierr) _error_("Could not initialize Petsc");
-#else
-#ifdef _HAVE_MPI_
-        MPI_Init(&argc,&argv);
-#endif
-#endif
+        /*Initialize environment (MPI, PETSC, MUMPS, etc ...)*/
+        comm=EnvironmentInit(argc,argv);
 
-        /*Size and rank: */
-#ifdef _HAVE_MPI_
-        MPI_Comm_rank(MPI_COMM_WORLD,&my_rank);  
-        MPI_Comm_size(MPI_COMM_WORLD,&num_procs); 
-#endif
+        MPI_Comm_size(comm,&num_procs);
+        MPI_Comm_rank(comm,&my_rank);
 
         /*First process inputs*/
@@ -76 +73 @@
                 results->AddObject(new GenericExternalResult<double*>(results->Size()+1,1,error,ninterp,1,1,0));
                 for(int i=0;i<results->Size();i++){
-                        ExternalResult* result=(ExternalResult*)results->GetObjectByOffset(i);
+                        ExternalResult* result=dynamic_cast<ExternalResult*>(results->GetObjectByOffset(i));
                         result->WriteData(output_fid,1);
                 }
@@ -101 +98 @@
         delete results;
 
-#ifdef _HAVE_PETSC_
-        _pprintLine_("closing MPI and Petsc");
-        PetscFinalize(); 
-#else
-#ifdef _HAVE_MPI_
-        _pprintLine_("closing MPI and Petsc");
-        MPI_Finalize();
-#endif
-#endif
+        /*Finalize environment:*/
+        EnvironmentFinalize();
 
-        /*end module: */
-        ISSMEND();
+        /*Finalize exception trapping: */
+        ExceptionTrapEnd();
 
         return 0; //unix success return;
@@ -166 +156 @@
         Option  *option   = NULL;
 
-        int dummy,M,N;
+        int      M,N;
         IoModel* iomodel = new IoModel();
         iomodel->fid=fid;