Changeset 901

Timestamp:

Mar 12, 2013, 7:36:18 PM (12 years ago)

Author:

slebonnois

Message:

SL: debug pour rcm1d apres parallelisation Venus

Location:

trunk

Files:

• LMDZ.COMMON/libf/dyn3d/mod_const_mpi.F90 (moved) (moved from trunk/LMDZ.COMMON/libf/dyn3d/mod_const_para.F90)
• LMDZ.VENUS/libf/phyvenus/iostart.F90 (modified) (3 diffs)
• LMDZ.VENUS/libf/phyvenus/phys_state_var_mod.F90 (modified) (1 diff)
• LMDZ.VENUS/libf/phyvenus/rcm1d.F (modified) (10 diffs)

trunk/LMDZ.VENUS/libf/phyvenus/iostart.F90

@@ -25 +25 @@
 
     PUBLIC get_field,get_var,put_field,put_var
-    PUBLIC Open_startphy,close_startphy,open_restartphy,close_restartphy
+    PUBLIC open_startphy,close_startphy,open_restartphy,close_restartphy
     
 CONTAINS
 
-  SUBROUTINE Open_startphy(filename)
+  SUBROUTINE open_startphy(filename)
   USE netcdf
   USE mod_phys_lmdz_para
@@ -45 +45 @@
     ENDIF
    
-  END SUBROUTINE Open_startphy
+  END SUBROUTINE open_startphy
 
   SUBROUTINE Close_startphy
@@ -326 +326 @@
       ENDIF
 
-      ierr = NF90_PUT_ATT (nid_restart, NF90_GLOBAL, "title","Fichier redemmarage physique")
+      ierr = NF90_PUT_ATT (nid_restart, NF90_GLOBAL, "title","Fichier redemarrage physique")
 
       ierr = NF90_DEF_DIM (nid_restart, "index", length, idim1)

trunk/LMDZ.VENUS/libf/phyvenus/phys_state_var_mod.F90

@@ -137 +137 @@
 IMPLICIT NONE
 
-      deallocate(ftsol, falbe)
+      deallocate(ftsol, ftsoil, falbe)
       deallocate(zmea, zstd, zsig, zgam)
       deallocate(zthe, zpic, zval)

trunk/LMDZ.VENUS/libf/phyvenus/rcm1d.F

@@ -5 +5 @@
       use control_mod
       use comgeomphy
+      USE phys_state_var_mod
       IMPLICIT NONE
 
@@ -48 +49 @@
       REAL play(llm)   ! Pressure at the middle of the layers (Pa)
       REAL plev(llm+1) ! intermediate pressure levels (pa)
-      REAL psurf,tsurf(1)      
+      REAL psurf      
       REAL u(llm),v(llm)  ! zonal, meridional wind
       REAL gru,grv   ! prescribed "geostrophic" background wind
       REAL temp(llm)   ! temperature at the middle of the layers
       REAL,allocatable :: q(:,:) ! tracer mixing ratio (e.g. kg/kg)
-      REAL tsoil(nsoilmx)   ! subsurface soik temperature (K)
       REAL zlay(llm)   ! altitude estimee dans les couches (km)
       REAL long(1),lati(1),area(1)
       REAL cufi(1),cvfi(1)
-      REAL phisfi(1),albedo(1)
-      REAL solsw(1),sollwdown(1),dlw(1),radsol(1)
-      REAL zmea(1), zstd(1)
-      REAL zsig(1), zgam(1), zthe(1)
-      REAL zpic(1), zval(1)
+      REAL phisfi(1)
 
 c    Physical and dynamical tandencies (e.g.  m.s-2, K/s, Pa/s)
@@ -196 +192 @@
       long(1)=0.E+0
 
-c  Initialisation albedo 
-c  ----------------------
-c ne sert pas ici...
-      albedo(1)=0.1
-c      PRINT *,'Albedo du sol nu ?'
-c      READ(unit,*) albedo(1)
-c      PRINT *,albedo(1)
-
 c   Initialisation speciales "physiq"
 c   ---------------------------------
@@ -271 +259 @@
       pks=cpp*(psurf/preff)**rcp
 
+c  init des variables pour phyredem
+c  --------------------------------
+      call phys_state_var_init
+
 c  profil de temperature et altitude au premier appel
 c  --------------------------------------------------
@@ -286 +278 @@
       print*,"               Pression        Altitude     Temperature"
       ilayer=1
-      tsurf(1)=tmp2(0)
+      ftsol(1)=tmp2(0)
        temp(1)=tmp2(1)
        zlay(1)=tmp2(1)*tmp1(1)
-      print*,"           0",tsurf(1)
+      print*,"           0",ftsol(1)
       print*,ilayer,play(ilayer),zlay(ilayer),temp(ilayer)
       DO ilayer=2,nlayer
@@ -300 +292 @@
 c     ~~~~~~~~~~~~~~~~~~~~~~~
       DO isoil=1,nsoil
-         tsoil(isoil)=tsurf(1)
+         ftsoil(1,isoil)=ftsol(1)
       ENDDO
 
@@ -323 +315 @@
       zval(1) = 0.
 
+c  Initialisation albedo 
+c  ----------------------
+
+      falbe(1)=0.1
+
 c  Ecriture de "startphy.nc"
 c  -------------------------
@@ -330 +327 @@
 
       solsw(1)    = 0.
-      sollwdown(1)= 0.
-      dlw(1)      = 0.
+      sollw(1)    = 0.
+      fder(1)      = 0.
       radsol(1)   = 0.
      
@@ -337 +334 @@
       soil_model  = .true.
 
-      call phyredem("startphy.nc  ",
-     .              lati,long,
-     .              tsurf,tsoil,albedo,
-     .              solsw,sollwdown,dlw,radsol,
-     .    zmea, zstd, zsig, zgam, zthe, zpic, zval, 
-     .              temp)
+      call phyredem("startphy.nc")
+
+c  deallocation des variables phyredem
+c  -----------------------------------
+      call phys_state_var_end
 
 c=======================================================================
@@ -457 +453 @@
 
       OPEN(11,file='profile.new')
-      write (11,*) tsurf
       DO ilayer=1,nlayer
         write (11,*) zlay(ilayer),temp(ilayer),tmp1(ilayer)