Changeset 25771
- Timestamp:
- 11/20/20 15:04:46 (4 years ago)
- Location:
- issm/trunk-jpl/src/c
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/classes/FemModel.cpp
r25752 r25771 2438 2438 2439 2439 /*Vector special case (maybe should go to specific analysis?)*/ 2440 case ChannelAreaEnum:{ 2440 case ChannelAreaEnum: 2441 case ChannelDischargeEnum:{ 2441 2442 2442 2443 /*Get Number of Channels*/ … … 2455 2456 if(object->ObjectEnum()==ChannelEnum){ 2456 2457 Channel* channel=(Channel*)object; 2457 channel->WriteChannelCrossSection(values); 2458 if(output_enum==ChannelAreaEnum){ 2459 channel->WriteChannelCrossSection(values); 2460 } 2461 else if(output_enum==ChannelDischargeEnum){ 2462 channel->WriteChannelDischarge(values); 2463 } 2464 else{ 2465 _error_("not supported"); 2466 } 2458 2467 } 2459 2468 } -
issm/trunk-jpl/src/c/classes/Loads/Channel.cpp
r25508 r25771 53 53 this->S = channelarea; 54 54 this->Sold = channelarea; 55 this->discharge = 0.;/*for output only*/ 55 56 56 57 /*Get edge info*/ … … 155 156 marshallhandle->call(this->id); 156 157 marshallhandle->call(this->S); 158 marshallhandle->call(this->Sold); 159 marshallhandle->call(this->boundary); 160 marshallhandle->call(this->discharge); 157 161 158 162 if(marshallhandle->OperationNumber()==MARSHALLING_LOAD){ … … 511 515 IssmDouble rho_ice = element->FindParam(MaterialsRhoIceEnum); 512 516 IssmDouble rho_water = element->FindParam(MaterialsRhoFreshwaterEnum); 513 IssmDouble kc = element->FindParam(HydrologyChannelConductivityEnum);514 517 IssmDouble g = element->FindParam(ConstantsGEnum); 515 518 IssmDouble lc = element->FindParam(HydrologyChannelSheetWidthEnum); … … 707 710 } 708 711 712 /*Compute new channel discharge for output only*/ 713 IssmDouble Kc = kc * pow(this->S,ALPHA_C) * pow(Ngrad,BETA_C-2.); 714 this->discharge = -Kc*dphids; 715 709 716 /*Clean up and return*/ 710 717 delete gauss; … … 712 719 /*}}}*/ 713 720 void Channel::WriteChannelCrossSection(IssmPDouble* values){/*{{{*/ 714 715 721 _assert_(values); 716 722 values[this->sid] = reCast<IssmPDouble>(this->S); 717 723 } 718 724 /*}}}*/ 725 void Channel::WriteChannelDischarge(IssmPDouble* values){/*{{{*/ 726 _assert_(values); 727 values[this->sid] = reCast<IssmPDouble>(this->discharge); 728 } 729 /*}}}*/ -
issm/trunk-jpl/src/c/classes/Loads/Channel.h
r25508 r25771 22 22 IssmDouble Sold; 23 23 bool boundary; 24 25 /*output only*/ 26 IssmDouble discharge; 24 27 25 28 public: … … 83 86 ElementMatrix* CreateKMatrixHydrologyGlaDS(void); 84 87 void WriteChannelCrossSection(IssmPDouble* values); 88 void WriteChannelDischarge(IssmPDouble* values); 85 89 /*}}}*/ 86 90 -
issm/trunk-jpl/src/c/shared/Enum/Enum.vim
r25763 r25771 1044 1044 syn keyword cConstant ChannelAreaEnum 1045 1045 syn keyword cConstant ChannelAreaOldEnum 1046 syn keyword cConstant ChannelDischargeEnum 1046 1047 syn keyword cConstant ClosedEnum 1047 1048 syn keyword cConstant ColinearEnum … … 1391 1392 syn keyword cType Cfsurfacesquare 1392 1393 syn keyword cType Channel 1394 syn keyword cType classes 1393 1395 syn keyword cType Constraint 1394 1396 syn keyword cType Constraints … … 1397 1399 syn keyword cType ControlInput 1398 1400 syn keyword cType Covertree 1401 syn keyword cType DatasetInput 1399 1402 syn keyword cType DataSetParam 1400 syn keyword cType DatasetInput1401 1403 syn keyword cType Definition 1402 1404 syn keyword cType DependentObject … … 1411 1413 syn keyword cType ElementInput 1412 1414 syn keyword cType ElementMatrix 1415 syn keyword cType Elements 1413 1416 syn keyword cType ElementVector 1414 syn keyword cType Elements1415 1417 syn keyword cType ExponentialVariogram 1416 1418 syn keyword cType ExternalResult … … 1419 1421 syn keyword cType Friction 1420 1422 syn keyword cType Gauss 1423 syn keyword cType GaussianVariogram 1424 syn keyword cType gaussobjects 1421 1425 syn keyword cType GaussPenta 1422 1426 syn keyword cType GaussSeg 1423 1427 syn keyword cType GaussTetra 1424 1428 syn keyword cType GaussTria 1425 syn keyword cType GaussianVariogram1426 1429 syn keyword cType GenericExternalResult 1427 1430 syn keyword cType GenericOption … … 1438 1441 syn keyword cType IssmDirectApplicInterface 1439 1442 syn keyword cType IssmParallelDirectApplicInterface 1443 syn keyword cType krigingobjects 1440 1444 syn keyword cType Load 1441 1445 syn keyword cType Loads … … 1448 1452 syn keyword cType Matice 1449 1453 syn keyword cType Matlitho 1454 syn keyword cType matrixobjects 1450 1455 syn keyword cType MatrixParam 1451 1456 syn keyword cType Misfit … … 1460 1465 syn keyword cType Observations 1461 1466 syn keyword cType Option 1467 syn keyword cType Options 1462 1468 syn keyword cType OptionUtilities 1463 syn keyword cType Options1464 1469 syn keyword cType Param 1465 1470 syn keyword cType Parameters … … 1475 1480 syn keyword cType Regionaloutput 1476 1481 syn keyword cType Results 1482 syn keyword cType Riftfront 1477 1483 syn keyword cType RiftStruct 1478 syn keyword cType Riftfront1479 1484 syn keyword cType SealevelMasks 1480 1485 syn keyword cType Seg 1481 1486 syn keyword cType SegInput 1487 syn keyword cType Segment 1482 1488 syn keyword cType SegRef 1483 syn keyword cType Segment1484 1489 syn keyword cType SpcDynamic 1485 1490 syn keyword cType SpcStatic … … 1500 1505 syn keyword cType Vertex 1501 1506 syn keyword cType Vertices 1502 syn keyword cType classes1503 syn keyword cType gaussobjects1504 syn keyword cType krigingobjects1505 syn keyword cType matrixobjects1506 1507 syn keyword cType AdjointBalancethickness2Analysis 1507 1508 syn keyword cType AdjointBalancethicknessAnalysis … … 1522 1523 syn keyword cType FreeSurfaceBaseAnalysis 1523 1524 syn keyword cType FreeSurfaceTopAnalysis 1525 syn keyword cType GiaAnalysis 1524 1526 syn keyword cType GLheightadvectionAnalysis 1525 syn keyword cType GiaAnalysis1526 1527 syn keyword cType HydrologyDCEfficientAnalysis 1527 1528 syn keyword cType HydrologyDCInefficientAnalysis -
issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
r25763 r25771 1043 1043 ChannelAreaEnum, 1044 1044 ChannelAreaOldEnum, 1045 ChannelDischargeEnum, 1045 1046 ClosedEnum, 1046 1047 ColinearEnum, -
issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
r25763 r25771 1046 1046 case ChannelAreaEnum : return "ChannelArea"; 1047 1047 case ChannelAreaOldEnum : return "ChannelAreaOld"; 1048 case ChannelDischargeEnum : return "ChannelDischarge"; 1048 1049 case ClosedEnum : return "Closed"; 1049 1050 case ColinearEnum : return "Colinear"; -
issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
r25763 r25771 1070 1070 else if (strcmp(name,"ChannelArea")==0) return ChannelAreaEnum; 1071 1071 else if (strcmp(name,"ChannelAreaOld")==0) return ChannelAreaOldEnum; 1072 else if (strcmp(name,"ChannelDischarge")==0) return ChannelDischargeEnum; 1072 1073 else if (strcmp(name,"Closed")==0) return ClosedEnum; 1073 1074 else if (strcmp(name,"Colinear")==0) return ColinearEnum; … … 1120 1121 else if (strcmp(name,"FSpressure")==0) return FSpressureEnum; 1121 1122 else if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum; 1122 else if (strcmp(name,"FemModel")==0) return FemModelEnum;1123 1123 else stage=10; 1124 1124 } 1125 1125 if(stage==10){ 1126 if (strcmp(name,"FileParam")==0) return FileParamEnum; 1126 if (strcmp(name,"FemModel")==0) return FemModelEnum; 1127 else if (strcmp(name,"FileParam")==0) return FileParamEnum; 1127 1128 else if (strcmp(name,"FixedTimestepping")==0) return FixedTimesteppingEnum; 1128 1129 else if (strcmp(name,"FloatingArea")==0) return FloatingAreaEnum; … … 1243 1244 else if (strcmp(name,"MeshElements")==0) return MeshElementsEnum; 1244 1245 else if (strcmp(name,"MeshX")==0) return MeshXEnum; 1245 else if (strcmp(name,"MeshY")==0) return MeshYEnum;1246 1246 else stage=11; 1247 1247 } 1248 1248 if(stage==11){ 1249 if (strcmp(name,"MinVel")==0) return MinVelEnum; 1249 if (strcmp(name,"MeshY")==0) return MeshYEnum; 1250 else if (strcmp(name,"MinVel")==0) return MinVelEnum; 1250 1251 else if (strcmp(name,"MinVx")==0) return MinVxEnum; 1251 1252 else if (strcmp(name,"MinVy")==0) return MinVyEnum; … … 1366 1367 else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum; 1367 1368 else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum; 1368 else if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum;1369 1369 else stage=12; 1370 1370 } 1371 1371 if(stage==12){ 1372 if (strcmp(name,"TotalCalvingFluxLevelset")==0) return TotalCalvingFluxLevelsetEnum; 1372 if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum; 1373 else if (strcmp(name,"TotalCalvingFluxLevelset")==0) return TotalCalvingFluxLevelsetEnum; 1373 1374 else if (strcmp(name,"TotalCalvingMeltingFluxLevelset")==0) return TotalCalvingMeltingFluxLevelsetEnum; 1374 1375 else if (strcmp(name,"TotalFloatingBmb")==0) return TotalFloatingBmbEnum;
Note:
See TracChangeset
for help on using the changeset viewer.