Changeset 473 for GCM

Timestamp:

03/30/06 11:54:53 (2 years ago)

Author:

mankoff

Message:

SECNDS system call is MCLOCK on OS X

Location:

GCM/GSO/trunk/code

Files:

• DBAO23M12_fix2_noDG9.f (modified) (8 diffs)
• DIAG9Ap.f (modified) (2 diffs)
• MBAO23aM12_D3_SnowAgeNoMelt_CKOfx4.f (modified) (1 diff)
• MBAO23aM12_D3_SnowAgeRev_CKOfx4.f (modified) (1 diff)
• MBAO23aM12_D3_SnowAgeRev_CKOfx5_TGI2_OMass1_GO1.f (modified) (1 diff)
• MBAO23aM12_D3_SnowAgeRev_CKOfx5_TGI2_OMass1_GO1_VO1.f (modified) (1 diff)
• UTILDBLp.f (modified) (1 diff)

GCM/GSO/trunk/code/DBAO23M12_fix2_noDG9.f

@@ -372 +372 @@
       DATA AQSAT/3.797915/,BQSAT/7.93252E-6/,CQSAT/2.166847E-3/          255.1  
       QSAT(TM,PR,QL)=AQSAT*EXP(QL*(BQSAT-CQSAT/TM))/PR                   256.   
-CCC   KBEGIN = MCLOCK ()                                                 257.   
-      KBEGIN = INT(100*SECNDS(0.0))
+      KBEGIN = MCLOCK ()                                                 257.   
+CCC   KBEGIN = INT(100*SECNDS(0.0))
       IDACC(4)=IDACC(4)+1                                                258.   
       IF (IFIRST.NE.1) GO TO 50                                          259.   
@@ -1264 +1264 @@
 C---- skip for now lines 1132-1163                                      1135.   
 C**** ACCUMULATE TIME USED IN DIAGA                                     1164.   
-CCC   KEND = MCLOCK ()                                                  1165.   
-      KEND = INT(100*SECNDS(0.0))
+      KEND = MCLOCK ()                                                  1165.   
+CCC   KEND = INT(100*SECNDS(0.0))
       MDIAG = MDIAG + (KEND-KBEGIN)                                     1167.   
       MDYN  = MDYN  - (KEND-KBEGIN)                                     1168.   
@@ -1361 +1361 @@
       DATA AQSAT/3.797915/,BQSAT/7.93252E-6/,CQSAT/2.166847E-3/         1557.1  
       QSAT(TM,PR,QL)=AQSAT*EXP(QL*(BQSAT-CQSAT/TM))/PR                  1558.   
-CCC   MBEGIN = MCLOCK ()                                                1559.   
-      MBEGIN = INT(100*SECNDS(0.0))
+      MBEGIN = MCLOCK ()                                                1559.   
+CCC      MBEGIN = INT(100*SECNDS(0.0))
       IF (IFIRST.NE.1) GO TO 50                                         1560.   
       IFIRST=0                                                          1561.   
@@ -2151 +2151 @@
  2150 SPECA(N,18,KS)=SPECA(N,18,KS)+KE(N,KS)                            2219.   
 C**** ACCUMULATE TIME USED IN DIAGA                                     2220.   
-CCC   MEND = MCLOCK ()                                                  2221.   
-      MEND = INT(100*SECNDS(0.0))
+      MEND = MCLOCK ()                                                  2221.   
+CCC   MEND = INT(100*SECNDS(0.0))
       MDIAG = MDIAG + (MEND-MBEGIN)                                     2223.   
       MDYN  = MDYN  - (MEND-MBEGIN)                                     2224.   
@@ -5364 +5364 @@
 C****                                                                   7566.   
 C**** TRANSFER RATES FOR KINETIC ENERGY IN THE DYNAMICS                 7567.   
-CC100 MBEGIN = MCLOCK ()                                                7568.   
-  100 MBEGIN = INT(100*SECNDS(0.0))
+  100 MBEGIN = MCLOCK ()                                                7568.   
+CC100 MBEGIN = INT(100*SECNDS(0.0))
       DO 110 N=1,NM8                                                    7569.   
   110 KE(N,1)=0.                                                        7570.   
@@ -5395 +5395 @@
       DO 180 N=1,NM                                                     7595.   
   180 SPECA(N,MKE,KS)=SPECA(N,MKE,KS)+KE(N,KS)/NDT                      7596.   
-CCC   MEND = MCLOCK ()                                                  7597.   
-      MEND = INT(100*SECNDS(0.0))
+      MEND = MCLOCK ()                                                  7597.   
+CCC   MEND = INT(100*SECNDS(0.0))
       MDIAG = MDIAG + (MEND-MBEGIN)                                     7599.   
       MDYN  = MDYN  - (MEND-MBEGIN)                                     7600.   
@@ -5570 +5570 @@
 C**** FOURIER COEFFICIENTS FOR CURRENT WIND FIELD                       7764.   
 C****                                                                   7765.   
-CCC   MBEGIN = MCLOCK ()                                                7766.   
-      MBEGIN = INT(100*SECNDS(0.0))
+      MBEGIN = MCLOCK ()                                                7766.   
+CCC   MBEGIN = INT(100*SECNDS(0.0))
       DO 590 K=IZERO,LM,LM                                              7767.   
       DO 590 L=1,LM                                                     7768.   
