pass2 switch

This commit is contained in:
ignis 2019-07-07 00:11:10 +09:00
parent e5d8c88314
commit 65be0d52bf
3 changed files with 50 additions and 3685 deletions

View file

@ -699,6 +699,9 @@ class Stage4():
avg1 = "\n".join(allvar[v].code_avg() for v in set1)
avg2 = "\n".join(allvar[v].code_avg() for v in set2)
ffmt = 'logical, parameter :: pass2_required={}'
declf = ffmt.format('.true.' if len(set2) > 0 else '.false.')
hfmt = 'character (len = *), parameter :: output_header="{}"'
declh = hfmt.format(" ".join(["x"] + set1 + set2))
@ -724,7 +727,7 @@ close (200)
md = {}
md["module_name"] = "terms"
md["module_data"] = "\n".join((declh, declavg, declarr))
md["module_data"] = "\n".join((declf, declh, declavg, declarr))
md["module_init"] = "\n".join((allocavg, allocarr))
md["module_finalize"] = "\n".join((freeavg, freearr))
md["module_pass1"] = calc1

File diff suppressed because it is too large Load diff

View file

@ -59,6 +59,7 @@
CALL m_terms_average_pass1(countnum)
optional_pass2: IF ( pass2_required ) THEN
secondloop: DO fread=startnum,endnum,skipnum
@ -86,6 +87,8 @@
CALL m_terms_average_pass2(countnum)
ENDIF optional_pass2
if (iammaster) then
CALL m_terms_write_result
WRITE(*,*) ' Avergaing RAW data is FINISHED'
@ -174,6 +177,8 @@
! PASS 2
optional_pass2: IF ( pass2_required ) THEN
tag = 2
nprogress = 0
@ -226,6 +231,8 @@
CALL m_terms_average_pass2(countnum)
ENDIF optional_pass2
if (iammaster) then
CALL m_terms_write_result
WRITE(*,*) ' Avergaing RAW data is FINISHED'