Changeset 15504


Ignore:
Timestamp:
07/18/13 10:36:05 (12 years ago)
Author:
Mathieu Morlighem
Message:

CHG: split ismacayealpattyn into ismacayeal and ispattyn

Location:
issm/trunk-jpl/src
Files:
2 added
1 deleted
17 edited

Legend:

Unmodified
Added
Removed

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

    r15104 r15504  
    1313
    1414        /*parameters: */
    15         bool  dakota_analysis   = false;
    16         int   dim               = -1;
    17         bool  ishutter          = false;
    18         bool  ismacayealpattyn  = false;
    19         bool  isl1l2            = false;
    20         bool  isstokes          = false;
     15        bool  dakota_analysis;
     16        int   dim;
     17        bool  ishutter,ismacayeal,isl1l2,ispattyn,isstokes;
    2118        bool  conserve_loads    = true;
    22         bool  modify_loads      = true;
    2319        bool  save_results;
    2420        int   newton;
    … …  
    3026        femmodel->parameters->FindParam(&dim,MeshDimensionEnum);
    3127        femmodel->parameters->FindParam(&ishutter,FlowequationIshutterEnum);
    32         femmodel->parameters->FindParam(&ismacayealpattyn,FlowequationIsmacayealpattynEnum);
     28        femmodel->parameters->FindParam(&ismacayeal,FlowequationIsmacayealEnum);
    3329        femmodel->parameters->FindParam(&isl1l2,FlowequationIsl1l2Enum);
     30        femmodel->parameters->FindParam(&ispattyn,FlowequationIspattynEnum);
    3431        femmodel->parameters->FindParam(&isstokes,FlowequationIsstokesEnum);
    3532        femmodel->parameters->FindParam(&newton,DiagnosticIsnewtonEnum);
    … …  
    5754
    5855        if(ishutter){
    59 
    6056                if(VerboseSolution()) _printf0_("   computing hutter velocities\n");
    6157
    62                 //Take the last velocity into account so that the velocity on the MacAyeal domain is not zero
    63                 if (ismacayealpattyn) ResetBoundaryConditions(femmodel,DiagnosticHutterAnalysisEnum);
    64 
     58                /*Take the last velocity into account so that the velocity on the MacAyeal domain is not zero*/
     59                if(ismacayeal || isl1l2 || ispattyn ) ResetBoundaryConditions(femmodel,DiagnosticHutterAnalysisEnum);
    6560                femmodel->SetCurrentConfiguration(DiagnosticHutterAnalysisEnum);
    6661                solutionsequence_linear(femmodel);
    67 
    68                 if (ismacayealpattyn) ResetBoundaryConditions(femmodel,DiagnosticHorizAnalysisEnum);
     62                if(ismacayeal || isl1l2 || ispattyn) ResetBoundaryConditions(femmodel,DiagnosticHorizAnalysisEnum);
    6963        }
    7064
    71         if ((ismacayealpattyn || isl1l2) ^ isstokes){ // ^ = xor
     65        if ((ismacayeal || ispattyn || isl1l2) ^ isstokes){ // ^ = xor
     66                if(VerboseSolution()) _printf0_("   computing velocities\n");
    7267
    73                 if(VerboseSolution()) _printf0_("   computing velocities\n");
    7468                femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
    7569                if(newton>0)
    … …  
    7973        }
    8074
    81         if (ismacayealpattyn && isstokes){
    82 
    83                 if(VerboseSolution()) _printf0_("   computing coupling macayealpattyn and stokes velocities and pressure \n");
     75        if ((ismacayeal || isl1l2 || ispattyn) && isstokes){
     76                if(VerboseSolution()) _printf0_("   computing coupling betweem lower order models and full-Stokes\n");
    8477                solutionsequence_stokescoupling_nonlinear(femmodel,conserve_loads);
    8578        }
    8679
    87         if (dim==3 & (ishutter || ismacayealpattyn)){
    88 
     80        if (dim==3 & (ishutter || ismacayeal || isl1l2 || ispattyn)){
    8981                if(VerboseSolution()) _printf0_("   computing vertical velocities\n");
    9082                femmodel->SetCurrentConfiguration(DiagnosticVertAnalysisEnum);

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

    r15420 r15504  
    4646        parameters->AddObject(iomodel->CopyConstantObject(MeshDimensionEnum));
    4747        parameters->AddObject(iomodel->CopyConstantObject(FlowequationIshutterEnum));
    48         parameters->AddObject(iomodel->CopyConstantObject(FlowequationIsmacayealpattynEnum));
     48        parameters->AddObject(iomodel->CopyConstantObject(FlowequationIsmacayealEnum));
    4949        parameters->AddObject(iomodel->CopyConstantObject(FlowequationIsl1l2Enum));
     50        parameters->AddObject(iomodel->CopyConstantObject(FlowequationIspattynEnum));
    5051        parameters->AddObject(iomodel->CopyConstantObject(FlowequationIsstokesEnum));
    5152        parameters->AddObject(iomodel->CopyConstantObject(FlowequationFeStokesEnum));

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

    r15484 r15504  
    1717        IssmDouble rho_ice;
    1818        IssmDouble stokesreconditioning;
    19         bool       isstokes,isl1l2,ismacayealpattyn;
     19        bool       ismacayeal,isl1l2,ispattyn,isstokes;
    2020        int        fe_ssa;
    2121        bool       spcpresent = false;
    … …  
    4848        iomodel->Constant(&rho_ice,MaterialsRhoIceEnum);
    4949        iomodel->Constant(&stokesreconditioning,DiagnosticStokesreconditioningEnum);
     50        iomodel->Constant(&ismacayeal,FlowequationIsmacayealEnum);
     51        iomodel->Constant(&isl1l2,FlowequationIsl1l2Enum);
     52        iomodel->Constant(&ispattyn,FlowequationIspattynEnum);
    5053        iomodel->Constant(&isstokes,FlowequationIsstokesEnum);
    51         iomodel->Constant(&isl1l2,FlowequationIsl1l2Enum);
    52         iomodel->Constant(&ismacayealpattyn,FlowequationIsmacayealpattynEnum);
    5354        iomodel->Constant(&fe_ssa,FlowequationFeSsaEnum);
    5455
    … …  
    5758
    5859        /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */
    59         if(!ismacayealpattyn & !isstokes & !isl1l2){
     60        if(!ismacayeal & !ispattyn & !isstokes & !isl1l2){
    6061                *pconstraints=constraints;
    6162                return;
    … …  
    312313
    313314        /*SPC Quadratic elements*/
    314         if(ismacayealpattyn&& fe_ssa==1){
     315        if(ismacayeal && fe_ssa==1){
    315316
    316317                int   v1,v2;

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

    r15465 r15504  
    1414
    1515        /*Intermediary*/
    16         int segment_width;
    17         int element;
    18         int i;
    19         int count=0;
    20         int penpair_ids[2];
    21         bool ismacayealpattyn,isstokes,isl1l2;
    22         int  numpenalties,numberofpressureloads,numrifts,numriftsegments;
     16        int         segment_width;
     17        int         element;
     18        int         i;
     19        int         count;
     20        int         penpair_ids[2];
     21        bool        ismacayeal,isl1l2,ispattyn,isstokes;
     22        int         numpenalties,numberofpressureloads,numrifts,numriftsegments;
    2323        IssmDouble *pressureload   = NULL;
    2424        IssmDouble *elements_type  = NULL;
    … …  
    3434        iomodel->Constant(&isl1l2,FlowequationIsl1l2Enum);
    3535        iomodel->Constant(&isstokes,FlowequationIsstokesEnum);
    36         iomodel->Constant(&ismacayealpattyn,FlowequationIsmacayealpattynEnum);
     36        iomodel->Constant(&ismacayeal,FlowequationIsmacayealEnum);
     37        iomodel->Constant(&ispattyn,FlowequationIspattynEnum);
    3738        iomodel->Constant(&numrifts,RiftsNumriftsEnum);
    3839
    … …  
    4142
    4243        /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */
    43         if(!ismacayealpattyn & !isstokes & !isl1l2) return;
     44        if(!ismacayeal & !ispattyn & !isstokes & !isl1l2) return;
    4445
    4546        /*Create pressure loads as boundary conditions. Pay attention to the partitioning if we are running in parallel (the nodes

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

    r15464 r15504  
    1212
    1313        /*Intermediary*/
    14         bool   isstokes,isl1l2,ismacayealpattyn;
     14        bool   ismacayeal,isl1l2,ispattyn,isstokes;
    1515        int    finiteelementssa;
    1616
    1717        /*Fetch parameters: */
     18        iomodel->Constant(&ismacayeal,FlowequationIsmacayealEnum);
     19        iomodel->Constant(&isl1l2,FlowequationIsl1l2Enum);
     20        iomodel->Constant(&ispattyn,FlowequationIspattynEnum);
    1821        iomodel->Constant(&isstokes,FlowequationIsstokesEnum);
    19         iomodel->Constant(&isl1l2,FlowequationIsl1l2Enum);
    20         iomodel->Constant(&ismacayealpattyn,FlowequationIsmacayealpattynEnum);
    2122        iomodel->Constant(&finiteelementssa,FlowequationFeSsaEnum);
    2223
    2324        /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */
    24         if(!ismacayealpattyn & !isstokes & !isl1l2) return;
     25        if(!ismacayeal & !isl1l2 & !ispattyn & !isstokes) return;
    2526
    2627        /*Create nodes: */

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

    r15428 r15504  
    1717
    1818        int    materials_type;
    19         bool   ismacayealpattyn;
    20         bool   isl1l2;
    21         bool   isstokes;
     19        bool   ismacayeal,isl1l2,ispattyn,isstokes;
    2220        bool   control_analysis;
    2321        bool   dakota_analysis;
    2422
    2523        /*Fetch constants needed: */
     24        iomodel->Constant(&ismacayeal,FlowequationIsmacayealEnum);
     25        iomodel->Constant(&isl1l2,FlowequationIsl1l2Enum);
     26        iomodel->Constant(&ispattyn,FlowequationIspattynEnum);
    2627        iomodel->Constant(&isstokes,FlowequationIsstokesEnum);
    27         iomodel->Constant(&isl1l2,FlowequationIsl1l2Enum);
    28         iomodel->Constant(&ismacayealpattyn,FlowequationIsmacayealpattynEnum);
    2928        iomodel->Constant(&control_analysis,InversionIscontrolEnum);
    3029        iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum);
    … …  
    3231
    3332        /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */
    34         if(!ismacayealpattyn & !isstokes &!isl1l2) return;
     33        if(!ismacayeal & !isl1l2 & !ispattyn & !isstokes) return;
    3534
    3635        /*Fetch data needed: */

  • issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

    r15492 r15504  
    6868        FlowequationElementEquationEnum,
    6969        FlowequationIshutterEnum,
     70        FlowequationIsmacayealEnum,
    7071        FlowequationIsl1l2Enum,
    71         FlowequationIsmacayealpattynEnum,
     72        FlowequationIspattynEnum,
    7273        FlowequationIsstokesEnum,
    7374        FlowequationFeStokesEnum,

  • issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

    r15492 r15504  
    7676                case FlowequationElementEquationEnum : return "FlowequationElementEquation";
    7777                case FlowequationIshutterEnum : return "FlowequationIshutter";
     78                case FlowequationIsmacayealEnum : return "FlowequationIsmacayeal";
    7879                case FlowequationIsl1l2Enum : return "FlowequationIsl1l2";
    79                 case FlowequationIsmacayealpattynEnum : return "FlowequationIsmacayealpattyn";
     80                case FlowequationIspattynEnum : return "FlowequationIspattyn";
    8081                case FlowequationIsstokesEnum : return "FlowequationIsstokes";
    8182                case FlowequationFeStokesEnum : return "FlowequationFeStokes";

  • issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

    r15492 r15504  
    7676              else if (strcmp(name,"FlowequationElementEquation")==0) return FlowequationElementEquationEnum;
    7777              else if (strcmp(name,"FlowequationIshutter")==0) return FlowequationIshutterEnum;
     78              else if (strcmp(name,"FlowequationIsmacayeal")==0) return FlowequationIsmacayealEnum;
    7879              else if (strcmp(name,"FlowequationIsl1l2")==0) return FlowequationIsl1l2Enum;
    79               else if (strcmp(name,"FlowequationIsmacayealpattyn")==0) return FlowequationIsmacayealpattynEnum;
     80              else if (strcmp(name,"FlowequationIspattyn")==0) return FlowequationIspattynEnum;
    8081              else if (strcmp(name,"FlowequationIsstokes")==0) return FlowequationIsstokesEnum;
    8182              else if (strcmp(name,"FlowequationFeStokes")==0) return FlowequationFeStokesEnum;
    … …  
    136137              else if (strcmp(name,"InversionTao")==0) return InversionTaoEnum;
    137138              else if (strcmp(name,"InversionIncompleteAdjoint")==0) return InversionIncompleteAdjointEnum;
    138               else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum;
    139139         else stage=2;
    140140   }
    141141   if(stage==2){
    142               if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum;
     142              if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum;
     143              else if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum;
    143144              else if (strcmp(name,"InversionMinParameters")==0) return InversionMinParametersEnum;
    144145              else if (strcmp(name,"InversionNsteps")==0) return InversionNstepsEnum;
    … …  
    259260              else if (strcmp(name,"GiaMantleViscosity")==0) return GiaMantleViscosityEnum;
    260261              else if (strcmp(name,"GiaLithosphereThickness")==0) return GiaLithosphereThicknessEnum;
    261               else if (strcmp(name,"Thickness")==0) return ThicknessEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum;
     265              if (strcmp(name,"Thickness")==0) return ThicknessEnum;
     266              else if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum;
    266267              else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum;
    267268              else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum;
    … …  
    382383              else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum;
    383384              else if (strcmp(name,"RiftfrontType")==0) return RiftfrontTypeEnum;
    384               else if (strcmp(name,"Segment")==0) return SegmentEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
     388              if (strcmp(name,"Segment")==0) return SegmentEnum;
     389              else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
    389390              else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum;
    390391              else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum;
    … …  
    505506              else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum;
    506507              else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
    507               else if (strcmp(name,"BoolElementResult")==0) return BoolElementResultEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
     511              if (strcmp(name,"BoolElementResult")==0) return BoolElementResultEnum;
     512              else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
    512513              else if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum;
    513514              else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;

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

    r15455 r15504  
    66classdef flowequation
    77        properties (SetAccess=public)
    8                 ismacayealpattyn     = 0;
    9                 ishutter             = 0;
    10                 isl1l2               = 0;
    11                 isstokes             = 0;
    12                 fe_stokes            = 0;
    13                 fe_ssa               = 0;
    14                 vertex_equation      = NaN;
    15                 element_equation     = NaN;
    16                 bordermacayeal       = NaN;
    17                 borderpattyn         = NaN;
    18                 borderstokes         = NaN;
     8                ismacayeal       = 0;
     9                ispattyn         = 0;
     10                ishutter         = 0;
     11                isl1l2           = 0;
     12                isstokes         = 0;
     13                fe_stokes        = 0;
     14                fe_ssa           = 0;
     15                vertex_equation  = NaN;
     16                element_equation = NaN;
     17                bordermacayeal   = NaN;
     18                borderpattyn     = NaN;
     19                borderstokes     = NaN;
    1920        end
    2021        methods
    … …  
    3435                        if ismember(DiagnosticHorizAnalysisEnum(),analyses),
    3536
    36                                 md = checkfield(md,'flowequation.ismacayealpattyn','numel',[1],'values',[0 1]);
    3737                                md = checkfield(md,'flowequation.ishutter','numel',[1],'values',[0 1]);
     38                                md = checkfield(md,'flowequation.ismacayeal','numel',[1],'values',[0 1]);
    3839                                md = checkfield(md,'flowequation.isl1l2','numel',[1],'values',[0 1]);
     40                                md = checkfield(md,'flowequation.ispattyn','numel',[1],'values',[0 1]);
    3941                                md = checkfield(md,'flowequation.isstokes','numel',[1],'values',[0 1]);
    4042                                md = checkfield(md,'flowequation.bordermacayeal','size',[md.mesh.numberofvertices 1],'values',[0 1]);
    … …  
    4850                                        md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements 1],'values',[0:8]);
    4951                                end
    50                                 if ~(obj.ismacayealpattyn || obj.ishutter || obj.isstokes || obj.isl1l2),
    51                                         md = checkmessage(md,['no element types set for this model. At least one of ismacayealpattyn, ishutter or isstokes need to be =1']);
     52                                if ~(obj.ismacayeal || obj.ispattyn || obj.ishutter || obj.isstokes || obj.isl1l2),
     53                                        md = checkmessage(md,['no element types set for this model']);
    5254                                end
    5355                        end
    … …  
    6466                        disp(sprintf('   flow equation parameters:'));
    6567
    66                         fielddisplay(obj,'ismacayealpattyn','is the macayeal or pattyn approximation used ?');
    6768                        fielddisplay(obj,'ishutter','is the shallow ice approximation used ?');
     69                        fielddisplay(obj,'ismacayeal','is the macayeal approximation used ?');
    6870                        fielddisplay(obj,'isl1l2','is the l1l2 approximation used ?');
     71                        fielddisplay(obj,'ispattyn','is the pattyn approximation used ?');
    6972                        fielddisplay(obj,'isstokes','are the Full-Stokes equations used ?');
    7073                        fielddisplay(obj,'fe_ssa','Finite Element for SSA   0: Lagrange P1 (linear), 1: Lagrange P2 (quadratic)');
    … …  
    7780                end % }}}
    7881                function marshall(obj,md,fid) % {{{
    79                         WriteData(fid,'object',obj,'fieldname','ismacayealpattyn','format','Boolean');
    8082                        WriteData(fid,'object',obj,'fieldname','ishutter','format','Boolean');
     83                        WriteData(fid,'object',obj,'fieldname','ismacayeal','format','Boolean');
    8184                        WriteData(fid,'object',obj,'fieldname','isl1l2','format','Boolean');
     85                        WriteData(fid,'object',obj,'fieldname','ispattyn','format','Boolean');
    8286                        WriteData(fid,'object',obj,'fieldname','isstokes','format','Boolean');
    8387                        WriteData(fid,'object',obj,'fieldname','fe_stokes','format','Integer');

  • issm/trunk-jpl/src/m/classes/flowequation.py

    r15455 r15504  
    1616        def __init__(self): # {{{
    1717               
    18                 self.ismacayealpattyn = 0
    1918                self.ishutter         = 0
     19                self.ismacayeal       = 0
    2020                self.isl1l2           = 0
     21                self.ispattyn         = 0
    2122                self.isstokes         = 0
    2223                self.fe_stokes        = 0
    … …  
    3536                string='   flow equation parameters:'
    3637
    37                 string="%s\n%s"%(string,fielddisplay(self,'ismacayealpattyn',"is the macayeal or pattyn approximation used ?"))
    3838                string="%s\n%s"%(string,fielddisplay(self,'ishutter',"is the shallow ice approximation used ?"))
     39                string="%s\n%s"%(string,fielddisplay(self,'ismacayeal',"is the macayeal approximation used ?"))
    3940                string="%s\n%s"%(string,fielddisplay(self,'isl1l2',"are l1l2 equations used ?"))
     41                string="%s\n%s"%(string,fielddisplay(self,'ispattyn',"is the pattyn approximation used ?"))
    4042                string="%s\n%s"%(string,fielddisplay(self,'isstokes',"are the Full-Stokes equations used ?"))
    4143                string="%s\n%s"%(string,fielddisplay(self,'fe_ssa',"Finite Element for SSA   0: Lagrange P1 (linear), 1: Lagrange P2 (quadratic)"))
    … …  
    5355
    5456                if DiagnosticHorizAnalysisEnum() in analyses:
    55                         md = checkfield(md,'flowequation.ismacayealpattyn','numel',[1],'values',[0,1])
    5657                        md = checkfield(md,'flowequation.ishutter','numel',[1],'values',[0,1])
     58                        md = checkfield(md,'flowequation.ismacayeal','numel',[1],'values',[0,1])
    5759                        md = checkfield(md,'flowequation.isl1l2','numel',[1],'values',[0,1])
     60                        md = checkfield(md,'flowequation.ispattyn','numel',[1],'values',[0,1])
    5861                        md = checkfield(md,'flowequation.isstokes','numel',[1],'values',[0,1])
    5962                        md = checkfield(md,'flowequation.bordermacayeal','size',[md.mesh.numberofvertices],'values',[0,1])
    … …  
    6669                                md = checkfield(md,'flowequation.vertex_equation','size',[md.mesh.numberofvertices],'values',numpy.arange(0,7+1))
    6770                                md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements],'values',numpy.arange(0,7+1))
    68                         if not (self.ismacayealpattyn or self.ishutter or self.isstokes or self.isl1l2):
    69                                 md.checkmessage("no element types set for this model. At least one of ismacayealpattyn, ishutter or isstokes need to be =1")
     71                        if not (self.ismacayeal or self.ispattyn or self.ishutter or self.isstokes or self.isl1l2):
     72                                md.checkmessage("no element types set for this model")
    7073
    7174                if DiagnosticHutterAnalysisEnum() in analyses:
    … …  
    7780        # }}}
    7881        def marshall(self,md,fid):    # {{{
    79                 WriteData(fid,'object',self,'fieldname','ismacayealpattyn','format','Boolean')
    8082                WriteData(fid,'object',self,'fieldname','ishutter','format','Boolean')
     83                WriteData(fid,'object',self,'fieldname','ismacayeal','format','Boolean')
    8184                WriteData(fid,'object',self,'fieldname','isl1l2','format','Boolean')
     85                WriteData(fid,'object',self,'fieldname','ispattyn','format','Boolean')
    8286                WriteData(fid,'object',self,'fieldname','isstokes','format','Boolean')
    8387                WriteData(fid,'object',self,'fieldname','fe_stokes','format','Integer')

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

    r15459 r15504  
    882882                        if isfield(structmd,'artificial_diffusivity'), md.balancethickness.stabilization=structmd.artificial_diffusivity; end
    883883                        if isfield(structmd,'dhdt'), md.balancethickness.thickening_rate=structmd.dhdt; end
    884                         if isfield(structmd,'ismacayealpattyn'), md.flowequation.ismacayealpattyn=structmd.ismacayealpattyn; end
    885884                        if isfield(structmd,'ishutter'), md.flowequation.ishutter=structmd.ishutter; end
    886885                        if isfield(structmd,'isstokes'), md.flowequation.isstokes=structmd.isstokes; end

  • issm/trunk-jpl/src/m/enum/EnumDefinitions.py

    r15492 r15504  
    835835        return StringToEnum('FlowequationIshutter')[0]
    836836
     837def FlowequationIsmacayealEnum():
     838        """
     839        FLOWEQUATIONISMACAYEALENUM - Enum of FlowequationIsmacayeal
     840
     841        WARNING: DO NOT MODIFY THIS FILE
     842                                this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
     843                                Please read src/c/shared/Enum/README for more information
     844
     845           Usage:
     846              macro=FlowequationIsmacayealEnum()
     847        """
     848
     849        return StringToEnum('FlowequationIsmacayeal')[0]
     850
    837851def FlowequationIsl1l2Enum():
    838852        """
    … …  
    849863        return StringToEnum('FlowequationIsl1l2')[0]
    850864
    851 def FlowequationIsmacayealpattynEnum():
    852         """
    853         FLOWEQUATIONISMACAYEALPATTYNENUM - Enum of FlowequationIsmacayealpattyn
    854 
    855         WARNING: DO NOT MODIFY THIS FILE
    856                                 this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
    857                                 Please read src/c/shared/Enum/README for more information
    858 
    859            Usage:
    860               macro=FlowequationIsmacayealpattynEnum()
    861         """
    862 
    863         return StringToEnum('FlowequationIsmacayealpattyn')[0]
     865def FlowequationIspattynEnum():
     866        """
     867        FLOWEQUATIONISPATTYNENUM - Enum of FlowequationIspattyn
     868
     869        WARNING: DO NOT MODIFY THIS FILE
     870                                this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
     871                                Please read src/c/shared/Enum/README for more information
     872
     873           Usage:
     874              macro=FlowequationIspattynEnum()
     875        """
     876
     877        return StringToEnum('FlowequationIspattyn')[0]
    864878
    865879def FlowequationIsstokesEnum():
    … …  
    79037917        """
    79047918
    7905         return 563
    7906 
     7919        return 564
     7920

  • issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m

    r15492 r15504  
    99%      macro=MaximumNumberOfEnums()
    1010
    11 macro=563;
     11macro=564;

  • issm/trunk-jpl/src/m/parameterization/setflowequation.m

    r13058 r15504  
    283283%figure out solution types
    284284md.flowequation.ishutter=double(any(md.flowequation.element_equation==1));
    285 md.flowequation.ismacayealpattyn=double(any(md.flowequation.element_equation==2 | md.flowequation.element_equation==3));
     285md.flowequation.ismacayeal=double(any(md.flowequation.element_equation==2));
     286md.flowequation.ispattyn=double(any(md.flowequation.element_equation==3));
     287md.flowequation.isl1l2=double(any(md.flowequation.element_equation==8));
    286288md.flowequation.isstokes=double(any(md.flowequation.element_equation==4));
    287 md.flowequation.isl1l2=double(any(md.flowequation.element_equation==8));
    288289
    289290return

  • issm/trunk-jpl/src/m/parameterization/setflowequation.py

    r14211 r15504  
    275275        #figure out solution types
    276276        md.flowequation.ishutter=any(md.flowequation.element_equation==1)
    277         md.flowequation.ismacayealpattyn=bool(numpy.any(numpy.logical_or(md.flowequation.element_equation==2,md.flowequation.element_equation==3)))
     277        md.flowequation.ismacayeal=any(md.flowequation.element_equation==2)
    278278        md.flowequation.isl1l2=any(md.flowequation.element_equation==8)
     279        md.flowequation.ispattyn=any(md.flowequation.element_equation==3)
    279280        md.flowequation.isstokes=any(md.flowequation.element_equation==4)
    280281

  • issm/trunk-jpl/src/m/qmu/qmuresponse.m

    r13646 r15504  
    2929        m_ds=models.ds;
    3030        ishutter=m_dhu.parameters.ishutter;
    31         ismacayealpattyn=m_dh.parameters.ismacayealpattyn;
     31        ismacayeal=m_dh.parameters.ismacayeal;
     32        ispattyn=m_dh.parameters.ispattyn;
    3233        isstokes=m_ds.parameters.isstokes;
    3334        if ishutter,
    … …  
    5758                end
    5859
    59         elseif ismacayealpattyn,
     60        elseif ismacayeal || ispattyn,
    6061
    6162% for now, separate all segments from double array for parallel to make cells
Note: See TracChangeset for help on using the changeset viewer.