Changeset 27265


Ignore:
Timestamp:
09/06/22 16:43:32 (3 years ago)
Author:
Eric.Larour
Message:

CHG: new relative sea level output.

Location:
issm/branches/trunk-larour-SLPS2022/src/c
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • issm/branches/trunk-larour-SLPS2022/src/c/cores/sealevelchange_core.cpp

    r27259 r27265  
    6868        /*Run coupler output transfer: */
    6969        coupleroutput_core(femmodel);
     70
     71        /*Add additional diagnostics:*/
     72        femmodel->inputs->ZAXPY(-1, BedEnum,SealevelEnum,RelativeSealevelEnum);
    7073
    7174        /*Save results: */

  • issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/Enum.vim

    r27138 r27265  
    857857syn keyword cConstant SamplingPhiEnum
    858858syn keyword cConstant SamplingTauEnum
     859syn keyword cConstant RelativeSealevelEnum
    859860syn keyword cConstant SealevelEnum
    860861syn keyword cConstant SealevelGRDEnum

  • issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/EnumDefinitions.h

    r27138 r27265  
    853853        SamplingPhiEnum,
    854854        SamplingTauEnum,
     855        RelativeSealevelEnum,
    855856        SealevelEnum,
    856857        SealevelGRDEnum,

  • issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/EnumToStringx.cpp

    r27138 r27265  
    859859                case SamplingPhiEnum : return "SamplingPhi";
    860860                case SamplingTauEnum : return "SamplingTau";
     861                case RelativeSealevelEnum : return "RelativeSealevel";
    861862                case SealevelEnum : return "Sealevel";
    862863                case SealevelGRDEnum : return "SealevelGRD";

  • issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/Enumjl.vim

    r27138 r27265  
    850850syn keyword juliaConstC SamplingPhiEnum
    851851syn keyword juliaConstC SamplingTauEnum
     852syn keyword juliaConstC RelativeSealevelEnum
    852853syn keyword juliaConstC SealevelEnum
    853854syn keyword juliaConstC SealevelGRDEnum

  • issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/StringToEnumx.cpp

    r27138 r27265  
    880880              if (strcmp(name,"SamplingPhi")==0) return SamplingPhiEnum;
    881881              else if (strcmp(name,"SamplingTau")==0) return SamplingTauEnum;
     882              else if (strcmp(name,"RelativeSealevel")==0) return RelativeSealevelEnum;
    882883              else if (strcmp(name,"Sealevel")==0) return SealevelEnum;
    883884              else if (strcmp(name,"SealevelGRD")==0) return SealevelGRDEnum;
    … …  
    997998              else if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum;
    998999              else if (strcmp(name,"SmbEAir")==0) return SmbEAirEnum;
    999               else if (strcmp(name,"SmbEC")==0) return SmbECEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"SmbECDt")==0) return SmbECDtEnum;
     1003              if (strcmp(name,"SmbEC")==0) return SmbECEnum;
     1004              else if (strcmp(name,"SmbECDt")==0) return SmbECDtEnum;
    10041005              else if (strcmp(name,"SmbECini")==0) return SmbECiniEnum;
    10051006              else if (strcmp(name,"SmbEla")==0) return SmbElaEnum;
    … …  
    11201121              else if (strcmp(name,"ThicknessResidual")==0) return ThicknessResidualEnum;
    11211122              else if (strcmp(name,"TransientAccumulatedDeltaIceThickness")==0) return TransientAccumulatedDeltaIceThicknessEnum;
    1122               else if (strcmp(name,"Vel")==0) return VelEnum;
    11231123         else stage=10;
    11241124   }
    11251125   if(stage==10){
    1126               if (strcmp(name,"VxAverage")==0) return VxAverageEnum;
     1126              if (strcmp(name,"Vel")==0) return VelEnum;
     1127              else if (strcmp(name,"VxAverage")==0) return VxAverageEnum;
    11271128              else if (strcmp(name,"VxBase")==0) return VxBaseEnum;
    11281129              else if (strcmp(name,"Vx")==0) return VxEnum;
    … …  
    12431244              else if (strcmp(name,"Outputdefinition88")==0) return Outputdefinition88Enum;
    12441245              else if (strcmp(name,"Outputdefinition89")==0) return Outputdefinition89Enum;
    1245               else if (strcmp(name,"Outputdefinition8")==0) return Outputdefinition8Enum;
    12461246         else stage=11;
    12471247   }
    12481248   if(stage==11){
    1249               if (strcmp(name,"Outputdefinition90")==0) return Outputdefinition90Enum;
     1249              if (strcmp(name,"Outputdefinition8")==0) return Outputdefinition8Enum;
     1250              else if (strcmp(name,"Outputdefinition90")==0) return Outputdefinition90Enum;
    12501251              else if (strcmp(name,"Outputdefinition91")==0) return Outputdefinition91Enum;
    12511252              else if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum;
    … …  
    13661367              else if (strcmp(name,"FreeSurfaceTopAnalysis")==0) return FreeSurfaceTopAnalysisEnum;
    13671368              else if (strcmp(name,"FrontalForcingsDefault")==0) return FrontalForcingsDefaultEnum;
    1368               else if (strcmp(name,"FrontalForcingsRignot")==0) return FrontalForcingsRignotEnum;
    13691369         else stage=12;
    13701370   }
    13711371   if(stage==12){
    1372               if (strcmp(name,"FrontalForcingsRignotAutoregression")==0) return FrontalForcingsRignotAutoregressionEnum;
     1372              if (strcmp(name,"FrontalForcingsRignot")==0) return FrontalForcingsRignotEnum;
     1373              else if (strcmp(name,"FrontalForcingsRignotAutoregression")==0) return FrontalForcingsRignotAutoregressionEnum;
    13731374              else if (strcmp(name,"Fset")==0) return FsetEnum;
    13741375              else if (strcmp(name,"FullMeltOnPartiallyFloating")==0) return FullMeltOnPartiallyFloatingEnum;
    … …  
    14891490              else if (strcmp(name,"MinVx")==0) return MinVxEnum;
    14901491              else if (strcmp(name,"MinVy")==0) return MinVyEnum;
    1491               else if (strcmp(name,"MinVz")==0) return MinVzEnum;
    14921492         else stage=13;
    14931493   }
    14941494   if(stage==13){
    1495               if (strcmp(name,"MismipFloatingMeltRate")==0) return MismipFloatingMeltRateEnum;
     1495              if (strcmp(name,"MinVz")==0) return MinVzEnum;
     1496              else if (strcmp(name,"MismipFloatingMeltRate")==0) return MismipFloatingMeltRateEnum;
    14961497              else if (strcmp(name,"Moulin")==0) return MoulinEnum;
    14971498              else if (strcmp(name,"MpiDense")==0) return MpiDenseEnum;
    … …  
    16121613              else if (strcmp(name,"TetraInput")==0) return TetraInputEnum;
    16131614              else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum;
    1614               else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum;
    16151615         else stage=14;
    16161616   }
    16171617   if(stage==14){
    1618               if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum;
     1618              if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum;
     1619              else if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum;
    16191620              else if (strcmp(name,"TotalCalvingFluxLevelset")==0) return TotalCalvingFluxLevelsetEnum;
    16201621              else if (strcmp(name,"TotalCalvingMeltingFluxLevelset")==0) return TotalCalvingMeltingFluxLevelsetEnum;

  • issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/issmenums.jl

    r27138 r27265  
    846846        SamplingPhiEnum
    847847        SamplingTauEnum
     848        RelativeSealevelEnum
    848849        SealevelEnum
    849850        SealevelGRDEnum
    … …  
    24542455        if(enum==SamplingPhiEnum) return "SamplingPhi" end
    24552456        if(enum==SamplingTauEnum) return "SamplingTau" end
     2457        if(enum==RelativeSealevelEnum) return "RelativeSealevel" end
    24562458        if(enum==SealevelEnum) return "Sealevel" end
    24572459        if(enum==SealevelGRDEnum) return "SealevelGRD" end
Note: See TracChangeset for help on using the changeset viewer.