diff --git a/config/workflow_config_nwn.json b/config/workflow_config_nwn.json index d1ec26b..a1c038e 100644 --- a/config/workflow_config_nwn.json +++ b/config/workflow_config_nwn.json @@ -7,6 +7,10 @@ "workflow_type_name": "grow_optimizer_default", "workflow_type_description_name": "Draft Design - Optimization" }, + { + "workflow_type_name": "grow_optimizer_eac", + "workflow_type_description_name": "Draft Design - Optimization – EAC" + }, { "workflow_type_name": "grow_optimizer_no_heat_losses_gurobi", "workflow_type_description_name": "Draft Design - Quickscan Validation - Gurobi" @@ -15,6 +19,10 @@ "workflow_type_name": "grow_optimizer_default_gurobi", "workflow_type_description_name": "Draft Design - Optimization - Gurobi" }, + { + "workflow_type_name": "grow_optimizer_eac_gurobi", + "workflow_type_description_name": "Draft Design - Optimization – EAC - Gurobi" + }, { "workflow_type_name": "simulator", "workflow_type_description_name": "Conceptual Design - Simulation", diff --git a/config/workflow_config_nwn_no_gurobi.json b/config/workflow_config_nwn_no_gurobi.json index da627e4..26c116b 100644 --- a/config/workflow_config_nwn_no_gurobi.json +++ b/config/workflow_config_nwn_no_gurobi.json @@ -7,6 +7,10 @@ "workflow_type_name": "grow_optimizer_default", "workflow_type_description_name": "Draft Design - Optimization" }, + { + "workflow_type_name": "grow_optimizer_eac", + "workflow_type_description_name": "Draft Design - Optimization – EAC" + }, { "workflow_type_name": "simulator", "workflow_type_description_name": "Conceptual Design - Simulation", diff --git a/docker-compose.override.dev.yml b/docker-compose.override.dev.yml index a08dc43..301455f 100644 --- a/docker-compose.override.dev.yml +++ b/docker-compose.override.dev.yml @@ -8,12 +8,12 @@ services: grow_worker_optimizer: &grow_worker image: omotes-worker-mesido-dev - build: - context: .. - dockerfile: optimizer-worker/dev.Dockerfile grow_worker_simulator: <<: *grow_worker + build: + context: .. + dockerfile: optimizer-worker/dev.Dockerfile grow_worker_optimizer_no_heat_losses: <<: *grow_worker @@ -21,6 +21,9 @@ services: grow_worker_optimizer_with_pressure: <<: *grow_worker + grow_worker_optimizer_eac: + <<: *grow_worker + grow_worker_gurobi: <<: *grow_worker diff --git a/docker-compose.yml b/docker-compose.yml index 046e3c3..5ce2c2c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -98,7 +98,7 @@ services: - manual_dev orchestrator: - image: ghcr.io/project-omotes/omotes_orchestrator:1.2.5 + image: ghcr.io/project-omotes/omotes_orchestrator:1.2.6 restart: unless-stopped networks: - omotes @@ -149,7 +149,7 @@ services: condition: service_healthy grow_worker_optimizer: &grow_worker - image: ghcr.io/project-omotes/omotes-grow-optimizer-worker:2.1.1 + image: ghcr.io/project-omotes/omotes-grow-optimizer-worker:2.1.2 restart: unless-stopped deploy: &grow_worker_deploy replicas: 2 @@ -197,6 +197,12 @@ services: <<: *grow_worker_env GROW_TASK_TYPE: grow_optimizer_with_pressure + grow_worker_optimizer_eac: + <<: *grow_worker + environment: + <<: *grow_worker_env + GROW_TASK_TYPE: grow_optimizer_eac + grow_worker_gurobi: <<: *grow_worker deploy: @@ -204,7 +210,7 @@ services: replicas: 1 # only 1 WLS available with a baseline of 1 active session environment: <<: *grow_worker_env - GROW_TASK_TYPE: grow_optimizer_no_heat_losses_gurobi,grow_optimizer_default_gurobi + GROW_TASK_TYPE: grow_optimizer_no_heat_losses_gurobi,grow_optimizer_default_gurobi,grow_optimizer_eac_gurobi volumes: - "./gurobi/gurobi.lic:/app/gurobi/gurobi.lic" diff --git a/scripts/start-dev.sh b/scripts/start-dev.sh index 8a4d33b..8966e7c 100755 --- a/scripts/start-dev.sh +++ b/scripts/start-dev.sh @@ -3,4 +3,5 @@ . scripts/_select_docker_compose.sh $DOCKER_COMPOSE --profile=manual_dev down orchestrator_postgres_db_dev -$DOCKER_COMPOSE -f docker-compose.yml -f docker-compose.override.dev.yml up --build --wait +$DOCKER_COMPOSE -f docker-compose.yml -f docker-compose.override.dev.yml build +$DOCKER_COMPOSE -f docker-compose.yml -f docker-compose.override.dev.yml up --wait diff --git a/scripts/test_system_dev.sh b/scripts/test_system_dev.sh index 944678f..2e80716 100755 --- a/scripts/test_system_dev.sh +++ b/scripts/test_system_dev.sh @@ -11,4 +11,5 @@ sed -i 's/LOG_LEVEL=[a-z]*/LOG_LEVEL=WARNING/gi' ${ENV_FILE} $DOCKER_COMPOSE --env-file ${ENV_FILE} -f $DOCKER_COMPOSE_FILE down -v ./scripts/setup.sh $ENV_FILE "./docker-compose.yml -f ./docker-compose.override.setup.yml" -$DOCKER_COMPOSE --env-file ${ENV_FILE} -f $DOCKER_COMPOSE_FILE up --build --abort-on-container-exit +$DOCKER_COMPOSE --env-file ${ENV_FILE} -f $DOCKER_COMPOSE_FILE build +$DOCKER_COMPOSE --env-file ${ENV_FILE} -f $DOCKER_COMPOSE_FILE up --abort-on-container-exit