Changeset 773

Timestamp:

2007-12-17T17:55:32+01:00 (16 years ago)

Author:

gm

Message:

dev_001_GM - small changes : compilation OK

Location:

branches/dev_001_GM/NEMO/TOP_SRC

Files:

• PISCES/trcini_pisces.F90 (modified) (2 diffs)
• PISCES/trclsm_pisces.F90 (modified) (1 diff)
• TRP/trcadv_tvd.F90 (modified) (1 diff)
• TRP/trcnxt.F90 (modified) (1 diff)
• TRP/trctrp.F90 (modified) (2 diffs)
• initrc.F90 (modified) (2 diffs)
• trcctl.F90 (modified) (1 diff)
• trcdtr.F90 (modified) (9 diffs)

branches/dev_001_GM/NEMO/TOP_SRC/PISCES/trcini_pisces.F90

@@ -19 +19 @@
    USE trccfc          ! CFC sms trends
    USE sms             ! Source Minus Sink variables
+   USE oce_trc         ! ocean variables
+   USE trp_trc         !
+
    USE iom
 
@@ -179 +182 @@
       DO jj = 2 , jpjm1
          DO ji = 2, jpim1
-            zcoef = e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,1)) * tmask(ji,jj,1) * tmask_i(ji,jj) * raass
+            zcoef = e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,1) * tmask(ji,jj,1) * tmask_i(ji,jj) * raass
             rivpo4input = rivpo4input + rivinp(ji,jj) * zcoef
             rivalkinput = rivalkinput + cotdep(ji,jj) * zcoef

branches/dev_001_GM/NEMO/TOP_SRC/PISCES/trclsm_pisces.F90

@@ -1 @@
-   !!----------------------------------------------------------------------
-   !!                     ***  trclsm.pisces.h90  ***  
-   !! TOP :   Definition some run parameter for PISCES biological model
-   !!----------------------------------------------------------------------
+MODULE trclsm_pisces
+   !!======================================================================
+   !!                      ***  MODULE trclsm_lobster  ***
+   !! TOP :   initialisation of some run parameters for PISCES bio-model
+   !!======================================================================
    !! History :    -   !  1999-10 (M.A. Foujols, M. Levy) original code
    !!              -   !  2000-01 (L. Bopp) hamocc3, p3zd

branches/dev_001_GM/NEMO/TOP_SRC/TRP/trcadv_tvd.F90

@@ -72 +72 @@
       !! * Local declarations
       INTEGER  ::   ji, jj, jk,jn           ! dummy loop indices
-      REAL(wp) ::   ztra                    ! temporary scalar
 
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::   &

branches/dev_001_GM/NEMO/TOP_SRC/TRP/trcnxt.F90

@@ -70 +70 @@
       INTEGER, INTENT( in ) ::   kt         ! ocean time-step index
       !! * Local declarations
-      INTEGER ::   ji, jj, jk,jn   ! dummy loop indices
-      REAL(wp) ::   zfact, ztra    ! temporary scalar
+      INTEGER  ::   ji, jj, jk, jn   ! dummy loop indices
+      REAL(wp) ::   zfact            ! temporary scalar
       CHARACTER (len=22) :: charout
       !!----------------------------------------------------------------------

branches/dev_001_GM/NEMO/TOP_SRC/TRP/trctrp.F90

@@ -15 +15 @@
    USE trc             ! ocean passive tracers variables 
    USE trctrp_lec      ! passive tracers transport parameters
+   USE prtctl_trc     ! Print control for debbuging
 
    USE trcbbl          ! bottom boundary layer               (trc_bbl routine)
@@ -67 +68 @@
       !!----------------------------------------------------------------------
       INTEGER, INTENT( in ) ::  kt  ! ocean time-step index
+      !!
+      CHARACTER (len=25) :: charout
       !! ---------------------------------------------------------------------
 

branches/dev_001_GM/NEMO/TOP_SRC/initrc.F90

@@ -51 +51 @@
       !!                or read data or analytical formulation
       !!---------------------------------------------------------------------
-      INTEGER ::   ji, jj, jk, jn    ! dummy loop indices
+      INTEGER ::   jk, jn    ! dummy loop indices
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zbt   ! workspace: masked grid volume
       !!---------------------------------------------------------------------
