Changeset 8561

Timestamp:

06/08/11 14:02:04 (14 years ago)

Author:

Mathieu Morlighem

Message:

removed all hydro_gamma and fixed indentation

Location:

issm/trunk/src/c

Files:

• objects/Elements/Tria.cpp (modified) (8 diffs)
• objects/IoModel.cpp (modified) (2 diffs)
• objects/IoModel.h (modified) (1 diff)
• objects/Materials/Matpar.cpp (modified) (9 diffs)
• objects/Materials/Matpar.h (modified) (2 diffs)
• solutions/hydrology_core.cpp (modified) (1 diff)

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -991 +991 @@
         double     Ke_gg_gaussian2[numdof][numdof]  ={0.0};
         double     Ke_gg_gaussian3[numdof][numdof]  ={0.0};
-        double     hydro_gamma,hydro_p,hydro_q,hydro_CR,hydro_n,rho_water,g;
+        double     hydro_p,hydro_q,hydro_CR,hydro_n,rho_water,g,gamma;
         double     DL_scalar1;
         double     DL_scalar2;
@@ -1005 +1005 @@
 
         /*retrieve material parameters: */
-//      hydro_gamma=matpar->GetGamma();
-        g          =matpar->GetG();
-        rho_water  =matpar->GetRhoWater();
-        hydro_p    =matpar->GetHydroP();
-        hydro_q    =matpar->GetHydroQ();
-   hydro_CR    =matpar->GetHydroCR();
-        hydro_n    =matpar->GetHydroN();
-        
-        hydro_gamma=1/(hydro_n*pow(hydro_CR,hydro_p)*pow((rho_water*g),hydro_q));
+        g        =matpar->GetG();
+        rho_water=matpar->GetRhoWater();
+        hydro_p  =matpar->GetHydroP();
+        hydro_q  =matpar->GetHydroQ();
+        hydro_CR =matpar->GetHydroCR();
+        hydro_n  =matpar->GetHydroN();
+        gamma=1/(hydro_n*pow(hydro_CR,hydro_p)*pow((rho_water*g),hydro_q));
         
         /* Start  looping on the number of gaussian points: */
@@ -1024 +1022 @@
                 GetNodalFunctions(&L[0],gauss);
                 GetNodalFunctionsDerivatives(&dL[0][0],&xyz_list[0][0],gauss);
- //printf("NUMVERTICES=%d, Jdettria=%f\n",NUMVERTICES,Jdettria); //BK
+                //printf("NUMVERTICES=%d, Jdettria=%f\n",NUMVERTICES,Jdettria); //BK
                 for(i=0;i<NUMVERTICES;i++)dLx[i]=dL[0][i];
-           for(i=0;i<NUMVERTICES;i++)dLy[i]=dL[1][i];
-  /*    for(i=0;i<NUMVERTICES;i++)
-                  { dLx[i]=dL[0][i];
-                printf("dLx[%d]=%f, L[%d]=%f\n",i,dLx[i]),i,L[i];}
-                for(i=0;i<NUMVERTICES;i++)
-                         { dLy[i]=dL[1][i];
-                                               printf("dLy[%d]=%f\n",i,dLy[i]);} */
+                for(i=0;i<NUMVERTICES;i++)dLy[i]=dL[1][i];
+                /*    for(i=0;i<NUMVERTICES;i++)
+                                { dLx[i]=dL[0][i];
+                                printf("dLx[%d]=%f, L[%d]=%f\n",i,dLx[i]),i,L[i];}
+                                for(i=0;i<NUMVERTICES;i++)
+                                { dLy[i]=dL[1][i];
+                                printf("dLy[%d]=%f\n",i,dLy[i]);} */
 
                 /*Get K parameter: */
                 GetHydrologyK(&K[0],&xyz_list[0][0],gauss);
-//      printf("K[0]=%g,K[1]=%g\n",K[0],K[1]);
+                //printf("K[0]=%g,K[1]=%g\n",K[0],K[1]);
 
                 if(dt){
@@ -1047 +1045 @@
 
                 if(dt){
-                        DL_scalar2=-gauss->weight*Jdettria*hydro_gamma*K[0]*dt; //don't forget the -
-                        DL_scalar3=-gauss->weight*Jdettria*hydro_gamma*K[1]*dt; //don't forget the -
+                        DL_scalar2=-gauss->weight*Jdettria*gamma*K[0]*dt; //don't forget the -
+                        DL_scalar3=-gauss->weight*Jdettria*gamma*K[1]*dt; //don't forget the -
 
                 }
                 else{
-                        DL_scalar2=-gauss->weight*Jdettria*hydro_gamma*K[0]; //don't forget the -
-                        DL_scalar3=-gauss->weight*Jdettria*hydro_gamma*K[1]; //don't forget the -
+                        DL_scalar2=-gauss->weight*Jdettria*gamma*K[0]; //don't forget the -
+                        DL_scalar3=-gauss->weight*Jdettria*gamma*K[1]; //don't forget the -
                 }
                 
@@ -2105 +2103 @@
                 basal_melting_input->GetParameterValue(&basal_melting_g,gauss);
                 old_watercolumn_input->GetParameterValue(&old_watercolumn_g,gauss);
-//      printf("ig=%d, old_watercolumn_g=%f,Jdettria=%f\n",ig,old_watercolumn_g,Jdettria);//bk
-//      if(old_watercolumn_g<0) printf("old_watercolumn_g=%g,Jdettria=%f\n",old_watercolumn_g,Jdettria);//bk
+                //printf("ig=%d, old_watercolumn_g=%f,Jdettria=%f\n",ig,old_watercolumn_g,Jdettria);//bk
+                //if(old_watercolumn_g<0) printf("old_watercolumn_g=%g,Jdettria=%f\n",old_watercolumn_g,Jdettria);//bk
 
                 if(dt)for(i=0;i<numdof;i++) pe->values[i]+=Jdettria*gauss->weight*(old_watercolumn_g+dt*basal_melting_g)*L[i];
@@ -2715 +2713 @@
                 watercolumn_input->GetParameterValue(&watercolumn,gauss);
                 values[i]=watercolumn;
-        //      if((values[i])<0)values[i]=0;
         }
 
@@ -2803 +2800 @@
   
         //bk
-          // K[0]=fabs(pow(w,2)*(rho_ice*g*dsdx+(rho_water/rho_ice-1)*rho_ice*g*dbdx) - rho_ice * g * kn* w * (dsdx - dbdx ) * surface_slope);
-          // K[1]=fabs(pow(w,2)*(rho_ice*g*dsdy+(rho_water/rho_ice-1)*rho_ice*g*dbdy) - rho_ice * g * kn *w * (dsdy - dbdy ) * surface_slope);
-//       printf("K[0]=%g,K[1]=%g,w=%g\n",K[0],K[1],w); //bk
-//   if (w<0) {printf("negative w!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
-//             printf("K[0]=%g,K[1]=%g,w=%g\n",K[0],K[1],w);}
-
-
-}
-
+        //K[0]=fabs(pow(w,2)*(rho_ice*g*dsdx+(rho_water/rho_ice-1)*rho_ice*g*dbdx) - rho_ice * g * kn* w * (dsdx - dbdx ) * surface_slope);
+        //K[1]=fabs(pow(w,2)*(rho_ice*g*dsdy+(rho_water/rho_ice-1)*rho_ice*g*dbdy) - rho_ice * g * kn *w * (dsdy - dbdy ) * surface_slope);
+        //printf("K[0]=%g,K[1]=%g,w=%g\n",K[0],K[1],w); //bk
+        //if (w<0) {printf("negative w!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+        //printf("K[0]=%g,K[1]=%g,w=%g\n",K[0],K[1],w);}
+}
 /*}}}*/
 /*FUNCTION Tria::Gradj {{{1*/
@@ -3940 +3934 @@
                 values[i]=solution[doflist[i]];
                 if(isnan(values[i])) _error_("NaN found in solution vector");
-        //      if (values[i]<pow(10,-10))values[i]=pow(10,-10); //correcting the water column to positive values
+                //if (values[i]<pow(10,-10))values[i]=pow(10,-10); //correcting the water column to positive values
  
         }

issm/trunk/src/c/objects/IoModel.cpp

@@ -226 +226 @@
         IoModelFetchData(&this->numforcings,iomodel_handle,"numforcings");
         
-    /*!Get hydrology parameters: */
-        //      IoModelFetchData(&this->hydro_gamma,iomodel_handle,"hydro_gamma");
+        /*!Get hydrology parameters: */
         IoModelFetchData(&this->hydro_kn,iomodel_handle,"hydro_kn");
         IoModelFetchData(&this->hydro_p,iomodel_handle,"hydro_p");
@@ -233 +232 @@
         IoModelFetchData(&this->hydro_CR,iomodel_handle,"hydro_CR");
         IoModelFetchData(&this->hydro_n,iomodel_handle,"hydro_n");
