![(please configure the [header_logo] section in trac.ini)](/trac/issm/chrome/common/trac_banner.png)
Changeset 24791
- Timestamp:
- 05/05/20 06:24:17 (5 years ago)
- Location:
- issm/trunk-jpl/src/c
- Files:
-
- 11 edited
-
analyses/HydrologyDCInefficientAnalysis.cpp (modified) (4 diffs)
-
analyses/SmbAnalysis.cpp (modified) (2 diffs)
-
classes/Elements/Tria.cpp (modified) (2 diffs)
-
classes/FemModel.cpp (modified) (1 diff)
-
classes/Inputs2/Input2.h (modified) (3 diffs)
-
classes/Inputs2/TransientInput2.cpp (modified) (2 diffs)
-
shared/Enum/Enum.vim (modified) (12 diffs)
-
shared/Enum/EnumDefinitions.h (modified) (2 diffs)
-
shared/Enum/EnumToStringx.cpp (modified) (2 diffs)
-
shared/Enum/StringToEnumx.cpp (modified) (11 diffs)
-
shared/Enum/Synchronize.sh (modified) (12 diffs)
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp
r24790 r24791 20 20 int hydro_maxiter; 21 21 int hydroslices; 22 int averaging_method; 22 23 int numoutputs; 23 24 bool isefficientlayer; … … 42 43 iomodel->FetchData(&hydro_maxiter, "md.hydrology.max_iter" ); 43 44 iomodel->FetchData(&hydroslices, "md.hydrology.steps_per_step"); 45 iomodel->FetchData(&averaging_method, "md.hydrology.averaging"); 44 46 iomodel->FetchData(&isefficientlayer, "md.hydrology.isefficientlayer"); 45 47 iomodel->FetchData(&penalty_factor, "md.hydrology.penalty_factor" ); … … 53 55 parameters->AddObject(new IntParam(HydrologydcMaxIterEnum,hydro_maxiter)); 54 56 parameters->AddObject(new IntParam(HydrologyStepsPerStepEnum,hydroslices)); 57 parameters->AddObject(new IntParam(HydrologyAveragingEnum,averaging_method)); 55 58 56 59 parameters->AddObject(new BoolParam(HydrologydcIsefficientlayerEnum,isefficientlayer)); … … 67 70 if(!issmb){ 68 71 parameters->AddObject(iomodel->CopyConstantObject("md.smb.model",SmbEnum)); 72 parameters->AddObject(iomodel->CopyConstantObject("md.smb.averaging",SmbAveragingEnum)); 69 73 } 70 74 -
issm/trunk-jpl/src/c/analyses/SmbAnalysis.cpp
r24735 r24791 208 208 char** requestedoutputs = NULL; 209 209 bool isdelta18o,ismungsm,isd18opd,issetpddfac,interp,isfirnwarming; 210 int smb_model, smbslices ;210 int smb_model, smbslices, averaging; 211 211 IssmDouble *temp = NULL; 212 212 int N,M; … … 217 217 iomodel->FindConstant(&interp,"md.timestepping.interp_forcings"); 218 218 219 iomodel->F etchData(&smbslices,"md.smb.steps_per_step");219 iomodel->FindConstant(&smbslices,"md.smb.steps_per_step"); 220 220 parameters->AddObject(new IntParam(SmbStepsPerStepEnum,smbslices)); 221 222 223 parameters->AddObject(iomodel->CopyConstantObject("md.smb.averaging",SmbAveragingEnum)); 221 224 222 225 switch(smb_model){ -
issm/trunk-jpl/src/c/classes/Elements/Tria.cpp
r24790 r24791 1920 1920 } 1921 1921 else{ 1922 TriaInput2* input = this->inputs2->GetTriaInput(inputenum,start_time, end_time, intaveraging_method);1922 TriaInput2* input = this->inputs2->GetTriaInput(inputenum,start_time,end_time,averaging_method); 1923 1923 if(!input) return input; 1924 1924 … … 2211 2211 break; 2212 2212 case 2: /*Harmonic mean*/ 2213 for(int iv=0;iv<NUMVERTICES;iv++) averaged_values[iv] = (end_time - start_time)/ (averaged_values[iv];2213 for(int iv=0;iv<NUMVERTICES;iv++) averaged_values[iv] = (end_time - start_time)/averaged_values[iv]; 2214 2214 break; 2215 2215 default: -
issm/trunk-jpl/src/c/classes/FemModel.cpp
r24790 r24791 5275 5275 } 5276 5276 /*}}}*/ 5277 void FemModel::AverageTransientInputx(int* transientinput_enum,int* averagedinput_enum,IssmDouble init_time,IssmDouble end_time,int numoutputs, int averaging_method){ /*{{{*/5277 void FemModel::AverageTransientInputx(int* transientinput_enum,int* averagedinput_enum,IssmDouble init_time,IssmDouble end_time,int numoutputs, int averaging_method){ /*{{{*/ 5278 5278 5279 5279 for(int i=0;i<numoutputs;i++){ -
issm/trunk-jpl/src/c/classes/Inputs2/Input2.h
r24360 r24791 1 1 /*!\file: Input2.h 2 2 * \brief abstract class for Input2 object 3 */ 3 */ 4 4 5 5 #ifndef _INPUT2_H_ … … 44 44 45 45 virtual void AXPY(Input2* xinput,IssmDouble scalar){_error_("Not implemented yet");}; 46 virtual void PointWiseMult(Input2* xinput){_error_("Not implemented yet");}; 47 virtual void Pow(IssmDouble scale_factor){_error_("Not implemented yet");}; 46 48 virtual void Scale(IssmDouble scale_factor){_error_("Not implemented yet");}; 47 49 … … 50 52 virtual int GetResultNumberOfNodes(void){_error_("Not implemented yet");}; 51 53 //virtual void ResultToMatrix(IssmDouble* values,int ncols,int sid){_error_("not supported yet");}; 52 //virtual void ResultToPatch(IssmDouble* values,int nodesperelement,int sid){_error_("not supported yet");}; 54 //virtual void ResultToPatch(IssmDouble* values,int nodesperelement,int sid){_error_("not supported yet");}; 53 55 }; 54 56 #endif -
issm/trunk-jpl/src/c/classes/Inputs2/TransientInput2.cpp
r24790 r24791 467 467 } 468 468 else{ 469 this->stepinput->Scale(dt);470 this->current_input->PointWiseMult(stepinput) 469 stepinput->Scale(dt); 470 this->current_input->PointWiseMult(stepinput); 471 471 } 472 472 break; … … 478 478 } 479 479 else{ 480 this->stepinput->Pow(-1);480 stepinput->Pow(-1); 481 481 this->current_input->AXPY(stepinput,dt); 482 482 } -
issm/trunk-jpl/src/c/shared/Enum/Enum.vim
r24750 r24791 163 163 syn keyword cConstant GroundinglineMeltInterpolationEnum 164 164 syn keyword cConstant GroundinglineMigrationEnum 165 syn keyword cConstant HydrologyAveragingEnum 165 166 syn keyword cConstant HydrologyCavitySpacingEnum 166 167 syn keyword cConstant HydrologyChannelConductivityEnum … … 340 341 syn keyword cConstant SmbAccurefEnum 341 342 syn keyword cConstant SmbAdThreshEnum 343 syn keyword cConstant SmbAveragingEnum 342 344 syn keyword cConstant SmbDesfacEnum 343 345 syn keyword cConstant SmbDpermilEnum … … 1341 1343 syn keyword cType Cfsurfacesquare 1342 1344 syn keyword cType Channel 1345 syn keyword cType classes 1343 1346 syn keyword cType Constraint 1344 1347 syn keyword cType Constraints … … 1347 1350 syn keyword cType ControlInput2 1348 1351 syn keyword cType Covertree 1352 syn keyword cType DatasetInput2 1349 1353 syn keyword cType DataSetParam 1350 syn keyword cType DatasetInput21351 1354 syn keyword cType Definition 1352 1355 syn keyword cType DependentObject … … 1360 1363 syn keyword cType ElementInput2 1361 1364 syn keyword cType ElementMatrix 1365 syn keyword cType Elements 1362 1366 syn keyword cType ElementVector 1363 syn keyword cType Elements1364 1367 syn keyword cType ExponentialVariogram 1365 1368 syn keyword cType ExternalResult … … 1368 1371 syn keyword cType Friction 1369 1372 syn keyword cType Gauss 1373 syn keyword cType GaussianVariogram 1374 syn keyword cType gaussobjects 1370 1375 syn keyword cType GaussPenta 1371 1376 syn keyword cType GaussSeg 1372 1377 syn keyword cType GaussTetra 1373 1378 syn keyword cType GaussTria 1374 syn keyword cType GaussianVariogram1375 1379 syn keyword cType GenericExternalResult 1376 1380 syn keyword cType GenericOption … … 1387 1391 syn keyword cType IssmDirectApplicInterface 1388 1392 syn keyword cType IssmParallelDirectApplicInterface 1393 syn keyword cType krigingobjects 1389 1394 syn keyword cType Load 1390 1395 syn keyword cType Loads … … 1397 1402 syn keyword cType Matice 1398 1403 syn keyword cType Matlitho 1404 syn keyword cType matrixobjects 1399 1405 syn keyword cType MatrixParam 1400 1406 syn keyword cType Misfit … … 1409 1415 syn keyword cType Observations 1410 1416 syn keyword cType Option 1417 syn keyword cType Options 1411 1418 syn keyword cType OptionUtilities 1412 syn keyword cType Options1413 1419 syn keyword cType Param 1414 1420 syn keyword cType Parameters … … 1424 1430 syn keyword cType Regionaloutput 1425 1431 syn keyword cType Results 1432 syn keyword cType Riftfront 1426 1433 syn keyword cType RiftStruct 1427 syn keyword cType Riftfront1428 1434 syn keyword cType Seg 1429 1435 syn keyword cType SegInput2 1436 syn keyword cType Segment 1430 1437 syn keyword cType SegRef 1431 syn keyword cType Segment1432 1438 syn keyword cType SpcDynamic 1433 1439 syn keyword cType SpcStatic … … 1448 1454 syn keyword cType Vertex 1449 1455 syn keyword cType Vertices 1450 syn keyword cType classes1451 syn keyword cType gaussobjects1452 syn keyword cType krigingobjects1453 syn keyword cType matrixobjects1454 1456 syn keyword cType AdjointBalancethickness2Analysis 1455 1457 syn keyword cType AdjointBalancethicknessAnalysis … … 1470 1472 syn keyword cType FreeSurfaceBaseAnalysis 1471 1473 syn keyword cType FreeSurfaceTopAnalysis 1474 syn keyword cType GiaIvinsAnalysis 1472 1475 syn keyword cType GLheightadvectionAnalysis 1473 syn keyword cType GiaIvinsAnalysis1474 1476 syn keyword cType HydrologyDCEfficientAnalysis 1475 1477 syn keyword cType HydrologyDCInefficientAnalysis -
issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
r24750 r24791 157 157 GroundinglineMeltInterpolationEnum, 158 158 GroundinglineMigrationEnum, 159 HydrologyAveragingEnum, 159 160 HydrologyCavitySpacingEnum, 160 161 HydrologyChannelConductivityEnum, … … 334 335 SmbAccurefEnum, 335 336 SmbAdThreshEnum, 337 SmbAveragingEnum, 336 338 SmbDesfacEnum, 337 339 SmbDpermilEnum, -
issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
r24750 r24791 165 165 case GroundinglineMeltInterpolationEnum : return "GroundinglineMeltInterpolation"; 166 166 case GroundinglineMigrationEnum : return "GroundinglineMigration"; 167 case HydrologyAveragingEnum : return "HydrologyAveraging"; 167 168 case HydrologyCavitySpacingEnum : return "HydrologyCavitySpacing"; 168 169 case HydrologyChannelConductivityEnum : return "HydrologyChannelConductivity"; … … 342 343 case SmbAccurefEnum : return "SmbAccuref"; 343 344 case SmbAdThreshEnum : return "SmbAdThresh"; 345 case SmbAveragingEnum : return "SmbAveraging"; 344 346 case SmbDesfacEnum : return "SmbDesfac"; 345 347 case SmbDpermilEnum : return "SmbDpermil"; -
issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
r24750 r24791 168 168 else if (strcmp(name,"GroundinglineMeltInterpolation")==0) return GroundinglineMeltInterpolationEnum; 169 169 else if (strcmp(name,"GroundinglineMigration")==0) return GroundinglineMigrationEnum; 170 else if (strcmp(name,"HydrologyAveraging")==0) return HydrologyAveragingEnum; 170 171 else if (strcmp(name,"HydrologyCavitySpacing")==0) return HydrologyCavitySpacingEnum; 171 172 else if (strcmp(name,"HydrologyChannelConductivity")==0) return HydrologyChannelConductivityEnum; … … 259 260 else if (strcmp(name,"MaterialsEffectiveconductivityAveraging")==0) return MaterialsEffectiveconductivityAveragingEnum; 260 261 else if (strcmp(name,"MaterialsHeatcapacity")==0) return MaterialsHeatcapacityEnum; 261 else if (strcmp(name,"MaterialsLatentheat")==0) return MaterialsLatentheatEnum;262 262 else stage=3; 263 263 } 264 264 if(stage==3){ 265 if (strcmp(name,"MaterialsLithosphereDensity")==0) return MaterialsLithosphereDensityEnum; 265 if (strcmp(name,"MaterialsLatentheat")==0) return MaterialsLatentheatEnum; 266 else if (strcmp(name,"MaterialsLithosphereDensity")==0) return MaterialsLithosphereDensityEnum; 266 267 else if (strcmp(name,"MaterialsLithosphereShearModulus")==0) return MaterialsLithosphereShearModulusEnum; 267 268 else if (strcmp(name,"MaterialsMantleDensity")==0) return MaterialsMantleDensityEnum; … … 348 349 else if (strcmp(name,"SmbAccuref")==0) return SmbAccurefEnum; 349 350 else if (strcmp(name,"SmbAdThresh")==0) return SmbAdThreshEnum; 351 else if (strcmp(name,"SmbAveraging")==0) return SmbAveragingEnum; 350 352 else if (strcmp(name,"SmbDesfac")==0) return SmbDesfacEnum; 351 353 else if (strcmp(name,"SmbDpermil")==0) return SmbDpermilEnum; … … 381 383 else if (strcmp(name,"SmbRdl")==0) return SmbRdlEnum; 382 384 else if (strcmp(name,"SmbRequestedOutputs")==0) return SmbRequestedOutputsEnum; 383 else if (strcmp(name,"SmbRlaps")==0) return SmbRlapsEnum;384 else if (strcmp(name,"SmbRlapslgm")==0) return SmbRlapslgmEnum;385 385 else stage=4; 386 386 } 387 387 if(stage==4){ 388 if (strcmp(name,"SmbRunoffalti")==0) return SmbRunoffaltiEnum; 388 if (strcmp(name,"SmbRlaps")==0) return SmbRlapsEnum; 389 else if (strcmp(name,"SmbRlapslgm")==0) return SmbRlapslgmEnum; 390 else if (strcmp(name,"SmbRunoffalti")==0) return SmbRunoffaltiEnum; 389 391 else if (strcmp(name,"SmbRunoffgrad")==0) return SmbRunoffgradEnum; 390 392 else if (strcmp(name,"SmbRunoffref")==0) return SmbRunoffrefEnum; … … 504 506 else if (strcmp(name,"CalvingHabFraction")==0) return CalvingHabFractionEnum; 505 507 else if (strcmp(name,"CalvingMeltingrate")==0) return CalvingMeltingrateEnum; 506 else if (strcmp(name,"CalvingStressThresholdFloatingice")==0) return CalvingStressThresholdFloatingiceEnum;507 else if (strcmp(name,"CalvingStressThresholdGroundedice")==0) return CalvingStressThresholdGroundediceEnum;508 508 else stage=5; 509 509 } 510 510 if(stage==5){ 511 if (strcmp(name,"CalvinglevermannCoeff")==0) return CalvinglevermannCoeffEnum; 511 if (strcmp(name,"CalvingStressThresholdFloatingice")==0) return CalvingStressThresholdFloatingiceEnum; 512 else if (strcmp(name,"CalvingStressThresholdGroundedice")==0) return CalvingStressThresholdGroundediceEnum; 513 else if (strcmp(name,"CalvinglevermannCoeff")==0) return CalvinglevermannCoeffEnum; 512 514 else if (strcmp(name,"CalvingratexAverage")==0) return CalvingratexAverageEnum; 513 515 else if (strcmp(name,"Calvingratex")==0) return CalvingratexEnum; … … 627 629 else if (strcmp(name,"Input")==0) return InputEnum; 628 630 else if (strcmp(name,"InversionCostFunctionsCoefficients")==0) return InversionCostFunctionsCoefficientsEnum; 629 else if (strcmp(name,"InversionSurfaceObs")==0) return InversionSurfaceObsEnum;630 else if (strcmp(name,"InversionThicknessObs")==0) return InversionThicknessObsEnum;631 631 else stage=6; 632 632 } 633 633 if(stage==6){ 634 if (strcmp(name,"InversionVelObs")==0) return InversionVelObsEnum; 634 if (strcmp(name,"InversionSurfaceObs")==0) return InversionSurfaceObsEnum; 635 else if (strcmp(name,"InversionThicknessObs")==0) return InversionThicknessObsEnum; 636 else if (strcmp(name,"InversionVelObs")==0) return InversionVelObsEnum; 635 637 else if (strcmp(name,"InversionVxObs")==0) return InversionVxObsEnum; 636 638 else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum; … … 750 752 else if (strcmp(name,"SmbMassBalanceClimate")==0) return SmbMassBalanceClimateEnum; 751 753 else if (strcmp(name,"SmbMassBalance")==0) return SmbMassBalanceEnum; 752 else if (strcmp(name,"SmbMassBalanceSubstep")==0) return SmbMassBalanceSubstepEnum;753 else if (strcmp(name,"SmbMassBalanceTransient")==0) return SmbMassBalanceTransientEnum;754 754 else stage=7; 755 755 } 756 756 if(stage==7){ 757 if (strcmp(name,"SmbMeanLHF")==0) return SmbMeanLHFEnum; 757 if (strcmp(name,"SmbMassBalanceSubstep")==0) return SmbMassBalanceSubstepEnum; 758 else if (strcmp(name,"SmbMassBalanceTransient")==0) return SmbMassBalanceTransientEnum; 759 else if (strcmp(name,"SmbMeanLHF")==0) return SmbMeanLHFEnum; 758 760 else if (strcmp(name,"SmbMeanSHF")==0) return SmbMeanSHFEnum; 759 761 else if (strcmp(name,"SmbMeanULW")==0) return SmbMeanULWEnum; … … 873 875 else if (strcmp(name,"Outputdefinition13")==0) return Outputdefinition13Enum; 874 876 else if (strcmp(name,"Outputdefinition14")==0) return Outputdefinition14Enum; 875 else if (strcmp(name,"Outputdefinition15")==0) return Outputdefinition15Enum;876 else if (strcmp(name,"Outputdefinition16")==0) return Outputdefinition16Enum;877 877 else stage=8; 878 878 } 879 879 if(stage==8){ 880 if (strcmp(name,"Outputdefinition17")==0) return Outputdefinition17Enum; 880 if (strcmp(name,"Outputdefinition15")==0) return Outputdefinition15Enum; 881 else if (strcmp(name,"Outputdefinition16")==0) return Outputdefinition16Enum; 882 else if (strcmp(name,"Outputdefinition17")==0) return Outputdefinition17Enum; 881 883 else if (strcmp(name,"Outputdefinition18")==0) return Outputdefinition18Enum; 882 884 else if (strcmp(name,"Outputdefinition19")==0) return Outputdefinition19Enum; … … 996 998 else if (strcmp(name,"BeckmannGoosseFloatingMeltRate")==0) return BeckmannGoosseFloatingMeltRateEnum; 997 999 else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum; 998 else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;999 else if (strcmp(name,"BoolInput")==0) return BoolInputEnum;1000 1000 else stage=9; 1001 1001 } 1002 1002 if(stage==9){ 1003 if (strcmp(name,"BoolInput2")==0) return BoolInput2Enum; 1003 if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum; 1004 else if (strcmp(name,"BoolInput")==0) return BoolInputEnum; 1005 else if (strcmp(name,"BoolInput2")==0) return BoolInput2Enum; 1004 1006 else if (strcmp(name,"IntInput2")==0) return IntInput2Enum; 1005 1007 else if (strcmp(name,"BoolParam")==0) return BoolParamEnum; … … 1119 1121 else if (strcmp(name,"IceVolumeAboveFloatation")==0) return IceVolumeAboveFloatationEnum; 1120 1122 else if (strcmp(name,"IceVolumeAboveFloatationScaled")==0) return IceVolumeAboveFloatationScaledEnum; 1121 else if (strcmp(name,"IceVolume")==0) return IceVolumeEnum;1122 else if (strcmp(name,"IceVolumeScaled")==0) return IceVolumeScaledEnum;1123 1123 else stage=10; 1124 1124 } 1125 1125 if(stage==10){ 1126 if (strcmp(name,"IcefrontMassFlux")==0) return IcefrontMassFluxEnum; 1126 if (strcmp(name,"IceVolume")==0) return IceVolumeEnum; 1127 else if (strcmp(name,"IceVolumeScaled")==0) return IceVolumeScaledEnum; 1128 else if (strcmp(name,"IcefrontMassFlux")==0) return IcefrontMassFluxEnum; 1127 1129 else if (strcmp(name,"IcefrontMassFluxLevelset")==0) return IcefrontMassFluxLevelsetEnum; 1128 1130 else if (strcmp(name,"Incremental")==0) return IncrementalEnum; … … 1242 1244 else if (strcmp(name,"PentaInput")==0) return PentaInputEnum; 1243 1245 else if (strcmp(name,"Profiler")==0) return ProfilerEnum; 1244 else if (strcmp(name,"ProfilingCurrentFlops")==0) return ProfilingCurrentFlopsEnum;1245 else if (strcmp(name,"ProfilingCurrentMem")==0) return ProfilingCurrentMemEnum;1246 1246 else stage=11; 1247 1247 } 1248 1248 if(stage==11){ 1249 if (strcmp(name,"ProfilingSolutionTime")==0) return ProfilingSolutionTimeEnum; 1249 if (strcmp(name,"ProfilingCurrentFlops")==0) return ProfilingCurrentFlopsEnum; 1250 else if (strcmp(name,"ProfilingCurrentMem")==0) return ProfilingCurrentMemEnum; 1251 else if (strcmp(name,"ProfilingSolutionTime")==0) return ProfilingSolutionTimeEnum; 1250 1252 else if (strcmp(name,"Regionaloutput")==0) return RegionaloutputEnum; 1251 1253 else if (strcmp(name,"Regular")==0) return RegularEnum; -
issm/trunk-jpl/src/c/shared/Enum/Synchronize.sh
r24241 r24791 6 6 7 7 #Removed existing files 8 rm $ISSM_D IR/src/c/shared/Enum/EnumToStringx.cpp9 rm $ISSM_D IR/src/c/shared/Enum/StringToEnumx.cpp8 rm $ISSM_DEV_DIR/src/c/shared/Enum/EnumToStringx.cpp 9 rm $ISSM_DEV_DIR/src/c/shared/Enum/StringToEnumx.cpp 10 10 11 11 #Get number of enums … … 16 16 #Build EnumToAnalysis.cpp {{{ 17 17 #Header 18 cat <<END > $ISSM_D IR/src/c/analyses/EnumToAnalysis.cpp18 cat <<END > $ISSM_DEV_DIR/src/c/analyses/EnumToAnalysis.cpp 19 19 /* 20 20 * \file EnumToAnalysis.cpp … … 37 37 grep -v DefaultAnalysis | grep -v FlaimAnalysis | grep -v SurfaceSlopeAnalysis | grep -v BedSlopeAnalysis | \ 38 38 awk '{print "\t\t#ifdef _HAVE_"toupper(substr($1,1,length($1)-12))"_\n\t\t" "case " $1" : return new " substr($1,1,length($1)-4) "();\n\t\t#endif"}' \ 39 >> $ISSM_D IR/src/c/analyses/EnumToAnalysis.cpp39 >> $ISSM_DEV_DIR/src/c/analyses/EnumToAnalysis.cpp 40 40 41 41 #Footer 42 cat <<END >> $ISSM_D IR/src/c/analyses/EnumToAnalysis.cpp42 cat <<END >> $ISSM_DEV_DIR/src/c/analyses/EnumToAnalysis.cpp 43 43 default : _error_("enum provided not supported ("<<EnumToStringx(analysis_enum)<<")"); 44 44 } … … 48 48 #Build analyses.m4{{{ 49 49 #Header 50 cat <<END > $ISSM_D IR/m4/analyses.m450 cat <<END > $ISSM_DEV_DIR/m4/analyses.m4 51 51 52 52 dnl WARNING: DO NOT MODIFY THIS FILE … … 78 78 AC_MSG_RESULT($HAVE_" toupper($1)")\n\ 79 79 dnl }}}"}' \ 80 >> $ISSM_D IR/m4/analyses.m480 >> $ISSM_DEV_DIR/m4/analyses.m4 81 81 82 82 #Footer 83 cat <<END >> $ISSM_D IR/m4/analyses.m483 cat <<END >> $ISSM_DEV_DIR/m4/analyses.m4 84 84 85 85 ]) … … 91 91 #Build EnumToStringx.cpp {{{ 92 92 #Header 93 cat <<END > $ISSM_D IR/src/c/shared/Enum/EnumToStringx.cpp93 cat <<END > $ISSM_DEV_DIR/src/c/shared/Enum/EnumToStringx.cpp 94 94 /* 95 95 * \file EnumToStringx.cpp: … … 112 112 END 113 113 #core 114 cat temp | awk '{print "\t\t" "case " $1" : return \"" substr($1,1,length($1)-4) "\";"}' >> $ISSM_D IR/src/c/shared/Enum/EnumToStringx.cpp114 cat temp | awk '{print "\t\t" "case " $1" : return \"" substr($1,1,length($1)-4) "\";"}' >> $ISSM_DEV_DIR/src/c/shared/Enum/EnumToStringx.cpp 115 115 #Footer 116 cat <<END >> $ISSM_D IR/src/c/shared/Enum/EnumToStringx.cpp116 cat <<END >> $ISSM_DEV_DIR/src/c/shared/Enum/EnumToStringx.cpp 117 117 default : return "unknown"; 118 118 … … 144 144 #Build StringToEnumx.cpp {{{ 145 145 #Header 146 cat <<END > $ISSM_D IR/src/c/shared/Enum/StringToEnumx.cpp146 cat <<END > $ISSM_DEV_DIR/src/c/shared/Enum/StringToEnumx.cpp 147 147 /* 148 148 * \file StringToEnumx.cpp: … … 168 168 i2=120; 169 169 for (( i=1 ; i<=100 ; i++ )); do 170 echo " if(stage==$i){" >> $ISSM_D IR//src/c/shared/Enum/StringToEnumx.cpp170 echo " if(stage==$i){" >> $ISSM_DEV_DIR//src/c/shared/Enum/StringToEnumx.cpp 171 171 awk -v i1=$i1 -v i2=$i2 '{if(NR>=i1 && NR<=i2) print $0 }' temp | 172 awk '{print "\t" ((NR==1)?" if":" else if") " (strcmp(name,\"" substr($1,1,length($1)-4) "\")==0) return " $1 ";"}' >> $ISSM_D IR//src/c/shared/Enum/StringToEnumx.cpp173 echo " else stage=$(($i+1));" >> $ISSM_D IR//src/c/shared/Enum/StringToEnumx.cpp174 echo " }" >> $ISSM_D IR//src/c/shared/Enum/StringToEnumx.cpp172 awk '{print "\t" ((NR==1)?" if":" else if") " (strcmp(name,\"" substr($1,1,length($1)-4) "\")==0) return " $1 ";"}' >> $ISSM_DEV_DIR//src/c/shared/Enum/StringToEnumx.cpp 173 echo " else stage=$(($i+1));" >> $ISSM_DEV_DIR//src/c/shared/Enum/StringToEnumx.cpp 174 echo " }" >> $ISSM_DEV_DIR//src/c/shared/Enum/StringToEnumx.cpp 175 175 176 176 if [ $i2 -ge $NUMENUMS ]; then break; fi … … 180 180 181 181 #footer 182 cat <<END >> $ISSM_D IR/src/c/shared/Enum/StringToEnumx.cpp182 cat <<END >> $ISSM_DEV_DIR/src/c/shared/Enum/StringToEnumx.cpp 183 183 /*If we reach this point, the string provided has not been found*/ 184 184 if(notfounderror) … … 193 193 #Build Enum.vim{{{ 194 194 #Header 195 cat <<END > $ISSM_D IR/src/c/shared/Enum/Enum.vim195 cat <<END > $ISSM_DEV_DIR/src/c/shared/Enum/Enum.vim 196 196 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" 197 197 " ISSM specific c syntax highlighting … … 211 211 "ISSM Enums 212 212 END 213 cat temp | awk '{print "syn keyword cConstant " $1}' >> $ISSM_D IR/src/c/shared/Enum/Enum.vim214 cat <<END >> $ISSM_D IR/src/c/shared/Enum/Enum.vim213 cat temp | awk '{print "syn keyword cConstant " $1}' >> $ISSM_DEV_DIR/src/c/shared/Enum/Enum.vim 214 cat <<END >> $ISSM_DEV_DIR/src/c/shared/Enum/Enum.vim 215 215 "ISSM Enums end 216 216 END 217 217 218 218 #Synchronize ISSM objects objects 219 cat <<END >> $ISSM_D IR/src/c/shared/Enum/Enum.vim219 cat <<END >> $ISSM_DEV_DIR/src/c/shared/Enum/Enum.vim 220 220 221 221 "ISSM objects 222 222 END 223 find $ISSM_D IR/src/c/classes -name "*.cpp" -o -name "*.h" | sed -e "s/\// /g" -e "s/\.cpp//" -e "s/\.h//" | awk '{print $(NF)}' | sort | uniq | awk '{ printf "syn keyword cType " $1 "\n"}'>> $ISSM_DIR/src/c/shared/Enum/Enum.vim224 find $ISSM_D IR/src/c/analyses -name "*Analysis.h" | sed -e "s/\// /g" -e "s/\.cpp//" -e "s/\.h//" | awk '{print $(NF)}' | sort | uniq | awk '{ printf "syn keyword cType " $1 "\n"}'>> $ISSM_DIR/src/c/shared/Enum/Enum.vim225 echo "\"ISSM objects end" >> $ISSM_D IR/src/c/shared/Enum/Enum.vim223 find $ISSM_DEV_DIR/src/c/classes -name "*.cpp" -o -name "*.h" | sed -e "s/\// /g" -e "s/\.cpp//" -e "s/\.h//" | awk '{print $(NF)}' | sort | uniq | awk '{ printf "syn keyword cType " $1 "\n"}'>> $ISSM_DEV_DIR/src/c/shared/Enum/Enum.vim 224 find $ISSM_DEV_DIR/src/c/analyses -name "*Analysis.h" | sed -e "s/\// /g" -e "s/\.cpp//" -e "s/\.h//" | awk '{print $(NF)}' | sort | uniq | awk '{ printf "syn keyword cType " $1 "\n"}'>> $ISSM_DEV_DIR/src/c/shared/Enum/Enum.vim 225 echo "\"ISSM objects end" >> $ISSM_DEV_DIR/src/c/shared/Enum/Enum.vim 226 226 #}}} 227 227
Note:
See TracChangeset
for help on using the changeset viewer.
