updated executable names

pism · Nov 20, 2024 · 98a72ef · 98a72ef
1 parent 9333d61
commit 98a72ef
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/calibration/calibrate.py b/calibration/calibrate.py
@@ -309,7 +309,7 @@ def create_offset_file(file_name: str, delta_T: float = 0.0, frac_P: float = 1.0
     pism_config = "pism"
     pism_config_nc = join(output_dir, pism_config + ".nc")
 
-    nc_cmd = f"ncgen -o {pism_config_nc} {input_dir}/config/{pism_config}.cdl"
+    nc_cmd = f"ncgen3 -o {pism_config_nc} {input_dir}/config/{pism_config}.cdl"
     sub.call(shlex.split(nc_cmd))
 
     m_dirs = " ".join(list(dirs.values()))
@@ -362,7 +362,7 @@ def create_offset_file(file_name: str, delta_T: float = 0.0, frac_P: float = 1.0
     print(f"""Using PISM found in {os.environ.get("PISM_PREFIX")}""")
     print("+++++++++++++++++++++++++++++++++++++++++++++++++++++\n\n")
     tm_cmd: List[Any] = [
-        join(pism_path, "bin/create_timeline.py"),
+        join(pism_path, "bin/pism_create_timeline"),
         "-a",
         start_date,
         "-e",

diff --git a/hindcasts/hindcast.py b/hindcasts/hindcast.py
@@ -315,7 +315,7 @@ def create_offset_file(file_name: str, delta_T: float = 0.0, frac_P: float = 1.0
     pism_config = "pism"
     pism_config_nc = join(output_dir, pism_config + ".nc")
 
-    nc_cmd = f"ncgen -o {pism_config_nc} {input_dir}/config/{pism_config}.cdl"
+    nc_cmd = f"ncgen3 -o {pism_config_nc} {input_dir}/config/{pism_config}.cdl"
     sub.call(shlex.split(nc_cmd))
 
     m_dirs = " ".join(list(dirs.values()))
@@ -368,7 +368,7 @@ def create_offset_file(file_name: str, delta_T: float = 0.0, frac_P: float = 1.0
     print(f"""Using PISM found in {os.environ.get("PISM_PREFIX")}""")
     print("+++++++++++++++++++++++++++++++++++++++++++++++++++++\n\n")
     tm_cmd: List[Any] = [
-        join(pism_path, "bin/create_timeline.py"),
+        join(pism_path, "bin/pism_create_timeline"),
         "-a",
         start_date,
         "-e",

diff --git a/hindcasts/run.sh b/hindcasts/run.sh
@@ -1,3 +1,22 @@
+export RAGIS_DIR=/anvil/projects/x-ees240003/pism-ragis
+export PISM_PREFIX=$HOME/local/pism
+export grid=1200
+export odir=${RAGIS_DIR}/hindcasts/2024_11_dem
+
+python $RAGIS_DIR/hindcasts/hindcast.py --start 1940-01-01 --end 1979-12-31 --boot_file $RAGIS_DIR/data/dem/BedMachineGreenland-v5_0.nc --exstep monthly --spatial_ts dem --data_dir $RAGIS_DIR/data  --grid_file $RAGIS_DIR/data/grids/pism-bedmachine-greenland.nc -s anvil -n 128 -q wholenode -w 48:00:00 --o_dir $odir -r $grid -e $RAGIS_DIR/uq/ensemble_gris_ragis_dem_w_posterior_lhs_10.csv $RAGIS_DIR/calibration/2024_11_grimp_tw/state/g1200m_id_BAYES-MEDIAN_1980-1-1_1984-12-31.nc
+
+
+export RAGIS_DIR=/anvil/projects/x-ees240003/pism-ragis
+export PISM_PREFIX=$HOME/local/pism
+export grid=1200
+export odir=${RAGIS_DIR}/hindcasts/2024_11_dem_training
+
+python $RAGIS_DIR/hindcasts/hindcast.py --start 1940-01-01 --end 1979-12-31 --boot_file $RAGIS_DIR/data/dem/BedMachineGreenland-v5_0.nc --exstep yearly --spatial_ts dem --data_dir $RAGIS_DIR/data  --grid_file $RAGIS_DIR/data/grids/pism-bedmachine-greenland.nc -s anvil -n 128 -q wholenode -w 24:00:00 --o_dir $odir -r $grid -e $RAGIS_DIR/uq/ensemble_gris_ragis_dem_w_posterior_lhs_10.csv $RAGIS_DIR/calibration/2024_11_grimp_tw/state/g1200m_id_BAYES-MEDIAN_1980-1-1_1984-12-31.nc
+
+
+
+
+
 for file in hindcasts/2024_07_ragis_tw/spatial/ex_gris_g1800m_v2024-02_RAGIS_id_*; do python analysis/compute_basins_stats_single.py --ensemble_dir hindcasts/ --result_dir analysis/2024_07_ragis_uq --n_jobs 12 $file; done
 
 grid=900