Changeset 2134

Timestamp:

Oct 24, 2014, 7:53:24 PM (10 years ago)

Author:

lguez

Message:

In nudging procedures, replaced explicit Euler integration of nudged
fields by exact integration. This does not change anything if
guide_add is true, but it changes the value of alpha if guide_add is
false. We could have taken into account the variation of the nudging
field during a nudging time step. This would be a small correction. We
choose not to take it into account for the time being. Also, we add a
restriction on zonal nudging: we allow it only for a grid which is
regular in longitude. It does not seem to make sense otherwise and the
exact integration would take more programming for an irregular grid.

In the sequential version, copying the parallel versions, set
iguide_int to 1 when the input value is 0.

Location:

LMDZ5/trunk/libf

Files:

• dyn3d/guide_mod.F90 (modified) (5 diffs)
• dyn3dmem/guide_loc_mod.F90 (modified) (4 diffs)
• dyn3dpar/guide_p_mod.F90 (modified) (6 diffs)

LMDZ5/trunk/libf/dyn3d/guide_mod.F90

@@ -71 +71 @@
     INCLUDE "netcdf.inc"
 
+    ! For grossismx:
+    include "serre.h"
+
     INTEGER                :: error,ncidpl,rid,rcod
     CHARACTER (len = 80)   :: abort_message
@@ -89 +92 @@
     CALL getpar('guide_add',.false.,guide_add,'for�age constant?')
     CALL getpar('guide_zon',.false.,guide_zon,'guidage moy zonale')
+    if (guide_zon .and. abs(grossismx - 1.) > 0.01) &
+         call abort_gcm("guide_init", &
+         "zonal nudging requires grid regular in longitude", 1)
 
 !   Constantes de rappel. Unite : fraction de jour
@@ -112 +118 @@
     ELSE if (iguide_sav == 0) then
        iguide_sav = huge(0)
-    else
+    ELSE
        iguide_sav=day_step*iguide_sav
     ENDIF
@@ -127 +133 @@
 ! Parametres pour lecture des fichiers
     CALL getpar('iguide_read',4,iguide_read,'freq. lecture guidage')
-    CALL getpar('iguide_int',4,iguide_int,'freq. lecture guidage')
-    IF (iguide_int.GT.0) THEN
+    CALL getpar('iguide_int',4,iguide_int,'freq. interpolation vert')
+    IF (iguide_int.EQ.0) THEN
+        iguide_int=1
+    ELSEIF (iguide_int.GT.0) THEN
         iguide_int=day_step/iguide_int
     ELSE
@@ -1004 +1012 @@
         enddo
     ENDIF ! guide_reg
+
+    if (.not. guide_add) alpha = 1. - exp(- alpha)
 
   END SUBROUTINE tau2alpha

LMDZ5/trunk/libf/dyn3dmem/guide_loc_mod.F90

@@ -68 +68 @@
 
   SUBROUTINE guide_init
-    
+
     USE control_mod
+
     IMPLICIT NONE
   
@@ -75 +76 @@
     INCLUDE "paramet.h"
     INCLUDE "netcdf.inc"
+
+    ! For grossismx:
+    include "serre.h"
 
     INTEGER                :: error,ncidpl,rid,rcod
@@ -94 +98 @@
     CALL getpar('guide_add',.false.,guide_add,'for�age constant?')
     CALL getpar('guide_zon',.false.,guide_zon,'guidage moy zonale')
+    if (guide_zon .and. abs(grossismx - 1.) > 0.01) &
+         call abort_gcm("guide_init", &
+         "zonal nudging requires grid regular in longitude", 1)
 
 !   Constantes de rappel. Unite : fraction de jour
@@ -1519 +1526 @@
             enddo
         enddo
-    
     ENDIF ! guide_reg
+
+    if (.not. guide_add) alpha = 1. - exp(- alpha)
 
   END SUBROUTINE tau2alpha

LMDZ5/trunk/libf/dyn3dpar/guide_p_mod.F90

@@ -67 +67 @@
 
   SUBROUTINE guide_init
-    
+
     USE control_mod
+
     IMPLICIT NONE
   
@@ -74 +75 @@
     INCLUDE "paramet.h"
     INCLUDE "netcdf.inc"
+
+    ! For grossismx:
+    include "serre.h"
 
     INTEGER                :: error,ncidpl,rid,rcod
@@ -93 +97 @@
     CALL getpar('guide_add',.false.,guide_add,'for�age constant?')
     CALL getpar('guide_zon',.false.,guide_zon,'guidage moy zonale')
+    if (guide_zon .and. abs(grossismx - 1.) > 0.01) &
+         call abort_gcm("guide_init", &
+         "zonal nudging requires grid regular in longitude", 1)
 
 !   Constantes de rappel. Unite : fraction de jour
@@ -157 +164 @@
     ncidpl=-99
     if (guide_plevs.EQ.1) then
-       if (ncidpl.eq.-99) then 
+       if (ncidpl.eq.-99) then
           rcod=nf90_open('apbp.nc',Nf90_NOWRITe, ncidpl)
           if (rcod.NE.NF_NOERR) THEN
@@ -165 +172 @@
        endif
     elseif (guide_plevs.EQ.2) then
-       if (ncidpl.EQ.-99) then 
+       if (ncidpl.EQ.-99) then
           rcod=nf90_open('P.nc',Nf90_NOWRITe,ncidpl)
           if (rcod.NE.NF_NOERR) THEN
@@ -1251 +1258 @@
         enddo
     ENDIF ! guide_reg
+
+    if (.not. guide_add) alpha = 1. - exp(- alpha)
 
   END SUBROUTINE tau2alpha