Changeset 391

Timestamp:

2006-03-10T11:35:43+01:00 (18 years ago)

Author:

opalod

Message:

RB:nemo_v1_update_038: first integration of AGRIF :

add agrif to ice files

Location:

trunk/NEMO/LIM_SRC

Files:

• iceini.F90 (modified) (3 diffs)
• limrhg.F90 (modified) (4 diffs)
• limrst.F90 (modified) (3 diffs)
• limrst_dimg.h90 (modified) (3 diffs)

trunk/NEMO/LIM_SRC/iceini.F90

@@ -60 +60 @@
       !!   8.5  !  02-08  (G. Madec)  F90: Free form and modules
       !!----------------------------------------------------------------------
-
+       CHARACTER(len=80) :: namelist_icename
+       
       ! Open the namelist file 
-      OPEN( numnam_ice, FILE= 'namelist_ice', FORM='formatted', STATUS = 'old') 
+      namelist_icename = 'namelist_ice'
+           
+      CALL ctlopn(numnam_ice,namelist_icename,'OLD', 'FORMATTED', 'SEQUENTIAL',   &
+                     1,numout,.FALSE.,1)      
 
       CALL ice_run                    !  read in namelist some run parameters
@@ -114 +118 @@
       !!   2.0  !  03-08 (C. Ethe)  Original code
       !!-------------------------------------------------------------------
+
       NAMELIST/namicerun/ ln_limdyn, acrit, hsndif, hicdif
       !!-------------------------------------------------------------------
@@ -132 +137 @@
          WRITE(numout,*) '   computation of temp. in ice  (=0) or not (=9999) hicdif = ', hicdif
       ENDIF
-      
    END SUBROUTINE ice_run
 

trunk/NEMO/LIM_SRC/limrhg.F90

@@ -46 +46 @@
       !!  atmospheric (wind stress) and oceanic (water stress and surface
       !!  tilt) forcings. Ice-ice interaction is described by a non-linear
-      !!  viscous-plastic law including shear strength and a bulk rheology.   
+      !!  viscous-plastic law including shear strength and a bulk rheology.
       !!
       !! ** Action  : - compute u_ice, v_ice the sea-ice velocity
@@ -501 +501 @@
             END DO
 
-            ! Terms involving already up-dated velocities.     
+            ! Terms involving already up-dated velocities.
             !-Using the arrays zu_ice and zv_ice in the computation of the terms ze leads to JACOBI's method; 
-            ! Using arrays u and v in the computation of the terms ze leads to GAUSS-SEIDEL method.   
+            ! Using arrays u and v in the computation of the terms ze leads to GAUSS-SEIDEL method.
              
             DO jj = k_j1+1, k_jpj-1
@@ -530 +530 @@
                   zs21(ji,jj,1,1) =  zvis12 * ze21 + zvis21 * ze12
 
+#if defined key_agrif
+             END DO
+          END DO
+
+          DO jj = k_j1+1, k_jpj-1
+             DO ji = 2, jpim1
+#endif
 
                   iim1 = ji
@@ -571 +578 @@
                   zs21(ji,jj,1,2) =  zs21(ji,jj,1,2) + zvis12 * ze21 + zvis21 * ze12
 
-!i             END DO
-!i          END DO
-
-!i          DO jj = k_j1+1, k_jpj-1
-!i             DO ji = 2, jpim1
+#if defined key_agrif
+             END DO
+          END DO
+
+          DO jj = k_j1+1, k_jpj-1
+             DO ji = 2, jpim1
+#endif
                   zd1(ji,jj) =   &
                      + alambd(ji,jj,2,2,2,1) * zs11(ji,jj,2,1) + alambd(ji,jj,2,2,2,2) * zs11(ji,jj,2,2)  &

trunk/NEMO/LIM_SRC/limrst.F90

@@ -74 +74 @@
          zsec, zdate0, zdt
 
-      CHARACTER(len=45)  ::  &
-         ccfile = 'restart_ice_out.nc'
+      CHARACTER(len=45)  ::  ccfile
+
+      ccfile = 'restart_ice_out.nc'
+
+#if defined key_agrif
+      if ( .NOT. Agrif_Root() ) then
+         ccfile= TRIM(Agrif_CFixed())//'_'//TRIM(ccfile)
+      endif
+#endif
 
       inumwrs  = 61
@@ -172 +179 @@
 
       !- dummy variables :
-      CHARACTER(len=45)  ::  &
-         ccfile = 'restart_ice_in.nc'
+      CHARACTER(len=45)  ::  ccfile
       INTEGER :: &
         ji, jj
@@ -193 +199 @@
          clvnames(60)       
 
+
+       ccfile = 'restart_ice_in.nc'
+#if defined key_agrif
+      if ( .NOT. Agrif_Root() ) then
+         ccfile= TRIM(Agrif_CFixed())//'_'//TRIM(ccfile)
+      endif
+#endif
 
       !Initialisations

trunk/NEMO/LIM_SRC/limrst_dimg.h90

@@ -39 +39 @@
       !! no additional check is necessary.
 
+       
        ! 0. Initializations
        ! ------------------
@@ -52 +53 @@
        irecl8= jpi * jpj * wp
        WRITE(clres,'(a,".",i3.3)') TRIM(ccfile),narea
-       OPEN(inum,FILE=clres,FORM='UNFORMATTED', ACCESS='DIRECT', RECL=irecl8 )
+       CALL ctlopn(inum,clres,'UNKNOWN','UNFORMATTED','DIRECT',irecl8,numout,lwp,0)
+!!       OPEN(inum,FILE=clres,FORM='UNFORMATTED', ACCESS='DIRECT', RECL=irecl8 )
 
 
@@ -165 +167 @@
        ! Open direct access file, with reclength for 2D wp fields
        WRITE(clres,'(a,".",i3.3)') TRIM(ccfile),narea
-       OPEN(inum,FILE=clres,FORM='UNFORMATTED', ACCESS='DIRECT', RECL=8)
+       CALL ctlopn(inum,clres,'UNKNOWN','UNFORMATTED','DIRECT',8,numout,lwp,1)
+   !!!    OPEN(inum,FILE=clres,FORM='UNFORMATTED', ACCESS='DIRECT', RECL=8)
        READ(inum,REC=1) irecl8
        CLOSE(inum)