Changeset 27276

Timestamp:

09/10/22 05:53:45 (3 years ago)

Author:

vverjans

Message:

CHG: deleting old autoregression scripts

Location:

issm/trunk-jpl/src

Files:

• c/shared/Random/random.cpp (modified) (2 diffs)
• m/classes/SMBautoregression.m (deleted)
• m/classes/SMBautoregression.py (deleted)
• m/classes/autoregressionlinearbasalforcings.m (deleted)
• m/classes/autoregressionlinearbasalforcings.py (deleted)
• m/classes/frontalforcingsrignotautoregression.m (deleted)
• m/classes/frontalforcingsrignotautoregression.py (deleted)
• m/contrib/morlighem/modeldata/interpBedmachineGreenland.m (modified) (2 diffs)
• m/contrib/morlighem/modeldata/interpSeaRISE.m (modified) (2 diffs)

issm/trunk-jpl/src/c/shared/Random/random.cpp

@@ -44 +44 @@
         for(int i=0;i<dim;i++){
                 sampleStandardNormal[i] = distriNormal.generator(randomengine);
+                //_printf_("VV i sampleStandardNormal[i]: "<<i<<"  "<<sampleStandardNormal[i]<<'\n');
         }
 
@@ -77 +78 @@
         for(int i=0;i<dim;i++){
                 sampleStandardNormal[i] = distriNormal.generator(randomengine);
+                //_printf_("VV i sampleStandardNormal[i]: "<<i<<"  "<<sampleStandardNormal[i]<<'\n');
         }
 

issm/trunk-jpl/src/m/contrib/morlighem/modeldata/interpBedmachineGreenland.m

@@ -45 +45 @@
                 ['/Users/larour/ModelData/BedMachine/' basename '-' ncdate '.nc'],...
                 ['./' basename '-' ncdate '.nc'],...
+                '/media/vincent/TOSH4TB/GeorgiaTech/DataSearch/BedMachine/BedMachineGreenland-2021-04-20.nc',...
                 };
 
@@ -89 +90 @@
 if strcmp(string,'mask') | strcmp(string,'source'),
         %Need nearest neighbor to avoid interpolation between 0 and 2
-        output = InterpFromGrid(xdata,ydata,data,double(X),double(Y),'nearest');
+        %output = InterpFromGrid(xdata,ydata,data,double(X),double(Y),'nearest');
+        output = InterpFromGridToMesh(xdata,flipud(ydata),flipud(data),double(X),double(Y),NaN); %VV
 else
-        output = InterpFromGrid(xdata,ydata,data,double(X),double(Y));
+        %output = InterpFromGrid(xdata,ydata,data,double(X),double(Y));
+        output = InterpFromGridToMesh(xdata,flipud(ydata),flipud(data),double(X),double(Y),NaN); %VV
 end
 

issm/trunk-jpl/src/m/contrib/morlighem/modeldata/interpSeaRISE.m

@@ -58 +58 @@
                         searisenc='/totten_1/ModelData/SeaRISE/Antarctica_5km_dev1.0.nc';
                 end
+   case {'vincentxps159500'}
+                if hemisphere==1
+                        searisenc = '/media/vincent/TOSH4TB/GeorgiaTech/ISSM/fromSeroussi/GrIS04Feb2022/seariseData/Greenland_5km_dev1.2.nc';
+                end
         otherwise
                 error('hostname not supported yet');
@@ -80 +84 @@
 if verbose, disp(['   -- SeaRISE: interpolating ' string]); end
 if strcmpi(string,'LandMask');
-        dataout = InterpFromGrid(xdata,ydata,data,xproj,yproj,'nearest');
+        %dataout = InterpFromGrid(xdata,ydata,data,xproj,yproj,'nearest');
+        dataout = InterpFromGridToMesh(xdata,ydata,data,xproj,yproj,NaN); %VV
 else
-        dataout = InterpFromGrid(xdata,ydata,data,xproj,yproj);
+        %dataout = InterpFromGrid(xdata,ydata,data,xproj,yproj);
+        dataout = InterpFromGridToMesh(xdata,ydata,data,xproj,yproj,NaN); %VV
 end
 dataout = reshape(dataout,size(X,1),size(X,2));