+
         /*qmu: */
         if(this->qmu_analysis){

issm/trunk/src/c/objects/IoModel.h

@@ -227 +227 @@
                 int     constraintcounter; //keep track of how many constraints are being created in each analysis type
 
-                 /*hydrology parameters: */
-//               double hydro_gamma;
-            double hydro_kn;
-            double hydro_p;
-                 double hydro_q;
-       double hydro_CR;
-                 double hydro_n;
+                /*hydrology parameters: */
+                double hydro_kn;
+                double hydro_p;
+                double hydro_q;
+                double hydro_CR;
+                double hydro_n;
                  /*}}}*/
                 /*Methods: {{{1*/

issm/trunk/src/c/objects/Materials/Matpar.cpp

@@ -36 +36 @@
         double  matpar_thermal_exchange_velocity;
         double  matpar_g;
-        double  matpar_gamma;
         double  matpar_kn;
 
@@ -50 +49 @@
         matpar_mixed_layer_capacity=iomodel->mixed_layer_capacity; 
         matpar_thermal_exchange_velocity=iomodel->thermal_exchange_velocity; 
-//      matpar_gamma=iomodel->hydro_gamma; 
         matpar_kn=iomodel->hydro_kn; 
 
@@ -65 +63 @@
         this->thermal_exchange_velocity=matpar_thermal_exchange_velocity; 
         this->g=matpar_g; 
-        this->gamma=matpar_gamma; 
         this->kn=matpar_kn; 
         this->hydro_p=iomodel->hydro_p; 
@@ -96 +93 @@
         printf("   thermal_exchange_velocity: %g\n",thermal_exchange_velocity);
         printf("   g: %g\n",g);
-        printf("   gamma: %g\n",gamma);
         printf("   kn: %g\n",kn);
         return;
@@ -117 +113 @@
         printf("   thermal_exchange_velocity: %g\n",thermal_exchange_velocity);
         printf("   g: %g\n",g);
-        printf("   gamma: %g\n",gamma);
         printf("   kn: %g\n",kn);
         return;
@@ -159 +154 @@
         memcpy(marshalled_dataset,&thermal_exchange_velocity,sizeof(thermal_exchange_velocity));marshalled_dataset+=sizeof(thermal_exchange_velocity);
         memcpy(marshalled_dataset,&g,sizeof(g));marshalled_dataset+=sizeof(g);
-        memcpy(marshalled_dataset,&gamma,sizeof(gamma));marshalled_dataset+=sizeof(gamma);
         memcpy(marshalled_dataset,&kn,sizeof(kn));marshalled_dataset+=sizeof(kn);
 
@@ -181 +175 @@
                 sizeof(thermal_exchange_velocity)+
                 sizeof(g)+
-                sizeof(gamma)+
                 sizeof(kn)+
                 sizeof(int); //sizeof(int) for enum type
@@ -209 +202 @@
         memcpy(&thermal_exchange_velocity,marshalled_dataset,sizeof(thermal_exchange_velocity));marshalled_dataset+=sizeof(thermal_exchange_velocity);
         memcpy(&g,marshalled_dataset,sizeof(g));marshalled_dataset+=sizeof(g);
-        memcpy(&gamma,marshalled_dataset,sizeof(gamma));marshalled_dataset+=sizeof(gamma);
         memcpy(&kn,marshalled_dataset,sizeof(kn));marshalled_dataset+=sizeof(kn);
 
@@ -393 +385 @@
 double Matpar::GetThermalExchangeVelocity(){
         return thermal_exchange_velocity;
-}
-/*}}}1*/
-/*FUNCTION Matpar::GetGamma {{{1*/
-double Matpar::GetGamma(){
-        return gamma;
 }
 /*}}}1*/

issm/trunk/src/c/objects/Materials/Matpar.h

@@ -30 +30 @@
                 /*hydrology: */
                 double  kn; 
-                double  gamma;
                 double  hydro_p;
                 double  hydro_q;
-      double  hydro_CR;
+                double  hydro_CR;
                 double  hydro_n;
+
         public:
-
                 Matpar();
-        
                 Matpar(int matpar_id, IoModel* iomodel);
                 ~Matpar();
@@ -83 +81 @@
                 double GetMeltingPoint();
                 double GetReferenceTemperature();
-                double GetGamma();
                 double GetKn();
                 double GetHydroP();
                 double GetHydroQ();
-      double GetHydroCR();
-      double GetHydroN();
+                double GetHydroCR();
+                double GetHydroN();
                 double TMeltingPoint(double pressure);
                 double PureIceEnthalpy(double pressure);

issm/trunk/src/c/solutions/hydrology_core.cpp

@@ -46 +46 @@
                 time=(i+1)*dt;
 
-//              printf("time step=%d=============================\n",i+1);//bk
                 /*call hydrology_core step: */
                 hydrology_core_step(femmodel,i,time);