Changeset 22159 for issm/branches/trunk-larour-NatGeoScience2016/src/c/analyses/SealevelriseAnalysis.cpp

Timestamp:

10/10/17 08:23:38 (8 years ago)

Author:

Eric.Larour

Message:

CHG: divers bug fixes

File:

• issm/branches/trunk-larour-NatGeoScience2016/src/c/analyses/SealevelriseAnalysis.cpp (modified) (4 diffs)

issm/branches/trunk-larour-NatGeoScience2016/src/c/analyses/SealevelriseAnalysis.cpp

@@ -38 +38 @@
         iomodel->FetchData(&geodetic,"md.slr.geodetic");
         if (geodetic){
-                iomodel->FetchDataToInput(elements,"md.mask.ocean_levelset",MaskOceanLevelsetEnum);
-                iomodel->FetchDataToInput(elements,"md.mask.land_levelset",MaskLandLevelsetEnum);
+                char* masktype=NULL;
+                iomodel->FetchData(&masktype,"md.mask.type");
+                if (strcmp(masktype,"maskpsl")==0){
+                        iomodel->FetchDataToInput(elements,"md.mask.ocean_levelset",MaskOceanLevelsetEnum);
+                        iomodel->FetchDataToInput(elements,"md.mask.land_levelset",MaskLandLevelsetEnum);
+                }
+                xDelete<char>(masktype);
         }
         iomodel->FetchDataToInput(elements,"md.slr.deltathickness",SealevelriseDeltathicknessEnum);
@@ -46 +51 @@
         iomodel->FetchDataToInput(elements,"md.geometry.bed",BedEnum);
 
-        /*Initialize cumdeltalthickness input: unfortunately, we don't have femmodel, so we need to iterate on 
-         *elements, otherwise we would have used InputUpdateFromConstantx: */
+        /*Initialize cumdeltalthickness and sealevel rise rate input: unfortunately, we don't have femmodel, so we 
+         * need to iterate on elements, otherwise we would have used InputUpdateFromConstantx: */
         counter=0;
         for(int i=0;i<iomodel->numberofelements;i++){
@@ -53 +58 @@
                         Element* element=(Element*)elements->GetObjectByOffset(counter);
                         element->InputUpdateFromConstant(0.0,SealevelriseCumDeltathicknessEnum);
+                        element->InputUpdateFromConstant(0.0,SealevelRateEnum);
+                        element->InputUpdateFromConstant(0.0,SealevelUmotionRateEnum);
                         counter++;
                 }
@@ -269 +276 @@
 }/*}}}*/
 void           SealevelriseAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/
-        
-        IssmDouble *deltaS  = NULL;
-        IssmDouble *S  = NULL;
-        int*        sidlist = NULL;
-        int         numvertices;
-        
-        numvertices= element->GetNumberOfVertices();
-        sidlist=xNew<int>(numvertices);
-        
-        element->GetVerticesSidList(sidlist);
-
-        deltaS = xNew<IssmDouble>(numvertices);
-        for(int i=0;i<numvertices;i++){
-                deltaS[i]=solution[sidlist[i]];
-        }
-
-        S = xNew<IssmDouble>(numvertices);
-        element->GetInputListOnVertices(S,SealevelEnum,0);
-
-        /*Add deltaS to S:*/
-        for (int i=0;i<numvertices;i++)S[i]+=deltaS[i];
-
-        /*Add S back into inputs: */
-        element->AddInput(SealevelEnum,S,P1Enum);
-
-        /*Free ressources:*/
-        xDelete<int>(sidlist);
-        xDelete<IssmDouble>(deltaS);
-        xDelete<IssmDouble>(S);
+        _error_("not implemeneted yet!");
 
 }/*}}}*/