Further simplify workflow (#2)

Author: spencerkclark

Makefile

@@ -5,19 +5,20 @@ download_input_data:
 	./download_input_data.sh
 
 test:
-	docker/docker_run.sh \
+	docker run \
 		-v $(shell pwd)/input_data:/input_data \
 		-v $(shell pwd)/tests:/tests \
 		shield:main pytest -vv /tests/test_regression.py
 
 test_regtest_reset:
-	docker/docker_run.sh \
+	docker run \
 		-v $(shell pwd)/input_data:/input_data \
 		-v $(shell pwd)/tests:/tests \
 		shield:main pytest -vv /tests/test_regression.py --regtest-reset
 
 enter:
-	docker/docker_run.sh \
+	docker run \
+		-v $(shell pwd)/input_data:/input_data \
 		-v $(shell pwd)/tests:/tests \
 		-it shield:main bash
 

docker/docker_run.sh

@@ -133,9 +133,9 @@ diag_table:
     time_axis_name: time
     time_axis_units: minutes
 experiment_name: default
-field_table: gs://vcm-fv3config/config/field_table/TKE-EDMF/v1.1/field_table
-forcing: gs://vcm-ml-experiments/spencerc/2023-09-13-SHiELD-forcing-data
-initial_conditions: gs://vcm-fv3config/data/initial_conditions/gfs_c12_example/v1.0
+field_table: /input_data/field_table
+forcing: /input_data/forcing
+initial_conditions: /input_data/initial_conditions
 namelist:
   fms_affinity_nml:
     affinity: false
@@ -468,4 +468,4 @@ namelist:
     stress_ratio: 1.0
     use_old_mlm: true
     use_rain_flux: true
-orographic_forcing: gs://vcm-fv3config/data/orographic_data/v1.0
+orographic_forcing: /input_data/orographic_forcing

tests/default.yml

@@ -1,4 +1,3 @@
-import copy
 import hashlib
 import os
 import shutil
@@ -12,30 +11,13 @@
 
 
 CONFIG_DIR = Path(__file__).parent
-INPUT_DATA_DIR = CONFIG_DIR.parent / "input_data"
 EXECUTABLE = Path("/SHiELD/SHiELD_build/Build/bin/SHiELD_nh.prod.64bit.gnu.x")
 
 
 def get_config(filename):
     config_filename = CONFIG_DIR / filename
     with open(config_filename, "r") as f:
-        return prepare_config(fv3config.load(f))
-
-
-def prepare_config(config: dict) -> dict:
-    """Convert GCS paths to local paths"""
-    result = copy.deepcopy(config)
-
-    forcing = INPUT_DATA_DIR / "forcing"
-    orographic_forcing = INPUT_DATA_DIR / "orographic_forcing"
-    initial_conditions = INPUT_DATA_DIR / "initial_conditions"
-    field_table = INPUT_DATA_DIR / "field_table"
-    
-    result["forcing"] = forcing.as_uri()
-    result["orographic_forcing"] = orographic_forcing.as_uri()
-    result["initial_conditions"] = initial_conditions.as_uri()
-    result["field_table"] = field_table.as_uri()
-    return result
+        return fv3config.load(f)
 
 
 def checksum_file(path: Path) -> str: