Changeset 25303 for issm/trunk-jpl/src/m/solve/parseresultsfromdisk.m

Timestamp:

07/27/20 12:11:11 (5 years ago)

Author:

jdquinn

Message:

BUG: Array addressing when parsing results (Python); test translation; cleanup

File:

• issm/trunk-jpl/src/m/solve/parseresultsfromdisk.m (modified) (2 diffs)

issm/trunk-jpl/src/m/solve/parseresultsfromdisk.m

@@ -229 +229 @@
                 mu0 = md.love.mu0;
                 rr = md.materials.radius; 
-                rho= md.materials.density; 
-                rho_avg = sum( rho .*  diff(rr.^3)/sum(diff(rr.^3)) ); 
-                temp_field = cell(degmax+1,nfreq,nlayer+1,6); 
+                rho= md.materials.density;
+                rho_avg = sum(rho.*diff(rr.^3)/sum(diff(rr.^3)));
+                temp_field = cell(degmax+1,nfreq,nlayer+1,6);
                 for ii=1:degmax+1
                         for jj=1:nfreq
                                 for kk=1:nlayer+1
                                         if (kk<nlayer+1)
-                                                ll = (ii-1)*(nlayer+1)*6 + ((kk-1)*6+1) + 3; 
-                                                temp_field{ii,jj,kk,1} = field(ll+(1-1),jj)*r0;         % mm = 4 
+                                                ll = (ii-1)*(nlayer+1)*6 + ((kk-1)*6+1) + 3;
+                                                temp_field{ii,jj,kk,1} = field(ll+(1-1),jj)*r0;         % mm = 4
                                                 temp_field{ii,jj,kk,2} = field(ll+(2-1),jj)*mu0;        % mm = 5 
                                                 temp_field{ii,jj,kk,3} = field(ll+(3-1),jj)*r0;         % mm = 6 
@@ -252 +252 @@
                                                 if (md.love.forcing_type==9)
                                                         temp_field{ii,jj,kk,2} = 0; 
-                                                        temp_field{ii,jj,kk,6} = (2*ii-1)/r0 - ii*field(ll+(3-1),jj)*g0; 
+                                                        temp_field{ii,jj,kk,6} = (2*ii-1)/r0 - ii*field(ll+(3-1),jj)*g0;
                                                 elseif (md.love.forcing_type==11)
                                                         temp_field{ii,jj,kk,2} = -(2*(ii-1)+1)*rho_avg/3;