Changeset 20947


Ignore:
Timestamp:
07/19/16 14:22:05 (9 years ago)
Author:
agscott1
Message:

CHG: Changed md.materials.rheology_law to use a String for marshalling instead of an integer

Location:
issm/trunk-jpl
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/configs/config-macosx64.sh

    r18326 r20947  
    1111        --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
    1212        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
    13         --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \
    14         --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
     13   --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lpmpich -lmpich -lmpl" \
    1514        --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
    1615        --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
    17         --with-fortran-lib="/usr/lib/gcc/i686-apple-darwin10/4.2.1/x86_64/libgfortran.a" \
    18         --with-graphics-lib="/usr/X11/lib/libX11.dylib" \
    19         --with-numthreads=8
     16        --with-numthreads=8 \
     17        --enable-debugging \
     18        --enable-development

  • issm/trunk-jpl/examples/IceflowModels/eismint.m

    r20780 r20947  
    1414
    1515%Set ice flow approximation
    16 md=setflowequation(md,'SIA','all');
     16md=setflowequation(md,'SSA','all');
    1717
    1818%Create boundary conditions: zero velocity on the bed

  • issm/trunk-jpl/examples/IceflowModels/runme.m

    r18198 r20947  
    55%Set flow equation
    66md=setflowequation(md,'HO','Contour.exp','fill','SSA','coupling','tiling');
     7%md=setflowequation(md,'SSA','all');
    78%Solve
    89md=solve(md,StressbalanceSolutionEnum);

  • issm/trunk-jpl/examples/Inversion/CheatSheet.m

    r20712 r20947  
    11step=1;
    22if step==1
    3         %Generate observations
     3        %Generate observation
    44        md = model;
    55        md = triangle(md,'DomainOutline.exp',100000);
    … …  
    2323        md.friction.coefficient(find(md.mesh.x<600000 & md.mesh.x>400000))=10;
    2424
    25         md = solve(md,StressbalanceSolutionEnum());
     25        md = solve(md,StressbalanceSolutionEnum);
    2626
    27         plotmodel(md,'axis#all','tight','data',md.friction.coefficient,'caxis',[0 100],'title','"True" \alpha',...
    28                 'data',md.results.StressbalanceSolution.Vel,'title','"observed velocities"')
     27        plotmodel(md,'data',md.friction.coefficient,'figure',1);
     28        plotmodel(md,'data',md.results.StressbalanceSolution.Vel,'figure',2);
     29
    2930        save model1 md
    3031end
    … …  
    4142        md.inversion.vel_obs = md.results.StressbalanceSolution.Vel;
    4243
    43         md = solve(md,StressbalanceSolutionEnum());
     44        md = solve(md,StressbalanceSolutionEnum);
    4445
    45         plotmodel(md,'axis#all','tight','data',md.friction.coefficient,'caxis',[0 100],'title','\alpha first guess',...
    46                 'data',md.results.StressbalanceSolution.Vel,'title','modeled velocities')
     46        plotmodel(md,'data',md.friction.coefficient,'figure',1);
     47        plotmodel(md,'data',md.results.StressbalanceSolution.Vel,'figure',2);
    4748
    4849        save model2 md
    … …  
    6162
    6263        %Hands on: STEP 2
    63         md.inversion.cost_functions = [101 103];
    64         md.inversion.cost_functions_coefficients = ones(md.mesh.numberofvertices,2);
     64        md.inversion.cost_functions = 101;
     65        md.inversion.cost_functions_coefficients = ones(md.mesh.numberofvertices,1);
    6566
    6667        %Hands on: STEP 3
    … …  
    7071        %Go solve!
    7172        md.verbose=verbose(0);
    72         md=solve(md,StressbalanceSolutionEnum());
     73        md=solve(md,StressbalanceSolutionEnum);
    7374
    74         plotmodel(md,'axis#all','tight','data',md.results.StressbalanceSolution.FrictionCoefficient,'caxis',[0 100],'title','inferred \alpha',...
    75                 'data',md.results.StressbalanceSolution.Vel,'title','modeled velocities')
     75        plotmodel(md,'data',md.results.StressbalanceSolution.FrictionCoefficient,'figure',1,'caxis',[10 50]);
     76        plotmodel(md,'data',md.results.StressbalanceSolution.Vel,'figure',2); 
    7677end

  • issm/trunk-jpl/examples/Inversion/runme.m

    r20708 r20947  
    1 step=1;
     1step=3;
    22if step==1
    3         %Generate observations
     3        %Generate observation
    44        md = model;
    55        md = triangle(md,'DomainOutline.exp',100000);
    6         md = setmask(md,'all','');
     6        md = setmask(md,'','');
    77        md = parameterize(md,'Square.par');
    88        md = setflowequation(md,'SSA','all');
     9    md.geometry.base = md.geometry.base + 100;
     10    md.geometry.surface = md.geometry.surface + 100;
     11    md.materials.rheology_B(:) = 1.8*10^8;
     12    md.friction.coefficient(:) = 50;
     13    pos = find(md.mesh.x < 600000 & md.mesh.x > 400000);
     14    md.friction.coefficient(pos) = 10;
    915        md.cluster = generic('np',2);
    10         md = solve(md,StressbalanceSolutionEnum());
    11         plotmodel(md,'axis#all','tight','data',md.materials.rheology_B,'caxis',[ 1.3 1.9]*10^8,'title','"True" B',...
    12                 'data',md.results.StressbalanceSolution.Vel,'title','"observed velocities"')
     16
     17   
     18        md = solve(md,StressbalanceSolutionEnum);
     19
     20        plotmodel(md,'data',md.friction.coefficient,'caxis',[0 100],'figure',1,'gridded#all',1);
     21        plotmodel(md,'data',md.results.StressbalanceSolution.Vel,'figure',2,'gridded#all',1); 
     22
    1323        save model1 md
    1424end
    … …  
    1727        loadmodel('model1.mat');
    1828        md.materials.rheology_B(:) = 1.8*10^8;
    19 
     29    md.friction.coefficient(:) = 50;
     30   
    2031        %results of previous run are taken as observations
    2132        md.inversion=m1qn3inversion();
    … …  
    2435        md.inversion.vel_obs = md.results.StressbalanceSolution.Vel;
    2536
    26         md = solve(md,StressbalanceSolutionEnum());
    27         plotmodel(md,'axis#all','tight','data',md.materials.rheology_B,'caxis',[ 1.3 1.9]*10^8,'title','B first guess',...
    28                 'data',md.results.StressbalanceSolution.Vel,'title','modeled velocities')
     37        md = solve(md,StressbalanceSolutionEnum);
     38
     39        plotmodel(md,'data',md.friction.coefficient,'caxis',[0 100],'figure',1);
     40        plotmodel(md,'data',md.results.StressbalanceSolution.Vel,'figure',2); 
     41
    2942        save model2 md
    3043end
    … …  
    3649        maxsteps = 20;
    3750        md.inversion.iscontrol = 1;
    38         md.inversion.control_parameters = {'MaterialsRheologyBbar'};
     51        md.inversion.control_parameters = {'FrictionCoefficient'};
    3952        md.inversion.maxsteps = maxsteps;
    40         md.inversion.cost_functions = 101;
    41         md.inversion.cost_functions_coefficients = ones(md.mesh.numberofvertices,1);
    42         md.inversion.min_parameters    = cuffey(273)*ones(md.mesh.numberofvertices,1);
    43         md.inversion.max_parameters    = cuffey(200)*ones(md.mesh.numberofvertices,1);
     53        md.inversion.cost_functions = [101 103 501];
     54        md.inversion.cost_functions_coefficients = ones(md.mesh.numberofvertices,3);
     55    md.inversion.cost_functions_coefficients(:,1) = 1000;
     56    md.inversion.cost_functions_coefficients(:,3) = 0.05;
     57        md.inversion.min_parameters    = 1*ones(md.mesh.numberofvertices,1);
     58        md.inversion.max_parameters    = 100*ones(md.mesh.numberofvertices,1);
    4459
    4560        %Go solve!
    4661        md.verbose=verbose(0);
    47         md=solve(md,StressbalanceSolutionEnum());
    48         plotmodel(md,'axis#all','tight','data',md.results.StressbalanceSolution.MaterialsRheologyBbar,'caxis',[ 1.3 1.9]*10^8,'title','inferred B',...
    49                 'data',md.results.StressbalanceSolution.Vel,'title','modeled velocities')
     62        md=solve(md,StressbalanceSolutionEnum);
     63
     64        plotmodel(md,'data',md.results.StressbalanceSolution.FrictionCoefficient,'caxis',[0 100],'figure',1);
     65        plotmodel(md,'data',md.results.StressbalanceSolution.Vel,'figure',2); 
    5066end
    5167if step==4
    … …  
    6177        md.inversion.cost_functions_coefficients      = ones(md.mesh.numberofvertices,1);
    6278        md.inversion.cost_functions_coefficients(:,2) = 10^-16*ones(md.mesh.numberofvertices,1);
    63         md.inversion.min_parameters    = cuffey(273)*ones(md.mesh.numberofvertices,1);
    64         md.inversion.max_parameters    = cuffey(200)*ones(md.mesh.numberofvertices,1);
     79        md.inversion.min_parameters    = paterson(273)*ones(md.mesh.numberofvertices,1);
     80        md.inversion.max_parameters    = paterson(200)*ones(md.mesh.numberofvertices,1);
    6581
    6682        %Go solve!
    6783        md.verbose=verbose(0);
    68         md=solve(md,StressbalanceSolutionEnum());
    69         plotmodel(md,'axis#all','tight','data',md.results.StressbalanceSolution.MaterialsRheologyBbar,'caxis',[ 1.3 1.9]*10^8,'title','inferred B',...
    70                 'data',md.results.StressbalanceSolution.Vel,'title','modeled velocities')
     84        md=solve(md,StressbalanceSolutionEnum);
     85
     86        plotmodel(md,'data',md.results.StressbalanceSolution.MaterialsRheologyBbar,'caxis',[ 1.3 1.9]*10^8,'figure',1);
     87        plotmodel(md,'data',md.results.StressbalanceSolution.Vel,'figure',2); 
    7188end

  • issm/trunk-jpl/examples/Pig/runme.m

    r20795 r20947  
    138138
    139139        % Save model
     140<<<<<<< .mine
     141        save ./Models/PIG_ModelHO md;
     142=======
    140143        save ./Models/PIG_Control_drag md;
     144>>>>>>> .r20806
    141145end
    142146
    … …  
    161165
    162166        % Load Model
    163 
     167    md = loadmodel('./Models/PIG_Control_drag.mat');
    164168        % Disable inversion
    165 
     169    md.inversion.iscontrol = 0;
    166170        % Extrude Mesh
    167 
     171    md = extrude(md, 10, 1);
    168172        % Set Flowequation
    169 
     173    md = setflowequation(md,'HO','all');
    170174        % Solve
    171 
     175    md.cluster=generic('name',oshostname,'np',2);
     176        md=solve(md,StressbalanceSolutionEnum);
    172177        % Save Model
     178    save ./Models/PIG_Control_drag md;
     179   
    173180
    174181end

  • issm/trunk-jpl/externalpackages/petsc/install-3.7-greenplanet.sh

    r20705 r20947  
    55
    66#Some cleanup
    7 rm -rf install petsc-3.7.2 src
     7rm -rf install petsc-3.7.1 src
    88mkdir install src
    99
    1010#Download from ISSM server
    11 $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.7.2.tar.gz' 'petsc-3.7.2.tar.gz'
     11$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.7.1.tar.gz' 'petsc-3.7.1.tar.gz'
    1212
    1313#Untar and move petsc to install directory
    14 tar -zxvf  petsc-3.7.2.tar.gz
    15 mv petsc-3.7.2/* src/
    16 rm -rf petsc-3.7.2
     14tar -zxvf  petsc-3.7.1.tar.gz
     15mv petsc-3.7.1/* src/
     16rm -rf petsc-3.7.1
    1717
    1818#configure

  • issm/trunk-jpl/externalpackages/petsc/install-3.7-hpc.sh

    r20705 r20947  
    55
    66#Some cleanup
    7 rm -rf install petsc-3.7.2 src
     7rm -rf install petsc-3.7.1 src
    88mkdir install src
    99
    1010#Download from ISSM server
    11 $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.7.2.tar.gz' 'petsc-3.7.2.tar.gz'
     11$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.7.1.tar.gz' 'petsc-3.7.1.tar.gz'
    1212
    1313#Untar and move petsc to install directory
    14 tar -zxvf  petsc-3.7.2.tar.gz
    15 mv petsc-3.7.2/* src/
    16 rm -rf petsc-3.7.2
     14tar -zxvf  petsc-3.7.1.tar.gz
     15mv petsc-3.7.1/* src/
     16rm -rf petsc-3.7.1
    1717
    1818#configure

  • issm/trunk-jpl/externalpackages/petsc/install-3.7-linux64.sh

    r20705 r20947  
    33
    44#Some cleanup
    5 rm -rf install petsc-3.7.2 src
     5rm -rf install petsc-3.7.1 src
    66mkdir install src
    77
    88#Download from ISSM server
    9 $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.7.2.tar.gz' 'petsc-3.7.2.tar.gz'
     9$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.7.1.tar.gz' 'petsc-3.7.1.tar.gz'
    1010
    1111#Untar and move petsc to install directory
    12 tar -zxvf  petsc-3.7.2.tar.gz
    13 mv petsc-3.7.2/* src/
    14 rm -rf petsc-3.7.2
     12tar -zxvf  petsc-3.7.1.tar.gz
     13mv petsc-3.7.1/* src/
     14rm -rf petsc-3.7.1
    1515
    1616#configure

  • issm/trunk-jpl/externalpackages/petsc/install-3.7-macosx64.sh

    r20705 r20947  
    77
    88#Download from ISSM server
    9 $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.7.2.tar.gz' 'petsc-3.7.2.tar.gz'
     9#$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.7.1.tar.gz' 'petsc-3.7.1.tar.gz'
    1010
    1111#Untar and move petsc to install directory
    … …  
    1515
    1616#configure
     17#       --download-mpich \
     18#       --with-fc=/usr/local/Cellar/gcc/6.1.0/bin/gfortran \
    1719cd src
    1820./config/configure.py \
    19         --CXXOPTFLAGS="-g -O3" \
    20         --COPTFLAGS="-g -O3" \
    21         --FOPTFLAGS="-g -O3" \
    2221        --prefix="$ISSM_DIR/externalpackages/petsc/install" \
    2322        --with-mpi-dir="$ISSM_DIR/externalpackages/mpich/install" \

  • issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim

    r20720 r20947  
    412412syn keyword cType BoolInput
    413413syn keyword cType BoolParam
    414 syn keyword cType classes
    415414syn keyword cType Constraint
    416415syn keyword cType Constraints
    … …  
    419418syn keyword cType ControlInput
    420419syn keyword cType Covertree
     420syn keyword cType DataSetParam
    421421syn keyword cType DatasetInput
    422 syn keyword cType DataSetParam
    423422syn keyword cType Definition
    424423syn keyword cType DependentObject
    … …  
    434433syn keyword cType ElementHook
    435434syn keyword cType ElementMatrix
     435syn keyword cType ElementVector
    436436syn keyword cType Elements
    437 syn keyword cType ElementVector
    438437syn keyword cType ExponentialVariogram
    439438syn keyword cType ExternalResult
    … …  
    442441syn keyword cType Friction
    443442syn keyword cType Gauss
    444 syn keyword cType GaussianVariogram
    445 syn keyword cType gaussobjects
    446443syn keyword cType GaussPenta
    447444syn keyword cType GaussSeg
    448445syn keyword cType GaussTetra
    449446syn keyword cType GaussTria
     447syn keyword cType GaussianVariogram
    450448syn keyword cType GenericExternalResult
    451449syn keyword cType GenericOption
    … …  
    453451syn keyword cType GiaDeflectionCoreArgs
    454452syn keyword cType Hook
     453syn keyword cType IndependentObject
    455454syn keyword cType Input
    456455syn keyword cType Inputs
    … …  
    462461syn keyword cType IssmDirectApplicInterface
    463462syn keyword cType IssmParallelDirectApplicInterface
    464 syn keyword cType krigingobjects
    465463syn keyword cType Load
    466464syn keyword cType Loads
    … …  
    470468syn keyword cType Material
    471469syn keyword cType Materials
    472 syn keyword cType Matestar
    473470syn keyword cType Matice
    474471syn keyword cType Matpar
    475 syn keyword cType matrixobjects
    476472syn keyword cType MatrixParam
    477473syn keyword cType Misfit
    478474syn keyword cType Moulin
    479475syn keyword cType Neumannflux
    480 syn keyword cType Nodalvalue
    481476syn keyword cType Node
    482477syn keyword cType Nodes
    … …  
    485480syn keyword cType Observations
    486481syn keyword cType Option
     482syn keyword cType OptionUtilities
    487483syn keyword cType Options
    488 syn keyword cType OptionUtilities
    489484syn keyword cType Param
    490485syn keyword cType Parameters
    … …  
    498493syn keyword cType Quadtree
    499494syn keyword cType Results
     495syn keyword cType RiftStruct
    500496syn keyword cType Riftfront
    501 syn keyword cType RiftStruct
    502497syn keyword cType Seg
    503498syn keyword cType SegInput
     499syn keyword cType SegRef
    504500syn keyword cType Segment
    505 syn keyword cType SegRef
    506501syn keyword cType SpcDynamic
    507502syn keyword cType SpcStatic
    … …  
    523518syn keyword cType Vertex
    524519syn keyword cType Vertices
     520syn keyword cType classes
     521syn keyword cType gaussobjects
     522syn keyword cType krigingobjects
     523syn keyword cType matrixobjects
    525524syn keyword cType AdjointBalancethickness2Analysis
    526525syn keyword cType AdjointBalancethicknessAnalysis
    … …  
    552551syn keyword cType MeltingAnalysis
    553552syn keyword cType MeshdeformationAnalysis
    554 syn keyword cType SealevelriseAnalysis
    555553syn keyword cType SmbAnalysis
    556554syn keyword cType SmoothAnalysis
    … …  
    562560"ISSM's objects end
    563561"ISSM's Enums begin
    564 syn keyword cConstant ParametersSTARTEnum
    565562syn keyword cConstant FemModelEnum
    566 syn keyword cConstant FemModelCommEnum
    567 syn keyword cConstant WorldCommEnum
    568 syn keyword cConstant IcecapToEarthCommEnum
    569 syn keyword cConstant NumModelsEnum
    570 syn keyword cConstant ModelIdEnum
    571 syn keyword cConstant EarthIdEnum
    572563syn keyword cConstant AutodiffIsautodiffEnum
    573564syn keyword cConstant AutodiffNumDependentsEnum
    … …  
    609600syn keyword cConstant BasalforcingsThresholdThicknessEnum
    610601syn keyword cConstant BasalforcingsUpperdepthMeltEnum
    611 syn keyword cConstant BasalforcingsMantleconductivityEnum
    612 syn keyword cConstant BasalforcingsNusseltEnum
    613 syn keyword cConstant BasalforcingsDtbgEnum
    614 syn keyword cConstant BasalforcingsPlumeradiusEnum
    615 syn keyword cConstant BasalforcingsTopplumedepthEnum
    616 syn keyword cConstant BasalforcingsBottomplumedepthEnum
    617 syn keyword cConstant BasalforcingsPlumexEnum
    618 syn keyword cConstant BasalforcingsPlumeyEnum
    619 syn keyword cConstant BasalforcingsCrustthicknessEnum
    620 syn keyword cConstant BasalforcingsUppercrustthicknessEnum
    621 syn keyword cConstant BasalforcingsUppercrustheatEnum
    622 syn keyword cConstant BasalforcingsLowercrustheatEnum
    623602syn keyword cConstant FloatingMeltRateEnum
    624603syn keyword cConstant LinearFloatingMeltRateEnum
    625604syn keyword cConstant MismipFloatingMeltRateEnum
    626 syn keyword cConstant MantlePlumeGeothermalFluxEnum
    627605syn keyword cConstant BedEnum
    628606syn keyword cConstant BaseEnum
    … …  
    632610syn keyword cConstant DependentObjectEnum
    633611syn keyword cConstant StressbalanceAbstolEnum
    634 syn keyword cConstant StressbalanceConvergenceNumStepsEnum
    635612syn keyword cConstant StressbalanceIsnewtonEnum
    636613syn keyword cConstant StressbalanceMaxiterEnum
    … …  
    738715syn keyword cConstant HydrologySpcheadEnum
    739716syn keyword cConstant HydrologyConductivityEnum
     717syn keyword cConstant IndependentObjectEnum
    740718syn keyword cConstant InversionControlParametersEnum
    741719syn keyword cConstant InversionControlScalingFactorsEnum
    … …  
    769747syn keyword cConstant InversionVzObsEnum
    770748syn keyword cConstant MaskIceLevelsetEnum
    771 syn keyword cConstant MaskOceanLevelsetEnum
    772 syn keyword cConstant MaskLandLevelsetEnum
    773749syn keyword cConstant MaterialsBetaEnum
    774750syn keyword cConstant MaterialsHeatcapacityEnum
    … …  
    780756syn keyword cConstant MaterialsRheologyLawEnum
    781757syn keyword cConstant MaterialsRheologyNEnum
    782 syn keyword cConstant MaterialsRheologyKoEnum
    783 syn keyword cConstant MaterialsRheologyKobarEnum
    784 syn keyword cConstant MaterialsRheologyEcEnum
    785 syn keyword cConstant MaterialsRheologyEcbarEnum
    786 syn keyword cConstant MaterialsRheologyEsEnum
    787 syn keyword cConstant MaterialsRheologyEsbarEnum
    788758syn keyword cConstant DamageIsdamageEnum
    789759syn keyword cConstant DamageDEnum
    … …  
    813783syn keyword cConstant CalvingMeltingrateEnum
    814784syn keyword cConstant CalvingLevermannEnum
     785syn keyword cConstant CalvingPiEnum
    815786syn keyword cConstant CalvingDevEnum
    816 syn keyword cConstant CalvingMinthicknessEnum
    817787syn keyword cConstant DefaultCalvingEnum
    818788syn keyword cConstant CalvingRequestedOutputsEnum
    819789syn keyword cConstant CalvinglevermannCoeffEnum
    820790syn keyword cConstant CalvinglevermannMeltingrateEnum
    821 syn keyword cConstant CalvingdevCoeffEnum
     791syn keyword cConstant CalvingpiCoeffEnum
     792syn keyword cConstant CalvingpiMeltingrateEnum
    822793syn keyword cConstant CalvingratexEnum
    823794syn keyword cConstant CalvingrateyEnum
    … …  
    838809syn keyword cConstant MaterialsMantleShearModulusEnum
    839810syn keyword cConstant MaterialsMantleDensityEnum
    840 syn keyword cConstant MaterialsEarthDensityEnum
    841811syn keyword cConstant MeshAverageVertexConnectivityEnum
    842812syn keyword cConstant MeshElements2dEnum
    … …  
    855825syn keyword cConstant MeshYEnum
    856826syn keyword cConstant MeshZEnum
    857 syn keyword cConstant MeshLatEnum
    858 syn keyword cConstant MeshLongEnum
    859 syn keyword cConstant MeshREnum
    860827syn keyword cConstant MeshElementtypeEnum
    861828syn keyword cConstant MeshSegmentsEnum
    … …  
    865832syn keyword cConstant Domain2DverticalEnum
    866833syn keyword cConstant Domain3DEnum
    867 syn keyword cConstant Domain3DsurfaceEnum
    868834syn keyword cConstant MiscellaneousNameEnum
    869835syn keyword cConstant MasstransportHydrostaticAdjustmentEnum
    … …  
    923889syn keyword cConstant TimesteppingInterpForcingsEnum
    924890syn keyword cConstant TransientIssmbEnum
    925 syn keyword cConstant TransientIscouplerEnum
    926891syn keyword cConstant TransientIsstressbalanceEnum
    927892syn keyword cConstant TransientIsgroundinglineEnum
    … …  
    931896syn keyword cConstant TransientIsdamageevolutionEnum
    932897syn keyword cConstant TransientIshydrologyEnum
    933 syn keyword cConstant TransientIsmovingfrontEnum
    934 syn keyword cConstant TransientIsslrEnum
     898syn keyword cConstant TransientIscalvingEnum
    935899syn keyword cConstant TransientNumRequestedOutputsEnum
    936900syn keyword cConstant TransientRequestedOutputsEnum
    … …  
    11471111syn keyword cConstant MaticeEnum
    11481112syn keyword cConstant MatdamageiceEnum
    1149 syn keyword cConstant MatestarEnum
    11501113syn keyword cConstant MatparEnum
    11511114syn keyword cConstant NodeEnum
    … …  
    12541217syn keyword cConstant ThicknessAlongGradientEnum
    12551218syn keyword cConstant ThicknessAcrossGradientEnum
    1256 syn keyword cConstant ThicknessPositiveEnum
    12571219syn keyword cConstant IntMatParamEnum
    12581220syn keyword cConstant RheologyBbarAbsGradientEnum
    … …  
    12841246syn keyword cConstant DeviatoricStressyzEnum
    12851247syn keyword cConstant DeviatoricStresszzEnum
    1286 syn keyword cConstant DeviatoricStresseffectiveEnum
    1287 syn keyword cConstant LambdaSEnum
    12881248syn keyword cConstant StrainRateEnum
    12891249syn keyword cConstant StrainRatexxEnum
    … …  
    14371397syn keyword cConstant MassfluxatgateDefinitionenumEnum
    14381398syn keyword cConstant MassfluxatgateSegmentsEnum
    1439 syn keyword cConstant NodalvalueEnum
    1440 syn keyword cConstant NodalvalueNameEnum
    1441 syn keyword cConstant NodalvalueDefinitionenumEnum
    1442 syn keyword cConstant NodalvalueModelEnumEnum
    1443 syn keyword cConstant NodalvalueNodeEnum
    14441399syn keyword cConstant MisfitNameEnum
    14451400syn keyword cConstant MisfitDefinitionenumEnum
    … …  
    14681423syn keyword cConstant MaxVzEnum
    14691424syn keyword cConstant MaxAbsVzEnum
    1470 syn keyword cConstant FloatingAreaEnum
    14711425syn keyword cConstant GroundedAreaEnum
    14721426syn keyword cConstant IceMassEnum
    14731427syn keyword cConstant IceVolumeEnum
    14741428syn keyword cConstant IceVolumeAboveFloatationEnum
    1475 syn keyword cConstant TotalFloatingBmbEnum
    1476 syn keyword cConstant TotalGroundedBmbEnum
    14771429syn keyword cConstant TotalSmbEnum
    14781430syn keyword cConstant AbsoluteEnum
    … …  
    15111463syn keyword cConstant NodalEnum
    15121464syn keyword cConstant OldGradientEnum
    1513 syn keyword cConstant OutputBufferPointerEnum
    1514 syn keyword cConstant OutputBufferSizePointerEnum
    15151465syn keyword cConstant OutputFilePointerEnum
    15161466syn keyword cConstant ToolkitsFileNameEnum
    … …  
    15471497syn keyword cConstant OptionStructEnum
    15481498syn keyword cConstant CuffeyEnum
    1549 syn keyword cConstant BuddJackaEnum
    1550 syn keyword cConstant CuffeyTemperateEnum
    15511499syn keyword cConstant PatersonEnum
    15521500syn keyword cConstant ArrheniusEnum
    15531501syn keyword cConstant LliboutryDuvalEnum
    1554 syn keyword cConstant SpclevelsetEnum
     1502syn keyword cConstant TransientIslevelsetEnum
     1503syn keyword cConstant SpcLevelsetEnum
    15551504syn keyword cConstant ExtrapolationVariableEnum
    15561505syn keyword cConstant IceMaskNodeActivationEnum
    … …  
    15581507syn keyword cConstant LevelsetfunctionSlopeYEnum
    15591508syn keyword cConstant LevelsetfunctionPicardEnum
    1560 syn keyword cConstant LevelsetReinitFrequencyEnum
    1561 syn keyword cConstant SealevelriseSolutionEnum
    1562 syn keyword cConstant SealevelriseAnalysisEnum
    1563 syn keyword cConstant SealevelEnum
    1564 syn keyword cConstant SealevelEustaticEnum
    1565 syn keyword cConstant SealevelriseDeltathicknessEnum
    1566 syn keyword cConstant SealevelriseMaxiterEnum
    1567 syn keyword cConstant SealevelriseReltolEnum
    1568 syn keyword cConstant SealevelriseAbstolEnum
    1569 syn keyword cConstant SealevelriseLoveHEnum
    1570 syn keyword cConstant SealevelriseLoveKEnum
    1571 syn keyword cConstant SealevelriseTideLoveHEnum
    1572 syn keyword cConstant SealevelriseTideLoveKEnum
    1573 syn keyword cConstant SealevelriseRigidEnum
    1574 syn keyword cConstant SealevelriseElasticEnum
    1575 syn keyword cConstant SealevelriseRotationEnum
    1576 syn keyword cConstant SealevelriseGElasticEnum
    1577 syn keyword cConstant SealevelriseDegaccEnum
    1578 syn keyword cConstant SealevelriseTransitionsEnum
    1579 syn keyword cConstant SealevelriseRequestedOutputsEnum
    1580 syn keyword cConstant SealevelriseNumRequestedOutputsEnum
    1581 syn keyword cConstant ParametersENDEnum
    15821509"ISSM's Enums end
    15831510"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""

  • issm/trunk-jpl/jenkins/linux64_ross_se

    r20715 r20947  
    3838EXTERNALPACKAGES="autotools     install.sh               
    3939                                                mpich         install-3.0-linux64.sh   
    40                                                 cmake         install.sh
    4140                                                petsc         install-3.6-linux64.sh   
    4241                                                triangle      install-linux64.sh       
    … …  
    4443                                                gshhg         install.sh
    4544                                                gdal          install-1.10-linux64.sh
    46                                                 hdf5          install.sh
    47                                                 netcdf        install.sh
    48                                                 gmt           install-jenkins.sh
     45                                                gmt           install.sh
    4946                                                gmsh          install.sh
    5047                                                shell2junit   install.sh"

  • issm/trunk-jpl/scripts/ol

    r20721 r20947  
    33#Get the runme file, read it, and display steps
    44rm -rf orglist_temporary_file
    5 LIST=$(cat runme.m | grep perform | grep if | sed "s/'/ /g" | awk '{print $3}')
     5LIST=$(cat runme.m | grep perform | sed "s/'/ /g" | awk '{print $3}')
    66
    77COUNT=0;

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

    r20943 r20947  
    660660                                                this->AddConstant(new IoConstant(StringToEnumx(string),record_name));
    661661                                        } else if(strcmp(record_name,"md.masstransport.hydrostatic_adjustment")==0){
     662                                                this->AddConstant(new IoConstant(StringToEnumx(string),record_name));
     663                                        } else if(strcmp(record_name,"md.materials.rheology_law")==0){
    662664                                                this->AddConstant(new IoConstant(StringToEnumx(string),record_name));
    663665                                        } else {
    … …  
    792794                                                } else if(strcmp(record_name,"md.masstransport.hydrostatic_adjustment")==0){
    793795                                                        this->AddConstant(new IoConstant(StringToEnumx(string),record_name));
     796                                                } else if(strcmp(record_name,"md.materials.rheology_law")==0){
     797                                                        this->AddConstant(new IoConstant(StringToEnumx(string),record_name));
    794798                                                } else {
    795799                                                        /*Add string to parameters: */
    … …  
    799803                                                /*Free string*/
    800804                                                xDelete<char>(string);
    801 
    802805                                                break;
    803806                                        case 5: break; //do nothing. not interested in this type of data, which is memory intensive.

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

    r20918 r20947  
    168168                        WriteData(fid,prefix,'object',self,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1);
    169169                        WriteData(fid,prefix,'object',self,'class','materials','fieldname','rheology_n','format','DoubleMat','mattype',2);
    170                         WriteData(fid,prefix,'data',StringToEnum(self.rheology_law),'name','md.materials.rheology_law','format','Integer');
     170                        WriteData(fid,prefix,'data',self.rheology_law,'name','md.materials.rheology_law','format','String');
    171171
    172172                        WriteData(fid,prefix,'object',self,'class','materials','fieldname','lithosphere_shear_modulus','format','Double');

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

    r20918 r20947  
    160160                WriteData(fid,prefix,'object',self,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1)
    161161                WriteData(fid,prefix,'object',self,'class','materials','fieldname','rheology_n','format','DoubleMat','mattype',2)
    162                 WriteData(fid,prefix,'data',StringToEnum(self.rheology_law)[0],'name','md.materials.rheology_law','format','Integer')
     162                WriteData(fid,prefix,'data',self.rheology_law,'name','md.materials.rheology_law','format','String')
    163163
    164164                WriteData(fid,prefix,'object',self,'class','materials','fieldname','lithosphere_shear_modulus','format','Double');

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

    r20918 r20947  
    172172                        WriteData(fid,prefix,'object',self,'class','materials','fieldname','rheology_Ec','format','DoubleMat','mattype',1);
    173173                        WriteData(fid,prefix,'object',self,'class','materials','fieldname','rheology_Es','format','DoubleMat','mattype',1);
    174                         WriteData(fid,prefix,'data',StringToEnum(self.rheology_law),'name','md.materials.rheology_law','format','Integer');
     174                        WriteData(fid,prefix,'data',self.rheology_law,'name','md.materials.rheology_law','format','String');
    175175
    176176                        WriteData(fid,prefix,'object',self,'class','materials','fieldname','lithosphere_shear_modulus','format','Double');

  • issm/trunk-jpl/src/m/classes/matice.js

    r20930 r20947  
    129129                        WriteData(fid,prefix,'object',this,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
    130130                        WriteData(fid,prefix,'object',this,'class','materials','fieldname','rheology_n','format','DoubleMat','mattype',2);
    131                         WriteData(fid,prefix,'data',StringToEnum(this.rheology_law),'name','md.materials.rheology_law','format','Integer');
     131                        WriteData(fid,prefix,'data',this.rheology_law,'name','md.materials.rheology_law','format','String');
    132132                        WriteData(fid,prefix,'object',this,'class','materials','fieldname','lithosphere_shear_modulus','format','Double');
    133133                        WriteData(fid,prefix,'object',this,'class','materials','fieldname','lithosphere_density','format','Double','scale',Math.pow(10,3));

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

    r20918 r20947  
    167167                        WriteData(fid,prefix,'object',self,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
    168168                        WriteData(fid,prefix,'object',self,'class','materials','fieldname','rheology_n','format','DoubleMat','mattype',2);
    169                         WriteData(fid,prefix,'data',StringToEnum(self.rheology_law),'name','md.materials.rheology_law','format','Integer');
     169                        WriteData(fid,prefix,'data',self.rheology_law,'name','md.materials.rheology_law','format','String');
    170170
    171171                        WriteData(fid,prefix,'object',self,'class','materials','fieldname','lithosphere_shear_modulus','format','Double');

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

    r20918 r20947  
    161161                WriteData(fid,prefix,'object',self,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)
    162162                WriteData(fid,prefix,'object',self,'class','materials','fieldname','rheology_n','format','DoubleMat','mattype',2)
    163                 WriteData(fid,prefix,'data',StringToEnum(self.rheology_law)[0],'name','md.materials.rheology_law','format','Integer')
     163                WriteData(fid,prefix,'data',self.rheology_law,'name','md.materials.rheology_law','format','String')
    164164
    165165                WriteData(fid,prefix,'object',self,'class','materials','fieldname','lithosphere_shear_modulus','format','Double');

  • issm/trunk-jpl/test/NightlyRun/test101.m

    r19049 r20947  
    44md=parameterize(md,'../Par/SquareShelfConstrained.par');
    55md=setflowequation(md,'SSA','all');
    6 md.cluster=generic('name',oshostname(),'np',2);
     6md.cluster=generic('name',oshostname(),'np',1); % originally, 'np',2
    77
    88%output

  • issm/trunk-jpl/test/NightlyRun/test102.m

    r19049 r20947  
    55md=extrude(md,3,2.);
    66md=setflowequation(md,'SSA','all');
    7 md.cluster=generic('name',oshostname(),'np',3);
     7md.cluster=generic('name',oshostname(),'np', 3); %originally 3
    88md=solve(md,StressbalanceSolutionEnum());
    99

  • issm/trunk-jpl/test/NightlyRun/test243.m

    r20722 r20947  
    4545%Fields and tolerances to track changes
    4646field_names      ={'SmbDz','SmbT' ,'SmbD' ,'SmbRe','SmbGdn','SmbGsp','SmbA' ,'SmbEC','SmbMassBalance'};
    47 field_tolerances ={1e-7,5e-5,1e-4,5e-5,1e-5,5e-5,1e-5,1e-7,1e-7};
     47field_tolerances ={1e-13,1e-13,5e-13,5e-13,1e-13 ,5e-13 ,1e-13,1e-13,1e-13};
    4848
    4949field_values={...
Note: See TracChangeset for help on using the changeset viewer.