@@ -5577 +5577 @@
   590 CALL FFT(UX(1,J,L+K),FCUVA(0,J,L+K,1),FCUVB(0,J,L+K,1))           7770.   
       IDACC(6)=IDACC(6)+1                                               7771.   
-CCC   MEND = MCLOCK ()                                                  7772.   
-      MEND = INT(100*SECNDS(0.0))
+      MEND = MCLOCK ()                                                  7772.   
+CCC   MEND = INT(100*SECNDS(0.0))
       MINC=MBEGIN-MEND                                                  7773.   
       MDIAG = MDIAG + (MEND-MBEGIN)                                     7774.   

GCM/GSO/trunk/code/DIAG9Ap.f

@@ -170 +170 @@
 C****                                                                   7235.   
       ENTRY DIAG9D (M,DT1,UX,VX)                                        7236.   
-CCC   MBEGIN = MCLOCK ()                                                7237.   
-      MBEGIN = INT(100*SECNDS(0.0))
+      MBEGIN = MCLOCK ()                                                7237.   
+CCC   MBEGIN = INT(100*SECNDS(0.0))
 C****                                                                   7238.   
 C**** THE PARAMETER M INDICATES WHEN DIAG9D IS BEING CALLED             7239.   
@@ -228 +228 @@
 !$OMP  END PARALLEL DO 
 C****                                                                   7286.   
-CC680 MEND = MCLOCK ()                                                  7287.   
-  680 MEND = INT(100*SECNDS(0.0))
+  680 MEND = MCLOCK ()                                                  7287.   
+CC680 MEND = INT(100*SECNDS(0.0))
       MDIAG = MDIAG + (MEND-MBEGIN)                                     7289.   
       MDYN  = MDYN  - (MEND-MBEGIN)                                     7290.   

GCM/GSO/trunk/code/MBAO23aM12_D3_SnowAgeNoMelt_CKOfx4.f

@@ -1379 +1379 @@
 C****         MINC (.01 S) = TIME SINCE LAST CALL TO SUBROUTINE TIMER   9504.   
 C****                                                                   9505.   
-CCC   MNOW  = MCLOCK ()                                                 9506.   
-      MNOW  = INT(100*SECNDS(0.0))
+      MNOW  = MCLOCK ()                                                 9506.   
+CCC   MNOW  = INT(100*SECNDS(0.0))
       MINC  = MNOW - MLAST                                              9507.   
       MSUM  = MSUM + MINC                                               9508.   

GCM/GSO/trunk/code/MBAO23aM12_D3_SnowAgeRev_CKOfx4.f

@@ -1375 +1375 @@
 C****         MINC (.01 S) = TIME SINCE LAST CALL TO SUBROUTINE TIMER   9504.   
 C****                                                                   9505.   
-CCC   MNOW  = MCLOCK ()                                                 9506.   
-      MNOW  = INT(100*SECNDS(0.0))
+      MNOW  = MCLOCK ()                                                 9506.   
+CCC   MNOW  = INT(100*SECNDS(0.0))
       MINC  = MNOW - MLAST                                              9507.   
       MSUM  = MSUM + MINC                                               9508.   

GCM/GSO/trunk/code/MBAO23aM12_D3_SnowAgeRev_CKOfx5_TGI2_OMass1_GO1.f

@@ -1380 +1380 @@
 C****         MINC (.01 S) = TIME SINCE LAST CALL TO SUBROUTINE TIMER   9504.   
 C****                                                                   9505.   
-CCC   MNOW  = MCLOCK ()                                                 9506.   
-      MNOW  = INT(100*SECNDS(0.0))
+      MNOW  = MCLOCK ()                                                 9506.   
+CCC   MNOW  = INT(100*SECNDS(0.0))
       MINC  = MNOW - MLAST                                              9507.   
       MSUM  = MSUM + MINC                                               9508.   

GCM/GSO/trunk/code/MBAO23aM12_D3_SnowAgeRev_CKOfx5_TGI2_OMass1_GO1_VO1.f

@@ -1380 +1380 @@
 C****         MINC (.01 S) = TIME SINCE LAST CALL TO SUBROUTINE TIMER   9504.   
 C****                                                                   9505.   
-CCC   MNOW  = MCLOCK ()                                                 9506.   
-      MNOW  = INT(100*SECNDS(0.0))
+      MNOW  = MCLOCK ()                                                 9506.   
+CCC   MNOW  = INT(100*SECNDS(0.0))
       MINC  = MNOW - MLAST                                              9507.   
       MSUM  = MSUM + MINC                                               9508.   

GCM/GSO/trunk/code/UTILDBLp.f

@@ -5 +5 @@
 C SYSTEM TIME OF CHILD PROCESSES                                           5.   
 C NOTE: MCLOCK IS REALLY IN HUNDREDTHS OF A SECOND, NOT SIXTIETHS.         6.   
-CCC   IHSC=-MCLOCK()                                                       7.   
-      IHSC = INT(100*SECNDS(0.0))
+      IHSC=-MCLOCK()                                                       7.   
+C     IHSC = INT(100*SECNDS(0.0))
       RETURN                                                               8.   
       END                                                                  9.