Changeset 30 for trunk

Timestamp:

02/21/12 15:56:24 (12 years ago)

Author:

cholod

Message:

replace old IND4 keywords by LITTLE_NEMO... waiting for curie

Location:

trunk/NEMOGCM/NEMO/OPA_SRC/OBC

Files:

• obc_oce.F90 (modified) (1 diff)
• obcdyn.F90 (modified) (7 diffs)
• obcini.F90 (modified) (2 diffs)
• obctra.F90 (modified) (7 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/OBC/obc_oce.F90

@@ -65 +65 @@
    !                                    !  scale are set to 0 in the namelist, for both inflow and outflow).
 
-!--> IND4 Begin
+!--> LITTLE_NEMO Begin
 !     Logical for restarting with radiative OBCs, but without an OBC restart restart.obc.output file.
 !     During the first 30 time steps, used FIXED boundary conditions.
 !     We modify : obcini, obctra, obcdyn
    LOGICAL :: ln_obc_rstart = .TRUE. !: radiative OBCs, but do not read restart.obc.output
-!<-- IND4 End
+!<-- LITTLE_NEMO End
 
    REAL(wp), PUBLIC ::   obcsurftot       !: Total lateral surface of open boundaries

trunk/NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn.F90

@@ -46 +46 @@
                  rtauein, rtauwin, rtaunin, rtausin
 
-! IND4
+! LITTLE_NEMO
    LOGICAL  ::   ll_fbc
-! IND4
+! LITTLE_NEMO
 
    !!---------------------------------------------------------------------------------
@@ -101 +101 @@
          rtausin = 2. * rdt / rdpsin 
       END IF
-! IND4
+! LITTLE_NEMO
 !     ll_fbc = ( ( ( kt < nit000+3  ) .AND. .NOT.  ln_rstart     ) .OR. lk_dynspg_exp ) 
 !     IF ( cp_cfg == "indian" .OR. cp_cfg == "bengal" ) THEN
          ll_fbc = ( ( ( kt < nit000+30 ) .AND. .NOT.  ln_obc_rstart ) .OR. lk_dynspg_exp ) 
 !     ENDIF
-! IND4
+! LITTLE_NEMO
 
 
@@ -115 +115 @@
 
       IF( lk_mpp ) THEN
-! IND4 BUG OBC_RADIA
+! LITTLE_NEMO BUG OBC_RADIA
        ! IF( kt >= nit000+3 .AND. ln_rstart ) THEN
             CALL lbc_lnk( ub, 'U', -1. )
             CALL lbc_lnk( vb, 'V', -1. )
 !        END IF
-! IND4
+! LITTLE_NEMO
          CALL lbc_lnk( ua, 'U', -1. )
          CALL lbc_lnk( va, 'V', -1. )
@@ -156 +156 @@
       ! --------------------------------------------------------
 
-! IND4
+! LITTLE_NEMO
 !     IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbceast .OR. lk_dynspg_exp ) THEN
       IF ( ll_fbc .OR. lfbceast ) THEN
-! IND4
+! LITTLE_NEMO
 
          ! 1.1 U zonal velocity    
@@ -301 +301 @@
       ! --------------------------------------------------------
 
-! IND4
+! LITTLE_NEMO
 !     IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcwest .OR. lk_dynspg_exp ) THEN
       IF ( ll_fbc .OR. lfbcwest ) THEN
-! IND4
+! LITTLE_NEMO
 
          ! 1.1 U zonal velocity
@@ -443 +443 @@
       ! ---------------------------------------------------------
  
-! IND4
+! LITTLE_NEMO
 !     IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcnorth  .OR. lk_dynspg_exp ) THEN
       IF ( ll_fbc .OR. lfbcnorth ) THEN
-! IND4
+! LITTLE_NEMO
 
          ! 1.1 U zonal velocity
@@ -597 +597 @@
       ! ---------------------------------------------------------
 
-! IND4
+! LITTLE_NEMO
 !     IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcsouth  .OR. lk_dynspg_exp ) THEN
       IF ( ll_fbc .OR. lfbcsouth ) THEN
