Changeset 4804 for branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/OPA_SRC/TRD

Timestamp:

2014-10-03T12:47:03+02:00 (10 years ago)

Author:

cetlod

Message:

branch dev_CNRS1_10_TEOS10_Ediag : add changes to avoid compilation errors owhen coupling with TOP components

Location:

branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/OPA_SRC/TRD

Files:

• trddyn.F90 (modified) (1 diff)
• trdmod_trc.F90 (deleted)
• trdtra.F90 (modified) (3 diffs)
• trdtrc.F90 (added)

branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/OPA_SRC/TRD/trddyn.F90

@@ -87 +87 @@
       !  Mixed layer trends for active tracers
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-!!gm      IF( ln_dyn_mld )   CALL trd_mld_dyn   
+!!gm      IF( ln_dyn_mxl )   CALL trd_mxl_dyn   
       !
    END SUBROUTINE trd_dyn

branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/OPA_SRC/TRD/trdtra.F90

@@ -19 +19 @@
    USE zdf_oce        ! ocean vertical physics
    USE trd_oce        ! trends: ocean variables
-   USE trdmod_trc     ! ocean passive mixed layer tracers trends 
+   USE trdtrc     ! ocean passive mixed layer tracers trends 
    USE trdglo         ! trends: global domain averaged
    USE trdpen         ! trends: Potential ENergy
@@ -73 +73 @@
       !!              call to trd_tra_adv
       !!              - 'TRA' case : regroup T & S trends
-      !!              - send the trends to trd_tra_mng (trdmod_trc) for further processing
+      !!              - send the trends to trd_tra_mng (trdtrc) for further processing
       !!----------------------------------------------------------------------
       INTEGER                         , INTENT(in)           ::   kt      ! time step
@@ -157 +157 @@
                                  ztrds(:,:,:) = ptrd(:,:,:) * tmask(:,:,:)
          END SELECT
-         !                            ! send trend to trd_mod_trc
-         CALL trd_mod_trc( ztrds, ktra, ktrd, kt ) 
+         !                            ! send trend to trd_trc
+         CALL trd_trc( ztrds, ktra, ktrd, kt ) 
          !
       ENDIF