Index: /issm/trunk-jpl/src/c/analyses/DepthAverageAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/DepthAverageAnalysis.cpp (revision 21073) +++ /issm/trunk-jpl/src/c/analyses/DepthAverageAnalysis.cpp (revision 21074) @@ -113,5 +113,5 @@ /*Retrieve all inputs and parameters*/ element->GetVerticesCoordinates(&xyz_list); - element->FindParam(&input_enum,InputToDepthaverageEnum); + element->FindParam(&input_enum,InputToDepthaverageInEnum); Input* input = element->GetInput(input_enum); _assert_(input); @@ -166,5 +166,5 @@ int inputenum; - element->FindParam(&inputenum,InputToDepthaverageEnum); + element->FindParam(&inputenum,InputToDepthaverageOutEnum); element->InputUpdateFromSolutionOneDof(solution,inputenum); }/*}}}*/ Index: /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 21073) +++ /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 21074) @@ -275,5 +275,5 @@ else{ if(dim==1){ - vxaverage_input=element->GetInput(VxEnum); _assert_(vxaverage_input); + vxaverage_input=element->GetInput(VxAverageEnum); _assert_(vxaverage_input); } if(dim==2){ Index: /issm/trunk-jpl/src/c/cores/masstransport_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/masstransport_core.cpp (revision 21073) +++ /issm/trunk-jpl/src/c/cores/masstransport_core.cpp (revision 21074) @@ -49,4 +49,12 @@ else{ if(VerboseSolution()) _printf0_(" call computational core\n"); + femmodel->parameters->SetParam(VxEnum,InputToDepthaverageInEnum); + femmodel->parameters->SetParam(VxAverageEnum,InputToDepthaverageOutEnum); + depthaverage_core(femmodel); + if(domaintype!=Domain2DverticalEnum){ + femmodel->parameters->SetParam(VyEnum,InputToDepthaverageInEnum); + femmodel->parameters->SetParam(VyAverageEnum,InputToDepthaverageOutEnum); + depthaverage_core(femmodel); + } if(stabilization==4){ solutionsequence_fct(femmodel); Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 21073) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 21074) @@ -604,5 +604,6 @@ InputToExtrudeEnum, InputToL2ProjectEnum, - InputToDepthaverageEnum, + InputToDepthaverageInEnum, + InputToDepthaverageOutEnum, InputToSmoothEnum, SmoothThicknessMultiplierEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 21073) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 21074) @@ -594,5 +594,6 @@ case InputToExtrudeEnum : return "InputToExtrude"; case InputToL2ProjectEnum : return "InputToL2Project"; - case InputToDepthaverageEnum : return "InputToDepthaverage"; + case InputToDepthaverageInEnum : return "InputToDepthaverageIn"; + case InputToDepthaverageOutEnum : return "InputToDepthaverageOut"; case InputToSmoothEnum : return "InputToSmooth"; case SmoothThicknessMultiplierEnum : return "SmoothThicknessMultiplier"; Index: /issm/trunk-jpl/src/c/shared/Enum/README =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/README (revision 21073) +++ /issm/trunk-jpl/src/c/shared/Enum/README (revision 21074) @@ -3,5 +3,4 @@ - StringToEnumx.cpp - EnumToStringx.cpp -- src/m/enum/* all these files are automatically synchronized with EnumDefinitions.h Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 21073) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 21074) @@ -606,5 +606,6 @@ else if (strcmp(name,"InputToExtrude")==0) return InputToExtrudeEnum; else if (strcmp(name,"InputToL2Project")==0) return InputToL2ProjectEnum; - else if (strcmp(name,"InputToDepthaverage")==0) return InputToDepthaverageEnum; + else if (strcmp(name,"InputToDepthaverageIn")==0) return InputToDepthaverageInEnum; + else if (strcmp(name,"InputToDepthaverageOut")==0) return InputToDepthaverageOutEnum; else if (strcmp(name,"InputToSmooth")==0) return InputToSmoothEnum; else if (strcmp(name,"SmoothThicknessMultiplier")==0) return SmoothThicknessMultiplierEnum; @@ -628,9 +629,9 @@ else if (strcmp(name,"Masscon")==0) return MassconEnum; else if (strcmp(name,"MassconName")==0) return MassconNameEnum; - else if (strcmp(name,"MassconDefinitionenum")==0) return MassconDefinitionenumEnum; else stage=6; } if(stage==6){ - if (strcmp(name,"MassconLevelset")==0) return MassconLevelsetEnum; + if (strcmp(name,"MassconDefinitionenum")==0) return MassconDefinitionenumEnum; + else if (strcmp(name,"MassconLevelset")==0) return MassconLevelsetEnum; else if (strcmp(name,"Massconaxpby")==0) return MassconaxpbyEnum; else if (strcmp(name,"MassconaxpbyName")==0) return MassconaxpbyNameEnum; @@ -751,9 +752,9 @@ else if (strcmp(name,"DeviatoricStressxy")==0) return DeviatoricStressxyEnum; else if (strcmp(name,"DeviatoricStressxz")==0) return DeviatoricStressxzEnum; - else if (strcmp(name,"DeviatoricStressyy")==0) return DeviatoricStressyyEnum; else stage=7; } if(stage==7){ - if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum; + if (strcmp(name,"DeviatoricStressyy")==0) return DeviatoricStressyyEnum; + else if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum; else if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum; else if (strcmp(name,"DeviatoricStresseffective")==0) return DeviatoricStresseffectiveEnum; @@ -874,9 +875,9 @@ else if (strcmp(name,"Outputdefinition68")==0) return Outputdefinition68Enum; else if (strcmp(name,"Outputdefinition69")==0) return Outputdefinition69Enum; - else if (strcmp(name,"Outputdefinition70")==0) return Outputdefinition70Enum; else stage=8; } if(stage==8){ - if (strcmp(name,"Outputdefinition71")==0) return Outputdefinition71Enum; + if (strcmp(name,"Outputdefinition70")==0) return Outputdefinition70Enum; + else if (strcmp(name,"Outputdefinition71")==0) return Outputdefinition71Enum; else if (strcmp(name,"Outputdefinition72")==0) return Outputdefinition72Enum; else if (strcmp(name,"Outputdefinition73")==0) return Outputdefinition73Enum; @@ -997,9 +998,9 @@ else if (strcmp(name,"RestartFileName")==0) return RestartFileNameEnum; else if (strcmp(name,"ToolkitsOptionsAnalyses")==0) return ToolkitsOptionsAnalysesEnum; - else if (strcmp(name,"ToolkitsOptionsStrings")==0) return ToolkitsOptionsStringsEnum; else stage=9; } if(stage==9){ - if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum; + if (strcmp(name,"ToolkitsOptionsStrings")==0) return ToolkitsOptionsStringsEnum; + else if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum; else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum; else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum; Index: /issm/trunk-jpl/src/c/shared/Enum/Synchronize.sh =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/Synchronize.sh (revision 21073) +++ /issm/trunk-jpl/src/c/shared/Enum/Synchronize.sh (revision 21074) @@ -6,7 +6,4 @@ #Removed existing files -rm $ISSM_DIR/src/m/enum/*.m -rm $ISSM_DIR/src/m/enum/*.py -rm $ISSM_DIR/src/m/enum/*.js rm $ISSM_DIR/src/c/shared/Enum/EnumToStringx.cpp rm $ISSM_DIR/src/c/shared/Enum/StringToEnumx.cpp @@ -181,83 +178,4 @@ #}}} -#Deal with Python Enums -#Build EnumDefinitions.py{{{ -cat < $ISSM_DIR/src/m/enum/EnumDefinitions.py -from StringToEnum import StringToEnum - -""" - -WARNING: DO NOT MODIFY THIS FILE -this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -Please read src/c/shared/Enum/README for more information - -""" - -END -#core -cat temp | awk '{print "def " $1"(): return StringToEnum(\"" substr($1,1,length($1)-4) "\")[0]"}' >> $ISSM_DIR/src/m/enum/EnumDefinitions.py -#}}} - -#Deal with Javascript Enums -#Build EnumDefinitions.js{{{ -cat < $ISSM_DIR/src/m/enum/EnumDefinitions.js -//WARNING: DO NOT MODIFY THIS FILE -//this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -//Please read src/c/shared/Enum/README for more information -END -#core -ENUM=0; -for NAMEENUM in $(cat temp); do - #Get name and enum of the line i - NAME=$(echo $NAMEENUM | sed -e "s/Enum//g") - echo "function ${NAME}Enum(){ return $ENUM;}" >> $ISSM_DIR/src/m/enum/EnumDefinitions.js - #offset Enum by one (Enum begins with 0 and not 1!) - let ENUM=$ENUM+1 -done -#}}} - -#Deal with Matlab Enums` -ENUM=0; - -for NAMEENUM in $(cat temp); do - - #Get name and enum of the line i - NAME=$(echo $NAMEENUM | sed -e "s/Enum//g") - #offset Enum by one (Enum begins with 0 and not 1!) - let ENUM=$ENUM+1 - - #print info {{{ - if [ $ENUM -lt 10 ] - then - printf "\r " - printf "\r $ENUM/$NUMENUMS Adding "$NAME"..." - else - if [ $ENUM -lt 100 ] - then - printf "\r " - printf "\r $ENUM/$NUMENUMS Adding "$NAME"..." - else - printf "\r " - printf "\r$ENUM/$NUMENUMS Adding "$NAME"..." - fi - fi - #}}} - #Add case to matlabenum file{{{ - cat < $ISSM_DIR"/src/m/enum/"$(echo $NAMEENUM".m") -function macro=$(echo $NAMEENUM)() -%$(echo $NAMEENUM | awk {'print toupper($1)'}) - Enum of $(echo $NAME) -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=$NAMEENUM() - -macro=StringToEnum('$NAME'); -END -#}}} - -done #clean up{{{ rm temp