Changeset 24384

Timestamp:

11/22/19 02:48:36 (5 years ago)

Author:

bdef

Message:

CHG: syntax fix

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test1101.py (modified) (1 diff)
• test1104.py (modified) (2 diffs)
• test1110.m (modified) (3 diffs)
• test1110.py (modified) (8 diffs)
• test228.py (modified) (1 diff)
• test230.py (modified) (1 diff)
• test234.py (modified) (1 diff)
• test235.py (modified) (1 diff)
• test241.py (modified) (1 diff)
• test242.py (modified) (1 diff)
• test2424.py (modified) (1 diff)
• test250.py (modified) (1 diff)
• test251.py (modified) (1 diff)
• test333.py (modified) (1 diff)
• test336.py (modified) (1 diff)
• test337.py (modified) (1 diff)
• test338.py (modified) (1 diff)
• test339.py (modified) (1 diff)
• test352.py (modified) (1 diff)
• test353.py (modified) (1 diff)
• test354.py (modified) (1 diff)

issm/trunk-jpl/test/NightlyRun/test1101.py

@@ -41 +41 @@
     md.stressbalance.spcvy[pos] = 0.
 
-#Create MPCs to have periodic boundary conditions
+#Create MPCs to have periodic boundary conditions this is done on matlab indexing
     posx = np.where(md.mesh.x == 0.)[0]
     posx2 = np.where(md.mesh.x == np.max(md.mesh.x))[0]

issm/trunk-jpl/test/NightlyRun/test1104.py

@@ -44 +44 @@
 
     md.stressbalance.vertex_pairing = np.vstack((np.vstack((posx + 1, posx2 + 1)).T, np.vstack((posy + 1, posy2 + 1)).T))
-    print(np.shape(md.stressbalance.vertex_pairing))
+
 #Compute the stressbalance
     md.stressbalance.abstol = np.nan
@@ -62 +62 @@
     results.append(md.results.StressbalanceSolution)
 
-#       plotmodel(md, 'data', vx, 'data', vy, 'data', vz, 'layer  #all', md.mesh.numberoflayers)
+#       plotmodel(md, 'data', vx, 'data', vy, 'data', vz, 'layer#all', md.mesh.numberoflayers)
 
 #Fields and tolerances to track changes

issm/trunk-jpl/test/NightlyRun/test1110.m

@@ -1 +1 @@
 %Test Name: ISMIPF
 %This test is a test from the ISMP-HOM Intercomparison project.
-%TestF 
+%TestF
 printingflag=false;
 results={};
 
-for i=1:4,
+for i=3,  %1:4,
         L=100000.; %in m
         nx=30; %numberof nodes in x direction
@@ -55 +55 @@
         md.masstransport.stabilization=1;
         md.stressbalance.maxiter=1;
-        
+
         %Compute the stressbalance
         md.cluster=generic('name',oshostname(),'np',8);
@@ -63 +63 @@
         %save the results
         results{i}=md.results.TransientSolution(end);
-        
-        %Now plot vx and delta surface 
+
+        %Now plot vx and delta surface
         if (i==1 | i==3),
                 plotmodel(md,'data',(md.results.TransientSolution(end).Vx),'layer',md.mesh.numberoflayers,'sectionvalue','../Exp/ISMIP100000.exp','title','','xlabel','','ylabel','Velocity (m/yr)','linewidth',3,'grid','on','unit','km','ylim',[91 100])

issm/trunk-jpl/test/NightlyRun/test1110.py

@@ -4 +4 @@
 from socket import gethostname
 from bamg import *
-from setmask import *
-from parameterize import *
-from setflowequation import *
-from solve import *
-from squaremesh import *
+from setmask import setmask
+from parameterize import parameterize
+from setflowequation import setflowequation
+from solve import solve
+from squaremesh import squaremesh
 
 #This test is a test from the ISMP - HOM Intercomparison project.
@@ -15 +15 @@
 results = []
 
-for i in range(4):
+for i in [1]:  #range(4):
     L = 100000.  #in m
     nx = 30  #numberof nodes in x direction
@@ -25 +25 @@
     md = parameterize(md, '../Par/ISMIPF.py')
     md = md.extrude(4, 1.)
-
     if (i == 0 or i == 1):
         md = setflowequation(md, 'HO', 'all')
@@ -42 +41 @@
     else:
         posA = np.where(md.mesh.vertexonbase)
-        posB = np.unique(np.concatenate(np.where(md.mesh.x == 0.), np.where(md.mesh.x == max(md.mesh.x))))
-        posC = np.unique(np.concatenate(np.where(md.mesh.y == 0.), np.where(md.mesh.y == max(md.mesh.y))))
+        posB = np.unique(np.hstack((np.where(md.mesh.x == 0.), np.where(md.mesh.x == np.nanmax(md.mesh.x)))))
+        posC = np.unique(np.hstack((np.where(md.mesh.y == 0.), np.where(md.mesh.y == np.nanmax(md.mesh.y)))))
         pos = np.intersect1d(np.intersect1d(posA, posB), posC)
         md.stressbalance.spcvx[pos] = 100.  #because we need a dirichlet somewhere
