Changeset 22900


Ignore:
Timestamp:
07/04/18 07:49:32 (7 years ago)
Author:
bdef
Message:

NEW:deactivation of hydrologydc for frozen elements

Location:
issm/trunk-jpl/test/NightlyRun
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/test/NightlyRun/test330.m

    r22857 r22900  
    1616md.hydrology.isefficientlayer=0;
    1717md.hydrology.sedimentlimit_flag=0;
     18md.hydrology.mask_thawed_node=ones(md.mesh.numberofvertices,1);
    1819md.hydrology.rel_tol=1.0e-6;
    1920md.hydrology.penalty_lock=0;

  • issm/trunk-jpl/test/NightlyRun/test330.py

    r22857 r22900  
    2828md.hydrology.isefficientlayer=0
    2929md.hydrology.sedimentlimit_flag=0
     30md.hydrology.mask_thawed_node=np.ones((md.mesh.numberofvertices))
    3031md.hydrology.rel_tol=1.0e-6
    3132md.hydrology.penalty_lock=0

  • issm/trunk-jpl/test/NightlyRun/test3300.py

    r22857 r22900  
    2626md.hydrology.sedimentlimit_flag=1
    2727md.hydrology.sedimentlimit=400.0
     28md.hydrology.mask_thawed_node=np.ones((md.mesh.numberofvertices))
    2829md.hydrology.sediment_thickness=20.0
    2930md.initialization.sediment_head=np.zeros((md.mesh.numberofvertices))
    … …  
    5859md=solve(md,'Transient')
    5960
    60 sedvol=np.zeros(4000)
    61 eplvol=np.zeros(4000)
    62 totvol=np.zeros(4001)
    63 time=np.arange(0.002,8.001,0.002)
    64 store=md.constants.g*md.hydrology.sediment_porosity*md.materials.rho_freshwater*((md.hydrology.sediment_compressibility/md.hydrology.sediment_porosity)+md.hydrology.water_compressibility)
    65 sedstore=20.0*store
    66 for i in range(0,4000):
    67         sedvol[i]=np.mean(md.results.TransientSolution[i].SedimentHead)*sedstore
    68         eplvol[i]=np.mean(md.results.TransientSolution[i].EplHead)*store*np.mean(md.results.TransientSolution[i].HydrologydcEplThicknessHydrostep)
    69         totvol[i+1]=totvol[i]+md.basalforcings.groundedice_melting_rate[0,i]*0.002
     61# sedvol=np.zeros(4000)
     62# eplvol=np.zeros(4000)
     63# totvol=np.zeros(4001)
     64# time=np.arange(0.002,8.001,0.002)
     65# store=md.constants.g*md.hydrology.sediment_porosity*md.materials.rho_freshwater*((md.hydrology.sediment_compressibility/md.hydrology.sediment_porosity)+md.hydrology.water_compressibility)
     66# sedstore=20.0*store
     67# for i in range(0,4000):
     68#       sedvol[i]=np.mean(md.results.TransientSolution[i].SedimentHead)*sedstore
     69#       eplvol[i]=np.mean(md.results.TransientSolution[i].EplHead)*store*np.mean(md.results.TransientSolution[i].HydrologydcEplThicknessHydrostep)
     70#       totvol[i+1]=totvol[i]+md.basalforcings.groundedice_melting_rate[0,i]*0.002
    7071
    7172field_names     =['SedimentWaterHead5','EplWaterHead5','SedimentWaterHead40','EplWaterHead40']

  • issm/trunk-jpl/test/NightlyRun/test332.m

    r22857 r22900  
    1212md.hydrology.sedimentlimit_flag=1;
    1313md.hydrology.sedimentlimit=8000.0;
     14md.hydrology.mask_thawed_node=ones(md.mesh.numberofvertices,1);
    1415md.initialization.sediment_head=0.0*ones(md.mesh.numberofvertices,1);
    1516md.hydrology.spcsediment_head=NaN*ones(md.mesh.numberofvertices,1);

  • issm/trunk-jpl/test/NightlyRun/test332.py

    r22857 r22900  
    2626
    2727md.hydrology.isefficientlayer=0
     28md.hydrology.mask_thawed_node=np.ones((md.mesh.numberofvertices))
    2829md.hydrology.sedimentlimit_flag=1
    2930md.hydrology.sedimentlimit=8000.0

  • issm/trunk-jpl/test/NightlyRun/test333.m

    r22857 r22900  
    1818md.basalforcings.floatingice_melting_rate = 0.0*ones(md.mesh.numberofvertices,1);
    1919md.hydrology.sediment_transmitivity=3*ones(md.mesh.numberofvertices,1);
     20md.hydrology.mask_thawed_node=ones(md.mesh.numberofvertices,1);
    2021
    2122md.initialization.epl_head=0.0*ones(md.mesh.numberofvertices,1);

  • issm/trunk-jpl/test/NightlyRun/test333.py

    r22857 r22900  
    2626md.hydrology.sedimentlimit_flag=1
    2727md.hydrology.sedimentlimit=800.0
     28md.hydrology.mask_thawed_node=np.ones((md.mesh.numberofvertices))
    2829md.initialization.sediment_head=np.zeros((md.mesh.numberofvertices))
    2930md.hydrology.spcsediment_head=np.nan*np.ones((md.mesh.numberofvertices))

  • issm/trunk-jpl/test/NightlyRun/test334.m

    r22857 r22900  
    1212md.hydrology.sedimentlimit_flag=1;
    1313md.hydrology.sedimentlimit=8000.0;
    14 md.initialization.sediment_head=0.0*ones(md.mesh.numberofvertices,1);
     14md.initialization.sediment_head=0.0*ones(md.mesh.numberofvertices, ...
     15                                         1);
     16md.hydrology.mask_thawed_node=ones(md.mesh.numberofvertices,1);
    1517md.hydrology.spcsediment_head=NaN*ones(md.mesh.numberofvertices,1);
    1618pos=find(md.mesh.y==0);

  • issm/trunk-jpl/test/NightlyRun/test334.py

    r22857 r22900  
    2626md.hydrology.sedimentlimit_flag=1
    2727md.hydrology.sedimentlimit=8000.0
     28md.hydrology.mask_thawed_node=np.ones((md.mesh.numberofvertices))
    2829md.initialization.sediment_head=np.zeros((md.mesh.numberofvertices))
    2930md.hydrology.spcsediment_head=np.nan*np.ones((md.mesh.numberofvertices))

  • issm/trunk-jpl/test/NightlyRun/test335.m

    r22857 r22900  
    1414md.hydrology.sedimentlimit=800.0;
    1515md.initialization.sediment_head=0.0*ones(md.mesh.numberofvertices,1);
     16md.hydrology.mask_thawed_node=ones(md.mesh.numberofvertices,1);
    1617md.hydrology.spcsediment_head=NaN*ones(md.mesh.numberofvertices,1);
    1718md.basalforcings.groundedice_melting_rate = 2.0*ones(md.mesh.numberofvertices,1);

  • issm/trunk-jpl/test/NightlyRun/test335.py

    r22857 r22900  
    2727md.hydrology.sedimentlimit_flag=1
    2828md.hydrology.sedimentlimit=800.0
     29md.hydrology.mask_thawed_node=np.ones((md.mesh.numberofvertices))
    2930md.initialization.sediment_head=np.zeros((md.mesh.numberofvertices))
    3031md.hydrology.spcsediment_head=np.nan*np.ones((md.mesh.numberofvertices))
Note: See TracChangeset for help on using the changeset viewer.