Changeset 27022

Timestamp:

05/24/22 10:08:07 (3 years ago)

Author:

aleahsommers

Message:

CHG: take out PMPheat in melt rate

Location:

issm/trunk-jpl

Files:

• examples/Inversion/Square.par (modified) (1 diff)
• examples/Inversion/runme.m (modified) (1 diff)
• src/c/analyses/HydrologyShaktiAnalysis.cpp (modified) (2 diffs)

issm/trunk-jpl/examples/Inversion/Square.par

@@ -11 +11 @@
 
 disp('      creating drag');
-md.friction.coefficient=200*ones(md.mesh.numberofvertices,1);
+md.friction.coefficient=50*ones(md.mesh.numberofvertices,1);
 md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
 md.friction.p = ones(md.mesh.numberofelements,1);

issm/trunk-jpl/examples/Inversion/runme.m

@@ -1 @@
-steps=[1];
+steps=[4];
 
 if any(steps==1) 

issm/trunk-jpl/src/c/analyses/HydrologyShaktiAnalysis.cpp

@@ -382 +382 @@
                 dpressure_water[1] = rho_water*g*(dh[1] - dbed[1]);
                 PMPheat=CT*CW*conductivity*rho_water*(dh[0]*dpressure_water[0]+dh[1]*dpressure_water[1]);
+                PMPheat=0; /*** TEST no PMPheat***/
 
         meltrate = 1/latentheat*(G+frictionheat+rho_water*g*conductivity*(dh[0]*dh[0]+dh[1]*dh[1])-PMPheat);
@@ -629 +630 @@
                 dpressure_water[1] = rho_water*g*(dh[1] - dbed[1]);
                 PMPheat=CT*CW*conductivity*rho_water*(dh[0]*dpressure_water[0]+dh[1]*dpressure_water[1]);
+PMPheat=0; /*** TEST no PMPheat***/
                 dissipation=rho_water*g*conductivity*(dh[0]*dh[0]+dh[1]*dh[1]);