Skip to content

Commit

Permalink
For ribbon meshing, update command file to not reuse elastic partials
Browse files Browse the repository at this point in the history
  • Loading branch information
jploveless committed Jul 23, 2024
1 parent faae7cf commit 5db6667
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 31 deletions.
2 changes: 1 addition & 1 deletion data/command/japan_command_ribbonmesh.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"printslipcons": 0,
"quiver_scale": 100,
"repl": 1,
"reuse_elastic": 1,
"reuse_elastic": 0,
"reuse_elastic_file": "../data/operators/japan_elastic_operators.hdf5",
"ridge_param": 0,
"run_name": "0000000041",
Expand Down
38 changes: 8 additions & 30 deletions notebooks/segment_meshing.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"cells": [
{
"cell_type": "code",
"execution_count": 1,
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -13,7 +13,7 @@
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": null,
"metadata": {
"execution": {
"iopub.execute_input": "2021-08-22T18:29:51.661926Z",
Expand Down Expand Up @@ -57,7 +57,7 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -69,7 +69,7 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": null,
"metadata": {
"execution": {
"iopub.execute_input": "2021-08-22T18:29:53.570589Z",
Expand All @@ -80,30 +80,7 @@
},
"tags": []
},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"\u001b[32m2024-07-23 12:03:25.385\u001b[0m | \u001b[1mINFO \u001b[0m | \u001b[36mceleri.celeri\u001b[0m:\u001b[36mget_logger\u001b[0m:\u001b[36m6343\u001b[0m - \u001b[1mRead: ../data/command/japan_command.json\u001b[0m\n",
"\u001b[32m2024-07-23 12:03:25.385\u001b[0m | \u001b[1mINFO \u001b[0m | \u001b[36mceleri.celeri\u001b[0m:\u001b[36mget_logger\u001b[0m:\u001b[36m6344\u001b[0m - \u001b[1mRUN_NAME: 0000000039\u001b[0m\n",
"\u001b[32m2024-07-23 12:03:25.386\u001b[0m | \u001b[1mINFO \u001b[0m | \u001b[36mceleri.celeri\u001b[0m:\u001b[36mget_logger\u001b[0m:\u001b[36m6345\u001b[0m - \u001b[1mWrite log file: ../runs/0000000039/0000000039.log\u001b[0m\n",
"\u001b[32m2024-07-23 12:03:25.386\u001b[0m | \u001b[1mINFO \u001b[0m | \u001b[36mceleri.celeri\u001b[0m:\u001b[36mread_data\u001b[0m:\u001b[36m302\u001b[0m - \u001b[1mReading data files\u001b[0m\n",
"\u001b[32m2024-07-23 12:03:25.391\u001b[0m | \u001b[32m\u001b[1mSUCCESS \u001b[0m | \u001b[36mceleri.celeri\u001b[0m:\u001b[36mread_data\u001b[0m:\u001b[36m306\u001b[0m - \u001b[32m\u001b[1mRead: ../data/segment/japan_new380_adjusted_segment_ribbonmesh.csv\u001b[0m\n",
"\u001b[32m2024-07-23 12:03:25.393\u001b[0m | \u001b[32m\u001b[1mSUCCESS \u001b[0m | \u001b[36mceleri.celeri\u001b[0m:\u001b[36mread_data\u001b[0m:\u001b[36m311\u001b[0m - \u001b[32m\u001b[1mRead: ../data/block/japan_block.csv\u001b[0m\n",
"\u001b[32m2024-07-23 12:03:25.394\u001b[0m | \u001b[32m\u001b[1mSUCCESS \u001b[0m | \u001b[36mceleri.celeri\u001b[0m:\u001b[36mread_data\u001b[0m:\u001b[36m318\u001b[0m - \u001b[32m\u001b[1mRead: ../data/mesh/japan_mesh_parameters.json\u001b[0m\n",
"\n",
"\u001b[32m2024-07-23 12:03:25.466\u001b[0m | \u001b[32m\u001b[1mSUCCESS \u001b[0m | \u001b[36mceleri.celeri\u001b[0m:\u001b[36mread_data\u001b[0m:\u001b[36m464\u001b[0m - \u001b[32m\u001b[1mRead: ../data/mesh/nankai.msh\u001b[0m\n",
"\n",
"\u001b[32m2024-07-23 12:03:25.494\u001b[0m | \u001b[32m\u001b[1mSUCCESS \u001b[0m | \u001b[36mceleri.celeri\u001b[0m:\u001b[36mread_data\u001b[0m:\u001b[36m464\u001b[0m - \u001b[32m\u001b[1mRead: ../data/mesh/japan.msh\u001b[0m\n",
"\n",
"\u001b[32m2024-07-23 12:03:25.529\u001b[0m | \u001b[32m\u001b[1mSUCCESS \u001b[0m | \u001b[36mceleri.celeri\u001b[0m:\u001b[36mread_data\u001b[0m:\u001b[36m464\u001b[0m - \u001b[32m\u001b[1mRead: ../data/mesh/sagami.msh\u001b[0m\n",
"\u001b[32m2024-07-23 12:03:25.533\u001b[0m | \u001b[32m\u001b[1mSUCCESS \u001b[0m | \u001b[36mceleri.celeri\u001b[0m:\u001b[36mread_data\u001b[0m:\u001b[36m500\u001b[0m - \u001b[32m\u001b[1mRead: ../data/station/japan_station.csv\u001b[0m\n",
"\u001b[32m2024-07-23 12:03:25.535\u001b[0m | \u001b[32m\u001b[1mSUCCESS \u001b[0m | \u001b[36mceleri.celeri\u001b[0m:\u001b[36mread_data\u001b[0m:\u001b[36m519\u001b[0m - \u001b[32m\u001b[1mRead: ../data/mogi/japan_mogi.csv\u001b[0m\n",
"\u001b[32m2024-07-23 12:03:25.536\u001b[0m | \u001b[1mINFO \u001b[0m | \u001b[36mceleri.celeri\u001b[0m:\u001b[36mread_data\u001b[0m:\u001b[36m537\u001b[0m - \u001b[1mNo sar_file_name\u001b[0m\n"
]
}
],
"outputs": [],
"source": [
"command = celeri.get_command(command_file_name)\n",
"logger = celeri.get_logger(command)\n",
Expand Down Expand Up @@ -132,7 +109,7 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
Expand Down Expand Up @@ -280,7 +257,7 @@
},
{
"cell_type": "code",
"execution_count": 7,
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
Expand Down Expand Up @@ -326,6 +303,7 @@
"new_command_file_name = os.path.splitext(os.path.normpath(command_file_name))[0] + '_ribbonmesh.json'\n",
"command[\"segment_file_name\"] = new_segment_file_name\n",
"command[\"mesh_parameters_file_name\"] = new_mesh_param_name\n",
"command[\"reuse_elastic\"] = 0\n",
"with open(new_command_file_name, \"w\") as cf:\n",
" json.dump(command, cf, indent=2)"
]
Expand Down

0 comments on commit 5db6667

Please sign in to comment.