From aaa80eb98926a271b59df6b992a90c48df88d637 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Tue, 23 Aug 2016 06:26:20 -0500 Subject: [PATCH 1/4] Update title() subroutine with ASCII logo --- src/output.F90 | 60 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 20 deletions(-) diff --git a/src/output.F90 b/src/output.F90 index 9e23f11d88..29950a0bc2 100644 --- a/src/output.F90 +++ b/src/output.F90 @@ -38,43 +38,63 @@ contains use omp_lib #endif - write(UNIT=OUTPUT_UNIT, FMT='(/11(A/))') & - ' .d88888b. 888b d888 .d8888b.', & - ' d88P" "Y88b 8888b d8888 d88P Y88b', & - ' 888 888 88888b.d88888 888 888', & - ' 888 888 88888b. .d88b. 88888b. 888Y88888P888 888 ', & - ' 888 888 888 "88b d8P Y8b 888 "88b 888 Y888P 888 888 ', & - ' 888 888 888 888 88888888 888 888 888 Y8P 888 888 888', & - ' Y88b. .d88P 888 d88P Y8b. 888 888 888 " 888 Y88b d88P', & - ' "Y88888P" 88888P" "Y8888 888 888 888 888 "Y8888P"', & - '__________________888______________________________________________________', & - ' 888', & - ' 888' + write(UNIT=OUTPUT_UNIT, FMT='(/29(A/))') & + ' %%%%%%%%%%%%%%%%%%', & + ' %%%%%%%%%%%%%%%%%%%%%%%%%%%%', & + ' %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & + ' %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & + ' %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & + ' %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & + ' %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & + ' %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & + ' %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & + ' %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & + ' ################### %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & + ' ###################### %%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & + ' ####################### %%%%%%%%%%%%%%%%%%%%%%%%%%%%', & + ' ######################## %%%%%%%%%%%%%%%%%%%%%%%%%%%%', & + ' ######################### %%%%%%%%%%%%%%%%%%%%%%%%%%%', & + ' ########################## %%%%%%%%%%%%%%%%%%%%%%%%%%', & + ' ############################ %%%%%%%%%%%%%%%%%%%%%%%%', & + ' ############################# %%%%%%%%%%%%%%%%%%%%%%%', & + ' ############################## %%%%%%%%%%%%%%%%%%%%%', & + ' ############################# %%%%%%%%%%%%%%%%%%%%', & + ' ########################### %%%%%%%%%%%%%%%%%%%%', & + ' ######################### %%%%%%%%%%%%%%%%%%%%%', & + ' ###################### %%%%%%%%%%%%%%%%%%%%%', & + ' #################### %%%%%%%%%%%%%%%%%%%%%', & + ' ################# %%%%%%%%%%%%%%%%%%%%', & + ' ############## %%%%%%%%%%%%%%%%%%%', & + ' ########### %%%%%%%%%%%%%%%%%%', & + ' ####### %%%%%%%%%%%%%%%%', & + ' %%%%%%%%%%%%%%' + ! Write version information write(UNIT=OUTPUT_UNIT, FMT=*) & - ' Copyright: 2011-2016 Massachusetts Institute of Technology' + ' | The OpenMC Monte Carlo Code' write(UNIT=OUTPUT_UNIT, FMT=*) & - ' License: http://openmc.readthedocs.io/en/latest/license.html' - write(UNIT=OUTPUT_UNIT, FMT='(6X,"Version:",8X,I1,".",I1,".",I1)') & + ' Copyright | 2011-2016 Massachusetts Institute of Technology' + write(UNIT=OUTPUT_UNIT, FMT=*) & + ' License | http://openmc.readthedocs.io/en/latest/license.html' + write(UNIT=OUTPUT_UNIT, FMT='(11X,"Version | ",I1,".",I1,".",I1)') & VERSION_MAJOR, VERSION_MINOR, VERSION_RELEASE #ifdef GIT_SHA1 - write(UNIT=OUTPUT_UNIT, FMT='(6X,"Git SHA1:",7X,A)') GIT_SHA1 + write(UNIT=OUTPUT_UNIT, FMT='(10X,"Git SHA1 | ",A)') GIT_SHA1 #endif ! Write the date and time - write(UNIT=OUTPUT_UNIT, FMT='(6X,"Date/Time:",6X,A)') & - time_stamp() + write(UNIT=OUTPUT_UNIT, FMT='(9X,"Date/Time | ",A)') time_stamp() #ifdef MPI ! Write number of processors - write(UNIT=OUTPUT_UNIT, FMT='(6X,"MPI Processes:",2X,A)') & + write(UNIT=OUTPUT_UNIT, FMT='(5X,"MPI Processes | ",A)') & trim(to_str(n_procs)) #endif #ifdef _OPENMP ! Write number of OpenMP threads - write(UNIT=OUTPUT_UNIT, FMT='(6X,"OpenMP Threads:",1X,A)') & + write(UNIT=OUTPUT_UNIT, FMT='(4X,"OpenMP Threads | ",A)') & trim(to_str(omp_get_max_threads())) #endif From 75a7986bb792115295a55ee6f25b40dec962b76e Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Tue, 23 Aug 2016 06:26:20 -0500 Subject: [PATCH 2/4] Make ASCII logo a little smaller --- src/output.F90 | 55 ++++++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/src/output.F90 b/src/output.F90 index 29950a0bc2..dc007aab61 100644 --- a/src/output.F90 +++ b/src/output.F90 @@ -38,37 +38,30 @@ contains use omp_lib #endif - write(UNIT=OUTPUT_UNIT, FMT='(/29(A/))') & - ' %%%%%%%%%%%%%%%%%%', & - ' %%%%%%%%%%%%%%%%%%%%%%%%%%%%', & - ' %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & - ' %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & - ' %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & - ' %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & - ' %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & - ' %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & - ' %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & - ' %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & - ' ################### %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & - ' ###################### %%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & - ' ####################### %%%%%%%%%%%%%%%%%%%%%%%%%%%%', & - ' ######################## %%%%%%%%%%%%%%%%%%%%%%%%%%%%', & - ' ######################### %%%%%%%%%%%%%%%%%%%%%%%%%%%', & - ' ########################## %%%%%%%%%%%%%%%%%%%%%%%%%%', & - ' ############################ %%%%%%%%%%%%%%%%%%%%%%%%', & - ' ############################# %%%%%%%%%%%%%%%%%%%%%%%', & - ' ############################## %%%%%%%%%%%%%%%%%%%%%', & - ' ############################# %%%%%%%%%%%%%%%%%%%%', & - ' ########################### %%%%%%%%%%%%%%%%%%%%', & - ' ######################### %%%%%%%%%%%%%%%%%%%%%', & - ' ###################### %%%%%%%%%%%%%%%%%%%%%', & - ' #################### %%%%%%%%%%%%%%%%%%%%%', & - ' ################# %%%%%%%%%%%%%%%%%%%%', & - ' ############## %%%%%%%%%%%%%%%%%%%', & - ' ########### %%%%%%%%%%%%%%%%%%', & - ' ####### %%%%%%%%%%%%%%%%', & - ' %%%%%%%%%%%%%%' - + write(UNIT=OUTPUT_UNIT, FMT='(/23(A/))') & + ' %%%%%%%%%%%%%%%', & + ' %%%%%%%%%%%%%%%%%%%%%%%%', & + ' %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & + ' %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & + ' %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & + ' %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%', & + ' %%%%%%%%%%%%%%%%%%%%%%%%', & + ' %%%%%%%%%%%%%%%%%%%%%%%%', & + ' ############### %%%%%%%%%%%%%%%%%%%%%%%%', & + ' ################## %%%%%%%%%%%%%%%%%%%%%%%', & + ' ################### %%%%%%%%%%%%%%%%%%%%%%%', & + ' #################### %%%%%%%%%%%%%%%%%%%%%%', & + ' ##################### %%%%%%%%%%%%%%%%%%%%%', & + ' ###################### %%%%%%%%%%%%%%%%%%%%', & + ' ####################### %%%%%%%%%%%%%%%%%%', & + ' ######################## %%%%%%%%%%%%%%%%%', & + ' ###################### %%%%%%%%%%%%%%%%%', & + ' #################### %%%%%%%%%%%%%%%%%', & + ' ################# %%%%%%%%%%%%%%%%%', & + ' ############## %%%%%%%%%%%%%%%%', & + ' ########### %%%%%%%%%%%%%%%', & + ' ####### %%%%%%%%%%%%%%', & + ' %%%%%%%%%%%%' ! Write version information write(UNIT=OUTPUT_UNIT, FMT=*) & From 6b64cc7783e86fd3c2bc993921ca40a9e06dd8df Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Tue, 23 Aug 2016 10:23:52 -0500 Subject: [PATCH 3/4] Add SVG version of logo (thanks @samuelshaner!) --- docs/source/_images/openmc_logo.svg | 60 +++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 docs/source/_images/openmc_logo.svg diff --git a/docs/source/_images/openmc_logo.svg b/docs/source/_images/openmc_logo.svg new file mode 100644 index 0000000000..a7352b79ab --- /dev/null +++ b/docs/source/_images/openmc_logo.svg @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + From c91480e56c46f65f0e8ca3a4cc5e3035df524a4b Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Wed, 24 Aug 2016 10:10:52 -0500 Subject: [PATCH 4/4] Will this one satisfy @nelsonag? We shall see. --- src/output.F90 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/output.F90 b/src/output.F90 index dc007aab61..ee5aeeaf1c 100644 --- a/src/output.F90 +++ b/src/output.F90 @@ -54,14 +54,14 @@ contains ' ##################### %%%%%%%%%%%%%%%%%%%%%', & ' ###################### %%%%%%%%%%%%%%%%%%%%', & ' ####################### %%%%%%%%%%%%%%%%%%', & - ' ######################## %%%%%%%%%%%%%%%%%', & + ' ####################### %%%%%%%%%%%%%%%%%', & ' ###################### %%%%%%%%%%%%%%%%%', & ' #################### %%%%%%%%%%%%%%%%%', & ' ################# %%%%%%%%%%%%%%%%%', & - ' ############## %%%%%%%%%%%%%%%%', & - ' ########### %%%%%%%%%%%%%%%', & - ' ####### %%%%%%%%%%%%%%', & - ' %%%%%%%%%%%%' + ' ############### %%%%%%%%%%%%%%%%', & + ' ############ %%%%%%%%%%%%%%%', & + ' ######## %%%%%%%%%%%%%%', & + ' %%%%%%%%%%%' ! Write version information write(UNIT=OUTPUT_UNIT, FMT=*) &