source: issm/oecreview/Archive/26740-27031/ISSM-26885-26886.diff@ 27032

Index: ../trunk-jpl/test/MITgcm/code_4003/shelfice_step_icemass.F
===================================================================
--- ../trunk-jpl/test/MITgcm/code_4003/shelfice_step_icemass.F  (revision 26885)
+++ ../trunk-jpl/test/MITgcm/code_4003/shelfice_step_icemass.F  (revision 26886)
@@ -72,7 +72,7 @@
          DO bi = myBxLo(myThid), myBxHi(myThid)
           DO j=1-OLy,sNy+OLy-1
            DO i=1-OLx+1,sNx+OLx-1
-             shelficeMass(i,j,bi,bj) = R_shelfIce(i,j,bi,bj) * rhoConst
+             shelficeMass(i,j,bi,bj) = -R_shelfIce(i,j,bi,bj) * rhoConst
            ENDDO
           ENDDO
          ENDDO
Index: ../trunk-jpl/test/MITgcm/input_4003/data.shelfice
===================================================================
--- ../trunk-jpl/test/MITgcm/input_4003/data.shelfice   (revision 26885)
+++ ../trunk-jpl/test/MITgcm/input_4003/data.shelfice   (revision 26886)
@@ -16,7 +16,5 @@
  SHELFICEmergeThreshold = 0.10,
 #--
  SHELFICEtopoFile='shelficeTopo.Lin.bin',
- SHELFICEmassFile='shelficeMass.Lin.bin',
- SHELFICEMassDynTendFile='shelfice_dMdt.r02.bin',
-#SHELFICEwriteState = .TRUE.,
+ SHELFICEwriteState = .TRUE.,
  &
Index: ../trunk-jpl/test/MITgcm/tools/lookat_4003.m
===================================================================
--- ../trunk-jpl/test/MITgcm/tools/lookat_4003.m        (revision 26885)
+++ ../trunk-jpl/test/MITgcm/tools/lookat_4003.m        (revision 26886)
@@ -1,25 +1,20 @@
 pn='~/mitgcm/slr/components/issm/trunk-jpl/test/NightlyRun/';
-p1=[pn 'RunUncoupledMITgcm/'];
-p2=[pn 'RunCoupledMITgcmISSM/'];
+p1=[pn 'RunUncoupled/'];
+p2=[pn 'run/'];
 
-fld='Eta';
-ts=1;
-v1=rdmds([p1 fld],ts);
-v2=rdmds([p2 fld],ts);
-clf
-subplot(311), mypcolor(v1); title(fld), colorbar
-subplot(312), mypcolor(v2); title('coupled'), colorbar
-subplot(313), mypcolor(v2-v1); title('coupled-uncoupled'), colorbar
-
-ts=8;
+ts=0;
 fld='R_shelfIce1_';
 v1=readbin([p2 fld myint2str(ts,10) '.data'],[3 200]);
 fld='R_shelfIce2_';
-v2=readbin([p2 fld myint2str(ts,10) '.data'],[3 200]);
-clf
-subplot(311), mypcolor(v1); title(fld), colorbar
-subplot(312), mypcolor(v2); title('coupled'), colorbar
-subplot(313), mypcolor(v2-v1); title('coupled-uncoupled'), colorbar
+for ts=0:8:184
+    v2=readbin([p2 fld myint2str(ts,10) '.data'],[3 200]);
+    clf
+    subplot(311), mypcolor(v1); title(ts-8), colorbar
+    subplot(312), mypcolor(v2); title(ts), colorbar
+    subplot(313), mypcolor(v2-v1); title('diff'), colorbar
+    pause
+    v1=v2;
+end
 
 fld='surfDiag';
 ts=2;
@@ -35,3 +30,12 @@
     subplot(313), mypcolor(v2(:,:,i)-v1(:,:,i)); title('coupled-uncoupled'), colorbar
     pause
 end
