Index: /issm/trunk-jpl/src/c/analyses/AdjointBalancethickness2Analysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/AdjointBalancethickness2Analysis.cpp (revision 18402) +++ /issm/trunk-jpl/src/c/analyses/AdjointBalancethickness2Analysis.cpp (revision 18403) @@ -52,5 +52,5 @@ IssmDouble NUMxUbar,NUMyUbar,DENUbar; IssmDouble vxobs,vyobs,vxobsbar,vyobsbar,vbarobs2,vbarobs; - IssmDouble nux,nuy,phi,dphi[2]; + IssmDouble nu,phi,dphi[2]; int *responses = NULL; IssmDouble *xyz_list = NULL; @@ -73,6 +73,5 @@ Input* vxobs_input = element->GetInput(BalancethicknessVxObsEnum); _assert_(vxobs_input); Input* vyobs_input = element->GetInput(BalancethicknessVyObsEnum); _assert_(vyobs_input); - Input* nux_input = element->GetInput(BalancethicknessNuxEnum); _assert_(nux_input); - Input* nuy_input = element->GetInput(BalancethicknessNuyEnum); _assert_(nuy_input); + Input* nu_input = element->GetInput(BalancethicknessNuEnum); _assert_(nu_input); /* Start looping on the number of gaussian points: */ @@ -87,14 +86,13 @@ vxobs_input->GetInputValue(&vxobs,gauss); vyobs_input->GetInputValue(&vyobs,gauss); - nux_input->GetInputValue(&nux,gauss); - nuy_input->GetInputValue(&nuy,gauss); + nu_input->GetInputValue(&nu,gauss); potential_input->GetInputValue(&phi,gauss); potential_input->GetInputDerivativeValue(&dphi[0],xyz_list,gauss); thicknessobs_input->GetInputValue(&hobs,gauss); - vxobsbar = nux*vxobs; - vyobsbar = nuy*vyobs; - - vbarobs2 = (nux*nux*vxobs*vxobs + nuy*nuy*vyobs*vyobs); + vxobsbar = nu*vxobs; + vyobsbar = nu*vyobs; + + vbarobs2 = (nu*nu*vxobs*vxobs + nu*nu*vyobs*vyobs); vbarobs = sqrt(vbarobs2); hu2 = hobs*hobs*vbarobs2; @@ -105,17 +103,27 @@ switch(responses[resp]){ + case IrrotationalH2MisfitEnum: + /*J = (H^2 - Hobs^2)^2*/ + for(i=0;ivalues[i]+=(NUMxH2+NUMyH2)/DENH2 *weight*Jdet*gauss->weight; + } + break; + case IrrotationalDirectionMisfitEnum: + /*J = 1/2 (vbar ^ gard(phi))^2*/ + for(i=0;ivalues[i]+= weight*Jdet*gauss->weight* + nu*nu*(vyobs*dphi[0] - vxobs*dphi[1])* + (vyobs*dbasis[0*numnodes+i] - vxobs*dbasis[1*numnodes+i]); + } + break; case Balancethickness2MisfitEnum: - /*J = (H^2 - Hobs^2)^2*/ - //for(i=0;ivalues[i]+=(NUMxH2+NUMyH2)/DENH2 *weight*Jdet*gauss->weight; - //} /*J = phi^2*/ //for(i=0;ivalues[i]+= phi*basis[i]*weight*Jdet*gauss->weight; //OK /*J = grad phi ^2*/ //for(i=0;ivalues[i]+= (dphi[0]*dbasis[0*numnodes+i] + dphi[1]*dbasis[1*numnodes+i])*weight*Jdet*gauss->weight; //OK - /*J = (ubar - nux*uobs)^2*/ + /*J = (ubar - nu*uobs)^2*/ //for(i=0;ivalues[i]+=(NUMxUbar-NUMyUbar)/DENUbar *weight*Jdet*gauss->weight; //} - /*J = 1/2 (vbar ^ gard(phi))^2*/ - for(i=0;ivalues[i]+= weight*Jdet*gauss->weight* - (nuy*vyobs*dphi[0] - nux*vxobs*dphi[1])* - (nuy*vyobs*dbasis[0*numnodes+i] - nux*vxobs*dbasis[1*numnodes+i]); - } - + _error_("Not implemented yet"); break; default: @@ -169,5 +171,28 @@ /*Deal with first part (partial derivative a J with respect to k)*/ for(resp=0;respGetVerticesCoordinates(&xyz_list); element->GradientIndexing(&vertexpidlist[0],control_index); - Input* adjoint_input = element->GetInput(AdjointEnum); _assert_(adjoint_input); - Input* weights_input = element->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input); + Input* adjoint_input = element->GetInput(AdjointEnum); _assert_(adjoint_input); Gauss* gauss=element->NewGauss(2); @@ -212,10 +234,9 @@ element->JacobianDeterminant(&Jdet,xyz_list,gauss); element->NodalFunctionsP1(basis,gauss); - weights_input->GetInputValue(&weight,gauss,Balancethickness2MisfitEnum); adjoint_input->GetInputValue(&lambda,gauss); /*Build gradient vector (actually -dJ/da): */ for(int i=0;iweight*basis[i]*lambda; + ge[i]+= - Jdet*gauss->weight*basis[i]*lambda; _assert_(!xIsNan(ge[i])); } @@ -230,10 +251,9 @@ delete gauss; }/*}}}*/ -void AdjointBalancethickness2Analysis::GradientJNux(Element* element,Vector* gradient,int control_index){/*{{{*/ +void AdjointBalancethickness2Analysis::GradientJ1Nu(Element* element,Vector* gradient,int control_index){/*{{{*/ /*Intermediaries*/ - IssmDouble Jdet,weight; - IssmDouble vxobs,vyobs,thicknessobs; - IssmDouble nux,nuy,dphi[2],dphinorm2,nuvobs2; + IssmDouble vxobs,vyobs,thicknessobs,weight; + IssmDouble nu,Jdet,dphi[2],dphinorm2,nuvobs2; IssmDouble *xyz_list= NULL; @@ -252,6 +272,5 @@ Input* vxobs_input = element->GetInput(BalancethicknessVxObsEnum); _assert_(vxobs_input); Input* vyobs_input = element->GetInput(BalancethicknessVyObsEnum); _assert_(vyobs_input); - Input* nux_input = element->GetInput(BalancethicknessNuxEnum); _assert_(nux_input); - Input* nuy_input = element->GetInput(BalancethicknessNuyEnum); _assert_(nuy_input); + Input* nu_input = element->GetInput(BalancethicknessNuEnum); _assert_(nu_input); Input* potential_input = element->GetInput(PotentialEnum); _assert_(potential_input); Input* thicknessobs_input=element->GetInput(InversionThicknessObsEnum);_assert_(thicknessobs_input); @@ -263,22 +282,18 @@ element->JacobianDeterminant(&Jdet,xyz_list,gauss); element->NodalFunctionsP1(basis,gauss); - weights_input->GetInputValue(&weight,gauss,Balancethickness2MisfitEnum); + weights_input->GetInputValue(&weight,gauss,IrrotationalH2MisfitEnum); vxobs_input->GetInputValue(&vxobs,gauss); vyobs_input->GetInputValue(&vyobs,gauss); - nux_input->GetInputValue(&nux,gauss); - nuy_input->GetInputValue(&nuy,gauss); + nu_input->GetInputValue(&nu,gauss); potential_input->GetInputDerivativeValue(&dphi[0],xyz_list,gauss); thicknessobs_input->GetInputValue(&thicknessobs,gauss); dphinorm2 = dphi[0]*dphi[0] + dphi[1]*dphi[1]; - nuvobs2 = nux*vxobs*nux*vxobs + nuy*vyobs*nuy*vyobs; + nuvobs2 = nu*nu*(vxobs*vxobs + vyobs*vyobs); /*Build gradient vector (actually -dJ/da): */ for(int i=0;iweight*(-vxobs)*dphi[1]*(nuy*vyobs*dphi[0] - nux*vxobs*dphi[1])*basis[i]; //THIS IS FOR Q//V - ge[i]+= - weight*Jdet*gauss->weight*basis[i]*( - -2.*nux*vxobs*vxobs*( - dphinorm2*dphinorm2 - thicknessobs*thicknessobs*dphinorm2*nuvobs2 - )/ ( (pow(nux,6)+pow(nuy,6))*pow(vxobs,6) + 3*(nux*vxobs*nuy*vyobs)*(nux*vxobs*nuy*vyobs)*nuvobs2) + ge[i]+= -weight*Jdet*gauss->weight*basis[i]*( + -2./pow(nu,3) * dphinorm2/(vxobs*vxobs + vyobs*vyobs) * (dphinorm2/nuvobs2 - thicknessobs*thicknessobs) ); _assert_(!xIsNan(ge[i])); @@ -294,10 +309,9 @@ delete gauss; }/*}}}*/ -void AdjointBalancethickness2Analysis::GradientJNuy(Element* element,Vector* gradient,int control_index){/*{{{*/ +void AdjointBalancethickness2Analysis::GradientJ2Nu(Element* element,Vector* gradient,int control_index){/*{{{*/ /*Intermediaries*/ - IssmDouble Jdet,weight; - IssmDouble vxobs,vyobs,thicknessobs; - IssmDouble nux,nuy,dphi[2],dphinorm2,nuvobs2; + IssmDouble vxobs,vyobs,thicknessobs,weight; + IssmDouble nu,Jdet,dphi[2],dphinorm2,nuvobs2; IssmDouble *xyz_list= NULL; @@ -313,12 +327,10 @@ element->GetVerticesCoordinates(&xyz_list); element->GradientIndexing(&vertexpidlist[0],control_index); - Input* weights_input = element->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input); - Input* vxobs_input = element->GetInput(BalancethicknessVxObsEnum); _assert_(vxobs_input); - Input* vyobs_input = element->GetInput(BalancethicknessVyObsEnum); _assert_(vyobs_input); - Input* nux_input = element->GetInput(BalancethicknessNuxEnum); _assert_(nux_input); - Input* nuy_input = element->GetInput(BalancethicknessNuyEnum); _assert_(nuy_input); - Input* potential_input = element->GetInput(PotentialEnum); _assert_(potential_input); - Input* thicknessobs_input = element->GetInput(InversionThicknessObsEnum);_assert_(thicknessobs_input); - + Input* weights_input = element->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input); + Input* vxobs_input = element->GetInput(BalancethicknessVxObsEnum); _assert_(vxobs_input); + Input* vyobs_input = element->GetInput(BalancethicknessVyObsEnum); _assert_(vyobs_input); + Input* nu_input = element->GetInput(BalancethicknessNuEnum); _assert_(nu_input); + Input* potential_input = element->GetInput(PotentialEnum); _assert_(potential_input); + Input* thicknessobs_input=element->GetInput(InversionThicknessObsEnum);_assert_(thicknessobs_input); Gauss* gauss=element->NewGauss(2); @@ -328,24 +340,17 @@ element->JacobianDeterminant(&Jdet,xyz_list,gauss); element->NodalFunctionsP1(basis,gauss); - weights_input->GetInputValue(&weight,gauss,Balancethickness2MisfitEnum); + weights_input->GetInputValue(&weight,gauss,IrrotationalDirectionMisfitEnum); vxobs_input->GetInputValue(&vxobs,gauss); vyobs_input->GetInputValue(&vyobs,gauss); - nux_input->GetInputValue(&nux,gauss); - nuy_input->GetInputValue(&nuy,gauss); + nu_input->GetInputValue(&nu,gauss); potential_input->GetInputDerivativeValue(&dphi[0],xyz_list,gauss); thicknessobs_input->GetInputValue(&thicknessobs,gauss); dphinorm2 = dphi[0]*dphi[0] + dphi[1]*dphi[1]; - nuvobs2 = nux*vxobs*nux*vxobs + nuy*vyobs*nuy*vyobs; - + nuvobs2 = nu*vxobs*nu*vxobs + nu*vyobs*nu*vyobs; /*Build gradient vector (actually -dJ/da): */ for(int i=0;iweight*(+vyobs)*dphi[0]*(nuy*vyobs*dphi[0] - nux*vxobs*dphi[1])*basis[i]; - ge[i]+= - weight*Jdet*gauss->weight*basis[i]*( - -2.*nuy*vyobs*vyobs*( - dphinorm2*dphinorm2 - thicknessobs*thicknessobs*dphinorm2*nuvobs2 - )/ ( (pow(nux,6)+pow(nuy,6))*pow(vyobs,6) + 3*(nux*vxobs*nuy*vyobs)*(nux*vxobs*nuy*vyobs)*nuvobs2) - ); + ge[i]+= - weight*Jdet*gauss->weight*nu*(vyobs*dphi[0] -vxobs*dphi[1])*(vyobs*dphi[0] -vxobs*dphi[1])*basis[i]; _assert_(!xIsNan(ge[i])); } Index: /issm/trunk-jpl/src/c/analyses/AdjointBalancethickness2Analysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/AdjointBalancethickness2Analysis.h (revision 18402) +++ /issm/trunk-jpl/src/c/analyses/AdjointBalancethickness2Analysis.h (revision 18403) @@ -29,6 +29,6 @@ void GradientJ(Vector* gradient,Element* element,int control_type,int control_index); void GradientJAdot(Element* element,Vector* gradient,int control_index); - void GradientJNux(Element* element,Vector* gradient,int control_index); - void GradientJNuy(Element* element,Vector* gradient,int control_index); + void GradientJ1Nu(Element* element,Vector* gradient,int control_index); + void GradientJ2Nu(Element* element,Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/AdjointBalancethicknessAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/AdjointBalancethicknessAnalysis.cpp (revision 18402) +++ /issm/trunk-jpl/src/c/analyses/AdjointBalancethicknessAnalysis.cpp (revision 18403) @@ -199,6 +199,5 @@ /*Intermediaries*/ - IssmDouble Jdet,weight; - IssmDouble thickness,Dlambda[3],dp[3]; + IssmDouble thickness,Jdet,Dlambda[3],dp[3]; IssmDouble *xyz_list= NULL; @@ -247,6 +246,5 @@ /*Intermediaries*/ - IssmDouble Jdet,weight; - IssmDouble thickness,Dlambda[3],dp[3]; + IssmDouble thickness,Jdet,Dlambda[3],dp[3]; IssmDouble *xyz_list= NULL; Index: /issm/trunk-jpl/src/c/analyses/Balancethickness2Analysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/Balancethickness2Analysis.cpp (revision 18402) +++ /issm/trunk-jpl/src/c/analyses/Balancethickness2Analysis.cpp (revision 18403) @@ -27,6 +27,5 @@ iomodel->FetchDataToInput(elements,BalancethicknessApparentMassbalanceEnum); - iomodel->FetchDataToInput(elements,BalancethicknessNuxEnum); - iomodel->FetchDataToInput(elements,BalancethicknessNuyEnum); + iomodel->FetchDataToInput(elements,BalancethicknessNuEnum); iomodel->FetchDataToInput(elements,BalancethicknessVxObsEnum); iomodel->FetchDataToInput(elements,BalancethicknessVyObsEnum); @@ -203,5 +202,5 @@ /*Intermediaries */ int Hinterpolation; - IssmDouble vx,vy,vbar,nux,nuy,normdphi,dphi[2]; + IssmDouble vx,vy,vbar,nu,normdphi,dphi[2]; IssmDouble* xyz_list = NULL; int * doflist = NULL; @@ -233,6 +232,5 @@ Input* vx_input = element->GetInput(BalancethicknessVxObsEnum); _assert_(vx_input); Input* vy_input = element->GetInput(BalancethicknessVyObsEnum); _assert_(vy_input); - Input* nux_input = element->GetInput(BalancethicknessNuxEnum); _assert_(nux_input); - Input* nuy_input = element->GetInput(BalancethicknessNuyEnum); _assert_(nuy_input); + Input* nu_input = element->GetInput(BalancethicknessNuEnum); _assert_(nu_input); switch(element->GetElementType()){ @@ -247,9 +245,8 @@ vx_input->GetInputValue(&vx,gauss); vy_input->GetInputValue(&vy,gauss); - nux_input->GetInputValue(&nux,gauss); - nuy_input->GetInputValue(&nuy,gauss); + nu_input->GetInputValue(&nu,gauss); potential_input->GetInputDerivativeValue(&dphi[0],xyz_list,gauss); - vx = vx*nux; vy = vy*nuy; + vx = vx*nu; vy = vy*nu; vbar = sqrt(vx*vx + vy*vy) + 1.e-10; normdphi = sqrt(dphi[0]*dphi[0] + dphi[1]*dphi[1]); Index: /issm/trunk-jpl/src/c/classes/Elements/Element.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 18402) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 18403) @@ -1054,6 +1054,5 @@ name==BalancethicknessThickeningRateEnum || name==BalancethicknessApparentMassbalanceEnum || - name==BalancethicknessNuxEnum || - name==BalancethicknessNuyEnum || + name==BalancethicknessNuEnum || name==SigmaNNEnum || name==SurfaceSlopeXEnum || Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 18402) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 18403) @@ -1032,6 +1032,5 @@ case ThicknessEnum: case FrictionCoefficientEnum: - case BalancethicknessNuxEnum: - case BalancethicknessNuyEnum: + case BalancethicknessNuEnum: if(iomodel->Data(control)){ for(j=0;jData(control)[tria_vertex_ids[j]-1]; Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 18402) +++ /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 18403) @@ -592,5 +592,10 @@ case DragCoefficientAbsGradientEnum:DragCoefficientAbsGradientx(&double_result,elements,nodes,vertices,loads,materials,parameters); break; case BalancethicknessMisfitEnum: BalancethicknessMisfitx(&double_result); break; - case Balancethickness2MisfitEnum: Balancethickness2Misfitx(&double_result); break; + case Balancethickness2MisfitEnum: Balancethickness2Misfitx(&double_result); break; + case IrrotationalH2MisfitEnum: IrrotationalH2Misfitx(&double_result); break; + case IrrotationalDirectionMisfitEnum: IrrotationalDirectionMisfitx(&double_result); break; + case IrrotationalVelMisfitEnum: IrrotationalVelMisfitx(&double_result); break; + case IrrotationalAlongGradientNuEnum: IrrotationalAlongGradientNux(&double_result); break; + case IrrotationalAcrossGradientNuEnum: IrrotationalAcrossGradientNux(&double_result); break; /*Vector */ @@ -1305,5 +1310,5 @@ IssmDouble weight,thicknessobs,thickness,potential,dpotential[2]; - IssmDouble vx,vy,vxbar,vybar,vxobs,vyobs,vxbarobs,vybarobs,nux,nuy; + IssmDouble vx,vy,vxbar,vybar,vxobs,vyobs,vxbarobs,vybarobs,nu; IssmDouble Jdet; IssmDouble* xyz_list = NULL; @@ -1326,6 +1331,5 @@ Input* vx_input =element->GetInput(VxEnum); _assert_(vx_input); Input* vy_input =element->GetInput(VyEnum); _assert_(vy_input); - Input* nux_input = element->GetInput(BalancethicknessNuxEnum); _assert_(nux_input); - Input* nuy_input = element->GetInput(BalancethicknessNuyEnum); _assert_(nuy_input); + Input* nu_input = element->GetInput(BalancethicknessNuEnum); _assert_(nu_input); /* Start looping on the number of gaussian points: */ @@ -1348,9 +1352,8 @@ vx_input->GetInputValue(&vxbar,gauss); vy_input->GetInputValue(&vybar,gauss); - nux_input->GetInputValue(&nux,gauss); - nuy_input->GetInputValue(&nuy,gauss); - - vxbarobs = nux*vxobs; - vybarobs = nuy*vyobs; + nu_input->GetInputValue(&nu,gauss); + + vxbarobs = nu*vxobs; + vybarobs = nu*vyobs; /*J = (H^2 - Hobs^2)^2*/ @@ -1379,4 +1382,124 @@ *presponse=J; +}/*}}}*/ +void FemModel::IrrotationalH2Misfitx(IssmDouble* presponse){/*{{{*/ + + /*output: */ + IssmDouble J=0.; + IssmDouble J_sum; + + IssmDouble weight,thicknessobs,thickness; + IssmDouble Jdet; + IssmDouble* xyz_list = NULL; + + /*Compute Misfit: */ + for(int i=0;iSize();i++){ + Element* element=dynamic_cast(elements->GetObjectByOffset(i)); + + /*If on water, return 0: */ + if(!element->IsIceInElement()) continue; + + /* Get node coordinates*/ + element->GetVerticesCoordinates(&xyz_list); + Input* weights_input =element->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input); + Input* thickness_input =element->GetInput(ThicknessEnum); _assert_(thickness_input); + Input* thicknessobs_input=element->GetInput(InversionThicknessObsEnum); _assert_(thicknessobs_input); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + + /*Get all parameters at gaussian point*/ + weights_input->GetInputValue(&weight,gauss,IrrotationalH2MisfitEnum); + thickness_input->GetInputValue(&thickness,gauss); + thicknessobs_input->GetInputValue(&thicknessobs,gauss); + + /*J = (H^2 - Hobs^2)^2*/ + J +=0.5*(thickness*thickness - thicknessobs*thicknessobs)*(thickness*thickness - thicknessobs*thicknessobs)*weight*Jdet*gauss->weight; + } + + /*clean up and Return: */ + xDelete(xyz_list); + delete gauss; + } + + /*Sum all J from all cpus of the cluster:*/ + ISSM_MPI_Reduce (&J,&J_sum,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,0,IssmComm::GetComm() ); + ISSM_MPI_Bcast(&J_sum,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm()); + J=J_sum; + + /*Assign output pointers: */ + *presponse=J; + +}/*}}}*/ +void FemModel::IrrotationalDirectionMisfitx(IssmDouble* presponse){/*{{{*/ + + /*output: */ + IssmDouble J=0.; + IssmDouble J_sum; + + IssmDouble weight,thicknessobs,thickness,dpotential[2]; + IssmDouble vx,vy,vxobs,vyobs,nu; + IssmDouble Jdet; + IssmDouble* xyz_list = NULL; + + /*Compute Misfit: */ + for(int i=0;iSize();i++){ + Element* element=dynamic_cast(elements->GetObjectByOffset(i)); + + /*If on water, return 0: */ + if(!element->IsIceInElement()) continue; + + /* Get node coordinates*/ + element->GetVerticesCoordinates(&xyz_list); + Input* weights_input =element->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input); + Input* potential_input =element->GetInput(PotentialEnum); _assert_(potential_input); + Input* vxobs_input =element->GetInput(BalancethicknessVxObsEnum); _assert_(vxobs_input); + Input* vyobs_input =element->GetInput(BalancethicknessVyObsEnum); _assert_(vyobs_input); + Input* nu_input = element->GetInput(BalancethicknessNuEnum); _assert_(nu_input); + + /* Start looping on the number of gaussian points: */ + Gauss* gauss=element->NewGauss(2); + for(int ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); + element->JacobianDeterminant(&Jdet,xyz_list,gauss); + + /*Get all parameters at gaussian point*/ + weights_input->GetInputValue(&weight,gauss,IrrotationalDirectionMisfitEnum); + potential_input->GetInputDerivativeValue(&dpotential[0],xyz_list,gauss); + vxobs_input->GetInputValue(&vxobs,gauss); + vyobs_input->GetInputValue(&vyobs,gauss); + nu_input->GetInputValue(&nu,gauss); + + /*J = 1/2 (vbar ^ gard(phi))^2*/ + J += 0.5*(nu*vyobs*dpotential[0] - nu*vxobs*dpotential[1])*(nu*vyobs*dpotential[0] - nu*vxobs*dpotential[1])*weight*Jdet*gauss->weight; + } + + /*clean up and Return: */ + xDelete(xyz_list); + delete gauss; + } + + /*Sum all J from all cpus of the cluster:*/ + ISSM_MPI_Reduce (&J,&J_sum,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,0,IssmComm::GetComm() ); + ISSM_MPI_Bcast(&J_sum,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm()); + J=J_sum; + + /*Assign output pointers: */ + *presponse=J; + +}/*}}}*/ +void FemModel::IrrotationalVelMisfitx(IssmDouble* presponse){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void FemModel::IrrotationalAlongGradientNux(IssmDouble* presponse){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +void FemModel::IrrotationalAcrossGradientNux(IssmDouble* presponse){/*{{{*/ + _error_("not implemented yet"); }/*}}}*/ void FemModel::ThicknessAbsGradientx( IssmDouble* pJ){/*{{{*/ Index: /issm/trunk-jpl/src/c/classes/FemModel.h =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.h (revision 18402) +++ /issm/trunk-jpl/src/c/classes/FemModel.h (revision 18403) @@ -81,4 +81,9 @@ void BalancethicknessMisfitx(IssmDouble* pV); void Balancethickness2Misfitx(IssmDouble* pV); + void IrrotationalH2Misfitx(IssmDouble* pV); + void IrrotationalDirectionMisfitx(IssmDouble* pV); + void IrrotationalVelMisfitx(IssmDouble* pV); + void IrrotationalAlongGradientNux(IssmDouble* pV); + void IrrotationalAcrossGradientNux(IssmDouble* pV); #ifdef _HAVE_DAKOTA_ void DakotaResponsesx(double* d_responses,char** responses_descriptors,int numresponsedescriptors,int d_numresponses); Index: /issm/trunk-jpl/src/c/cores/controlvalidation_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/controlvalidation_core.cpp (revision 18402) +++ /issm/trunk-jpl/src/c/cores/controlvalidation_core.cpp (revision 18403) @@ -12,6 +12,8 @@ int solution_type,n; + int num_responses; IssmDouble j0,j; IssmDouble Ialpha,exponent,alpha; + IssmDouble* jlist = NULL; IssmDouble *G = NULL; IssmDouble *X = NULL; @@ -25,4 +27,5 @@ femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum); femmodel->parameters->SetParam(false,SaveResultsEnum); + femmodel->parameters->FindParam(&num_responses,InversionNumCostFunctionsEnum); /*Get initial guess*/ @@ -45,6 +48,14 @@ if(VerboseControl()) _printf0_(" Compute Adjoint\n"); adjointcore(femmodel); + if(VerboseControl()) _printf0_(" Compute Initial cost function\n"); - femmodel->CostFunctionx(&j0,NULL,NULL); + femmodel->CostFunctionx(&j0,&jlist,NULL); + _printf0_("Initial J(x+dk) | List of contributions\n"); + _printf0_("_____________________________________________\n"); + _printf0_("J(x) = "<(jlist); + if(VerboseControl()) _printf0_(" Compute Gradient\n"); Gradjx(&G,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); @@ -95,4 +106,6 @@ femmodel->results->AddObject(new GenericExternalResult(femmodel->results->Size()+1,JEnum,output,num,2,1,0)); #endif + ControlInputSetGradientx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,G); + femmodel->OutputControlsx(&femmodel->results); /*Clean up and return*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (revision 18402) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (revision 18403) @@ -41,6 +41,5 @@ case ThicknessEnum: case FrictionCoefficientEnum: - case BalancethicknessNuxEnum: - case BalancethicknessNuyEnum: + case BalancethicknessNuEnum: case BalancethicknessApparentMassbalanceEnum: iomodel->FetchData(1,control); Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 18402) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 18403) @@ -301,6 +301,10 @@ BalancethicknessApparentMassbalanceEnum, Balancethickness2MisfitEnum, - BalancethicknessNuxEnum, - BalancethicknessNuyEnum, + IrrotationalH2MisfitEnum, + IrrotationalDirectionMisfitEnum, + IrrotationalVelMisfitEnum, + IrrotationalAlongGradientNuEnum, + IrrotationalAcrossGradientNuEnum, + BalancethicknessNuEnum, BalancethicknessVxObsEnum, BalancethicknessVyObsEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 18402) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 18403) @@ -309,6 +309,10 @@ case BalancethicknessApparentMassbalanceEnum : return "BalancethicknessApparentMassbalance"; case Balancethickness2MisfitEnum : return "Balancethickness2Misfit"; - case BalancethicknessNuxEnum : return "BalancethicknessNux"; - case BalancethicknessNuyEnum : return "BalancethicknessNuy"; + case IrrotationalH2MisfitEnum : return "IrrotationalH2Misfit"; + case IrrotationalDirectionMisfitEnum : return "IrrotationalDirectionMisfit"; + case IrrotationalVelMisfitEnum : return "IrrotationalVelMisfit"; + case IrrotationalAlongGradientNuEnum : return "IrrotationalAlongGradientNu"; + case IrrotationalAcrossGradientNuEnum : return "IrrotationalAcrossGradientNu"; + case BalancethicknessNuEnum : return "BalancethicknessNu"; case BalancethicknessVxObsEnum : return "BalancethicknessVxObs"; case BalancethicknessVyObsEnum : return "BalancethicknessVyObs"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 18402) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 18403) @@ -315,6 +315,10 @@ else if (strcmp(name,"BalancethicknessApparentMassbalance")==0) return BalancethicknessApparentMassbalanceEnum; else if (strcmp(name,"Balancethickness2Misfit")==0) return Balancethickness2MisfitEnum; - else if (strcmp(name,"BalancethicknessNux")==0) return BalancethicknessNuxEnum; - else if (strcmp(name,"BalancethicknessNuy")==0) return BalancethicknessNuyEnum; + else if (strcmp(name,"IrrotationalH2Misfit")==0) return IrrotationalH2MisfitEnum; + else if (strcmp(name,"IrrotationalDirectionMisfit")==0) return IrrotationalDirectionMisfitEnum; + else if (strcmp(name,"IrrotationalVelMisfit")==0) return IrrotationalVelMisfitEnum; + else if (strcmp(name,"IrrotationalAlongGradientNu")==0) return IrrotationalAlongGradientNuEnum; + else if (strcmp(name,"IrrotationalAcrossGradientNu")==0) return IrrotationalAcrossGradientNuEnum; + else if (strcmp(name,"BalancethicknessNu")==0) return BalancethicknessNuEnum; else if (strcmp(name,"BalancethicknessVxObs")==0) return BalancethicknessVxObsEnum; else if (strcmp(name,"BalancethicknessVyObs")==0) return BalancethicknessVyObsEnum; @@ -379,12 +383,12 @@ else if (strcmp(name,"HydrologyShreveAnalysis")==0) return HydrologyShreveAnalysisEnum; else if (strcmp(name,"HydrologyDCInefficientAnalysis")==0) return HydrologyDCInefficientAnalysisEnum; - else if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum; + else stage=4; + } + if(stage==4){ + if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum; else if (strcmp(name,"HydrologySolution")==0) return HydrologySolutionEnum; else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum; else if (strcmp(name,"MasstransportAnalysis")==0) return MasstransportAnalysisEnum; - else stage=4; - } - if(stage==4){ - if (strcmp(name,"MasstransportSolution")==0) return MasstransportSolutionEnum; + else if (strcmp(name,"MasstransportSolution")==0) return MasstransportSolutionEnum; else if (strcmp(name,"FreeSurfaceBaseAnalysis")==0) return FreeSurfaceBaseAnalysisEnum; else if (strcmp(name,"FreeSurfaceTopAnalysis")==0) return FreeSurfaceTopAnalysisEnum; @@ -502,12 +506,12 @@ else if (strcmp(name,"Converged")==0) return ConvergedEnum; else if (strcmp(name,"Fill")==0) return FillEnum; - else if (strcmp(name,"FractionIncrement")==0) return FractionIncrementEnum; + else stage=5; + } + if(stage==5){ + if (strcmp(name,"FractionIncrement")==0) return FractionIncrementEnum; else if (strcmp(name,"Friction")==0) return FrictionEnum; else if (strcmp(name,"Internal")==0) return InternalEnum; else if (strcmp(name,"MassFlux")==0) return MassFluxEnum; - else stage=5; - } - if(stage==5){ - if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum; + else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum; else if (strcmp(name,"Misfit")==0) return MisfitEnum; else if (strcmp(name,"Pressure")==0) return PressureEnum; @@ -625,12 +629,12 @@ else if (strcmp(name,"MisfitObservation")==0) return MisfitObservationEnum; else if (strcmp(name,"MisfitObservationEnum")==0) return MisfitObservationEnumEnum; - else if (strcmp(name,"MisfitTimeinterpolation")==0) return MisfitTimeinterpolationEnum; + else stage=6; + } + if(stage==6){ + if (strcmp(name,"MisfitTimeinterpolation")==0) return MisfitTimeinterpolationEnum; else if (strcmp(name,"MisfitWeights")==0) return MisfitWeightsEnum; else if (strcmp(name,"MisfitWeightsEnum")==0) return MisfitWeightsEnumEnum; else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum; - else stage=6; - } - if(stage==6){ - if (strcmp(name,"WeightsSurfaceObservation")==0) return WeightsSurfaceObservationEnum; + else if (strcmp(name,"WeightsSurfaceObservation")==0) return WeightsSurfaceObservationEnum; else if (strcmp(name,"MinVel")==0) return MinVelEnum; else if (strcmp(name,"MaxVel")==0) return MaxVelEnum; Index: /issm/trunk-jpl/src/m/classes/balancethickness2.m =================================================================== --- /issm/trunk-jpl/src/m/classes/balancethickness2.m (revision 18402) +++ /issm/trunk-jpl/src/m/classes/balancethickness2.m (revision 18403) @@ -8,6 +8,5 @@ spcpotential = NaN; apparent_massbalance = NaN; - nux = NaN; - nuy = NaN; + nu = NaN; vx_obs = NaN; vy_obs = NaN; @@ -32,6 +31,5 @@ md = checkfield(md,'fieldname','balancethickness.spcpotential','size',[md.mesh.numberofvertices 1]); md = checkfield(md,'fieldname','balancethickness.apparent_massbalance','size',[md.mesh.numberofvertices 1],'NaN',1); - md = checkfield(md,'fieldname','balancethickness.nux','size',[md.mesh.numberofvertices 1],'NaN',1,'>',0,'<=',1); - md = checkfield(md,'fieldname','balancethickness.nuy','size',[md.mesh.numberofvertices 1],'NaN',1,'>',0,'<=',1); + md = checkfield(md,'fieldname','balancethickness.nu','size',[md.mesh.numberofvertices 1],'NaN',1,'>',0,'<=',1); md = checkfield(md,'fieldname','balancethickness.vx_obs','size',[md.mesh.numberofvertices 1],'NaN',1); md = checkfield(md,'fieldname','balancethickness.vy_obs','size',[md.mesh.numberofvertices 1],'NaN',1); @@ -43,6 +41,5 @@ fielddisplay(obj,'spcpotential','potential constraints (NaN means no constraint)'); fielddisplay(obj,'apparent_massbalance','Apparent mass balance [m/yr]'); - fielddisplay(obj,'nux','vx_bar = nux vx_s (in ]0 1])'); - fielddisplay(obj,'nuy','vy_bar = nuy vy_s (in ]0 1])'); + fielddisplay(obj,'nu','v_bar = nu v_s (in ]0 1])'); fielddisplay(obj,'vx_obs','observed vx'); fielddisplay(obj,'vy_obs','observed vy'); @@ -53,8 +50,12 @@ WriteData(fid,'object',obj,'class','Balancethickness','fieldname','spcpotential','format','DoubleMat','mattype',1); WriteData(fid,'object',obj,'class','Balancethickness','fieldname','apparent_massbalance','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'class','Balancethickness','fieldname','nux','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'class','Balancethickness','fieldname','nuy','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'class','Balancethickness','fieldname','vx_obs','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'class','Balancethickness','fieldname','vy_obs','format','DoubleMat','mattype',1); + WriteData(fid,'object',obj,'class','Balancethickness','fieldname','nu','format','DoubleMat','mattype',1); + if(numel(obj.vx_obs)==md.mesh.numberofelements), + mattype=2; + else + mattype=1; + end + WriteData(fid,'object',obj,'class','Balancethickness','fieldname','vx_obs','format','DoubleMat','mattype',mattype); + WriteData(fid,'object',obj,'class','Balancethickness','fieldname','vy_obs','format','DoubleMat','mattype',mattype); WriteData(fid,'object',obj,'class','Balancethickness','fieldname','thickness_obs','format','DoubleMat','mattype',1); end % }}} Index: /issm/trunk-jpl/src/m/classes/inversion.m =================================================================== --- /issm/trunk-jpl/src/m/classes/inversion.m (revision 18402) +++ /issm/trunk-jpl/src/m/classes/inversion.m (revision 18403) @@ -132,5 +132,6 @@ md = checkfield(md,'fieldname','inversion.incomplete_adjoint','values',[0 1]); md = checkfield(md,'fieldname','inversion.control_parameters','cell',1,'values',... - {'BalancethicknessThickeningRate' 'FrictionCoefficient' 'MaterialsRheologyBbar' 'DamageDbar' 'Vx' 'Vy' 'Thickness' 'BalancethicknessNux' 'BalancethicknessNuy' 'BalancethicknessApparentMassbalance'}); + {'BalancethicknessThickeningRate' 'FrictionCoefficient' 'MaterialsRheologyBbar' 'DamageDbar' 'Vx' 'Vy' 'Thickness',... + 'BalancethicknessNux' 'BalancethicknessNuy' 'BalancethicknessApparentMassbalance'}); md = checkfield(md,'fieldname','inversion.nsteps','numel',1,'>=',0); md = checkfield(md,'fieldname','inversion.maxiter_per_step','size',[md.inversion.nsteps 1],'>=',0); Index: /issm/trunk-jpl/src/m/classes/inversionvalidation.m =================================================================== --- /issm/trunk-jpl/src/m/classes/inversionvalidation.m (revision 18402) +++ /issm/trunk-jpl/src/m/classes/inversionvalidation.m (revision 18403) @@ -53,6 +53,7 @@ md = checkfield(md,'fieldname','inversion.incomplete_adjoint','values',[0 1]); md = checkfield(md,'fieldname','inversion.control_parameters','cell',1,'values',... - {'BalancethicknessThickeningRate' 'FrictionCoefficient' 'MaterialsRheologyBbar' 'MaterialsRheologyZbar' 'Vx' 'Vy' 'Thickness' 'BalancethicknessApparentMassbalance'}); - md = checkfield(md,'fieldname','inversion.cost_functions','size',[1 num_costfunc],'values',[101:105 201 501:507]); + {'BalancethicknessThickeningRate' 'FrictionCoefficient' 'MaterialsRheologyBbar' 'DamageDbar' 'Vx' 'Vy' 'Thickness',... + 'BalancethicknessNu' 'BalancethicknessApparentMassbalance'}); + md = checkfield(md,'fieldname','inversion.cost_functions','size',[1 num_costfunc],'values',[101:105 201 501:506 601:604]); md = checkfield(md,'fieldname','inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices num_costfunc],'>=',0); md = checkfield(md,'fieldname','inversion.min_parameters','size',[md.mesh.numberofvertices num_controls]); @@ -139,5 +140,9 @@ pos=find(obj.cost_functions==505); data(pos)=ThicknessAcrossGradientEnum(); pos=find(obj.cost_functions==506); data(pos)=BalancethicknessMisfitEnum(); - pos=find(obj.cost_functions==507); data(pos)=Balancethickness2MisfitEnum(); + pos=find(obj.cost_functions==601); data(pos)=IrrotationalH2MisfitEnum(); + pos=find(obj.cost_functions==602); data(pos)=IrrotationalDirectionMisfitEnum(); + pos=find(obj.cost_functions==603); data(pos)=IrrotationalVelMisfitEnum(); + pos=find(obj.cost_functions==604); data(pos)=IrrotationalAlongGradientNuEnum(); + pos=find(obj.cost_functions==605); data(pos)=IrrotationalAcrossGradientNuEnum(); WriteData(fid,'data',data,'enum',InversionCostFunctionsEnum(),'format','DoubleMat','mattype',3); WriteData(fid,'data',num_cost_functions,'enum',InversionNumCostFunctionsEnum(),'format','Integer'); Index: /issm/trunk-jpl/src/m/enum/BalancethicknessNuEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/BalancethicknessNuEnum.m (revision 18403) +++ /issm/trunk-jpl/src/m/enum/BalancethicknessNuEnum.m (revision 18403) @@ -0,0 +1,11 @@ +function macro=BalancethicknessNuEnum() +%BALANCETHICKNESSNUENUM - Enum of BalancethicknessNu +% +% 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=BalancethicknessNuEnum() + +macro=StringToEnum('BalancethicknessNu'); Index: sm/trunk-jpl/src/m/enum/BalancethicknessNuxEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/BalancethicknessNuxEnum.m (revision 18402) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=BalancethicknessNuxEnum() -%BALANCETHICKNESSNUXENUM - Enum of BalancethicknessNux -% -% 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=BalancethicknessNuxEnum() - -macro=StringToEnum('BalancethicknessNux'); Index: sm/trunk-jpl/src/m/enum/BalancethicknessNuyEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/BalancethicknessNuyEnum.m (revision 18402) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=BalancethicknessNuyEnum() -%BALANCETHICKNESSNUYENUM - Enum of BalancethicknessNuy -% -% 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=BalancethicknessNuyEnum() - -macro=StringToEnum('BalancethicknessNuy'); Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 18402) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 18403) @@ -301,6 +301,10 @@ def BalancethicknessApparentMassbalanceEnum(): return StringToEnum("BalancethicknessApparentMassbalance")[0] def Balancethickness2MisfitEnum(): return StringToEnum("Balancethickness2Misfit")[0] -def BalancethicknessNuxEnum(): return StringToEnum("BalancethicknessNux")[0] -def BalancethicknessNuyEnum(): return StringToEnum("BalancethicknessNuy")[0] +def IrrotationalH2MisfitEnum(): return StringToEnum("IrrotationalH2Misfit")[0] +def IrrotationalDirectionMisfitEnum(): return StringToEnum("IrrotationalDirectionMisfit")[0] +def IrrotationalVelMisfitEnum(): return StringToEnum("IrrotationalVelMisfit")[0] +def IrrotationalAlongGradientNuEnum(): return StringToEnum("IrrotationalAlongGradientNu")[0] +def IrrotationalAcrossGradientNuEnum(): return StringToEnum("IrrotationalAcrossGradientNu")[0] +def BalancethicknessNuEnum(): return StringToEnum("BalancethicknessNu")[0] def BalancethicknessVxObsEnum(): return StringToEnum("BalancethicknessVxObs")[0] def BalancethicknessVyObsEnum(): return StringToEnum("BalancethicknessVyObs")[0] Index: /issm/trunk-jpl/src/m/enum/IrrotationalAcrossGradientNuEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/IrrotationalAcrossGradientNuEnum.m (revision 18403) +++ /issm/trunk-jpl/src/m/enum/IrrotationalAcrossGradientNuEnum.m (revision 18403) @@ -0,0 +1,11 @@ +function macro=IrrotationalAcrossGradientNuEnum() +%IRROTATIONALACROSSGRADIENTNUENUM - Enum of IrrotationalAcrossGradientNu +% +% 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=IrrotationalAcrossGradientNuEnum() + +macro=StringToEnum('IrrotationalAcrossGradientNu'); Index: /issm/trunk-jpl/src/m/enum/IrrotationalAlongGradientNuEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/IrrotationalAlongGradientNuEnum.m (revision 18403) +++ /issm/trunk-jpl/src/m/enum/IrrotationalAlongGradientNuEnum.m (revision 18403) @@ -0,0 +1,11 @@ +function macro=IrrotationalAlongGradientNuEnum() +%IRROTATIONALALONGGRADIENTNUENUM - Enum of IrrotationalAlongGradientNu +% +% 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=IrrotationalAlongGradientNuEnum() + +macro=StringToEnum('IrrotationalAlongGradientNu'); Index: /issm/trunk-jpl/src/m/enum/IrrotationalDirectionMisfitEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/IrrotationalDirectionMisfitEnum.m (revision 18403) +++ /issm/trunk-jpl/src/m/enum/IrrotationalDirectionMisfitEnum.m (revision 18403) @@ -0,0 +1,11 @@ +function macro=IrrotationalDirectionMisfitEnum() +%IRROTATIONALDIRECTIONMISFITENUM - Enum of IrrotationalDirectionMisfit +% +% 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=IrrotationalDirectionMisfitEnum() + +macro=StringToEnum('IrrotationalDirectionMisfit'); Index: /issm/trunk-jpl/src/m/enum/IrrotationalH2MisfitEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/IrrotationalH2MisfitEnum.m (revision 18403) +++ /issm/trunk-jpl/src/m/enum/IrrotationalH2MisfitEnum.m (revision 18403) @@ -0,0 +1,11 @@ +function macro=IrrotationalH2MisfitEnum() +%IRROTATIONALH2MISFITENUM - Enum of IrrotationalH2Misfit +% +% 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=IrrotationalH2MisfitEnum() + +macro=StringToEnum('IrrotationalH2Misfit'); Index: /issm/trunk-jpl/src/m/enum/IrrotationalVelMisfitEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/IrrotationalVelMisfitEnum.m (revision 18403) +++ /issm/trunk-jpl/src/m/enum/IrrotationalVelMisfitEnum.m (revision 18403) @@ -0,0 +1,11 @@ +function macro=IrrotationalVelMisfitEnum() +%IRROTATIONALVELMISFITENUM - Enum of IrrotationalVelMisfit +% +% 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=IrrotationalVelMisfitEnum() + +macro=StringToEnum('IrrotationalVelMisfit');