Changeset 5322


Ignore:
Timestamp:
08/17/10 15:30:49 (15 years ago)
Author:
Mathieu Morlighem
Message:

Enabled CM dhdt for Discontinuous Galerkin and dhdt is assumed to be in m/yr in iomodel

Location:
issm/trunk/src/c/objects
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified issm/trunk/src/c/objects/Elements/Penta.cpp

    r5316 r5322  
    20882088        }
    20892089        if (iomodel->dhdt) {
    2090                 for(i=0;i<6;i++)nodeinputs[i]=iomodel->dhdt[penta_vertex_ids[i]-1];
     2090                for(i=0;i<6;i++)nodeinputs[i]=iomodel->dhdt[penta_vertex_ids[i]-1]/iomodel->yts;
    20912091                this->inputs->AddInput(new PentaVertexInput(DhDtEnum,nodeinputs));
    20922092        }
  • TabularUnified issm/trunk/src/c/objects/Elements/Tria.cpp

    r5319 r5322  
    28772877        }
    28782878        if (iomodel->dhdt) {
    2879                 for(i=0;i<3;i++)nodeinputs[i]=iomodel->dhdt[tria_vertex_ids[i]-1];
     2879                for(i=0;i<3;i++)nodeinputs[i]=iomodel->dhdt[tria_vertex_ids[i]-1]/iomodel->yts;
    28802880                this->inputs->AddInput(new TriaVertexInput(DhDtEnum,nodeinputs));
    28812881        }
  • TabularUnified issm/trunk/src/c/objects/Loads/Numericalflux.cpp

    r5152 r5322  
    412412                parameters->FindParam(&dt,DtEnum);
    413413        }
    414         else if (analysis_type==BalancedthicknessAnalysisEnum){
     414        else if (analysis_type==BalancedthicknessAnalysisEnum || analysis_type==AdjointBalancedthicknessAnalysisEnum){
    415415                /*No transient term is involved*/
    416416                dt=1;
    417417        }
    418418        else{
    419                 ISSMERROR("analysis_type %i not supported yet");
     419                ISSMERROR("analysis_type %s not supported yet",EnumToString(analysis_type));
    420420        }
    421421
     
    544544                parameters->FindParam(&dt,DtEnum);
    545545        }
    546         else if (analysis_type==BalancedthicknessAnalysisEnum){
     546        else if (analysis_type==BalancedthicknessAnalysisEnum || analysis_type==AdjointBalancedthicknessAnalysisEnum){
    547547                /*No transient term is involved*/
    548548                dt=1;
    549549        }
    550550        else{
    551                 ISSMERROR("analysis_type %i not supported yet");
     551                ISSMERROR("analysis_type %s not supported yet",EnumToString(analysis_type));
    552552        }
    553553       
     
    686686                parameters->FindParam(&dt,DtEnum);
    687687        }
    688         else if (analysis_type==BalancedthicknessAnalysisEnum){
     688        else if (analysis_type==BalancedthicknessAnalysisEnum || analysis_type==AdjointBalancedthicknessAnalysisEnum){
    689689                /*No transient term is involved*/
    690690                dt=1;
    691691        }
    692692        else{
    693                 ISSMERROR("analysis_type %i not supported yet");
     693                ISSMERROR("analysis_type %s not supported yet",EnumToString(analysis_type));
    694694        }
    695695       
  • TabularUnified issm/trunk/src/c/objects/Loads/Numericalflux.h

    r5311 r5322  
    5151                void    InputUpdateFromVectorDakota(int* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    5252                void    InputUpdateFromVectorDakota(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    53                 void    InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
     53                void    InputUpdateFromConstant(double constant, int name){/*Do nothing*/};
    5454                void    InputUpdateFromConstant(int constant, int name){/*Do nothing*/};
    5555                void    InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
Note: See TracChangeset for help on using the changeset viewer.