Changeset 15626

Timestamp:

07/25/13 16:24:46 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: forgot to account for isSIA in coupling flag

File:

• issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp

@@ -17 +17 @@
         IssmDouble rho_ice;
         IssmDouble FSreconditioning;
-        bool       isSSA,isL1L2,isHO,isFS,iscoupling;
+        bool       isSIA,isSSA,isL1L2,isHO,isFS,iscoupling;
         bool       spcpresent = false;
         int        Mx,Nx;
@@ -46 +46 @@
         iomodel->Constant(&rho_ice,MaterialsRhoIceEnum);
         iomodel->Constant(&FSreconditioning,DiagnosticFSreconditioningEnum);
+        iomodel->Constant(&isSIA,FlowequationIsSIAEnum);
         iomodel->Constant(&isSSA,FlowequationIsSSAEnum);
         iomodel->Constant(&isL1L2,FlowequationIsL1L2Enum);
@@ -61 +62 @@
 
         /*Do we have coupling*/
-        if( (isSSA?1.:0.) + (isL1L2?1.:0.) + (isHO?1.:0.) + (isFS?1.:0.) >1.)
+        if((isSIA?1.:0.) + (isSSA?1.:0.) + (isL1L2?1.:0.) + (isHO?1.:0.) + (isFS?1.:0.) >1.)
          iscoupling = true;
         else