removed LOG_MATRIC option

Author: Joe Hamman

src/display_current_settings.c

@@ -196,10 +196,6 @@ void display_current_settings(int                 mode,
     fprintf(stderr,"GRND_FLUX_TYPE\t\tGF_406\n");
   else if (options.GRND_FLUX_TYPE == GF_410)
     fprintf(stderr,"GRND_FLUX_TYPE\t\tGF_410\n");
-  if (options.LOG_MATRIC == TRUE)
-    fprintf(stderr,"LOG_MATRIC\t\tTRUE\n");
-  else
-    fprintf(stderr,"LOG_MATRIC\t\tFALSE\n");
   if (options.LW_TYPE == LW_TVA)
     fprintf(stderr,"LW_TYPE\t\tLW_TVA\n");
   else if (options.LW_TYPE == LW_ANDERSON)

src/get_global_param.c

@@ -349,11 +349,6 @@ global_param_struct get_global_param(filenames_struct *names,
         if(strcasecmp("GF_406",flgstr)==0) options.GRND_FLUX_TYPE=GF_406;
         else if(strcasecmp("GF_410",flgstr)==0) options.GRND_FLUX_TYPE=GF_410;
       }
-      else if(strcasecmp("LOG_MATRIC",optstr)==0) {
-        sscanf(cmdstr,"%*s %s",flgstr);
-        if(strcasecmp("TRUE",flgstr)==0) options.LOG_MATRIC=TRUE;
-        else options.LOG_MATRIC = FALSE;
-      }
       else if(strcasecmp("LW_TYPE",optstr)==0) {
         sscanf(cmdstr,"%*s %s",flgstr);
         if(strcasecmp("LW_TVA",flgstr)==0) options.LW_TYPE=LW_TVA;

src/initialize_global.c

@@ -159,7 +159,6 @@ void initialize_global() {
   options.IMPLICIT              = TRUE;
   options.LAKES                 = FALSE;
   options.LAKE_PROFILE          = FALSE;
-  options.LOG_MATRIC            = FALSE;
   options.LW_CLOUD              = LW_CLOUD_DEARDORFF;
   options.LW_TYPE               = LW_PRATA;
   options.MIN_WIND_SPEED        = 0.1;

src/runoff.c

@@ -340,17 +340,6 @@ int  runoff(cell_data_struct  *cell,
       inflow   = dt_inflow;
       last_cnt = 0;
 
-      if (options.LOG_MATRIC) {
-        for( lindex = 0; lindex < options.Nlayer; lindex++ ) {
-	  if( (tmp_liq = liq[lindex] - evap[lindex][frost_area]) < resid_moist[lindex] )
-	    tmp_liq = resid_moist[lindex];
-	  if(tmp_liq > resid_moist[lindex])
-	    matric[lindex] = soil_con->bubble[lindex] * pow( (tmp_liq - resid_moist[lindex]) / (soil_con->max_moist[lindex] - resid_moist[lindex]), -b[lindex]);
-	  else
-	  matric[lindex] = HUGE_RESIST;
-	}
-      }
-
       /*************************************
         Compute Drainage between Sublayers 
       *************************************/
@@ -363,10 +352,6 @@ int  runoff(cell_data_struct  *cell,
 	  tmp_liq = resid_moist[lindex];
 
 	if(liq[lindex] > resid_moist[lindex]) {
-          if (options.LOG_MATRIC) {
-	    avg_matric = pow( 10, (soil_con->depth[lindex+1] * log10(fabs(matric[lindex])) + soil_con->depth[lindex] * log10(fabs(matric[lindex+1]))) / (soil_con->depth[lindex] + soil_con->depth[lindex+1]) );
-	    tmp_liq = resid_moist[lindex] + ( soil_con->max_moist[lindex] - resid_moist[lindex] ) * pow( ( avg_matric / soil_con->bubble[lindex] ), -1/b[lindex] );
-	  }
 	  Q12[lindex] = Ksat[lindex] * pow(((tmp_liq - resid_moist[lindex]) / (soil_con->max_moist[lindex] - resid_moist[lindex])), soil_con->expt[lindex]); 
 	}
 	else Q12[lindex] = 0.;