Skip to content

Commit f847598

Browse files
authored
Merge branch 'master' into Lodi_MultiComponent
2 parents 308d919 + 4949c07 commit f847598

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/post_process/m_start_up.f90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,11 @@ subroutine s_perform_time_step(t_step)
156156
integer, intent(inout) :: t_step
157157
if (proc_rank == 0) then
158158
if (cfl_dt) then
159-
print '(" ["I3"%] Saving "I8" of "I0"")', &
159+
print '(" [", I3, "%] Saving ", I8, " of ", I0, "")', &
160160
int(ceiling(100._wp*(real(t_step - n_start)/(n_save)))), &
161161
t_step, n_save
162162
else
163-
print '(" ["I3"%] Saving "I8" of "I0" @ t_step = "I0"")', &
163+
print '(" [", I3, "%] Saving ", I8, " of ", I0, " @ t_step = ", I0, "")', &
164164
int(ceiling(100._wp*(real(t_step - t_step_start)/(t_step_stop - t_step_start + 1)))), &
165165
(t_step - t_step_start)/t_step_save + 1, &
166166
(t_step_stop - t_step_start)/t_step_save + 1, &
@@ -708,7 +708,7 @@ subroutine s_initialize_mpi_domain
708708
call s_read_input_file()
709709
call s_check_input_file()
710710

711-
print '(" Post-processing a "I0"x"I0"x"I0" case on "I0" rank(s)")', m, n, p, num_procs
711+
print '(" Post-processing a ", I0, "x", I0, "x", I0, " case on ", I0, " rank(s)")', m, n, p, num_procs
712712
end if
713713

714714
! Broadcasting the user inputs to all of the processors and performing the

src/pre_process/m_start_up.fpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,7 @@ contains
912912
call s_read_input_file()
913913
call s_check_input_file()
914914

915-
print '(" Pre-processing a "I0"x"I0"x"I0" case on "I0" rank(s)")', m, n, p, num_procs
915+
print '(" Pre-processing a ", I0, "x", I0, "x", I0, " case on ", I0, " rank(s)")', m, n, p, num_procs
916916
end if
917917

918918
! Broadcasting the user inputs to all of the processors and performing the

src/simulation/m_start_up.fpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1279,15 +1279,15 @@ contains
12791279

12801280
if (cfl_dt) then
12811281
if (proc_rank == 0 .and. mod(t_step - t_step_start, t_step_print) == 0) then
1282-
print '(" ["I3"%] Time "ES16.6" dt = "ES16.6" @ Time Step = "I8"")', &
1282+
print '(" [", I3, "%] Time ", ES16.6, " dt = ", ES16.6, " @ Time Step = ", I8, "")', &
12831283
int(ceiling(100._wp*(mytime/t_stop))), &
12841284
mytime, &
12851285
dt, &
12861286
t_step
12871287
end if
12881288
else
12891289
if (proc_rank == 0 .and. mod(t_step - t_step_start, t_step_print) == 0) then
1290-
print '(" ["I3"%] Time step "I8" of "I0" @ t_step = "I0"")', &
1290+
print '(" [", I3, "%] Time step ", I8, " of ", I0, " @ t_step = ", I0, "")', &
12911291
int(ceiling(100._wp*(real(t_step - t_step_start)/(t_step_stop - t_step_start + 1)))), &
12921292
t_step - t_step_start + 1, &
12931293
t_step_stop - t_step_start + 1, &

toolchain/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ dependencies = [
3939

4040
# Chemistry
4141
"cantera==3.1.0",
42-
"pyrometheus@git+https://github.com/DimAdam-01/pyrometheus.git@main"
42+
"pyrometheus == 1.0.3"
4343
]
4444

4545
[tool.hatch.metadata]

0 commit comments

Comments
 (0)