@@ -53 +52 @@
 
     #Create MPCs to have periodic boundary conditions
-    posx = np.where(md.mesh.x == 0.)
-    posx2 = np.where(md.mesh.x == max(md.mesh.x))
+    posx = np.where(md.mesh.x == 0.)[0]
+    posx2 = np.where(md.mesh.x == max(md.mesh.x))[0]
+    # posy = np.where(np.logical_and.reduce((md.mesh.y == 0., md.mesh.x != 0., md.mesh.x != np.max(md.mesh.x))))[0]  #Don't take the same nodes two times
+    # posy2 = np.where(np.logical_and.reduce((md.mesh.y == np.max(md.mesh.y), md.mesh.x != 0., md.mesh.x != np.max(md.mesh.x))))[0]
+    posy = np.where(md.mesh.y == 0)[0]
+    posy2 = np.where(md.mesh.y == np.max(md.mesh.y))[0]
 
-    posy = np.where(md.mesh.y == 0.)
-    posy2 = np.where(md.mesh.y == max(md.mesh.y))
-
-    md.stressbalance.vertex_pairing = np.column_stack((posx, posx2, posy, posy2))
-    md.masstransport.vertex_pairing = np.column_stack((posx, posx2, posy, posy2))
+    md.stressbalance.vertex_pairing = np.vstack((np.vstack((posx + 1, posx2 + 1)).T, np.vstack((posy + 1, posy2 + 1)).T))
+    md.masstransport.vertex_pairing = np.vstack((np.vstack((posx + 1, posx2 + 1)).T, np.vstack((posy + 1, posy2 + 1)).T))
 
     md.timestepping.time_step = 3.
-    md.timestepping.final_time = 300.
-    md.settings.output_frequency = 50
+    md.timestepping.final_time = 30.  #300.
+    md.settings.output_frequency = 5  #50
     md.masstransport.stabilization = 1
     md.stressbalance.maxiter = 1
@@ -74 +74 @@
 
     #save the results
-    results[i] = md.results.TransientSolution()
+    results = np.append(results, md.results.TransientSolution[-1])
 
     #Now plot vx and delta surface
     if (i == 0 or i == 2):
