Changeset 19004


Ignore:
Timestamp:
01/13/15 08:52:41 (10 years ago)
Author:
bdef
Message:

BUG: fixing min

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp

    r19003 r19004  
    467467                        }
    468468                        //adding base in min to take into account heads under bed wich don't change N
    469                         pressure[i]=(rho_ice*g*thickness[i])-(rho_freshwater*g*(min(h_max,values[i],base[i])-base[i]));
     469                        pressure[i]=(rho_ice*g*thickness[i])-(rho_freshwater*g*(min((min(h_max,values[i])-base[i]),0.0)));
    470470                }
    471471                xDelete<IssmDouble>(thickness);
Note: See TracChangeset for help on using the changeset viewer.