Skip to content

Commit

Permalink
fig1 with increased textsize
Browse files Browse the repository at this point in the history
  • Loading branch information
@Arhathsis
Arhathsis committed Sep 20, 2020
1 parent 4458428 commit 36e26bf
Show file tree
Hide file tree
Showing 8 changed files with 1,265 additions and 222 deletions.
38 changes: 17 additions & 21 deletions COSMOD_Citadel.f95
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,26 @@ module COSMOD_citadel

use COSMOD_paths
use COSMOD_graphics
use COSMOD_tables
use COSMOD_scripts

contains

character(len) :: OS

contains

subroutine caption_MN_info

open(unit_1,file=MN_info,status='replace')
write(unit_1,*) 'Anyone with this link can edit this project'
write(unit_1,*) 'https://www.overleaf.com/9181497425tkqhjdzzmbgg'
write(unit_1,*) 'Anyone with this link can view this project'
write(unit_1,*) 'https://www.overleaf.com/read/jjrmkfbhhftv'
close(unit_1)

end subroutine caption_MN_info



subroutine preparation

call define_system
if (operation_system==1) OS = 'Windows'
write(*,*) 'OS: ',trim(OS)
call paths
call gen_folders

write(*,*) 'COSMOD citadel is runned..'
write(*,*) 'COSMOD citadel is run..'

end subroutine

Expand All @@ -46,6 +42,15 @@ subroutine commands
case ('overleaf') ; call make_overleaf_figures_folder
case ('o') ; call make_overleaf_figures_folder

case ('cosmod')
call COSMOD_model_set
case ('c')
call COSMOD_model_set

case ('fig1') ; call MN_Letter_plot_fig1

case ('tab1') ; call MN_Letter_plot_tab1

case ('exit') ; exit

case default ; write(*,*) 'unknown command'
Expand All @@ -58,14 +63,5 @@ subroutine commands



subroutine make_overleaf_figures_folder

