Changeset 13530


Ignore:
Timestamp:
10/04/12 10:33:59 (12 years ago)
Author:
Eric.Larour
Message:

CHG and NEW:
macros.h: changed name of ISSMBOOT and ISSMEND macros to IssmBoot and IssmEnd.
AdolcEdf: moved adolc_edf to src/c/classes and renamed it AdolcEdf. Updated all headers and Makefile.am
accordingly.
Noticed dual existence of objects.h in src/c/classes and src/c/classes/objects! Deleted first one and
fixed references accordingly in bamg and kriging.
Created new EnvironmentInit routine to initialize Petsc and MPI. Updated issm.cpp and kriging.cpp accordingly.

Location:
issm/trunk-jpl/src/c
Files:
2 added
2 deleted
24 edited

Legend:

Unmodified
Added
Removed

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

    r13432 r13530  
    6767                                        ./classes/objects/Vertex.h\
    6868                                        ./classes/objects/Vertex.cpp\
     69                                        ./classes/objects/AdolcEdf.h\
    6970                                        ./classes/Hook.h\
    7071                                        ./classes/Hook.cpp\
    … …  
    188189                                        ./shared/Matrix/matrix.h\
    189190                                        ./shared/Matrix/MatrixUtils.cpp\
    190                                         ./shared/Numerics/adolc_edf.h\
    191191                                        ./shared/Numerics/numerics.h\
    192192                                        ./shared/Numerics/Verbosity.h\
    … …  
    350350                                        ./solutions/AnalysisConfiguration.cpp\
    351351                                        ./solutions/CorePointerFromSolutionEnum.cpp\
     352                                        ./solutions/EnvironmentInit.cpp\
    352353                                        ./solvers/solver_linear.cpp\
    353354                                        ./solvers/solver_nonlinear.cpp\

  • issm/trunk-jpl/src/c/classes/bamg/BamgGeom.cpp

    r12821 r13530  
    11#include <stdio.h>
    2 #include "../objects.h"
     2#include "../objects/objects.h"
    33#include "../../io/io.h"
    44#include "../../shared/shared.h"

  • issm/trunk-jpl/src/c/classes/bamg/BamgMesh.cpp

    r12821 r13530  
    11#include <stdio.h>
    2 #include "../objects.h"
     2#include "../objects/objects.h"
    33#include "../../io/io.h"
    44#include "../../shared/shared.h"

  • issm/trunk-jpl/src/c/classes/bamg/BamgOpts.cpp

    r13036 r13530  
    22#include "../../shared/shared.h"
    33#include "../../include/include.h"
    4 #include "../objects.h"
     4#include "../objects/objects.h"
    55#include "../../io/io.h"
    66

  • issm/trunk-jpl/src/c/classes/bamg/BamgQuadtree.cpp

    r12821 r13530  
    33#include <stdlib.h>
    44
    5 #include "../objects.h"
     5#include "../objects/objects.h"
    66
    77namespace bamg {

  • issm/trunk-jpl/src/c/classes/bamg/BamgVertex.cpp

    r13036 r13530  
    44#include <ctime>
    55
    6 #include "../objects.h"
     6#include "../objects/objects.h"
    77
    88namespace bamg {

  • issm/trunk-jpl/src/c/classes/bamg/Geometry.cpp

    r13385 r13530  
    44#include <ctime>
    55
    6 #include "../objects.h"
     6#include "../objects/objects.h"
    77#include "../../include/include.h"
    88#include "../../shared/Exceptions/exceptions.h"

  • issm/trunk-jpl/src/c/classes/bamg/ListofIntersectionTriangles.cpp

    r13036 r13530  
    44#include <ctime>
    55
    6 #include "../objects.h"
     6#include "../objects/objects.h"
    77
    88namespace bamg {

  • issm/trunk-jpl/src/c/classes/bamg/Mesh.cpp

    r13036 r13530  
    44#include <ctime>
    55
    6 #include "../objects.h"
     6#include "../objects/objects.h"
    77
    88namespace bamg {

  • issm/trunk-jpl/src/c/classes/bamg/SetOfE4.cpp

    r13036 r13530  
    1 #include "../objects.h"
     1#include "../objects/objects.h"
    22
    33using namespace std;

  • issm/trunk-jpl/src/c/classes/bamg/Triangle.cpp

    r13036 r13530  
    44#include <ctime>
    55
    6 #include "../objects.h"
     6#include "../objects/objects.h"
    77
    88namespace bamg {

  • issm/trunk-jpl/src/c/classes/classes.h

    r12840 r13530  
    3030#include "./OptArgs.h"
    3131#include "./OptPars.h"
     32#include "./AdolcEdf.h"
    3233
    3334#endif

  • issm/trunk-jpl/src/c/classes/kriging/ExponentialVariogram.cpp

    r13036 r13530  
    1111#include <stdio.h>
    1212#include <string.h>
    13 #include "../objects.h"
     13#include "../objects/objects.h"
    1414#include "../../EnumDefinitions/EnumDefinitions.h"
    1515#include "../../shared/shared.h"

  • issm/trunk-jpl/src/c/classes/kriging/GaussianVariogram.cpp

    r13036 r13530  
    1111#include <stdio.h>
    1212#include <string.h>
    13 #include "../objects.h"
     13#include "../objects/objects.h"
    1414#include "../../EnumDefinitions/EnumDefinitions.h"
    1515#include "../../shared/shared.h"

  • issm/trunk-jpl/src/c/classes/kriging/Observation.cpp

    r12821 r13530  
    44
    55#include <stdlib.h>
    6 #include "../objects.h"
     6#include "../objects/objects.h"
    77
    88/*Observation constructors and destructor*/

  • issm/trunk-jpl/src/c/classes/kriging/PowerVariogram.cpp

    r13036 r13530  
    1111#include <stdio.h>
    1212#include <string.h>
    13 #include "../objects.h"
     13#include "../objects/objects.h"
    1414#include "../../EnumDefinitions/EnumDefinitions.h"
    1515#include "../../shared/shared.h"

  • issm/trunk-jpl/src/c/classes/kriging/Quadtree.cpp

    r13036 r13530  
    1 #include "../objects.h"
     1#include "../objects/objects.h"
    22
    33/*DOCUMENTATION What is a Quadtree? {{{

  • issm/trunk-jpl/src/c/classes/kriging/SphericalVariogram.cpp

    r13036 r13530  
    1111#include <stdio.h>
    1212#include <string.h>
    13 #include "../objects.h"
     13#include "../objects/objects.h"
    1414#include "../../EnumDefinitions/EnumDefinitions.h"
    1515#include "../../shared/shared.h"

  • issm/trunk-jpl/src/c/include/macros.h

    r13056 r13530  
    7171#endif
    7272/*}}}*/
    73 /* ISSMBOOT/ISSMEND {{{*/
     73/* IssmBoot/IssmEnd {{{*/
    7474
    7575/*The following macros hide the error exception handling in a matlab module. Just put
    76  * ISSMBOOT(); and ISSMEND(); at the beginning and end of a module, and c++ exceptions
     76 * IssmBoot(); and IssmEnd(); at the beginning and end of a module, and c++ exceptions
    7777 * will be trapped. Really nifty!*/
    7878
    79 #define ISSMBOOT(); \
     79#define IssmBoot(); \
    8080        try{
    8181
    82 #define ISSMEND(); }\
     82#define IssmEnd(); }\
    8383        catch(ErrorException &exception){\
    8484                exception.Report(); \

  • issm/trunk-jpl/src/c/modules/AutodiffDriversx/AutodiffDriversx.cpp

    r13513 r13530  
    88#include "../../toolkits/toolkits.h"
    99#include "../../EnumDefinitions/EnumDefinitions.h"
    10 #include "../../shared/Numerics/adolc_edf.h"
    1110
    1211

  • issm/trunk-jpl/src/c/modules/Solverx/SolverxSeq.cpp

    r13515 r13530  
    1212#include "./Solverx.h"
    1313#include "../../shared/shared.h"
     14#include "../../classes/classes.h"
    1415#include "../../include/include.h"
    1516#include "../../io/io.h"
    … …  
    1718#ifdef _HAVE_GSL_
    1819#include <gsl/gsl_linalg.h>
    19 #endif
    20 
    21 #ifdef _HAVE_ADOLC_
    22 #include "../../shared/Numerics/adolc_edf.h"
    2320#endif
    2421

  • issm/trunk-jpl/src/c/solutions/issm.cpp

    r13502 r13530  
    55#include "../issm.h"
    66#include "../include/globals.h"
    7 #include "../shared/Numerics/adolc_edf.h"
    8 
     7       
    98int main(int argc,char **argv){
    109
    … …  
    4645        IssmPDouble Solution_time, Memory_use, Current_flops;
    4746
    48         ISSMBOOT();
    49 
    50        
    51         /*Initialize environments: Petsc, MPI, etc...: */
    52         #ifdef _HAVE_PETSC_
    53         ierr=PetscInitialize(&argc,&argv,(char*)0,""); 
    54         if(ierr) _error_("Could not initialize Petsc");
    55         #else
    56         #ifdef _HAVE_MPI_
    57         MPI_Init(&argc,&argv);
    58         #endif
    59         #endif
    60 
    61         #ifdef _HAVE_MPI_
     47        IssmBoot();
     48
     49        EnvironmentInit(argc,argv);
     50       
     51                #ifdef _HAVE_MPI_
    6252        MPI_Barrier(MPI_COMM_WORLD); start=MPI_Wtime();
    6353        #else
    … …  
    6555        #endif
    6656
    67         /*Size and rank: */
    68         #ifdef _HAVE_MPI_
    69         MPI_Comm_rank(MPI_COMM_WORLD,&my_rank); 
    70         MPI_Comm_size(MPI_COMM_WORLD,&num_procs);
    71         #endif
    72 
     57       
    7358        /*First process inputs*/
    7459        _pprintLine_("");
    … …  
    115100        #endif
    116101       
    117         /*If running AD, then initialize the tape: */
     102        /*If running AD, then initialize a placeholder with which to work: */
    118103        #ifdef _HAVE_ADOLC_
    119104        GenericParam<Adolc_edf> *theAdolcEDF_p=new GenericParam<Adolc_edf>(AdolcParamEnum);
    … …  
    249234        #endif
    250235
    251        
    252236        /*end module: */
    253         ISSMEND();
     237        IssmEnd();
    254238
    255239        return 0; //unix success return;

  • issm/trunk-jpl/src/c/solutions/kriging.cpp

    r13376 r13530  
    3636        IssmDouble *error       = NULL;
    3737
    38         ISSMBOOT();
     38        IssmBoot();
    3939
    40         /*Initialize environments: Petsc, MPI, etc...: */
    41 #ifdef _HAVE_PETSC_
    42         int ierr=PetscInitialize(&argc,&argv,(char*)0,""); 
    43         if(ierr) _error_("Could not initialize Petsc");
    44 #else
    45 #ifdef _HAVE_MPI_
    46         MPI_Init(&argc,&argv);
    47 #endif
    48 #endif
    49 
    50         /*Size and rank: */
    51 #ifdef _HAVE_MPI_
    52         MPI_Comm_rank(MPI_COMM_WORLD,&my_rank); 
    53         MPI_Comm_size(MPI_COMM_WORLD,&num_procs);
    54 #endif
     40        EnvironmentInit(argc,argv);
    5541
    5642        /*First process inputs*/
    … …  
    11298
    11399        /*end module: */
    114         ISSMEND();
     100        IssmEnd();
    115101
    116102        return 0; //unix success return;

  • issm/trunk-jpl/src/c/solutions/solutions.h

    r13277 r13530  
    4545void controlrestart(FemModel* femmodel,IssmDouble* J);
    4646void ResetBoundaryConditions(FemModel* femmodel, int analysis_type);
     47void EnvironmentInit(int argc,char** argv);
    4748
    4849//solution configuration
Note: See TracChangeset for help on using the changeset viewer.