Changeset 22166

Timestamp:

10/11/17 09:40:30 (7 years ago)

Author:

Eric.Larour

Message:

CHG:diverse bug fixes

Location:

issm/branches/trunk-larour-NatGeoScience2016/src/c

Files:

• analyses/SealevelriseAnalysis.cpp (modified) (1 diff)
• cores/sealevelrise_core.cpp (modified) (7 diffs)

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

@@ -62 +62 @@
                         element->InputUpdateFromConstant(0.0,SealevelNEsaRateEnum);
                         element->InputUpdateFromConstant(0.0,SealevelUEsaRateEnum);
-                        element->InputUpdateFromConstant(0.0,SealevelRSLEustaticRateEnum);
                         counter++;
                 }

issm/branches/trunk-larour-NatGeoScience2016/src/c/cores/sealevelrise_core.cpp

@@ -64 +64 @@
         Vector<IssmDouble> *RSLg_rate    = NULL;
         Vector<IssmDouble> *RSLg_eustatic  = NULL; 
-        Vector<IssmDouble> *RSLg_eustatic_rate  = NULL; 
         Vector<IssmDouble> *U_esa  = NULL; 
         Vector<IssmDouble> *U_esa_rate  = NULL; 
@@ -163 +162 @@
                 U_gia_rate=U_gia->Duplicate(); U_gia->Copy(U_gia_rate); U_gia_rate->Scale(1/(dt*frequency));
                 RSLg_rate=RSLg->Duplicate(); RSLg->Copy(RSLg_rate); RSLg_rate->Scale(1/(dt*frequency));
-                RSLg_eustatic_rate=RSLg_eustatic->Duplicate(); RSLg_eustatic->Copy(RSLg_eustatic_rate); RSLg_eustatic_rate->Scale(1/(dt*frequency));
                 
                 /*get some results into elements:{{{*/
@@ -184 +182 @@
                         InputUpdateFromVectorx(femmodel,N_gia_rate,SealevelNGiaRateEnum,VertexSIdEnum); 
                         InputUpdateFromVectorx(femmodel,RSLg_rate,SealevelRSLRateEnum,VertexSIdEnum); 
-                        InputUpdateFromVectorx(femmodel,RSLg_eustatic_rate,SealevelRSLEustaticRateEnum,VertexSIdEnum); 
                 } /*}}}*/
         }
@@ -207 +204 @@
         delete RSLg_rate;
         delete RSLg_eustatic;
-        delete RSLg_eustatic_rate;
         delete U_esa;
         delete U_esa_rate;
@@ -340 +336 @@
          * presence of ice (terms 1 and 4 in Eq.4 of Farrel and Clarke):*/
         RSLgi->Shift(-eustatic-RSLgi_oceanaverage);
+        
+        /*save eustatic value for results: */
+        femmodel->results->AddResult(new GenericExternalResult<IssmDouble>(femmodel->results->Size()+1,SealevelRSLEustaticEnum,-eustatic));
+
 
         /*clean up and return:*/
@@ -861 +861 @@
         if(!xIsNan<IssmDouble>(eps_rel)){
                 if((ndS/nS)<eps_rel){
-                        if(VerboseConvergence()) _printf0_(setw(50) << left << "              convergence criterion: norm(dS)/norm(S)" << ndS/nS*100 << " < " << eps_rel*100 << " %");
+                        if(VerboseConvergence()) _printf0_(setw(50) << left << "              convergence criterion: norm(dS)/norm(S)" << ndS/nS*100 << " < " << eps_rel*100 << " %\n");
                 }
                 else{ 
-                        if(VerboseConvergence()) _printf0_(setw(50) << left << "              convergence criterion: norm(dS)/norm(S)" << ndS/nS*100 << " > " << eps_rel*100 << " %");
+                        if(VerboseConvergence()) _printf0_(setw(50) << left << "              convergence criterion: norm(dS)/norm(S)" << ndS/nS*100 << " > " << eps_rel*100 << " %\n");
                         converged=false;
                 }
@@ -870 +870 @@
         if(!xIsNan<IssmDouble>(eps_abs)){
                 if(ndS<eps_abs){
-                        if(VerboseConvergence()) _printf0_(setw(50) << left << "              convergence criterion: norm(dS)" << ndS << " < " << eps_abs << " ");
+                        if(VerboseConvergence()) _printf0_(setw(50) << left << "              convergence criterion: norm(dS)" << ndS << " < " << eps_abs << " \n");
                 }
                 else{ 
-                        if(VerboseConvergence()) _printf0_(setw(50) << left << "              convergence criterion: norm(dS)" << ndS << " > " << eps_abs << " ");
+                        if(VerboseConvergence()) _printf0_(setw(50) << left << "              convergence criterion: norm(dS)" << ndS << " > " << eps_abs << " \n");
                         converged=false;
                 }