call system('echo off && MD ' // trim(overleaf) // ' >> log.log ' )

call caption_MN_info

end subroutine



end module
2 changes: 2 additions & 0 deletions COSMOD_Config.f95
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@
!=- © Stanislav Shirokov, 2014-2020

module COSMOD_config

logical :: GRB_medians_flag = .true.

end module
445 changes: 444 additions & 1 deletion COSMOD_Graphics.f95
View file

Large diffs are not rendered by default.

67 changes: 64 additions & 3 deletions COSMOD_Paths.f95
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,79 @@
module COSMOD_paths
use global

character(len) :: WorkDir='' , overleaf='' , MN_info
character(len) :: WorkDir='' , overleaf='' , MN_info , Models_folder , path_tabs

contains

subroutine paths

WorkDir = trim( make_workdir() ) // 'Main_Workspace\'

overleaf = trim(WorkDir) // 'overleaf\'
Models_folder = trim(WorkDir) // 'Models\'

MN_info = trim(WorkDir)//'overleaf\MN.info'
overleaf = trim(WorkDir) // 'overleaf\MN_Letter\'
MN_info = trim(overleaf) // 'MN.info'

path_tabs = trim(WorkDir) // 'Tables\'

end subroutine



subroutine gen_folders

call system('mkdir ' // trim(Models_folder) // ' >> log.log ' )
call system('mkdir ' // trim(path_tabs) // ' >> log.log ' )

call sleep (1)

call system('cls')

end subroutine gen_folders



subroutine caption_MN_info

open(unit_1,file=MN_info,status='replace')
write(unit_1,*) 'Anyone with this link can edit this project'
write(unit_1,*) 'https://www.overleaf.com/5957249232dfnmwjsjvdng'
write(unit_1,*) 'Anyone with this link can view this project'
write(unit_1,*) 'https://www.overleaf.com/read/ybwtxspzsdtb'
close(unit_1)

end subroutine caption_MN_info


subroutine make_overleaf_figures_folder

call system('echo off && MD ' // trim(overleaf) // ' >> log.log ' )

files( 1 ) = trim(WorkDir) // &
'plots\MN_letter_model_set\MN_letter_model_set_mu(z)_all_models.eps'
new_files( 1 ) = 'Shirokov_fig1.eps'

files( 2 ) = trim(WorkDir) // &
'plots\MN_letter_model_set\MN_letter_model_set_delta_mu(z)_all_models.eps'
new_files( 2 ) = 'Shirokov_fig2.eps'

files( 3 ) = trim(WorkDir) // &
'plots\MN_letter_model_set\MN_letter_model_set_delta_mu(z)_fig1a.eps'
new_files( 3 ) = 'Shirokov_fig1a.eps'

files( 4 ) = trim(WorkDir) // &
'plots\MN_letter_model_set\MN_letter_model_set_delta_mu(z)_fig1b.eps'
new_files( 4 ) = 'Shirokov_fig1b.eps'

do i=1,N_files
if (files(i)/='') call system('copy '// trim(files(i)) //' '// trim(overleaf) // ' >> log.log ' )
if (files(i)/='') call system('move '// trim(overleaf) // trim(name(files(i))) //'.eps '// &
trim(overleaf) // trim(new_files(i)) // ' >> log.log ' )
enddo

call caption_MN_info

end subroutine


end module
179 changes: 179 additions & 0 deletions COSMOD_Scripts.f95
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,184 @@ module COSMOD_scripts

use COSMOD_config
use COSMOD_paths
use COSMOD_graphics



contains


subroutine MN_Letter_plot_fig1

integer i,j,k,k_max,i_max,j_max , i_min , w , n_model
model_set_path = trim(WorkDir) // 'MN_letter_model_set.dat'

!=- write(*,*) ' the model_set format:'
!=- write(*,*) ' wCDM H_0 w Omega_v Omega_k'
!=- write(*,*) ' FF H_0'
!=- write(*,*) ' TL H_0'

MS_parameters(1)='0.3'
MS_parameters(2)='0.7'

w_count = 2
Omega_v_count = 2
Omega_k_count = 3
MS_real_model_count = w_count*Omega_k_count*Omega_v_count


n_model=0
do j=1,Omega_v_count
do i=1,w_count
w=-i
do k=1,Omega_k_count
MS_O_k = -0.2 + 0.1*k
mm=4
if (k>1) mm=5
read(MS_parameters(j),*) MS_O_v
MS_O_m_bug = abs ( 1 + MS_O_k - MS_O_v ) !=- the Friedmann equation

n_model = n_model + 1
model_set ( n_model , 1 ) = &
' wCDM 70 ' // trim(inttostr(w)) // ' ' // &
trim(MS_parameters(j)) // ' ' // trim(realtostrf(MS_O_k,4,1))
model_set ( n_model , 2 ) = &
' wCDM (w = ' // trim(inttostr(w)) // &
', {/Symbol W}_{DE}=' // trim(MS_parameters(j)) // &
', {/Symbol W}_m=' // trim(realtostrf(MS_O_m_bug,4,1)) // &
', {/Symbol W}_k=' // trim(realtostrf(MS_O_k,mm,1)) // ') '
enddo
enddo
enddo

!=- the hand input:
!model_set

!=- write(*,'(A)') model_set(:,1) ; pause

call compute_model_set
call write_model_set
GRB_medians_flag = .false.
call MN_Letter_fig1
GRB_medians_flag = .true.
call MN_Letter_fig1
!=- call MN_Letter_example


end subroutine MN_Letter_plot_fig1


subroutine COSMOD_model_set
integer i,j,k,k_max,i_max,j_max , i_min , w , n_model
model_set_path = trim(WorkDir) // 'MN_letter_model_set.dat'

!=- write(*,*) ' the model_set format:'
!=- write(*,*) ' wCDM H_0 w Omega_v Omega_k'
!=- write(*,*) ' FF H_0'
!=- write(*,*) ' TL H_0'

MS_parameters(1)='0.5'
MS_parameters(2)='0.7'
MS_parameters(3)='0.9'

w_count = 2
Omega_v_count = 3
Omega_k_count = 3
MS_real_model_count = w_count*Omega_k_count*Omega_v_count - 6


n_model=0
do j=1,Omega_v_count
if ( j /= 2 ) then
i_max = 1
else
i_max = w_count
endif
do i=1,i_max
w=-i
if ( j /= 2 ) w=-2
do k=1,Omega_k_count
MS_O_k = -0.2 + 0.1*k
mm=4
if (k>1) mm=5
read(MS_parameters(j),*) MS_O_v
MS_O_m_bug = abs ( 1 + MS_O_k - MS_O_v ) !=- the Friedmann equation
!write(*,*) MS_O_m_bug ; pause
n_model = n_model + 1
model_set ( n_model , 1 ) = &
' wCDM 70 ' // trim(inttostr(w)) // ' ' // &
trim(MS_parameters(j)) // ' ' // trim(realtostrf(MS_O_k,4,1))
model_set ( n_model , 2 ) = &
' wCDM (w = ' // trim(inttostr(w)) // &
', {/Symbol W}_{DE}=' // trim(MS_parameters(j)) // &
', {/Symbol W}_m=' // trim(realtostrf(MS_O_m_bug,4,1)) // &
', {/Symbol W}_k=' // trim(realtostrf(MS_O_k,mm,1)) // ') '
enddo
enddo
enddo

!=- the hand input:
!model_set

!=- write(*,'(A)') model_set(:,1) ; pause

call compute_model_set
call write_model_set
call MN_Letter_example

end subroutine COSMOD_model_set



subroutine COSMOD_model_set_all
integer i,j,k
model_set_path = trim(WorkDir) // 'MN_letter_' // model_set_path

!=- write(*,*) ' the model_set format:'
!=- write(*,*) ' wCDM H_0 w Omega_v Omega_k'
!=- write(*,*) ' FF H_0'
!=- write(*,*) ' TL H_0'

MS_parameters(1)='0.7'
MS_parameters(2)='0.5'
MS_parameters(3)='0.9'

do k=1,3
read(MS_parameters(k),*) MS_O_v
do i=1,3
MS_O_m_bug = abs ( 1 + 0.0 - MS_O_v ) !=- the Friedmann equation
!write(*,*) MS_O_m_bug ; pause
model_set ( 1+3*(i-1)+9*(k-1) , 1 ) = ' wCDM 70 ' // trim(inttostr(-i)) // ' ' // &
trim(MS_parameters(k)) // ' 0.0 '
model_set ( 1+3*(i-1)+9*(k-1) , 2 ) = ' the wCDM (w = ' // trim(inttostr(-i)) // &
', {/Symbol W}_{/Symbol L}=' // trim(MS_parameters(k)) // &
', {/Symbol W}_m=' // trim(realtostrf(MS_O_m_bug,3,1)) // &
', {/Symbol W}_k= 0.0) model '

MS_O_m_bug = abs ( 1 + 0.1 - MS_O_v ) !=- the Friedmann equation
model_set ( 2+3*(i-1)+9*(k-1) , 1 ) = ' wCDM 70 ' // trim(inttostr(-i)) // ' ' // &
trim(MS_parameters(k)) // ' 0.1 '
model_set ( 2+3*(i-1)+9*(k-1) , 2 ) = ' the wCDM (w = ' // trim(inttostr(-i)) // &
', {/Symbol W}_{/Symbol L}=' // trim(MS_parameters(k)) // &
', {/Symbol W}_m=' // trim(realtostrf(MS_O_m_bug,3,1)) // &
', {/Symbol W}_k= 0.1) model '

MS_O_m_bug = abs ( 1 - 0.1 - MS_O_v ) !=- the Friedmann equation
model_set ( 3+3*(i-1)+9*(k-1) , 1 ) = ' wCDM 70 ' // trim(inttostr(-i)) // ' ' // &
trim(MS_parameters(k)) // ' -0.1 '
model_set ( 3+3*(i-1)+9*(k-1) , 2 ) = ' the wCDM (w = ' // trim(inttostr(-i)) // &
', {/Symbol W}_{/Symbol L}=' // trim(MS_parameters(k)) // &
', {/Symbol W}_m=' // trim(realtostrf(MS_O_m_bug,3,1)) // &
', {/Symbol W}_k=-0.1) model '
enddo
enddo

call compute_model_set
call write_model_set
call MN_Letter_all

end subroutine COSMOD_model_set_all



end module COSMOD_scripts
Loading

0 comments on commit 36e26bf

Please sign in to comment.