Updated import code and minor revisions

AquaticEcoDynamics · May 29, 2024 · c468b73 · c468b73
1 parent 853b419
commit c468b73
Show file tree

Hide file tree

Showing 16 changed files with 2,753 additions and 66 deletions.
diff --git a/code/actions/agency.mat b/code/actions/agency.mat
diff --git a/code/actions/execute_import_pipeline.m b/code/actions/execute_import_pipeline.m
@@ -22,7 +22,7 @@
 import_theme5 = 0;
 import_wc = 0;
 import_fpa = 0;
-import_bmtswan = 0;
+import_bmtswan = 1;
 import_wamsitheme1 = 0;
 
 create_smd = 1;
@@ -36,7 +36,7 @@
 create_shapefiles = 1;
 
 
-run_marvl = 1;
+run_marvl = 0;
 
 
 %___________________________________________________________________________

diff --git a/code/actions/sitekey.mat b/code/actions/sitekey.mat
diff --git a/code/actions/varkey.mat b/code/actions/varkey.mat
diff --git a/code/import/BMT-SWAN/importSWAN.m b/code/import/BMT-SWAN/importSWAN.m
@@ -158,7 +158,7 @@ function importSWAN()
 
     base = [outpath,filesite,'_',filevar];
     data = [base,'_DATA.csv'];
-    header = [base,'_Header.csv'];
+    header = [base,'_HEADER.csv'];
 
 end
 
diff --git a/code/import/IMOS/Benchmark.m b/code/import/IMOS/Benchmark.m
@@ -0,0 +1,28 @@
+diary Benchmark.txt
+fList = {...
+@()import_imos_profile_2_2010_csv_OLD()
+@()import_imos_profile_2_2010_csv()
+@()import_imos_profile_2_csv_Old()
+@()import_imos_profile_2_csv()
+@()import_imos_temp_sal_Old()
+@()import_imos_temp_sal()...
+}
+Names = {...
+'import_imos_profile_2_2010_csv_OLD'
+'import_imos_profile_2_2010_csv'
+'import_imos_profile_2_csv_Old'
+'import_imos_profile_2_csv'
+'import_imos_temp_sal_Old'
+'import_imos_temp_sal'...
+}
+
+for i = 1:2:6
+    disp('The Old code:');
+    disp(Names{i})
+    timeit(fList{i})
+
+    disp('New version:')
+    disp(Names{i+1})
+    timeit(fList{i+1})
+end
+