Diff of /MITgcm_contrib/enderton/PeriodicCoupling/MakePcForcing.m

Parent Directory | Revision Log | Revision Graph | Patch

--- MITgcm_contrib/enderton/PeriodicCoupling/MakePcForcing.m	2006/02/28 23:16:02	1.1
+++ MITgcm_contrib/enderton/PeriodicCoupling/MakePcForcing.m	2006/03/09 00:23:38	1.2
@@ -1,5 +1,5 @@
-function MakePcForcing(cplFiles,atmFiles,gridFiles,prevFocnFiles,period,...
-                       outDir,FocnRoot,focnRoot,iter,...
+function MakePcForcing(cplFiles,atmFiles,gridFiles,prevFocnFiles,...
+                       period,outDir,FocnRoot,focnRoot,iter,...
                        dtC,gWeight,FocnOnly,InspectFocn,Inspectfocn)
 
 % Make fields for forcing ocean component of periodic coupling.
@@ -22,13 +22,13 @@
 %                                 Load Data                               %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-% datacpl = rdmnc(cplFiles,'iter','HFtave','TXtave','TYtave','FWtave','T');
-% dataatm = rdmnc(atmFiles,'iter','THETA'   ,'ALBVISDF','RADSWG'  ,...
-%                                 'DWNLWG'  ,'TS'      ,'QS'      ,...
-%                                 'WINDS'   ,'PRECON'  ,'PRECLS','T');
-% datagrd = rdmnc(gridFiles,'rA','XG','YG','XC','YC','HFacC');
+datacpl = rdmnc(cplFiles,'iter','HFtave','TXtave','TYtave','FWtave','T');
+dataatm = rdmnc(atmFiles,'iter','THETA'   ,'ALBVISDF','RADSWG'  ,...
+                                'DWNLWG'  ,'TS'      ,'QS'      ,...
+                                'WINDS'   ,'PRECON'  ,'PRECLS','T');
+datagrd = rdmnc(gridFiles,'rA','XG','YG','XC','YC','HFacC');
 % save('DataPerCpl.mat','datacpl','dataatm','datagrd');
-load('DataPerCpl.mat');
+% load('DataPerCpl.mat');
 nc = size(datagrd.rA,2);
 RAC = datagrd.rA;
 mask = datagrd.HFacC(:,:,1);
@@ -57,6 +57,11 @@
 %                      Select Coupled Field Data                          %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+if ~isequal(datacpl.iter,dataatm.iter./8)
+    disp('datacpl.iter');    datacpl.iter
+    disp('dataatm.iter/8');  dataatm.iter./8
+    error('Iterations for coupled and atmospheric data do not match.');
+end
 test  = ismember(iter,datacpl.iter);
 index = ismember(datacpl.iter,iter);
 if ~isempty(find(test==0))