Changeset 84 for trunk/NEMO/OPA_SRC/DIA/diafwb.F90

Timestamp:

2004-04-22T15:32:41+02:00 (20 years ago)

Author:

opalod

Message:

CT : UPDATE057 : # General syntax, alignement, comments corrections

# l_ctl alone replace the set (l_ctl .AND. lwp)
# Add of diagnostics which are activated when using l_ctl logical

File:

• trunk/NEMO/OPA_SRC/DIA/diafwb.F90 (modified) (9 diffs)

trunk/NEMO/OPA_SRC/DIA/diafwb.F90

@@ -109 +109 @@
       IF( lk_mpp )   CALL mpp_sum( a_rnf    )       ! sum over the global domain
 
-      IF( aminus /= 0.0 ) a_aminus = a_aminus + ( MIN( aplus, aminus ) / aminus )
-      IF( aplus  /= 0.0 ) a_aplus  = a_aplus  + ( MIN( aplus, aminus ) / aplus  )
+      IF( aminus /= 0.e0 ) a_aminus = a_aminus + ( MIN( aplus, aminus ) / aminus )
+      IF( aplus  /= 0.e0 ) a_aplus  = a_aplus  + ( MIN( aplus, aminus ) / aplus  )
 
       IF( kt == nitend ) THEN
@@ -205 +205 @@
          zu = un(ji,jj,jk) * fse3t(ji,jj,jk) * e2u(ji,jj)
 
-         IF( un(ji,jj,jk) > 0.0 ) THEN 
+         IF( un(ji,jj,jk) > 0.e0 ) THEN 
             zflxi(1) = zflxi(1) +    zu
             ztemi(1) = ztemi(1) + zt*zu
@@ -245 +245 @@
          zu = un(ji,jj,jk) * fse3t(ji,jj,jk) * e2u(ji,jj)
          
-         IF( un(ji,jj,jk) > 0.0 ) THEN 
+         IF( un(ji,jj,jk) > 0.e0 ) THEN 
             zflxi(2) = zflxi(2) +    zu
             ztemi(2) = ztemi(2) + zt*zu
@@ -285 +285 @@
          zu = un(ji,jj,jk) * fse3t(ji,jj,jk) * e2u(ji,jj)
          
-         IF( un(ji,jj,jk) > 0.0 ) THEN 
+         IF( un(ji,jj,jk) > 0.e0 ) THEN 
             zflxi(3) = zflxi(3) +    zu
             ztemi(3) = ztemi(3) + zt*zu
@@ -325 +325 @@
          zu = un(ji,jj,jk) * fse3t(ji,jj,jk) * e2u(ji,jj)
          
-         IF( un(ji,jj,jk) > 0.0 ) THEN 
+         IF( un(ji,jj,jk) > 0.e0 ) THEN 
             zflxi(4) = zflxi(4) +    zu
             ztemi(4) = ztemi(4) + zt*zu
@@ -338 +338 @@
       ! Sum at each time-step
       DO jt = 1, 4 
-         IF( zflxi(jt) /= 0.0 .AND. zflxo(jt) /= 0.0 ) THEN
+         IF( zflxi(jt) /= 0.e0 .AND. zflxo(jt) /= 0.e0 ) THEN
             a_flxi(jt) = a_flxi(jt) + zflxi(jt)
             a_temi(jt) = a_temi(jt) + ztemi(jt)/zflxi(jt)
@@ -350 +350 @@
       IF( kt == nitend ) THEN
          DO jt = 1, 4 
-            a_flxi(jt) = a_flxi(jt)/((nitend-nit000+1)*1.e6)
-            a_temi(jt) = a_temi(jt)/( nitend-nit000+1)
-            a_sali(jt) = a_sali(jt)/( nitend-nit000+1)
-            a_flxo(jt) = a_flxo(jt)/((nitend-nit000+1)*1.e6)
-            a_temo(jt) = a_temo(jt)/( nitend-nit000+1)
-            a_salo(jt) = a_salo(jt)/( nitend-nit000+1)
+            a_flxi(jt) = a_flxi(jt) / ( FLOAT( nitend - nit000 + 1 ) * 1.e6 )
+            a_temi(jt) = a_temi(jt) /   FLOAT( nitend - nit000 + 1 )
+            a_sali(jt) = a_sali(jt) /   FLOAT( nitend - nit000 + 1 )
+            a_flxo(jt) = a_flxo(jt) / ( FLOAT( nitend - nit000 + 1 ) * 1.e6 )
+            a_temo(jt) = a_temo(jt) /   FLOAT( nitend - nit000 + 1 )
+            a_salo(jt) = a_salo(jt) /   FLOAT( nitend - nit000 + 1 )
          END DO
       ENDIF
@@ -368 +368 @@
          WRITE(111,*)
          WRITE(111,*)    'Net freshwater budget '
-         WRITE(111,9010) '  emp    = ',a_emp,   ' m3 =', a_emp   /((nitend-nit000+1)*rdttra(1)) * 1.e-6,' Sv'
-         WRITE(111,9010) '  precip = ',a_precip,' m3 =', a_precip/((nitend-nit000+1)*rdttra(1)) * 1.e-6,' Sv'
-         WRITE(111,9010) '  a_rnf   = ',a_rnf,   ' m3 =', a_rnf   /((nitend-nit000+1)*rdttra(1)) * 1.e-6,' Sv'
+         WRITE(111,9010) '  emp    = ',a_emp,   ' m3 =', a_emp   /(FLOAT(nitend-nit000+1)*rdttra(1)) * 1.e-6,' Sv'
+         WRITE(111,9010) '  precip = ',a_precip,' m3 =', a_precip/(FLOAT(nitend-nit000+1)*rdttra(1)) * 1.e-6,' Sv'
+         WRITE(111,9010) '  a_rnf  = ',a_rnf,   ' m3 =', a_rnf   /(FLOAT(nitend-nit000+1)*rdttra(1)) * 1.e-6,' Sv'
          WRITE(111,*)
          WRITE(111,9010) '  zarea =',zarea
@@ -378 +378 @@
          WRITE(111,9010) '  at nit000 = ',a_sshb        ,' m3 '
          WRITE(111,9010) '  at nitend = ',a_sshn        ,' m3 '
-         WRITE(111,9010) '  diff      = ',(a_sshn-a_sshb),' m3 =', (a_sshn-a_sshb)/((nitend-nit000+1)*rdt) * 1.e-6,' Sv'
+         WRITE(111,9010) '  diff      = ',(a_sshn-a_sshb),' m3 =', (a_sshn-a_sshb)/(FLOAT(nitend-nit000+1)*rdt) * 1.e-6,' Sv'
          WRITE(111,9020) '  mean sea level elevation    =', a_sshn/zarea,' m'
          WRITE(111,*)