From f806b3235ff6a46e7aa30246e0847e4151464114 Mon Sep 17 00:00:00 2001 From: James E McClure Date: Mon, 17 Aug 2015 20:27:45 -0400 Subject: [PATCH] Center of mass printed out component average in TwoPhase.h --- common/TwoPhase.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/common/TwoPhase.h b/common/TwoPhase.h index 40737cae..76634e6f 100644 --- a/common/TwoPhase.h +++ b/common/TwoPhase.h @@ -253,12 +253,12 @@ public: NWPLOG = fopen("components.NWP.tcat","a+"); fprintf(NWPLOG,"time label vol pn awn ans Jwn Kwn lwns cwns "); fprintf(NWPLOG,"vx vy vz vwnx vwny vwnz vwnsx vwnsy vwnsz vsq "); - fprintf(NWPLOG,"Gwnxx Gwnyy Gwnzz Gwnxy Gwnxz Gwnyz trawn trJwn\n"); + fprintf(NWPLOG,"Gwnxx Gwnyy Gwnzz Gwnxy Gwnxz Gwnyz Cx Cy Cz trawn trJwn\n"); WPLOG = fopen("components.WP.tcat","a+"); fprintf(WPLOG,"time label vol pw awn ans Jwn Kwn lwns cwns "); fprintf(WPLOG,"vx vy vz vwnx vwny vwnz vwnsx vwnsy vwnsz vsq "); - fprintf(WPLOG,"Gwnxx Gwnyy Gwnzz Gwnxy Gwnxz Gwnyz trawn trJwn\n"); + fprintf(WPLOG,"Gwnxx Gwnyy Gwnzz Gwnxy Gwnxz Gwnyz Cx Cy Cz trawn trJwn\n"); } } ~TwoPhase(){ @@ -1238,6 +1238,9 @@ void TwoPhase::PrintComponents(int timestep){ fprintf(NWPLOG,"%.5g ",ComponentAverages_NWP(GWNXY,b)); fprintf(NWPLOG,"%.5g ",ComponentAverages_NWP(GWNXZ,b)); fprintf(NWPLOG,"%.5g ",ComponentAverages_WP(GWNYZ,b)); + fprintf(NWPLOG,"%.5g ",ComponentAverages_NWP(CMX,b)); + fprintf(NWPLOG,"%.5g ",ComponentAverages_NWP(CMY,b)); + fprintf(NWPLOG,"%.5g ",ComponentAverages_NWP(CMZ,b)); fprintf(NWPLOG,"%.5g ",ComponentAverages_WP(TRAWN,b)); fprintf(NWPLOG,"%.5g\n",ComponentAverages_WP(TRJWN,b)); } } @@ -1272,6 +1275,9 @@ void TwoPhase::PrintComponents(int timestep){ fprintf(WPLOG,"%.5g ",ComponentAverages_WP(GWNXY,b)); fprintf(WPLOG,"%.5g ",ComponentAverages_WP(GWNXZ,b)); fprintf(WPLOG,"%.5g ",ComponentAverages_WP(GWNYZ,b)); + fprintf(WPLOG,"%.5g ",ComponentAverages_WP(CMX,b)); + fprintf(WPLOG,"%.5g ",ComponentAverages_WP(CMY,b)); + fprintf(WPLOG,"%.5g ",ComponentAverages_WP(CMZ,b)); fprintf(WPLOG,"%.5g ",ComponentAverages_WP(TRAWN,b)); fprintf(WPLOG,"%.5g\n",ComponentAverages_WP(TRJWN,b));