Changeset 25539 for issm/trunk-jpl/src/c/classes/Radar.cpp

Timestamp:

09/07/20 03:12:14 (5 years ago)

Author:

bdef

Message:

CHG:Modifying loop on elements towards for on iterator

File:

• issm/trunk-jpl/src/c/classes/Radar.cpp (modified) (8 diffs)

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

@@ -30 +30 @@
 }
 /*}}}*/
-Radar::Radar(char* in_name, int in_definitionenum){/*{{{*/      
+Radar::Radar(char* in_name, int in_definitionenum){/*{{{*/
         this->definitionenum=in_definitionenum;
         this->name              = xNew<char>(strlen(in_name)+1);
@@ -59 +59 @@
 /*}}}*/
 void Radar::Marshall(MarshallHandle* marshallhandle){/*{{{*/
-        _error_("not implemented yet!"); 
-} 
+        _error_("not implemented yet!");
+}
 /*}}}*/
 int Radar::ObjectEnum(void){/*{{{*/
@@ -77 +77 @@
 }
 /*}}}*/
-IssmDouble Radar::Response(FemModel* femmodel){/*{{{*/  
-        int i; 
-        for(i=0;i<femmodel->elements->Size();i++){
-                Element* element=(Element*)femmodel->elements->GetObjectByOffset(i);
+IssmDouble Radar::Response(FemModel* femmodel){/*{{{*/
+        for(Object* & object : femmodel->elements->objects){
+                Element* element=xDynamicCast<Element*>(object);
                 this->ComputeRadarAttenuation(element);
-                this->ComputeRadarPower(element); 
+                this->ComputeRadarPower(element);
         }
         return 0.;
@@ -112 +111 @@
         IssmDouble  E_Cl_W97=3.6800e-20;
         IssmDouble  E_NH=3.6800e-20;
-        IssmDouble  mol_H_hol=1.6; 
-        IssmDouble  mol_H_lgp=0.2; 
-        IssmDouble  mol_Cl_hol=0.4; 
-        IssmDouble  mol_Cl_lgp=1.8; 
+        IssmDouble  mol_H_hol=1.6;
+        IssmDouble  mol_H_lgp=0.2;
+        IssmDouble  mol_Cl_hol=0.4;
+        IssmDouble  mol_Cl_lgp=1.8;
         IssmDouble  mol_NH_hol=0.5;
-        IssmDouble  mol_NH_lgp=0.4; 
+        IssmDouble  mol_NH_lgp=0.4;
         IssmDouble  mol_H, mol_Cl, mol_NH;
         IssmDouble  attenuation_rate_macgregor[NUMVERTICES];
@@ -129 +128 @@
         /*Retrieve all inputs we will be needing: */
         Input* temp_input=element->GetInput(TemperatureEnum); _assert_(temp_input);
-        Input* ice_period_input=element->GetInput(RadarIcePeriodEnum); _assert_(ice_period_input); 
+        Input* ice_period_input=element->GetInput(RadarIcePeriodEnum); _assert_(ice_period_input);
 
         /* Start looping on the number of vertices: */
@@ -136 +135 @@
         for (int iv=0;iv<NUMVERTICES;iv++){
                 gauss->GaussVertex(iv);
-   
+
                 /*Get ice temperature: */
                 temp_input->GetInputValue(&temperature,gauss);
                 ice_period_input->GetInputValue(&ice_period,gauss);
 
-                if(ice_period>0){; 
+                if(ice_period>0){;
                         mol_H=mol_H_hol;
                         mol_Cl=mol_Cl_hol;
                         mol_NH=mol_NH_hol;
                         }
-                else{ 
+                else{
                         mol_H=mol_H_lgp;
-                        mol_Cl=mol_Cl_lgp; 
+                        mol_Cl=mol_Cl_lgp;
                         mol_NH=mol_NH_lgp;
                 }
@@ -209 +208 @@
         IssmDouble  rho_ice, gravity, pressure, pressure_melting_pt, frozen_temp, basal_temp, basal_pmp;
         GaussPenta* gauss=NULL;
-        
+
         /* Get node coordinates*/
         element->GetVerticesCoordinates(&xyz_list);
@@ -253 +252 @@
                                 pressure=rho_ice*gravity*thickness;
                                 pressure_melting_pt=t_tp-gamma*(pressure-p_tp);
-                                
+
                                 if((temperature-pressure_melting_pt)<=-1){
                                         reflectivity=-40;