Changeset 26881

Timestamp:

02/10/22 15:04:39 (3 years ago)

Author:

jdquinn

Message:

CHG: Reverting unintended commit; adjusting test2084 to avoid resource starvation

Location:

issm/trunk-jpl

Files:

• examples/SlrGRACE/runme.m (modified) (1 diff)
• src/c/modules/FourierLoveCorex/love_numbers.f90 (modified) (1 diff)
• src/c/modules/FourierLoveCorex/lovenb_sub.f90 (modified) (6 diffs)
• test/NightlyRun/test2071.m (modified) (1 diff)
• test/NightlyRun/test2084.m (modified) (1 diff)
• test/NightlyRun/test2084.py (modified) (1 diff)
• test/NightlyRun/test2092.m (modified) (1 diff)

issm/trunk-jpl/examples/SlrGRACE/runme.m ¶

@@ -2 +2 @@
 addpath('../Data','../Functions');
 
-steps=[7:7];
+steps=[1:7];
 
 if any(steps==1) % {{{ 

issm/trunk-jpl/src/c/modules/FourierLoveCorex/love_numbers.f90 ¶

@@ -308 +308 @@
    if (allow_layer_del.eqv..true.) then
 
-      !print*, layerrap, epsdb, nbc 
+      print*, layerrap, epsdb, nbc 
       !do while ((layerrap<=epsdb).and.(nbc>12*6).or.(isnan(layerrap)) )
       do while ((layerrap<=epsdb).and.(nbc>12).or.(isnan(layerrap)) )

issm/trunk-jpl/src/c/modules/FourierLoveCorex/lovenb_sub.f90 ¶

@@ -48 +48 @@
    endif
 
-        valini=1.d0;
   ! Which among the model interfaces is the first to display boundary conditions
   ifirst = 0
@@ -66 +65 @@
    xmin= radius(i)/ra
    xmax= radius(i+1)/ra - epsdb
-   nstep=1
+   nstep=100
   
    if (soliddim(i)) then
@@ -194 +193 @@
         !write(89,*),xsen,r,ra,cst,mu0,mu,n     
 
+
         bc(1,1)=xsen*r/ra
         bc(1,2)=xsen/(r*ra)
@@ -334 +334 @@
         if (radbc(i)) ifirst = i
   end do
-
- open(unit=200, file="/home/caronlam/Codes/trunk-exp/trunk-jpl/test/NightlyRun/BC_fourier", status='unknown')
- do i = 1,nbc 
-        do j = 1,nbc
-        !if (bc(i,j)/=0.d0) 
-        write(200,*), deg,nbc,i,j, dble(f(11,j)) ,dble(bc(i,j))
-        enddo
- enddo
+! do i = 1,nbc 
+!       do j = 1,nbc
+!       if (bc(i,j)/=0.d0) print*, i,j,bc(i,j)
+!       enddo
+! enddo
 ! write(*,*)
   
@@ -378 +375 @@
         lovel = sc(nbc-1,1)*ra*go_surf
         lovek = sc(nbc,1)*ra*go0
-        !print*,loveh,lovel, lovek
         delta = (1.d0-dble(n+1)/dble(n)*(lovek-1.d0)+2.d0/dble(n)*loveh)
 
@@ -386 +382 @@
       if (j<nbc-2) then ! no need for valini restoration for surface. 
          sc(j,1) = sc(j,1)*valini**((nbc-j-3)/6+1)
-        
       endif
-        !print*,ipiv(j),dble(sc(j,1))
            love_kernels(j,1)=sc(j,1) !*valini
         end do

issm/trunk-jpl/test/NightlyRun/test2071.m ¶

@@ -104 +104 @@
 field_values={h,k,l};
 
-return
-subplot(3,1,1)
-pcolor(0:256,t,log10(abs((hts-h(:,1:257))./hts)))       
-set(gca,'yscale', 'log')
-shading flat
-colorbar 
-title('h')
-
-subplot(3,1,2)
-pcolor(0:256,t,log10(abs((kts-k(:,1:257))./kts)))       
-set(gca,'yscale', 'log')
-shading flat
-colorbar 
-title('k')
-
-subplot(3,1,3)
-pcolor(0:256,t,log10(abs((lts-l(:,1:257))./lts)))       
-set(gca,'yscale', 'log')
-shading flat
-colorbar 
-title('l')
-
 
 return

issm/trunk-jpl/test/NightlyRun/test2084.m ¶

@@ -53 +53 @@
 md.love.n_temporal_iterations=8;
 %md.love.time=(logspace(-6,5, 2))'*cst;
-md.love.time=[0; (logspace(-3,5, 99))'*cst];
+md.love.time=[0; (logspace(-3,5, 24))'*cst];
 
 %md.love.time=(linspace(1/12,10, 10*12))'*cst/1e3;

issm/trunk-jpl/test/NightlyRun/test2084.py ¶

@@ -65 +65 @@
 md.love.n_temporal_iterations = 8
 #md.love.time = np.logspace(-6, 5, 2).reshape(-1, 1) * cst
-md.love.time = np.vstack(([0], np.logspace(-3, 5, 99).reshape(-1, 1) * cst))
+md.love.time = np.vstack(([0], np.logspace(-3, 5, 24).reshape(-1, 1) * cst))
 
 #md.love.time = np.linspace(1/12, 10, 10 * 12).reshape(-1, 1) * cst / 1e3

issm/trunk-jpl/test/NightlyRun/test2092.m ¶

@@ -22 +22 @@
 
 defaultoptions={'KeepVertices',0,'MaxCornerAngle',0.0000000001,'NoBoundaryRefinement',1}; 
-md2d=bamg(model,'domain',dom,'subdomains',co,'hmin',100e3,'hmax',10000e3,defaultoptions{:});
+md2d=bamg(model,'domain',dom,'subdomains',co,'hmin',50e3,'hmax',10000e3,defaultoptions{:});
 
 colat=sqrt(md2d.mesh.x.^2+md2d.mesh.y.^2)/re;