Changeset 24507

Timestamp:

01/10/20 16:46:20 (5 years ago)

Author:

schlegel

Message:

BUG: array size needs to be set to max array size of output arrays are corrupted

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Element.cpp (modified) (6 diffs)
• classes/FemModel.cpp (modified) (2 diffs)
• cores/smb_core.cpp (modified) (2 diffs)
• modules/SurfaceMassBalancex/Gembx.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Elements/Element.cpp

@@ -3665 +3665 @@
         Input2 *teValue_input       = this->GetInput2(SmbTeValueEnum);      _assert_(teValue_input);
         Input2 *aValue_input        = this->GetInput2(SmbAValueEnum);       _assert_(aValue_input);
-        Input2 *EC_input            = this->GetInput2(SmbECiniEnum);        _assert_(EC_input);
+        Input2 *EC_input            = NULL;
 
         /*Retrieve input values:*/
@@ -3700 +3700 @@
                 this->inputs2->GetArray(SmbAiniEnum,this->lid,&aini,&m);
                 this->inputs2->GetArray(SmbTiniEnum,this->lid,&Tini,&m);
+                EC_input = this->GetInput2(SmbECiniEnum);  _assert_(EC_input);
                 EC_input->GetInputAverage(&EC);
 
@@ -3755 +3756 @@
                 this->inputs2->GetArray(SmbAEnum,this->lid,&a,&m);
                 this->inputs2->GetArray(SmbTEnum,this->lid,&T,&m);
+                EC_input = this->GetInput2(SmbECEnum);  _assert_(EC_input);
                 EC_input->GetInputAverage(&EC);
+                EC=EC*dt*rho_ice;
 
                 //fixed lower temperature bounday condition - T is fixed
@@ -3792 +3795 @@
                 if(VerboseSmb() && this->Sid()==0 && IssmComm::GetRank()==0)_printf0_("Time: t=" << setprecision(8) << t/365.0/24.0/3600.0 << " yr/" << (time+dt)/365.0/24.0/3600.0 << " yr" << setprecision(3) << " Step: " << count << "\n");
 
-                Input2* Ta_input  = this->GetInput2(SmbTaEnum,t-time+timeclim);    _assert_(Ta_input);
+                Input2 *Ta_input  = this->GetInput2(SmbTaEnum,t-time+timeclim);    _assert_(Ta_input);
                 Input2 *V_input   = this->GetInput2(SmbVEnum,t-time+timeclim);     _assert_(V_input);
                 Input2 *Dlwr_input= this->GetInput2(SmbDlwrfEnum,t-time+timeclim); _assert_(Dlwr_input);
@@ -3809 +3812 @@
                 pAir_input->GetInputValue(&pAir,gauss);  // screen level air pressure [Pa]
                 teValue_input->GetInputValue(&teValue,gauss);  // Emissivity [0-1]
-                aValue_input->GetInputValue(&aValue,gauss);  // screen level air pressure [Pa]
+                aValue_input->GetInputValue(&aValue,gauss);  // Albedo [0 1]
                 //_printf_("Time: " << t << " Ta: " << Ta << " V: " << V << " dlw: " << dlw << " dsw: " << dsw << " P: " << P << " eAir: " << eAir << " pAir: " << pAir << "\n");
                 /*}}}*/
@@ -3922 +3925 @@
         this->inputs2->SetArrayInput(SmbWEnum,this->lid,W,m);
         this->inputs2->SetArrayInput(SmbAEnum,this->lid,a,m);
-        this->inputs2->SetArrayInput(SmbAEnum,this->lid,a,m);
         this->SetElementInput(SmbECEnum,sumEC/dt/rho_ice);
         this->SetElementInput(SmbMassBalanceEnum,(sumP + sumEC -sumR)/dt/rho_ice);

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -2424 +2424 @@
                                                         if(rank_arraysize>max_rank_arraysize)max_rank_arraysize=rank_arraysize;
                                                 }
+                                                rank_arraysize=max_rank_arraysize;
 
                                                 /*Broadcast for cpus that do not have any elements*/
@@ -2495 +2496 @@
                                                                 for(int j=0;j<elements->Size();j++){
                                                                         Element* element=xDynamicCast<Element*>(this->elements->GetObjectByOffset(j));
-                                                                        element->ResultToMatrix(values,ncols, output_enum);
+                                                                        element->ResultToMatrix(values,ncols,output_enum);
                                                                 }
                                                                 /*Gather from all cpus*/

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

@@ -37 +37 @@
         int numaveragedinput;
         femmodel->parameters->FindParam(&dtslices,SmbStepsPerStepEnum);
-        /*intermiedaries to deal with averaging*/
+        /*intermediaries to deal with averaging*/
         static const int substeplist[2] = {SmbMassBalanceSubstepEnum,SmbRunoffSubstepEnum};
         static const int transientlist[2] = {SmbMassBalanceTransientEnum,SmbRunoffTransientEnum};
@@ -53 +53 @@
         }
 
-        /*if yes compute necessary intermiedaries and start looping*/
+        /*if yes compute necessary intermediaries and start looping*/
         if (dtslices>1){
                 int        substep;

issm/trunk-jpl/src/c/modules/SurfaceMassBalancex/Gembx.cpp

@@ -650 +650 @@
         // discretized heat equation:
 
-        //                 Tp = (Au*Tu° + Ad*Td° + (Ap-Au-Ad)Tp° + S) / Ap
+        //                 Tp = (Au*Tuo+ Ad*Tdo+ (Ap-Au-Ad)Tpo+ S) / Ap
 
         // where neighbor coefficients Au, Ap, & Ad are
@@ -659 +659 @@
 
         // and u & d represent grid points up and down from the center grid point 
-        // p and // u & d represent grid points up and down from the center grid 
-        // point p and ° identifies previous time step values. S is a source term.
+        // point p and o identifies previous time step values. S is a source term.
 
         // u, d, and p conductivities