move directory

geoschem · Jun 29, 2022 · 7cd4877 · 7cd4877
1 parent 8eb25e5
commit 7cd4877
Show file tree

Hide file tree

Showing 39 changed files with 16 additions and 4 deletions.
diff --git a/tutorial/CMakeLists.txt b/tutorial/CMakeLists.txt
@@ -2,4 +2,9 @@ install (PROGRAMS run_tutorial_case.sh DESTINATION bin)
 
 add_subdirectory (driver_app)
 add_subdirectory (grid_comps)
-#add_subdirectory (tutorials)
+
+file (GLOB_RECURSE tutorial_files CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} mapl_tutorials/*)
+foreach ( file ${tutorial_files} )
+   get_filename_component( dir ${file} DIRECTORY )
+   install( FILES ${file} DESTINATION etc/${dir} )
+endforeach()
diff --git a/tutorial/tutorials/hello_world/CAP.rc → tutorial/mapl_tutorials/hello_world/CAP.rc b/tutorial/tutorials/hello_world/CAP.rc → tutorial/mapl_tutorials/hello_world/CAP.rc
diff --git a/tutorial/tutorials/hello_world/ExtData.rc → ...ial/mapl_tutorials/hello_world/ExtData.rc b/tutorial/tutorials/hello_world/ExtData.rc → ...ial/mapl_tutorials/hello_world/ExtData.rc
diff --git a/tutorial/tutorials/hello_world/HISTORY.rc → ...ial/mapl_tutorials/hello_world/HISTORY.rc b/tutorial/tutorials/hello_world/HISTORY.rc → ...ial/mapl_tutorials/hello_world/HISTORY.rc
diff --git a/tutorial/tutorials/hello_world/README.md → ...rial/mapl_tutorials/hello_world/README.md b/tutorial/tutorials/hello_world/README.md → ...rial/mapl_tutorials/hello_world/README.md
diff --git a/tutorial/tutorials/hello_world/cap_restart → ...al/mapl_tutorials/hello_world/cap_restart b/tutorial/tutorials/hello_world/cap_restart → ...al/mapl_tutorials/hello_world/cap_restart
diff --git a/...rial/tutorials/hello_world/hello_world.rc → ...mapl_tutorials/hello_world/hello_world.rc b/...rial/tutorials/hello_world/hello_world.rc → ...mapl_tutorials/hello_world/hello_world.rc
diff --git a/tutorial/tutorials/hello_world/root_lib → tutorial/mapl_tutorials/hello_world/root_lib b/tutorial/tutorials/hello_world/root_lib → tutorial/mapl_tutorials/hello_world/root_lib
diff --git a/tutorial/tutorials/parent_no_children/CAP.rc → .../mapl_tutorials/parent_no_children/CAP.rc b/tutorial/tutorials/parent_no_children/CAP.rc → .../mapl_tutorials/parent_no_children/CAP.rc
diff --git a/...l/tutorials/parent_no_children/ExtData.rc → ...l_tutorials/parent_no_children/ExtData.rc b/...l/tutorials/parent_no_children/ExtData.rc → ...l_tutorials/parent_no_children/ExtData.rc
diff --git a/...l/tutorials/parent_no_children/HISTORY.rc → ...l_tutorials/parent_no_children/HISTORY.rc b/...l/tutorials/parent_no_children/HISTORY.rc → ...l_tutorials/parent_no_children/HISTORY.rc
diff --git a/...al/tutorials/parent_no_children/README.md → ...pl_tutorials/parent_no_children/README.md b/...al/tutorials/parent_no_children/README.md → ...pl_tutorials/parent_no_children/README.md
diff --git a/.../tutorials/parent_no_children/cap_restart → ..._tutorials/parent_no_children/cap_restart b/.../tutorials/parent_no_children/cap_restart → ..._tutorials/parent_no_children/cap_restart
diff --git a/...rial/tutorials/parent_no_children/root.rc → ...mapl_tutorials/parent_no_children/root.rc b/...rial/tutorials/parent_no_children/root.rc → ...mapl_tutorials/parent_no_children/root.rc
diff --git a/...ial/tutorials/parent_no_children/root_lib → ...apl_tutorials/parent_no_children/root_lib b/...ial/tutorials/parent_no_children/root_lib → ...apl_tutorials/parent_no_children/root_lib
diff --git a/...arent_one_child_import_via_extdata/CAP.rc → ...arent_one_child_import_via_extdata/CAP.rc b/...arent_one_child_import_via_extdata/CAP.rc → ...arent_one_child_import_via_extdata/CAP.rc
diff --git a/...t_one_child_import_via_extdata/ExtData.rc → ...t_one_child_import_via_extdata/ExtData.rc b/...t_one_child_import_via_extdata/ExtData.rc → ...t_one_child_import_via_extdata/ExtData.rc
diff --git a/...t_one_child_import_via_extdata/HISTORY.rc → ...t_one_child_import_via_extdata/HISTORY.rc b/...t_one_child_import_via_extdata/HISTORY.rc → ...t_one_child_import_via_extdata/HISTORY.rc
diff --git a/...nt_one_child_import_via_extdata/README.md → ...nt_one_child_import_via_extdata/README.md b/...nt_one_child_import_via_extdata/README.md → ...nt_one_child_import_via_extdata/README.md
diff --git a/..._one_child_import_via_extdata/cap_restart → ..._one_child_import_via_extdata/cap_restart b/..._one_child_import_via_extdata/cap_restart → ..._one_child_import_via_extdata/cap_restart
diff --git a/...one_child_import_via_extdata/extdata.yaml → ...one_child_import_via_extdata/extdata.yaml b/...one_child_import_via_extdata/extdata.yaml → ...one_child_import_via_extdata/extdata.yaml
diff --git a/...port_via_extdata/extdata_input.200708.nc4 → ...port_via_extdata/extdata_input.200708.nc4 b/...port_via_extdata/extdata_input.200708.nc4 → ...port_via_extdata/extdata_input.200708.nc4
diff --git a/...rent_one_child_import_via_extdata/root.rc → ...rent_one_child_import_via_extdata/root.rc b/...rent_one_child_import_via_extdata/root.rc → ...rent_one_child_import_via_extdata/root.rc
diff --git a/...ent_one_child_import_via_extdata/root_lib → ...ent_one_child_import_via_extdata/root_lib b/...ent_one_child_import_via_extdata/root_lib → ...ent_one_child_import_via_extdata/root_lib
diff --git a/...orials/parent_one_child_no_imports/CAP.rc → ...orials/parent_one_child_no_imports/CAP.rc b/...orials/parent_one_child_no_imports/CAP.rc → ...orials/parent_one_child_no_imports/CAP.rc
diff --git a/...ls/parent_one_child_no_imports/ExtData.rc → ...ls/parent_one_child_no_imports/ExtData.rc b/...ls/parent_one_child_no_imports/ExtData.rc → ...ls/parent_one_child_no_imports/ExtData.rc
diff --git a/...ls/parent_one_child_no_imports/HISTORY.rc → ...ls/parent_one_child_no_imports/HISTORY.rc b/...ls/parent_one_child_no_imports/HISTORY.rc → ...ls/parent_one_child_no_imports/HISTORY.rc
diff --git a/...als/parent_one_child_no_imports/README.md → ...als/parent_one_child_no_imports/README.md b/...als/parent_one_child_no_imports/README.md → ...als/parent_one_child_no_imports/README.md
diff --git a/...s/parent_one_child_no_imports/cap_restart → ...s/parent_one_child_no_imports/cap_restart b/...s/parent_one_child_no_imports/cap_restart → ...s/parent_one_child_no_imports/cap_restart
diff --git a/...rials/parent_one_child_no_imports/root.rc → ...rials/parent_one_child_no_imports/root.rc b/...rials/parent_one_child_no_imports/root.rc → ...rials/parent_one_child_no_imports/root.rc
diff --git a/...ials/parent_one_child_no_imports/root_lib → ...ials/parent_one_child_no_imports/root_lib b/...ials/parent_one_child_no_imports/root_lib → ...ials/parent_one_child_no_imports/root_lib
diff --git a/...two_siblings_connect_import_export/CAP.rc → ...two_siblings_connect_import_export/CAP.rc b/...two_siblings_connect_import_export/CAP.rc → ...two_siblings_connect_import_export/CAP.rc
diff --git a/...siblings_connect_import_export/ExtData.rc → ...siblings_connect_import_export/ExtData.rc b/...siblings_connect_import_export/ExtData.rc → ...siblings_connect_import_export/ExtData.rc
diff --git a/...siblings_connect_import_export/HISTORY.rc → ...siblings_connect_import_export/HISTORY.rc b/...siblings_connect_import_export/HISTORY.rc → ...siblings_connect_import_export/HISTORY.rc
diff --git a/..._siblings_connect_import_export/README.md → ..._siblings_connect_import_export/README.md b/..._siblings_connect_import_export/README.md → ..._siblings_connect_import_export/README.md
diff --git a/...iblings_connect_import_export/cap_restart → ...iblings_connect_import_export/cap_restart b/...iblings_connect_import_export/cap_restart → ...iblings_connect_import_export/cap_restart
diff --git a/...wo_siblings_connect_import_export/root.rc → ...wo_siblings_connect_import_export/root.rc b/...wo_siblings_connect_import_export/root.rc → ...wo_siblings_connect_import_export/root.rc
diff --git a/...o_siblings_connect_import_export/root_lib → ...o_siblings_connect_import_export/root_lib b/...o_siblings_connect_import_export/root_lib → ...o_siblings_connect_import_export/root_lib
diff --git a/tutorial/run_tutorial_case.sh b/tutorial/run_tutorial_case.sh
@@ -18,11 +18,18 @@ export INSTALL_DIR=$1
 export TUTORIAL_CASE=$2
 source $INSTALL_DIR/bin/g5_modules.sh
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${BASEDIR}/${ARCH}/lib:${INSTALL_DIR}/lib
+export TUTORIAL_PATH=${INSTALL_DIR}/etc/mapl_tutorials/${TUTORIAL_CASE}
 
-for file in `ls ${TUTORIAL_CASE}`; do
-  cp "${TUTORIAL_CASE}/${file}" .
+for file in `ls ${TUTORIAL_PATH}`; do
+  cp "${TUTORIAL_PATH}/${file}" .
 done
 
 ROOT_LIB=`cat root_lib`
 
-mpirun -np 1 ${INSTALL_DIR}/bin/Example_Driver.x --root_dso ${ROOT_LIB}
+export ROOT_RC=`grep '^\s*ROOT_CF:' CAP.rc | cut -d: -f2`
+export NX=`grep '^\s*NX:' ${ROOT_RC}  | cut -d: -f2`
+export NY=`grep '^\s*NY:' ${ROOT_RC}  | cut -d: -f2`
+
+export NPES=`expr ${NY} \* ${NX}`
+
+mpirun -np ${NPES} ${INSTALL_DIR}/bin/Example_Driver.x --root_dso ${ROOT_LIB}