Changeset 19369

Timestamp:

05/14/15 12:41:19 (10 years ago)

Author:

adhikari

Message:

functions related to SH formulation of PSL model removed

Location:

issm/trunk-jpl/src/m/psl

Files:

• gmtOcean.m (deleted)
• gmtResults.m (deleted)
• intro.m (deleted)
• lonLat.m (deleted)
• oceFun.m (deleted)
• p_polynomial_value.m (modified) (2 diffs)
• results.m (deleted)
• selm.m (deleted)
• sharmonics.m (modified) (1 diff)
• shlm.m (modified) (2 diffs)
• shlm_element.m (modified) (2 diffs)
• xplm.m (deleted)
• xxlm.m (deleted)
• yplm.m (deleted)
• yylm.m (deleted)
• zelm.m (deleted)

issm/trunk-jpl/src/m/psl/p_polynomial_value.m

@@ -104 +104 @@
 
   v = ones ( m, n + 1 );
-  %v = zeros ( m, n + 1 );
-
-%  v(1:m,1) = 1.0;
 
   if ( n < 1 )
@@ -113 +110 @@
 
   v(1:m,2) = x;
-  %v(1:m,2) = x(1:m,1);
 
   for i = 2 : n
  
-    %v(1:m,i+1) = ( ( 2 * i - 1 ) * x(1:m,1) .* v(1:m,i)   ...
-    %            -  (     i - 1 ) *             v(1:m,i-1) ) ...
     v(:,i+1) = ( ( 2 * i - 1 ) * x .* v(:,i)   ...
-                -  (     i - 1 ) *             v(:,i-1) ) ...
+                -  (     i - 1 ) *    v(:,i-1) ) ...
                 /  (     i     );
  
   end
  
-%  return
-%end

issm/trunk-jpl/src/m/psl/sharmonics.m

@@ -18 +18 @@
 lon=lon*pi/180; 
 
-disp(['Spherical harmonics of degree and orders up to ',num2str(lMax),' being computed...']);
+%disp(['Spherical harmonics of degree and orders up to ',num2str(lMax),' being computed...']);
 %ortho-normalized SH 
 for l=0:lMax
-        plm = legendre(l,cos(lat),'norm');
+   plm = legendre(l,cos(lat),'norm'); %nromalized Plm (see Matlab documents)
    for m=-l:l 
-                if(m<0) 
-                        sh(:,1+q)=(-1)^(abs(m))*2.*plm(abs(m)+1,:)'.*sin(abs(m).*lon);
-      elseif(m==0)
-         sh(:,1+q)=sqrt(2)*plm(abs(m)+1,:)';
-      else
-         sh(:,1+q)=(-1)^(abs(m))*2.*plm(abs(m)+1,:)'.*cos(abs(m).*lon);
-      end
+                sh(:,1+q)=(-1)^(abs(m)).*plm(abs(m)+1,:)'.*(cos(abs(m).*lon)*(m>=0)+sin(abs(m).*lon)*(m<0)).*sqrt((2-(m==0))/(2*pi)); %orthonormalized
       q=q+1;
    end
    %disp(['Spherical Harmonics of degree ',num2str(l),' (of ',num2str(lMax),') computed!']);
 end
-disp(['... done!']);
+%disp(['... done!']);
 
 

issm/trunk-jpl/src/m/psl/shlm.m

@@ -20 +20 @@
 for l=0:lMax
    for m=-l:l
+      %func0 = sh(:,1+p).*(func<1); 
       func0 = sh(:,1+p).*func; 
       sh_lm(1+p) = sum(mean(func0(index),2).*areas); 
@@ -25 +26 @@
    end
 end 
-sh_lm = sh_lm/sum(areas);
-%sh_lm = sh_lm*4*pi/sum(areas);
+%sh_lm = sh_lm/sum(areas);
+sh_lm = sh_lm*4*pi/sum(areas);
 
+

issm/trunk-jpl/src/m/psl/shlm_element.m

@@ -19 +19 @@
 for l=0:lMax
    for m=-l:l
-      %func0 = sh(:,1+p).*(func<1); 
       func0 = sh(:,1+p).*func; 
       sh_lm(1+p) = sum(func0.*areas); 
@@ -25 +24 @@
    end
 end 
-%sh_lm = sh_lm/sum(areas);
 sh_lm = sh_lm*4*pi/sum(areas);