Changeset 16144


Ignore:
Timestamp:
09/17/13 12:21:42 (12 years ago)
Author:
Mathieu Morlighem
Message:

CHG: removed double blank lines

Location:
issm/trunk-jpl/src
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/analyses/ad_core.cpp

    r16141 r16144  
    3434        double     *xp  = NULL;
    3535        int my_rank=IssmComm::GetRank();
    36 
    3736
    3837        /*AD mode on?: */

  • issm/trunk-jpl/src/c/analyses/balancevelocity_core.cpp

    r16018 r16144  
    1414        /*parameters: */
    1515        bool save_results;
    16 
    1716
    1817        /*recover parameters: */

  • issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

    r16125 r16144  
    54175417/*FUNCTION Penta::DrainWaterfraction{{{*/
    54185418void Penta::DrainWaterfraction(void){
    5419    
     5419
    54205420    /*Intermediaries*/
    54215421        bool isenthalpy;
    … …  
    57545754/*FUNCTION Penta::CreatePVectorAdjointHO{{{*/
    57555755ElementVector* Penta::CreatePVectorAdjointHO(void){
    5756 
    57575756
    57585757        /*Nothing to be done if not on surface*/
    … …  
    75927591        ElementMatrix* Ke=new ElementMatrix(Ke1,Ke2);
    75937592        delete Ke1; delete Ke2;
    7594        
     7593
    75957594        /*Compute HO Matrix with P1 element type\n");*/
    75967595        this->element_type=P1Enum;
    … …  
    82828281                D_scalar=gauss->weight*Jdet;
    82838282
    8284 
    82858283                /*Add stabilization*/
    82868284                GetNodalFunctionsP1Derivatives(&dbasis[0][0],&xyz_list[0][0],gauss);

  • issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

    r16125 r16144  
    17661766/*FUNCTION Tria::InputUpdateFromVector(IssmDouble* vector, int name, int type);{{{*/
    17671767void  Tria::InputUpdateFromVector(IssmDouble* vector, int name, int type){
    1768 
    17691768
    17701769        /*Check that name is an element input*/

  • issm/trunk-jpl/src/c/classes/FemModel.cpp

    r16143 r16144  
    189189        /*Open input file on cpu 0: */
    190190        if(my_rank==0) IOMODEL = pfopen0(inputfilename ,"rb");
    191        
     191
    192192        /*Open toolkits file: */
    193193        toolkitsoptionsfid=pfopen(toolkitsfilename,"r");

  • issm/trunk-jpl/src/c/classes/IndependentObject.cpp

    r16116 r16144  
    106106                if(my_rank==0){
    107107                        if(fread(&pscalar,sizeof(IssmPDouble),1,fid)!=1)_error_("could not read scalar ");
    108                        
     108
    109109                        /*Now, before we even broadcast this to other nodes, declare the scalar  as an independent variable!: */
    110110                        scalar<<=pscalar;
    111111                }
    112112
    113                
    114113                ISSM_MPI_Bcast(&scalar,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm());
    115114

  • issm/trunk-jpl/src/c/modules/AllocateSystemMatricesx/AllocateSystemMatricesx.h

    r16126 r16144  
    1111void MatrixNonzeros(int** pd_nnz,int** po_nnz,FemModel* femmodel,int set1enum,int set2enum);
    1212
    13 
    1413#endif

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp

    r16142 r16144  
    245245        CreateParametersDakota(&parameters,iomodel,rootpath,solution_type,analysis_type);
    246246        #endif
    247        
     247
    248248        /*Now, deal with toolkits options, which need to be put into the parameters dataset: */
    249249        ParseToolkitsOptionsx(parameters,toolkitsoptionsfid);

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Stressbalance/UpdateElementsStressbalance.cpp

    r15986 r16144  
    3838        iomodel->FetchData(1,FlowequationElementEquationEnum);
    3939        finiteelement_list=xNewZeroInit<int>(iomodel->numberofelements);
    40 
    4140
    4241        /*Do we have coupling*/

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

    r15849 r16144  
    1515
    1616void ResetConstraintsx(FemModel* femmodel){
    17 
    1817
    1918        /*Display message*/

  • issm/trunk-jpl/src/c/shared/Elements/DrainageFunctionWaterfraction.cpp

    r16026 r16144  
    2727    else
    2828        Dret=D2;
    29    
     29
    3030    /*check if dt*Dret>waterfraction. If so, drain whole waterfraction*/
    3131    if(dt==0.){

  • issm/trunk-jpl/src/c/shared/Elements/LliboutryDuval.cpp

    r15843 r16144  
    66#include "../Numerics/types.h"
    77#include "../Exceptions/exceptions.h"
    8 
    98
    109/* get ice stiffness B from enthalpy, pressure and flow law exponent*/
    … …  
    3534   * 
    3635   *  Convert A to B :  B = A^(-1/n) */
    37  
     36
    3837  /*Some physical constants (Aschwanden 2012)*/
    3938  /*TODO: get those constants from model*/
    … …  
    4645  /*Intermediaries*/
    4746  IssmDouble A,B,Tstar,Tpmp,H_sp,waterfraction;
    48        
     47
    4948  _assert_(pressure>0);
    5049  _assert_(enthalpy>0);
    … …  
    8180         * get enthalpy from temperature and water fraction,
    8281         * and use LliboutryDuval(IssmDouble enthalpy, IssmDouble pressure,IssmDouble n) */
    83  
     82
    8483  IssmDouble rho_ice=910; // kg/m^3
    8584  IssmDouble g=9.81; //kg*m/s^2
    … …  
    103102    enthalpy=heatcapacity*(273.15 - Tref) + waterfraction*latentheat;
    104103  }
    105        
     104
    106105  B=LliboutryDuval(enthalpy, pressure, n);
    107106
    108107  return B;
    109108}
    110 

  • issm/trunk-jpl/src/c/shared/MemOps/MemOps.cpp

    r16113 r16144  
    55 *      Author: utke
    66 */
    7 
    87
    98#ifdef HAVE_CONFIG_H

  • issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h

    r16142 r16144  
    513513                        pf=(IssmMpiVec<IssmDouble>*)pfin;
    514514
    515                                                
    516515                        switch(IssmSolverTypeFromToolkitOptions()){
    517516                                case MumpsEnum: {

  • issm/trunk-jpl/src/c/toolkits/issm/IssmToolkitUtils.cpp

    r16142 r16144  
    6565         *we try and stick with the Petsc vector types: */
    6666        vec_type=ToolkitOptions::GetToolkitOptionValue("vec_type");
    67        
     67
    6868        if (strcmp(vec_type,"mpi")==0){
    6969                vec_type_enum=MpiEnum;

  • issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.cpp

    r16085 r16144  
    110110}/*}}}*/
    111111int ISSM_MPI_Allreduce(void *sendbuf, void *recvbuf, int count, ISSM_MPI_Datatype datatype, ISSM_MPI_Op op, ISSM_MPI_Comm comm){/*{{{*/
    112  
     112
    113113  int rc=0;
    114114#ifdef _HAVE_MPI_
    … …  
    178178}/*}}}*/
    179179int ISSM_MPI_Comm_free(ISSM_MPI_Comm *comm){ /*{{{*/
    180  
     180
    181181  int rc=0;
    182182#ifdef _HAVE_MPI_
    … …  
    203203}/*}}}*/
    204204int ISSM_MPI_Comm_size( ISSM_MPI_Comm comm, int *size){ /*{{{*/
    205  
     205
    206206  int rc=0;
    207207#ifdef _HAVE_MPI_
    … …  
    263263}/*}}}*/
    264264int ISSM_MPI_Gatherv(void *sendbuf, int sendcnt, ISSM_MPI_Datatype sendtype, void *recvbuf, int *recvcnts, int *displs, ISSM_MPI_Datatype recvtype, int root, ISSM_MPI_Comm comm){/*{{{*/
    265  
     265
    266266  int rc=0;
    267267  assert(sendtype==recvtype); // we handle only identical representations

  • issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.h

    r16090 r16144  
    5151        #define ISSM_MPI_ANY_TAG       MPI_ANY_TAG
    5252        #define ISSM_MPI_ANY_SOURCE    MPI_ANY_SOURCE
    53        
     53
    5454    /*other include files: */
    5555        #include "./commops/commops.h"

  • issm/trunk-jpl/src/m/classes/snowpack.m

    r15931 r16144  
    124124                end % }}}
    125125                function obj = setdefaultparameters(obj) % {{{
    126        
     126
    127127                %snowpack:  %{{{
    128128                obj.snowpack_meas_tss = 1;
    … …  
    279279                        %filters {{{
    280280                        filter_values={'MIN_MAX','RATE_FILTER1','RATE_FILTER2','UNHEATED_RAIN_GAUGE_FILTER','WMO_UNDERCATCH_FILTER','WMO_UNDERCATCH_FILTER-SIMPLIFIED','UNVENTILLATED_TEMPERATURE_SENSOR','ADD_AN_OFFSET'};
    281 
    282281
    283282                        md=checkfield(md,'snowpack.filters_ta_filter1','values',{filter_values});

  • issm/trunk-jpl/src/m/classes/thermal.m

    r16026 r16144  
    4040                        %Should we use cold ice (default) or enthalpy formulation
    4141                        obj.isenthalpy=0;
    42            
     42
    4343                        %will basal boundary conditions be set dynamically
    4444                        obj.isdynamicbasalspc=0;
    … …  
    6969                        fielddisplay(obj,'isenthalpy','use an enthalpy formulation to include temperate ice (default is 0)');
    7070                        fielddisplay(obj,'isdynamicbasalspc',['enable dynamic setting of basal forcing. required for enthalpy formulation (default is 0)']);
    71            
     71
    7272                end % }}}
    7373                function marshall(obj,md,fid) % {{{

  • issm/trunk-jpl/src/m/exp/Shp2Exp.m

    r16049 r16144  
    99%
    1010%   See also EXPMASTER, EXPDOC
    11 
    1211
    1312        if ~exist(shapefilename,'file'),
    … …  
    2221                        ids=find(isnan(x));
    2322                        x(ids)=[]; y(ids)=[];
    24                        
     23
    2524                        exp(end+1).x=x;
    2625                        exp(end).y=y;
    … …  
    3332
    3433        expwrite(exp,expfilename);
    35 

  • issm/trunk-jpl/src/wrappers/python/include/wrapper_macros.h

    r15107 r16144  
    4343/* WRAPPER 3.2 {{{*/
    4444#define WRAPPER(modulename,...)  \
    45 \
    4645static PyObject* modulename(PyObject* self,PyObject* args);\
    4746static PyMethodDef modulename##_funcs[] = {\
    … …  
    4948        {NULL,NULL,0,NULL}\
    5049};\
    51 \
    5250static struct PyModuleDef modulename##module= {\
    5351        PyModuleDef_HEAD_INIT,\
    … …  
    5856        modulename##_funcs\
    5957};\
    60 \
    6158PyMODINIT_FUNC PyInit_##modulename(void){\
    62 \
    6359        import_array();\
    6460        return PyModule_Create(&modulename##module);\
    6561}\
    66 \
    6762static PyObject* modulename(PyObject* self,PyObject* args)
    6863/*}}}*/
    … …  
    7065/* WRAPPER 2.7 {{{*/
    7166#define WRAPPER(modulename,...)  \
    72 \
    7367static PyObject* modulename(PyObject* self,PyObject* args);\
    7468static PyMethodDef modulename##_funcs[] = {\
    … …  
    7670        {NULL,NULL,0,NULL}\
    7771};\
    78 \
    7972PyMODINIT_FUNC init##modulename(void){\
    80 \
    8173        import_array();\
    8274        (void) Py_InitModule(#modulename, modulename##_funcs);\
    8375}\
    84 \
    8576static PyObject* modulename(PyObject* self,PyObject* args)
    8677/*}}}*/
Note: See TracChangeset for help on using the changeset viewer.