Changeset 27186

Timestamp:

08/03/22 04:09:16 (3 years ago)

Author:

bdef

Message:

NEW:adding a NR for hydro adaptative stepping (and minor fix)

Location:

issm/trunk-jpl

Files:

• src/c/cores/hydrology_core.cpp (modified) (2 diffs)
• test/Archives/Archive906.arch (added)
• test/NightlyRun/test906.m (added)
• test/NightlyRun/test906.py (added)

issm/trunk-jpl/src/c/cores/hydrology_core.cpp

@@ -132 +132 @@
                                         substep+=1;
                                         subtime+=subdt;
-                                        averagetime+=subtime*dt;
+                                        averagetime+=subtime*subdt;
                                         /*Setting substep time as global time*/
                                         femmodel->parameters->SetParam(subtime,TimeEnum);
@@ -157 +157 @@
                   dtslices=dtslices-remainingslices+(2*remainingslices);
                   subdt=remainingtime/(2*remainingslices);
-                  _printf0_("convergence failed for sub-step "<< substep <<" total number of slice is now "<< dtslices <<" for step "<<step<<"\n");
-                  _printf0_("next slice duration is "<< subdt/yts <<" years\n");
+                  if(VerboseSolution())_printf0_("convergence failed for sub-step "<< substep <<" total number of slice is now "<< dtslices <<" for step "<<step<<"\n");
+                  if(VerboseSolution())_printf0_("next slice duration is "<< subdt/yts <<" years\n");
                   conv_fail = false;  //re-initialize the control keyword
                   if (dtslices>500){