-        plotmodel(md, 'data', (md.results.TransientSolution().Vx),
+        plotmodel(md, 'data', np.squeeze(md.results.TransientSolution[-1].Vx),
                   'layer', md.mesh.numberoflayers,
                   'sectionvalue', '../Exp/ISMIP100000.exp',
@@ -89 +89 @@
                   'ylim', [91, 100])
     elif (i == 1 or i == 3):
-        plotmodel(md, 'data', (md.results.TransientSolution().Vx),
+        plotmodel(md, 'data', np.squeeze(md.results.TransientSolution[-1].Vx),
                   'layer', md.mesh.numberoflayers,
                   'sectionvalue', '../Exp/ISMIP100000.exp',
@@ -115 +115 @@
             #system(['mv ismipfFSvxsliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF'])
 
-    plotmodel(md, 'data', (md.results.TransientSolution().Surface) - md.geometry.surface,
+    plotmodel(md, 'data', np.squeeze(md.results.TransientSolution[-1].Surface) - md.geometry.surface,
               'layer', md.mesh.numberoflayers,
               'sectionvalue', '../Exp/ISMIP100000.exp',

issm/trunk-jpl/test/NightlyRun/test228.py

@@ -22 +22 @@
 #Set up transient
 smb = np.ones((md.mesh.numberofvertices)) * 3.6
-smb = np.vstack((smb, smb * - 1.)).T
+smb = np.vstack((smb, smb * -1.)).T
 
 md.smb.mass_balance = np.vstack((smb, [1.5, 3.]))

issm/trunk-jpl/test/NightlyRun/test230.py

@@ -23 +23 @@
 #Set up transient
 smb = np.ones((md.mesh.numberofvertices)) * 3.6
-smb = np.vstack((smb, smb * - 1.)).T
+smb = np.vstack((smb, smb * -1.)).T
 
 md.smb.mass_balance = np.vstack((smb, [1.5, 3.]))

issm/trunk-jpl/test/NightlyRun/test234.py

@@ -25 +25 @@
 
 smb = np.ones((md.mesh.numberofvertices, )) * 3.6
-smb = np.array([smb, smb * - 1]).T
+smb = np.array([smb, smb * -1]).T
 
 md.smb.mass_balance = smb

issm/trunk-jpl/test/NightlyRun/test235.py

@@ -25 +25 @@
 
 smb = np.ones((md.mesh.numberofvertices, )) * 3.6
-smb = np.array([smb, smb * - 1]).T
+smb = np.array([smb, smb * -1]).T
 
 md.smb.mass_balance = smb

issm/trunk-jpl/test/NightlyRun/test241.py

@@ -23 +23 @@
 #Set up transient
 smb = np.ones((md.mesh.numberofvertices)) * 3.6
-smb = np.vstack((smb, smb * - 1.)).T
+smb = np.vstack((smb, smb * -1.)).T
 
 md.smb.mass_balance = np.vstack((smb, [1.5, 3.]))

issm/trunk-jpl/test/NightlyRun/test242.py

@@ -24 +24 @@
 #Set up transient
 smb = np.ones((md.mesh.numberofvertices)) * 3.6
-smb = np.vstack((smb, smb * - 1.)).T
+smb = np.vstack((smb, smb * -1.)).T
 
 md.smb.mass_balance = np.vstack((smb, [1.5, 3.]))

issm/trunk-jpl/test/NightlyRun/test2424.py

@@ -45 +45 @@
 #time is off by the year constant
 for i in range(nsteps):
-    field_names.append('Time-' + str(md.results.TransientSolution[i].time) + ' - yr - ice_levelset - S - sl - (1 - di) * H')
+    field_names.append('Time-' + str(md.results.TransientSolution[i].time) + '-yr-ice_levelset-S-sl-(1-di) * H')
     field_tolerances.append(1e-12)
     field_values.append(md.results.TransientSolution[i].MaskGroundediceLevelset.reshape(-1, ) - (md.geometry.surface - md.results.TransientSolution[i].Sealevel.reshape(-1, ) - (1 - md.materials.rho_ice / md.materials.rho_water) * md.geometry.thickness))

issm/trunk-jpl/test/NightlyRun/test250.py

@@ -24 +24 @@
 
 smb = np.ones((md.mesh.numberofvertices, )) * 3.6
-smb = np.array([smb, smb * - 1]).T
+smb = np.array([smb, smb * -1]).T
 
 md.smb.mass_balance = smb

issm/trunk-jpl/test/NightlyRun/test251.py

@@ -24 +24 @@
 
 smb = np.ones((md.mesh.numberofvertices, )) * 3.6
-smb = np.array([smb, smb * - 1]).T
+smb = np.array([smb, smb * -1]).T
 
 md.smb.mass_balance = smb

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

@@ -49 +49 @@
 md.timestepping.final_time = 2.0
 
-#md.debug.valgrind = True
+md.debug.valgrind = True
 md = solve(md, 'Transient')
 

issm/trunk-jpl/test/NightlyRun/test336.py

@@ -22 +22 @@
 #Set up transient
 smb = np.ones((md.mesh.numberofvertices)) * 3.6
-smb = np.vstack((smb, smb * - 1.)).T
+smb = np.vstack((smb, smb * -1.)).T
 
 md.smb = SMBcomponents()

issm/trunk-jpl/test/NightlyRun/test337.py

@@ -23 +23 @@
 #Set up transient
 smb = np.ones((md.mesh.numberofvertices)) * 3.6
-smb = np.vstack((smb, smb * - 1.)).T
+smb = np.vstack((smb, smb * -1.)).T
 
 md.smb = SMBcomponents()

issm/trunk-jpl/test/NightlyRun/test338.py

@@ -22 +22 @@
 #Set up transient
 smb = np.ones((md.mesh.numberofvertices)) * 3.6
-smb = np.vstack((smb, smb * - 1.)).T
+smb = np.vstack((smb, smb * -1.)).T
 
 md.smb = SMBmeltcomponents()

issm/trunk-jpl/test/NightlyRun/test339.py

@@ -23 +23 @@
 #Set up transient
 smb = np.ones((md.mesh.numberofvertices)) * 3.6
-smb = np.vstack((smb, smb * - 1.)).T
+smb = np.vstack((smb, smb * -1.)).T
 
 md.smb = SMBmeltcomponents()

issm/trunk-jpl/test/NightlyRun/test352.py

@@ -22 +22 @@
 #Set up transient
 smb = np.ones((md.mesh.numberofvertices)) * 3.6
-smb = np.vstack((smb, smb * - 1.)).T
+smb = np.vstack((smb, smb * -1.)).T
 md.smb.mass_balance = np.vstack((smb, [1.5, 3.]))
 md.transient.isthermal = False

issm/trunk-jpl/test/NightlyRun/test353.py

@@ -22 +22 @@
 #Set up transient
 smb = np.ones((md.mesh.numberofvertices)) * 3.6
-smb = np.vstack((smb, smb * - 1.)).T
+smb = np.vstack((smb, smb * -1.)).T
 
 md.smb = SMBcomponents()

issm/trunk-jpl/test/NightlyRun/test354.py

@@ -22 +22 @@
 #Set up transient
 smb = np.ones((md.mesh.numberofvertices)) * 3.6
-smb = np.vstack((smb, smb * - 1.)).T
+smb = np.vstack((smb, smb * -1.)).T
 
 md.smb = SMBmeltcomponents()