-! IND4
+! LITTLE_NEMO
 
          ! 1.1 U zonal velocity

trunk/NEMOGCM/NEMO/OPA_SRC/OBC/obcini.F90

@@ -589 +589 @@
       ! --------------------------------------------------------------
       !   only if at least one boundary is  radiative 
-! IND4      IF ( inumfbc < nbobc .AND.  ln_rstart ) THEN
-! IND4         !  Restart from restart.obc
-! IND4         CALL obc_rst_read
-
-! IND4
+! LITTLE_NEMO      IF ( inumfbc < nbobc .AND.  ln_rstart ) THEN
+! LITTLE_NEMO         !  Restart from restart.obc
+! LITTLE_NEMO         CALL obc_rst_read
+
+! LITTLE_NEMO
        IF(lwp) WRITE(numout,*)
        IF(lwp) WRITE(numout,*) ' obcini : '
@@ -611 +611 @@
              IF(lwp) WRITE(numout,*) '   => We DO NOT read the OBC restart file (since all OBCs are fixed) '
           ENDIF         
-! IND4          
+! LITTLE_NEMO          
        ELSE
 

trunk/NEMOGCM/NEMO/OPA_SRC/OBC/obctra.F90

@@ -43 +43 @@
       rtauein, rtauwin, rtaunin, rtausin      ! Boundary restoring coefficient for inflow 
 
-! IND4
+! LITTLE_NEMO
    LOGICAL  ::   ll_fbc
-! IND4
+! LITTLE_NEMO
 
    !! * Substitutions
@@ -95 +95 @@
       END IF
 
-! IND4
+! LITTLE_NEMO
 !     ll_fbc = ( ( kt < nit000+3  ) .AND. .NOT.  ln_rstart     )
 !     IF ( cp_cfg == "indian" .OR. cp_cfg == "bengal" ) THEN
       ll_fbc = ( ( kt < nit000+30 ) .AND. .NOT.  ln_obc_rstart )
 !     ENDIF
-! IND4
+! LITTLE_NEMO
 
       IF( lp_obc_east  )   CALL obc_tra_east ( kt )    ! East open boundary
@@ -111 +111 @@
 
       IF( lk_mpp ) THEN                  !!bug ???
-! IND4 BUG OBC_RADIA
+! LITTLE_NEMO BUG OBC_RADIA
 !        IF( kt >= nit000+3 .AND. ln_rstart ) THEN
             CALL lbc_lnk( tsb(:,:,:,jp_tem), 'T', 1. )
@@ -151 +151 @@
       ! --------------------------------------------------------
 
-! IND4
+! LITTLE_NEMO
 !     IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbceast ) THEN
       IF ( ll_fbc .OR. lfbceast ) THEN
-! IND4
+! LITTLE_NEMO
          DO ji = fs_nie0+1, fs_nie1+1 ! Vector opt.
             DO jk = 1, jpkm1
@@ -254 +254 @@
       ! --------------------------------------------------------
 
-! IND4
+! LITTLE_NEMO
 !     IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcwest ) THEN
       IF ( ll_fbc .OR. lfbcwest ) THEN
-! IND4
+! LITTLE_NEMO
 
          DO ji = fs_niw0, fs_niw1 ! Vector opt.
@@ -356 +356 @@
       ! --------------------------------------------------------
 
-! IND4
+! LITTLE_NEMO
 !     IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcnorth ) THEN
       IF ( ll_fbc .OR. lfbcnorth ) THEN
-! IND4
+! LITTLE_NEMO
 
          DO jj = fs_njn0+1, fs_njn1+1  ! Vector opt.
@@ -461 +461 @@
       ! --------------------------------------------------------
 
-! IND4
+! LITTLE_NEMO
 !     IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcsouth ) THEN
       IF ( ll_fbc .OR. lfbcsouth ) THEN
-! IND4
+! LITTLE_NEMO
 
          DO jj = fs_njs0, fs_njs1  ! Vector opt.