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

Timestamp:

09/22/16 16:36:34 (9 years ago)

Author:

langchar

Message:

CHG: new test243 plus archive, isrestart-isinitialized bool

File:

• issm/trunk-jpl/src/c/classes/Elements/Element.cpp (modified) (9 diffs)

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

@@ -2246 +2246 @@
 
         /*Intermediary variables: {{{*/
-    IssmDouble isinitialized;
-    IssmDouble isrestart;
+    bool isinitialized;
+    bool isrestart;
     IssmDouble zTop,dzTop,zMax,zMin,zY,dzMin;
         IssmDouble Tmean; 
@@ -2331 +2331 @@
         parameters->FindParam(&isturbulentflux,SmbIsturbulentfluxEnum);
         parameters->FindParam(&init_scaling,SmbInitDensityScalingEnum);
+
         /*}}}*/
         /*Retrieve inputs: {{{*/
@@ -2366 +2367 @@
         Tz_input->GetInputValue(&Tz,gauss);
         Vz_input->GetInputValue(&Vz,gauss);
-    isinitialized_input->GetInputValue(&isinitialized,gauss);
-    isrestart_input->GetInputValue(&isrestart,gauss);
+    isinitialized_input->GetInputValue(&isinitialized);
+    isrestart_input->GetInputValue(&isrestart);
         /*}}}*/
 
@@ -2391 +2392 @@
         
         /*Flag the initialization:*/
-        this->AddInput(new DoubleInput(SmbIsInitializedEnum,false));
+        this->AddInput(new BoolInput(SmbIsInitializedEnum,false));
     }
     else if(isrestart){ //Retrieve the snow properties from previous run
@@ -2435 +2436 @@
         
         /*Flag the initialization:*/
-        this->AddInput(new DoubleInput(SmbIsrestartEnum,false));//*CL* add
+         this->AddInput(new BoolInput(SmbIsrestartEnum,false));
     }
     else{ 
- 
                 /*Recover inputs: */
                 DoubleArrayInput* dz_input= dynamic_cast<DoubleArrayInput*>(this->GetInput(SmbDzEnum)); _assert_(dz_input);
@@ -2449 +2449 @@
                 DoubleArrayInput* a_input= dynamic_cast<DoubleArrayInput*>(this->GetInput(SmbAEnum));_assert_(a_input);
                 DoubleArrayInput* T_input= dynamic_cast<DoubleArrayInput*>(this->GetInput(SmbTEnum));_assert_(T_input);
-                
-                /*Recover arrays: */
+
+        /*Recover arrays: */
                 dz_input->GetValues(&dz,&m);
-                d_input->GetValues(&d,&m);
+        d_input->GetValues(&d,&m);
                 re_input->GetValues(&re,&m);
                 gdn_input->GetValues(&gdn,&m);
@@ -2460 +2460 @@
                 a_input->GetValues(&a,&m);
                 T_input->GetValues(&T,&m);
-                
-                //fixed lower temperatuer bounday condition - T is fixed
+
+        //fixed lower temperatuer bounday condition - T is fixed
                 T_bottom=T[m-1];
 
-        } /*}}}*/
+    } /*}}}*/
 
         // determine initial mass [kg]
@@ -2578 +2578 @@
                 count++;
         } //for (t=time;t<time+dt;t=t+smb_dt)
-    
-        /*Save generated inputs: */
+
+    /*Save generated inputs: */
         this->AddInput(new DoubleArrayInput(SmbDzEnum,dz,m));
         this->AddInput(new DoubleArrayInput(SmbDEnum,d,m));
@@ -2595 +2595 @@
     this->AddInput(new DoubleInput(SmbM_addEnum,sumMassAdd/yts));
 
-        /*Free allocations:{{{*/
+    /*Free allocations:{{{*/
         xDelete<IssmDouble>(dz);
         xDelete<IssmDouble>(d);