Changeset 24211

Timestamp:

10/09/19 11:18:26 (5 years ago)

Author:

wchu28

Message:

BUG: fix bug for attenuation

Location:

issm/trunk-jpl/src/c/classes

Files:

• Radar.cpp (modified) (5 diffs)
• Radar.h (modified) (1 diff)

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

@@ -88 +88 @@
 }
         /*}}}*/
-IssmDouble Radar::ComputeRadarAttenuation(Element* element){/*{{{*/
+void Radar::ComputeRadarAttenuation(Element* element){/*{{{*/
         //int         numvertices = element->GetNumberOfVertices();
         IssmDouble  eps0=8.85418782e-12;
@@ -113 +113 @@
         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_NH_hol=0.5;
+        IssmDouble  mol_NH_lgp=0.4; 
         IssmDouble  mol_H, mol_Cl, mol_NH;
         IssmDouble  attenuation_rate_macgregor[NUMVERTICES];
         IssmDouble  attenuation_rate_wolff[NUMVERTICES];
-        IssmDouble  temperature, attenuation_rate_M07_pureice, attenuation_rate_M07_H, attenuation_rate_M07_Cl, attenuation_rate_M07_NH;
+        IssmDouble  temperature, ice_period, attenuation_rate_M07_pureice, attenuation_rate_M07_H, attenuation_rate_M07_Cl, attenuation_rate_M07_NH;
         IssmDouble  attenuation_rate_W97_pureice, attenuation_rate_W97_H, attenuation_rate_W97_Cl, attenuation_rate_W97_NH;
         IssmDouble  m1, m2, m3, m4, m5, m6, m7, m8;
@@ -124 +130 @@
         /*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); 
 
         /* Start looping on the number of vertices: */
@@ -133 +140 @@
                 /*Get ice temperature: */
                 temp_input->GetInputValue(&temperature,gauss);
-
-                mol_H=1.6;
-                mol_Cl=0.4;
-                mol_NH=0.5;
+                ice_period_input->GetInputValue(&ice_period,gauss);
+
+                if(ice_period>0){; 
+                        mol_H=mol_H_hol;
+                        mol_Cl=mol_Cl_hol;
+                        mol_NH=mol_NH_hol;
+                        }
+                else{ 
+                        mol_H=mol_H_lgp;
+                        mol_Cl=mol_Cl_lgp; 
+                        mol_NH=mol_NH_lgp;
+                }
 
                 /*Compute M07 radar conductivity constant: */
@@ -180 +195 @@
 
 }/*}}}*/
-IssmDouble Radar::ComputeRadarPower(Element* element){/*{{{*/
+void Radar::ComputeRadarPower(Element* element){/*{{{*/
 
         IssmDouble  *xyz_list=NULL;

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

@@ -36 +36 @@
                 char* Name();
                 IssmDouble Response(FemModel* femmodel);
-                IssmDouble ComputeRadarAttenuation(Element* element);
-                IssmDouble ComputeRadarPower(Element* element);
+                void ComputeRadarAttenuation(Element* element);
+                void ComputeRadarPower(Element* element);
 };
 #endif  /* _RADAR_H_ */