Changeset 956

Timestamp:

2008-05-14T18:46:05+02:00 (15 years ago)

Author:

cetlod

Message:

phasing the OFFLINE module to the new version of NEMO, see ticket 146

Location:

trunk/NEMO/OFF_SRC

Files:

• daymod.F90 (modified) (2 diffs)
• dtadyn.F90 (modified) (5 diffs)
• opa.F90 (modified) (1 diff)
• phycst.F90 (modified) (1 diff)
• step.F90 (modified) (1 diff)

trunk/NEMO/OFF_SRC/daymod.F90

@@ -26 +26 @@
       nday_year ,   &  !: curent day counted from jan 1st of the current year
       ndastp           !: time step date in year/month/day aammjj
+
    REAL(wp), PUBLIC ::   &  !:
        adatrj   ,   &  !: number of elapsed days since the begining of the run
@@ -31 +32 @@
        !               !  it is the accumulated duration of previous runs
        !               !  that may have been run with different time steps.
+
+   INTEGER, PUBLIC, DIMENSION(12) ::   nbiss = (/ 31, 29, 31, 30, 31, 30,    &  !: number of days per month
+      &                                           31, 31, 30, 31, 30, 31 /)     !: (leap-year)
+   INTEGER, PUBLIC, DIMENSION(12) ::   nobis = (/ 31, 28, 31, 30, 31, 30,    &  !: number of days per month
+      &                                           31, 31, 30, 31, 30, 31 /)     !: (365 days a year)
+
    !!----------------------------------------------------------------------
    !!  OPA 9.0 , LOCEAN-IPSL (2005) 

trunk/NEMO/OFF_SRC/dtadyn.F90

@@ -15 +15 @@
    USE in_out_manager  ! I/O manager
    USE phycst          ! physical constants
-   USE ocesbc
+   USE sbc_oce
    USE ldfslp
-   USE blk_oce
    USE ldfeiv          ! eddy induced velocity coef.      (ldf_eiv routine)
    USE ldftra_oce      ! ocean tracer   lateral physics
@@ -563 +562 @@
        ! keep needed fluxes
        !
-#if defined key_flx_bulk_monthly || defined key_flx_bulk_daily
-                    vatm(:,:) = flx(:,:,jpwind)
-#endif
+!!                    wndm(:,:) = flx(:,:,jpwind)
                     freeze(:,:) = flx(:,:,jpice)
                     emp(:,:) = flx(:,:,jpemp)
@@ -630 +627 @@
        ! keep needed fluxes
        !
-#if defined key_flx_bulk_monthly || defined key_flx_bulk_daily
-                  vatm(:,:) = flx(:,:,jpwind)
-#endif
+!!                  wndm(:,:) = flx(:,:,jpwind)
                   freeze(:,:) = flx(:,:,jpice)
                   emp(:,:)    = flx(:,:,jpemp)
@@ -764 +759 @@
       CALL iom_get ( numfl_t, jpdom_data, 'soshfldo', zqsr (:,:  ), jkenr )
       CALL iom_get ( numfl_t, jpdom_data, 'soicecov', zice (:,:  ), jkenr )
-      CALL iom_get ( numfl_t, jpdom_data, 'sowindsp', zwspd(:,:  ), jkenr )
+!!      CALL iom_get ( numfl_t, jpdom_data, 'sowindsp', zwspd(:,:  ), jkenr )
 
       ! file grid-U
@@ -896 +891 @@
       ! flux :
       !
-      flxdta(:,:,jpwind,2) = zwspd(:,:) * tmask(:,:,1)
+!!      flxdta(:,:,jpwind,2) = zwspd(:,:) * tmask(:,:,1)
       flxdta(:,:,jpice,2)  = MIN( 1., zice(:,:) ) * tmask(:,:,1)
       flxdta(:,:,jpemp,2)  = zemp(:,:) * tmask(:,:,1)

trunk/NEMO/OFF_SRC/opa.F90

@@ -166 +166 @@
       CALL dta_dyn(nit000)     
 
-#if defined key_passivetrc
+#if defined key_top
       CALL ini_trc                           ! Passive tracers
 #endif

trunk/NEMO/OFF_SRC/phycst.F90

@@ -15 +15 @@
 
    !! * Shared module variables
-   INTEGER, PUBLIC, DIMENSION(12) ::   &  !:
-      nbiss = (/ 31, 29, 31, 30, 31, 30,      &  !: number of days per month
-         &       31, 31, 30, 31, 30, 31 /) ,  &  !  (leap-year)
-      nobis = (/ 31, 28, 31, 30, 31, 30,      &  !: number of days per month
-         &       31, 31, 30, 31, 30, 31 /)       !  (365 days a year)
-   
    REAL(wp), PUBLIC ::                        &  !:
       rpi = 3.141592653589793_wp           ,  &  !: pi

trunk/NEMO/OFF_SRC/step.F90

@@ -81 +81 @@
       CALL dta_dyn( kstp )          ! Interpolation of the dynamical fields
 
-#if defined key_passivetrc
+#if defined key_top
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
       ! Passive Tracer Model