minor

Author: robertdkirkby

EvaluateFnOnAgentDist/EvalFnOnAgentDist_AggVars_Case1.m

@@ -37,7 +37,11 @@
 a_gridvals=CreateGridvals(n_a,a_grid,1);
 % Switch to z_gridvals
 if simoptions.alreadygridvals==0
-    [z_gridvals, ~, simoptions]=ExogShockSetup(n_z,z_grid,[],Parameters,simoptions,1);
+    if simoptions.parallel<2
+        z_gridvals=z_grid; % On cpu, only basics are allowed. No e.
+    else
+        [z_gridvals, ~, simoptions]=ExogShockSetup(n_z,z_grid,[],Parameters,simoptions,1);
+    end
 elseif simoptions.alreadygridvals==1
     z_gridvals=z_grid;
 end

HeterogeneousAgent/HeteroAgentStationaryEqm_Case1.m

@@ -176,13 +176,18 @@
         heteroagentoptions.gridsinGE=1;
     end        
 end
-% If z (and e) are not determined in GE, then compute z_gridvals_J and pi_z_J now (and e_gridvals_J and pi_e_J)
+% If z (and e) are not determined in GE, then compute z_gridvals and pi_z now (and e_gridvals and pi_e)
 if heteroagentoptions.gridsinGE==0
-    % Some of the shock grids depend on parameters that are determined in general eqm
-    [z_grid, pi_z, vfoptions]=ExogShockSetup(n_z,z_grid,pi_z,Parameters,vfoptions,3);
-    % Note: these are actually z_gridvals and pi_z
-    simoptions.e_gridvals=vfoptions.e_gridvals; % Note, will be [] if no e
-    simoptions.pi_e=vfoptions.pi_e; % Note, will be [] if no e
+    if vfoptions.parallel<2 % If on cpu, only allowed to use the very basics
+        % z_grid and pi_z are just simple, so leave as is.
+        % e is not supported for cpu
+    else
+        % Some of the shock grids depend on parameters that are determined in general eqm
+        [z_grid, pi_z, vfoptions]=ExogShockSetup(n_z,z_grid,pi_z,Parameters,vfoptions,3);
+        % Note: these are actually z_gridvals and pi_z
+        simoptions.e_gridvals=vfoptions.e_gridvals; % Note, will be [] if no e
+        simoptions.pi_e=vfoptions.pi_e; % Note, will be [] if no e
+    end
 end
 % Regardless of whether they are done here of in _subfn, they will be
 % precomputed by the time we get to the value fn, staty dist, etc. So

SubCodes/ExoShocks/ExogShockSetup.m

@@ -48,7 +48,6 @@
     elseif gridpiboth==2 % For agent dist, we don't use grid
         z_gridvals=[];
         % Now just do pi_z_J
-        pi_z=zeros(prod(n_z),prod(n_z),'gpuArray');
         if isfield(options,'ExogShockFn')
             ExogShockFnParamsVec=CreateVectorFromParams(Parameters, options.ExogShockFnParamNames);
             ExogShockFnParamsCell=cell(length(ExogShockFnParamsVec),1);
@@ -60,7 +59,6 @@
     elseif gridpiboth==3
         % For value fn, both z_gridvals_J and pi_z_J
         z_gridvals=zeros(prod(n_z),length(n_z),'gpuArray');
-        pi_z=zeros(prod(n_z),prod(n_z),'gpuArray');
         if isfield(options,'ExogShockFn')
             ExogShockFnParamsVec=CreateVectorFromParams(Parameters, options.ExogShockFnParamNames);
             ExogShockFnParamsCell=cell(length(ExogShockFnParamsVec),1);
@@ -71,10 +69,8 @@
         end
         if all(size(z_grid)==[prod(n_z),length(n_z)]) % joint grid
             z_gridvals=z_grid;
-            pi_z=pi_z;
         elseif all(size(z_grid)==[sum(n_z),1]) % basic grid
             z_gridvals=CreateGridvals(n_z,z_grid,1);
-            pi_z=pi_z;
         end
     end
 end
@@ -112,7 +108,6 @@
     elseif gridpiboth==2 % For agent dist, we don't use grid
         options.e_gridvals=[];
         % Now just do pi_e_J
-        options.pi_e=zeros(prod(options.n_e),prod(options.n_e),'gpuArray');
         if isfield(options,'EiidShockFn')
             EiidShockFnParamsVec=CreateVectorFromParams(Parameters, options.EiidShockFnParamNames);
             EiidShockFnParamsCell=cell(length(EiidShockFnParamsVec),1);
@@ -124,8 +119,6 @@
     elseif gridpiboth==3
         % For value fn, both e_gridvals_J and pi_e_J
         options.e_gridvals=zeros(prod(options.n_e),length(options.n_e),'gpuArray');
-        options.pi_e=zeros(prod(options.n_e),prod(options.n_e),'gpuArray');
-
         if isfield(options,'EiidShockFn')
             EiidShockFnParamsVec=CreateVectorFromParams(Parameters, options.EiidShockFnParamNames);
             EiidShockFnParamsCell=cell(length(EiidShockFnParamsVec),1);
@@ -158,5 +151,4 @@
 end
 
 
-
 end