+
+fld='Eta';
+ts=1;
+v1=rdmds([p1 fld],ts);
+v2=rdmds([p2 fld],ts);
+clf
+subplot(311), mypcolor(v1); title(fld), colorbar
+subplot(312), mypcolor(v2); title('coupled'), colorbar
+subplot(313), mypcolor(v2-v1); title('coupled-uncoupled'), colorbar
Index: ../trunk-jpl/test/NightlyRun/test4003.m
===================================================================
--- ../trunk-jpl/test/NightlyRun/test4003.m     (revision 26885)
+++ ../trunk-jpl/test/NightlyRun/test4003.m     (revision 26886)
@@ -143,18 +143,6 @@
     namF='run/shelficeTopo.Lin.bin';
     fid=fopen(namF,'w','b'); fwrite(fid,draft,prec);fclose(fid);
     
-    var=([1:Ny]-2)/(jEnd-2);
-    dMdt_fy=zeros(Nx,Ny);
-    for i=1:Nx
-        dMdt_fy(i,:)=-cos(pi*var);
-        dMdt_fy(i,1)=0; dMdt_fy(i,j2:Ny)=0;
-    end    
-    %- rate of change due to ice-stream dynamics
-    rateDyn=rho_water*0.1/3600;  sfx='r02';
-    dMdt=rateDyn*dMdt_fy;
-    namF=sprintf('%s.%s.%s','run/shelfice_dMdt',sfx,'bin');
-    fid=fopen(namF,'w','b'); fwrite(fid,dMdt,prec);fclose(fid);
-
     del_T = (T_bot - T_sfc)/(59*delZ);
     tref=zeros(1,Nz);
     for k = 1:Nz;
@@ -195,11 +183,6 @@
         end, end
     namF='run/salt_ini.bin';
     fid=fopen(namF,'w','b'); fwrite(fid,var,prec);fclose(fid);
-
-    rhoAvr=rho_water-1.345;
-    mIce=-rhoAvr*draft;
-    namF='run/shelficeMass.Lin.bin';
-    fid=fopen(namF,'w','b'); fwrite(fid,mIce,prec);fclose(fid);
     % }}}
 
     cd run
@@ -415,21 +398,17 @@
     namF='run/bathy_flat.bin';
     fid=fopen(namF,'w','b'); fwrite(fid,bathymetry,prec);fclose(fid);
     
+    draft=md.results.TransientSolution(end).Base;
+    draft=reshape(draft,[Nx+1,Ny+1]);
+    pos=ones(Nx+1,Ny+1);
+    pos(find(md.mask.ice_levelset>0))=0;
+    draft=draft.*pos;
+    draft=draft(1:Nx,1:Ny)+draft(2:end,1:Ny)+draft(1:Nx,2:end)+draft(2:end,2:end);
+    pos=pos(1:Nx,1:Ny)+pos(2:end,1:Ny)+pos(1:Nx,2:end)+pos(2:end,2:end);
+    draft(find(pos))=draft(find(pos))./pos(find(pos));
     namF='run/shelficeTopo.Lin.bin';
     fid=fopen(namF,'w','b'); fwrite(fid,draft,prec);fclose(fid);
     
-    var=([1:Ny]-2)/(jEnd-2);
-    dMdt_fy=zeros(Nx,Ny);
-    for i=1:Nx
-        dMdt_fy(i,:)=-cos(pi*var);
-        dMdt_fy(i,1)=0; dMdt_fy(i,j2:Ny)=0;
-    end    
-    %- rate of change due to ice-stream dynamics
-    rateDyn=rho_water*0.1/3600;  sfx='r02';
-    dMdt=rateDyn*dMdt_fy;
-    namF=sprintf('%s.%s.%s','run/shelfice_dMdt',sfx,'bin');
-    fid=fopen(namF,'w','b'); fwrite(fid,dMdt,prec);fclose(fid);
-
     del_T = (T_bot - T_sfc)/(59*delZ);
     tref=zeros(1,Nz);
     for k = 1:Nz;
@@ -470,11 +449,6 @@
         end, end
     namF='run/salt_ini.bin';
     fid=fopen(namF,'w','b'); fwrite(fid,var,prec);fclose(fid);
-
-    rhoAvr=rho_water-1.345;
-    mIce=-rhoAvr*draft;
-    namF='run/shelficeMass.Lin.bin';
-    fid=fopen(namF,'w','b'); fwrite(fid,mIce,prec);fclose(fid);
     % }}}
     % }}}