Ignore:
Timestamp:
08/20/12 17:39:30 (13 years ago)
Author:
cborstad
Message:

merged trunk-jpl through revision 13099 into branch

Location:
issm/branches/trunk-jpl-damage
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/branches/trunk-jpl-damage

    • Property svn:ignore

      •  

        old new  
         1projects
        12autom4te.cache
        23aclocal.m4
    • Property svn:mergeinfo changed
      /issm/trunk-jplmerged: 12948-13099

  • issm/branches/trunk-jpl-damage/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp

    r12878 r13101  
    1919        if (analysis_type==DiagnosticHorizAnalysisEnum){
    2020                if (vertices_type[0]==MacAyealApproximationEnum){
     21                        numdofs=2;
     22                }
     23                else if (vertices_type[0]==L1L2ApproximationEnum){
    2124                        numdofs=2;
    2225                }
    … …  
    6164                        doftype[5]=StokesApproximationEnum;
    6265                }
    63                 else _error2_("Approximationtype " << reCast<int>(*vertices_type) << " (" << EnumToStringx(reCast<int>(*vertices_type)) << ") not implemented yet for DiagnosticHoriz");
     66                else _error_("Approximationtype " << reCast<int>(*vertices_type) << " (" << EnumToStringx(reCast<int>(*vertices_type)) << ") not implemented yet for DiagnosticHoriz");
    6467        }
    6568        else if (analysis_type==DiagnosticVertAnalysisEnum){
    … …  
    9093                numdofs=1;
    9194        }
    92         else _error2_("analysis type: " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not implemented yet");
     95        else _error_("analysis type: " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not implemented yet");
    9396
    9497        /*Now initialize the index*/
Note: See TracChangeset for help on using the changeset viewer.