Changeset 22163

Timestamp:

10/10/17 14:08:27 (8 years ago)

Author:

Eric.Larour

Message:

CHG: diverse verbose and bug issues.

Location:

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

Files:

• analyses/SealevelriseAnalysis.cpp (modified) (1 diff)
• classes/FemModel.cpp (modified) (5 diffs)
• cores/sealevelrise_core.cpp (modified) (4 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/classes/FemModel.cpp

@@ -2458 +2458 @@
                 if(i<ns){
                 
-                        if(VerboseConvergence())if(i%100==0)_printf0_("\r" << "      convolution progress: " << (double)i/(double)ns*100 << "%  ");
+                        if(VerboseConvergence())if(i%100==0)_printf0_("\r" << "              convolution progress: " << (double)i/(double)ns*100 << "%  ");
                 
                         Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
@@ -2513 +2513 @@
         for(int i=0;i<nsmax;i++){
                 if(i<ns){
-                        if(verboseconvolution)if(VerboseConvergence())if(i%100==0)_printf_("\r" << "      convolution progress: " << (double)i/(double)ns*100 << "%   ");
+                        if(verboseconvolution)if(VerboseConvergence())if(i%100==0)_printf0_("\r" << "              convolution progress: " << (double)i/(double)ns*100 << "%   ");
                         Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
                         element->SealevelriseNonEustatic(pRSLgo,RSLg_old,latitude,longitude,radius,eartharea);
@@ -2519 +2519 @@
                 if(i%loop==0)pRSLgo->Assemble();
         }
-        if(verboseconvolution)if(VerboseConvergence())_printf_("\n");
+        if(verboseconvolution)if(VerboseConvergence())_printf0_("\n");
         
         /*Free ressources:*/
@@ -2637 +2637 @@
         for(int i=0;i<nsmax;i++){
                 if(i<ns){
-                        if(VerboseConvergence())if(i%100==0)_printf0_("\r" << "      convolution progress: " << (double)i/(double)ns*100 << "%  ");
+                        if(VerboseConvergence())if(i%100==0)_printf0_("\r" << "              convolution progress: " << (double)i/(double)ns*100 << "%  ");
                         Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
                         element->SealevelriseGeodetic(pUp,pNorth,pEast,RSLg,latitude,longitude,radius,xx,yy,zz,eartharea,horiz);
@@ -2656 +2656 @@
                 pEast->Assemble();
         }
-        if(VerboseConvergence())_printf_("\n");
+        if(VerboseConvergence())_printf0_("\n");
 
         /*Free ressources:*/

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

@@ -458 +458 @@
                 
         }
-        if(VerboseConvergence()) _printf0_("\n   total number of iterations: " << count-1 << "\n");
+        if(VerboseConvergence()) _printf0_("\n              total number of iterations: " << count-1 << "\n");
 
         xDelete<IssmDouble>(latitude);
@@ -803 +803 @@
         int nv;
         
-        if(VerboseSolution()) _printf0_("      computing earth mass transport\n");
+        if(VerboseSolution()) _printf0_("              computing earth mass transport\n");
 
         /*This mass transport module for the Earth is because we might have thickness variations as spcs 
@@ -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 << " %\n");
+                        if(VerboseConvergence()) _printf0_(setw(50) << left << "              convergence criterion: norm(dS)/norm(S)" << ndS/nS*100 << " < " << eps_rel*100 << " %");
                 }
                 else{ 
-                        if(VerboseConvergence()) _printf0_(setw(50) << left << "      convergence criterion: norm(dS)/norm(S)" << ndS/nS*100 << " > " << eps_rel*100 << " %\n");
+                        if(VerboseConvergence()) _printf0_(setw(50) << left << "              convergence criterion: norm(dS)/norm(S)" << ndS/nS*100 << " > " << eps_rel*100 << " %");
                         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 << " \n");
+                        if(VerboseConvergence()) _printf0_(setw(50) << left << "              convergence criterion: norm(dS)" << ndS << " < " << eps_abs << " ");
                 }
                 else{ 
-                        if(VerboseConvergence()) _printf0_(setw(50) << left << "      convergence criterion: norm(dS)" << ndS << " > " << eps_abs << " \n");
+                        if(VerboseConvergence()) _printf0_(setw(50) << left << "              convergence criterion: norm(dS)" << ndS << " > " << eps_abs << " ");
                         converged=false;
                 }