@@ -64 +64 @@
       END DO
 #if defined key_off_degrad
-      zbt(:,:,:) = zbt(:,:,:) * facvol(ji,jj,jk)      ! degrad option: reduction by facvol
+      zbt(:,:,:) = zbt(:,:,:) * facvol(:,:,jk)      ! degrad option: reduction by facvol
 #endif
 

branches/dev_001_GM/NEMO/TOP_SRC/trcctl.F90

@@ -83 +83 @@
 # if defined key_lobster
 #   include "trcctl.lobster1.h90"
+
 # elif defined key_pisces
 #   include "trcctl.pisces.h90"
+
 # elif defined key_cfc
 #   include "trcctl.cfc.h90"
+
 # else
       IF(lwp) WRITE (numout,*) '       No Source/Sink '

branches/dev_001_GM/NEMO/TOP_SRC/trcdtr.F90

@@ -41 +41 @@
       !! ** Method  : 
       !!---------------------------------------------------------------------
-      INTEGER :: ji,jj,jk,jn 
-#if defined key_pisces
+      INTEGER ::   jn 
+# if defined key_pisces
+      INTEGER ::   ji, jj, jk 
       REAL(wp) ::   alka0, oxyg0, calc0, bioma0
       REAL(wp) ::   silic1, po4, no3, caralk, bicarb, co3
-#endif
+# endif
       !!---------------------------------------------------------------------
 
@@ -52 +53 @@
       IF(lwp) WRITE(numout,*) '~~~~~~~'
 
-#if defined key_cfc
-      ! CFC initialisation
-      trn(:,:,:,:) = 0.e0
+      IF( lk_cfc ) THEN
+         DO jn = jp_cfc0,jp_cfc1
+            trn(:,:,:,jn) = 0.e0      ! CFC initialisation to zera
+         END DO
+      ENDIF
       
-#elif defined key_pisces
+# if defined key_pisces
       ! PISCES initialisation
       ! ---------------------
@@ -75 +78 @@
       trn(:,:,:,jppo4) = po4
       trn(:,:,:,jppoc) = bioma0
-#if ! defined key_kriest
+#  if ! defined key_kriest
       trn(:,:,:,jpgoc) = bioma0
       trn(:,:,:,jpbfe) = bioma0 * 5.e-6
-#else
+#  else
       trn(:,:,:,jpnum) = bioma0 / ( 6. *xkr_massp )
-#endif
+#  endif
       trn(:,:,:,jpsil) = silic1
       trn(:,:,:,jpbsi) = bioma0 * 0.15
@@ -119 +122 @@
       IF(lwp) WRITE(numout,*) ' '
 
-#elif defined key_lobster && ( defined key_eel_r6 || defined key_eel_r2 )
+# elif defined key_lobster && ( defined key_eel_r6 || defined key_eel_r2 )
       ! LOBSTER initialisation for EEL
       ! ----------------------
@@ -195 +198 @@
       trn(:,:,30,jpno3) = 20.01 * tmask(:,:,30)
 
-#elif defined key_lobster && defined key_gyre
+# elif defined key_lobster && defined key_gyre
       ! LOBSTER initialisation for GYRE
       ! ----------------------
@@ -216 +219 @@
       END DO
 
-#else
+# else
       ! Default case 
       ! ------------
@@ -223 +226 @@
       END DO
 
-#endif
-
-#if defined key_dtatrc
+# endif
+
+# if defined key_dtatrc
      ! Initialization of tracer from a file that may also be used for damping
       CALL dta_trc( nittrc000 )
@@ -231 +234 @@
         IF( lutini(jn) )   trn(:,:,:,jk) = trdta(:,:,:,jn) * tmask(:,:,:)   ! initialisation from file if required
       END DO
-#endif
+# endif
 
       ! before field :
@@ -237 +240 @@
       trb(:,:,:,:) = trn(:,:,:,:)
 
-#if defined key_lobster
+# if defined key_lobster
       !  initialize the POC in sediments
       sedpocb(:,:) = 0.e0
       sedpocn(:,:) = 0.e0
       sedpoca(:,:) = 0.e0
-#endif
+# endif
       !
    END SUBROUTINE trc_dtr