Changeset 14555 for issm/trunk-jpl/src


Ignore:
Timestamp:
04/12/13 09:05:48 (12 years ago)
Author:
Mathieu Morlighem
Message:

CHG: moved hydrology to hydrologyshreve, we are going to have more hydrological models coming

Location:
issm/trunk-jpl/src
Files:
9 edited
2 moved

Legend:

Unmodified
Added
Removed

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

    r14538 r14555  
    7979        FrictionQEnum,
    8080        GeometryHydrostaticRatioEnum,
    81         HydrologyCREnum,
    82         HydrologyKnEnum,
    83         HydrologyNEnum,
    84         HydrologyPEnum,
    85         HydrologyQEnum,
    86         HydrologySpcwatercolumnEnum,
    87         HydrologyStabilizationEnum,
     81        HydrologyshreveCREnum,
     82        HydrologyshreveKnEnum,
     83        HydrologyshreveNEnum,
     84        HydrologyshrevePEnum,
     85        HydrologyshreveQEnum,
     86        HydrologyshreveSpcwatercolumnEnum,
     87        HydrologyshreveStabilizationEnum,
    8888        IndependentObjectEnum,
    8989        InversionControlParametersEnum,

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

    r14435 r14555  
    56945694        GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES);
    56955695        this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    5696         this->parameters->FindParam(&diffusivity,HydrologyStabilizationEnum);
     5696        this->parameters->FindParam(&diffusivity,HydrologyshreveStabilizationEnum);
    56975697        Input* vx_input=inputs->GetInput(HydrologyWaterVxEnum); _assert_(vx_input);
    56985698        Input* vy_input=inputs->GetInput(HydrologyWaterVyEnum); _assert_(vy_input);

  • issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.cpp

    r13622 r14555  
    4040        iomodel->Constant(&this->g,ConstantsGEnum);
    4141
    42         iomodel->Constant(&this->hydro_CR,HydrologyCREnum);
    43         iomodel->Constant(&this->kn,HydrologyKnEnum);
    44         iomodel->Constant(&this->hydro_n,HydrologyNEnum);
    45         iomodel->Constant(&this->hydro_p,HydrologyPEnum);
    46         iomodel->Constant(&this->hydro_q,HydrologyQEnum);
     42        iomodel->Constant(&this->hydro_CR,HydrologyshreveCREnum);
     43        iomodel->Constant(&this->kn,HydrologyshreveKnEnum);
     44        iomodel->Constant(&this->hydro_n,HydrologyshreveNEnum);
     45        iomodel->Constant(&this->hydro_p,HydrologyshrevePEnum);
     46        iomodel->Constant(&this->hydro_q,HydrologyshreveQEnum);
    4747        this->inputs=NULL; /*not used here*/
    4848}

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

    r14538 r14555  
    8484                case FrictionQEnum : return "FrictionQ";
    8585                case GeometryHydrostaticRatioEnum : return "GeometryHydrostaticRatio";
    86                 case HydrologyCREnum : return "HydrologyCR";
    87                 case HydrologyKnEnum : return "HydrologyKn";
    88                 case HydrologyNEnum : return "HydrologyN";
    89                 case HydrologyPEnum : return "HydrologyP";
    90                 case HydrologyQEnum : return "HydrologyQ";
    91                 case HydrologySpcwatercolumnEnum : return "HydrologySpcwatercolumn";
    92                 case HydrologyStabilizationEnum : return "HydrologyStabilization";
     86                case HydrologyshreveCREnum : return "HydrologyCR";
     87                case HydrologyshreveKnEnum : return "HydrologyKn";
     88                case HydrologyshreveNEnum : return "HydrologyN";
     89                case HydrologyshrevePEnum : return "HydrologyP";
     90                case HydrologyshreveQEnum : return "HydrologyQ";
     91                case HydrologyshreveSpcwatercolumnEnum : return "HydrologySpcwatercolumn";
     92                case HydrologyshreveStabilizationEnum : return "HydrologyStabilization";
    9393                case IndependentObjectEnum : return "IndependentObject";
    9494                case InversionControlParametersEnum : return "InversionControlParameters";

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

    r14544 r14555  
    7676        parameters->AddObject(iomodel->CopyConstantObject(ConstantsReferencetemperatureEnum));
    7777        parameters->AddObject(iomodel->CopyConstantObject(BalancethicknessStabilizationEnum));
    78         parameters->AddObject(iomodel->CopyConstantObject(HydrologyStabilizationEnum));
     78        parameters->AddObject(iomodel->CopyConstantObject(HydrologyshreveStabilizationEnum));
    7979        parameters->AddObject(iomodel->CopyConstantObject(GroundinglineMeltingRateEnum));
    8080        parameters->AddObject(iomodel->CopyConstantObject(ThermalMaxiterEnum));

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

    r13762 r14555  
    1919        /*Create constraints if they do not exist yet*/
    2020        if(!constraints) constraints = new Constraints();
    21         IoModelToConstraintsx(constraints,iomodel,HydrologySpcwatercolumnEnum,HydrologyAnalysisEnum);
     21        IoModelToConstraintsx(constraints,iomodel,HydrologyshreveSpcwatercolumnEnum,HydrologyAnalysisEnum);
    2222
    2323        /*Assign output pointer: */

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

    r14538 r14555  
    8585              else if (strcmp(name,"FrictionQ")==0) return FrictionQEnum;
    8686              else if (strcmp(name,"GeometryHydrostaticRatio")==0) return GeometryHydrostaticRatioEnum;
    87               else if (strcmp(name,"HydrologyCR")==0) return HydrologyCREnum;
    88               else if (strcmp(name,"HydrologyKn")==0) return HydrologyKnEnum;
    89               else if (strcmp(name,"HydrologyN")==0) return HydrologyNEnum;
    90               else if (strcmp(name,"HydrologyP")==0) return HydrologyPEnum;
    91               else if (strcmp(name,"HydrologyQ")==0) return HydrologyQEnum;
    92               else if (strcmp(name,"HydrologySpcwatercolumn")==0) return HydrologySpcwatercolumnEnum;
    93               else if (strcmp(name,"HydrologyStabilization")==0) return HydrologyStabilizationEnum;
     87              else if (strcmp(name,"HydrologyshreveCR")==0) return HydrologyshreveCREnum;
     88              else if (strcmp(name,"HydrologyshreveKn")==0) return HydrologyshreveKnEnum;
     89              else if (strcmp(name,"HydrologyshreveN")==0) return HydrologyshreveNEnum;
     90              else if (strcmp(name,"HydrologyshreveP")==0) return HydrologyshrevePEnum;
     91              else if (strcmp(name,"HydrologyshreveQ")==0) return HydrologyshreveQEnum;
     92              else if (strcmp(name,"HydrologyshreveSpcwatercolumn")==0) return HydrologyshreveSpcwatercolumnEnum;
     93              else if (strcmp(name,"HydrologyshreveStabilization")==0) return HydrologyshreveStabilizationEnum;
    9494              else if (strcmp(name,"IndependentObject")==0) return IndependentObjectEnum;
    9595              else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum;

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

    r14550 r14555  
    1 %HYDROLOGY class definition
     1%HYDROLOGYSHREVE class definition
    22%
    33%   Usage:
    4 %      hydrology=hydrology();
     4%      hydrologyshreve=hydrologyshreve();
    55
    6 classdef hydrology
     6classdef hydrologyshreve
    77        properties (SetAccess=public)
    88                spcwatercolumn = NaN;
    … …  
    1515        end
    1616        methods
    17                 function obj = hydrology(varargin) % {{{
     17                function obj = hydrologyshreve(varargin) % {{{
    1818                        switch nargin
    1919                                case 0
    … …  
    2626
    2727                        %Parameters from Johnson's 2002 thesis, section 3.5.4                   
    28                         obj.n=.02;                       
    29                         obj.CR=.01;
    30                         obj.p=2;                 
    31                         obj.q=1;                 
    32                         obj.kn=0;
     28                        obj.n  = .02;
     29                        obj.CR = .01;
     30                        obj.p  = 2;
     31                        obj.q  = 1;
     32                        obj.kn = 0;
    3333
    3434                        %Type of stabilization to use 0:nothing 1:artificial_diffusivity
    … …  
    4444                end % }}}
    4545                function disp(obj) % {{{
    46                         disp(sprintf('   hydrology solution parameters:'));
     46                        disp(sprintf('   hydrologyshreve solution parameters:'));
    4747
    4848                        fielddisplay(obj,'spcwatercolumn','water thickness constraints (NaN means no constraint)');

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

    r14550 r14555  
    55from WriteData import *
    66
    7 class hydrology(object):
     7class hydrologyshreve(object):
    88        """
    9         HYDROLOGY class definition
     9        HYDROLOGYSHREVE class definition
    1010
    1111           Usage:
    12               hydrology=hydrology();
     12              hydrologyshreve=hydrologyshreve();
    1313        """
    1414
    … …  
    3131                # {{{ Display
    3232               
    33                 string='   hydrology solution parameters:'
     33                string='   hydrologyshreve solution parameters:'
    3434                string="%s\n%s"%(string,fielddisplay(self,'spcwatercolumn','water thickness constraints (NaN means no constraint)'))
    3535                string="%s\n%s"%(string,fielddisplay(self,'n','Manning roughness coefficient'))

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

    r14529 r14555  
    10891089                        md.balancethickness = balancethickness();
    10901090                        md.diagnostic       = diagnostic();
    1091                         md.hydrology        = hydrology();
     1091                        md.hydrology        = hydrologyshreve();
    10921092                        md.prognostic       = prognostic();
    10931093                        md.thermal          = thermal();

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

    r14530 r14555  
    7878                self.diagnostic       = diagnostic()
    7979                self.groundingline    = groundingline()
    80                 self.hydrology        = hydrology()
     80                self.hydrology        = hydrologyshreve()
    8181                self.prognostic       = prognostic()
    8282                self.thermal          = thermal()
Note: See TracChangeset for help on using the changeset viewer.