Changeset 5739

Timestamp:

2015-09-14T14:31:59+02:00 (9 years ago)

Author:

jpalmier

Message:

JPALM --14-09-2015 -- create a test config without dust and ccd

Location:

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/MEDUSA

Files:

• trcini_medusa.F90 (modified) (2 diffs)
• trcsed_medusa.F90 (modified) (2 diffs)

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcini_medusa.F90

@@ -296 +296 @@
       !! * arguments
       INTEGER, INTENT( in  ) ::   kt   ! ocean time step
+         !! JPALM (14/09/15)
+      LOGICAL, PUBLIC ::                  &
+      ln_ccd = .FALSE.
 
       !!---------------------------------------------------------------------
@@ -302 +305 @@
       !! -------------
       !!
-      IF(lwp) WRITE(numout,*) ' '
-      IF(lwp) WRITE(numout,*) ' **** Routine trc_ini_medusa_ccd'
-      CALL iom_open ( 'ccd_ocal_nemo.nc', numccd )
-      IF(lwp) WRITE(numout,*) ' **** trc_ini_medusa_ccd: ccd_ocal_nemo.nc opened'
+      !!!! JPALM -- 14-09-2015 -- 
+      !!!!       -- to test on ORCA2 with Christian, no file available, so initiate to 0 
+      IF ln_ccd THEN
+         IF(lwp) WRITE(numout,*) ' '
+         IF(lwp) WRITE(numout,*) ' **** Routine trc_ini_medusa_ccd'
+         CALL iom_open ( 'ccd_ocal_nemo.nc', numccd )
+         IF(lwp) WRITE(numout,*) ' **** trc_ini_medusa_ccd: ccd_ocal_nemo.nc opened'
 
       !! Read the data
       !! -------------
       !!
-      CALL iom_get ( numccd, jpdom_data, 'OCAL_CCD', ocal_ccd )
-      IF(lwp) WRITE(numout,*) ' **** trc_ini_medusa_ccd: data read'
+         CALL iom_get ( numccd, jpdom_data, 'OCAL_CCD', ocal_ccd )
+         IF(lwp) WRITE(numout,*) ' **** trc_ini_medusa_ccd: data read'
 
       !! Close the file
       !! --------------
       !!
-      CALL iom_close ( numccd )
-      IF(lwp) WRITE(numout,*) ' **** trc_ini_medusa_ccd: ccd_ocal_nemo.nc closed'
-      IF(lwp) CALL flush(numout)
-      
+         CALL iom_close ( numccd )
+         IF(lwp) WRITE(numout,*) ' **** trc_ini_medusa_ccd: ccd_ocal_nemo.nc closed'
+         IF(lwp) CALL flush(numout)
+      ELSE
+         IF(lwp) WRITE(numout,*) ' '
+         IF(lwp) WRITE(numout,*) ' **** Routine trc_ini_medusa_ccd'
+         IF(lwp) WRITE(numout,*) ' **** trc_ini_medusa_ccd: do not read ccd_ocal_nemo.nc'
+         IF(lwp) WRITE(numout,*) ' **** ln_ccd = FALSE and ocal_ccd = 0.0 ---'
+         ocal_ccd(:,:) = 0.0  
+      ENDIF
+ 
    END SUBROUTINE trc_ini_medusa_ccd
 

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcsed_medusa.F90

@@ -40 +40 @@
    !! AXY (10/02/09)
    LOGICAL, PUBLIC ::                  &
-      bdustfer = .TRUE.
+      bdustfer = .FALSE.
    REAL(wp), PUBLIC ::                 &
       sedfeinput = 1.e-9_wp  ,         &
@@ -120 +120 @@
 
       !! AXY (10/02/09)
-      IF( (jnt == 1) .and. (bdustfer) )  CALL trc_sed_medusa_sbc( kt )
+      trc_sed_medusa_sbcIF( (jnt == 1) .and. (bdustfer) )  CALL trc_sed_medusa_sbc( kt )
       !!
       zirondep(:,:,:) = 0.e0     !! Initialisation of deposition variables