Changeset 1200 for trunk/NEMO/NST_SRC

Timestamp:

2008-09-24T15:05:20+02:00 (16 years ago)

Author:

rblod

Message:

Adapt Agrif to the new SBC and correct several bugs for agrif (restart writing and reading), see ticket #133
Note : this fix does not work yet on NEC computerq (sxf90/360)

Location:

trunk/NEMO/NST_SRC

Files:

• agrif_opa_update.F90 (modified) (2 diffs)
• agrif_user.F90 (modified) (7 diffs)

trunk/NEMO/NST_SRC/agrif_opa_update.F90

@@ -95 +95 @@
       USE wzvmod
       USE cla_div
-      USE  ocfzpt
 
       INTEGER, INTENT(in) :: kt
@@ -101 +100 @@
       ta = hdivb
       sa = rotb
-      CALL oc_fz_pt
       Call div_cur(kt)
 

trunk/NEMO/NST_SRC/agrif_user.F90

@@ -80 +80 @@
 
       REAL(wp) :: tabtemp(jpi,jpj,jpk)
-#if defined key_passivetrc
+#if defined key_top
       REAL(wp) :: tabtrtemp(jpi,jpj,jpk,jptra)
 #endif 
@@ -123 +123 @@
       Call Agrif_Set_type(gcb,(/2,2/),(/3,3/))
 
-#if defined key_passivetrc
+#if defined key_top
       Call Agrif_Set_type(trb,(/2,2,0,0/),(/3,3,0,0/))
       Call Agrif_Set_type(trn,(/2,2,0,0/),(/3,3,0,0/))
@@ -152 +152 @@
       Call Agrif_Set_raf(gcb,(/'x','y'/))
 
-#if defined key_passivetrc
+#if defined key_top
       Call Agrif_Set_raf(trb,(/'x','y','N','N'/))
       Call Agrif_Set_raf(trn,(/'x','y','N','N'/))
@@ -175 +175 @@
       Call Agrif_Set_bcinterp(e2v,interp1=AGRIF_ppm,interp2=Agrif_linear)
 
-#if defined key_passivetrc
+#if defined key_top
       Call Agrif_Set_bcinterp(trn,interp=AGRIF_linear)
       Call Agrif_Set_bcinterp(tra,interp=AGRIF_linear)
@@ -197 +197 @@
       Call Agrif_Set_bc(va,(/-2*Agrif_irhox(),0/))
 
-#if defined key_passivetrc
+#if defined key_top
       Call Agrif_Set_bc(trn,(/0,1/))
       Call Agrif_Set_bc(tra,(/-3*Agrif_irhox(),0/))
@@ -213 +213 @@
       Call Agrif_Set_Updatetype(gcb,update = AGRIF_Update_Average)
 
-#if defined key_passivetrc
+#if defined key_top
       Call Agrif_Set_Updatetype(trn, update = AGRIF_Update_Average)
       Call Agrif_Set_Updatetype(trb, update = AGRIF_Update_Average)
@@ -239 +239 @@
       Call Agrif_Bc_variable(tabtemp,va,calledweight=1.,procname=interpvn)
 
-#if defined key_passivetrc
+#if defined key_top
       Call Agrif_Bc_variable(tabtrtemp,trn,calledweight=1.)
       Call Agrif_Bc_variable(tabtrtemp,tra,calledweight=1.)