Changeset 649 for trunk/LMDZ.GENERIC/libf/dyn3d

Timestamp:

May 4, 2012, 5:14:30 PM (13 years ago)

Author:

jleconte

Message:

• Correction a huge bug in newstart: rcp and cpp can now be changed in start.nc files and are the same as in startfi.nc;

Even when starting from start and startfi files.

• rcp, cpp and mugaz can now be computed using gases.def in newstart

• Correction of a bug arising in gcm.F when the solar days are long (thanks Melanie V.)

Location:

trunk/LMDZ.GENERIC/libf/dyn3d

Files:

• gcm.F (modified) (1 diff)
• newstart.F (modified) (6 diffs)

trunk/LMDZ.GENERIC/libf/dyn3d/gcm.F

@@ -409 +409 @@
              rday_ecri = rdaym_ini
            ELSE
-             rday_ecri = INT( rdayvrai )
+             rday_ecri = INT(rdaym_ini)+INT(day_ini)
            ENDIF
 c

trunk/LMDZ.GENERIC/libf/dyn3d/newstart.F

@@ -176 +176 @@
 !      CHARACTER*80 :: visu_file
 
-!      cpp    = 744.499 ! for Mars, instead of 1004.70885 (Earth)
-!      preff  = 610.    ! for Mars, instead of 101325. (Earth)
-!      pa     = 20      ! for Mars, instead of 500 (Earth)
       cpp    = 0.
       preff  = 0.
@@ -246 +243 @@
       endif
 
+
+c=======================================================================
+c  INITIALISATIONS DIVERSES
+c=======================================================================
+! Load tracer names:
+      call iniadvtrac(nq,numvanle)
+      ! tnom(:) now contains tracer names
+! JL12 we will need the tracer names to read start in dyneta0
+
 c-----------------------------------------------------------------------
 c Lecture du tableau des parametres du run (pour la dynamique)
@@ -284 +290 @@
           tab_cntrl(i+50)=tab_cntrl_bis(i)
         enddo
-      write(*,*) 'printing tab_cntrl', tab_cntrl
-      do i=1,100
-        write(*,*) i,tab_cntrl(i)
-      enddo
+        write(*,*) 'printing tab_cntrl', tab_cntrl
+        do i=1,100
+          write(*,*) i,tab_cntrl(i)
+        enddo
+        
+        ! Lmodif set to 0 to disable modifications possibility in phyeta0                           
+        write(*,*) 'Reading file START'
+        fichnom = 'start.nc'
+        CALL dynetat0(fichnom,nqmx,vcov,ucov,teta,q,masse,
+     .       ps,phis,time)
+
+        write(*,*) 'Reading file STARTFI'
+        fichnom = 'startfi.nc'
+        CALL phyetat0 (fichnom,tab0,Lmodif,nsoilmx,nqmx,
+     .        day_ini,time,
+     .        tsurf,tsoil,emis,q2,qsurf,   !) ! temporary modif by RDW
+     .        cloudfrac,totalfrac,hice)
+
+        ! copy albedo and soil thermal inertia
+        do i=1,ngridmx
+          albfi(i) = albedodat(i)
+          do j=1,nsoilmx
+           ithfi(i,j) = inertiedat(i,j)
+          enddo
+        ! build a surfithfi(:) using 1st layer of ithfi(:), which might
+        ! be neede later on if reinitializing soil thermal inertia
+          surfithfi(i)=ithfi(i,1)
+        enddo
+
       
       endif
@@ -332 +363 @@
      .            p_omeg,p_g,p_cpp,p_mugaz,p_daysec,time)
       else if (choix_1.eq.1) then
+         Lmodif=1 ! Lmodif set to 1 to allow modifications in phyeta0                           
          call tabfi (nid_fi,Lmodif,tab0,day_ini,lllm,p_rad,
      .            p_omeg,p_g,p_cpp,p_mugaz,p_daysec,time)
@@ -349 +381 @@
 c  INITIALISATIONS DIVERSES
 c=======================================================================
-! Load tracer names:
-      call iniadvtrac(nq,numvanle)
-      ! tnom(:) now contains tracer names
 ! Initialize global tracer indexes (stored in tracer.h)
       call initracer()
@@ -423 +452 @@
         ierr= NF_CLOSE(nid)
 
-      else if (choix_1.eq.1) then !  c'est l'appel a tabfi de phyeta0 qui
-                                  !  permet de changer les valeurs du 
-                                  !  tab_cntrl Lmodif=1
-        tab0=0
-        Lmodif=1 ! Lmodif set to 1 to allow modifications in phyeta0                           
-        write(*,*) 'Reading file START'
-        fichnom = 'start.nc'
-        CALL dynetat0(fichnom,nqmx,vcov,ucov,teta,q,masse,
-     .       ps,phis,time)
-
-        write(*,*) 'Reading file STARTFI'
-        fichnom = 'startfi.nc'
-        CALL phyetat0 (fichnom,tab0,Lmodif,nsoilmx,nqmx,
-     .        day_ini,time,
-     .        tsurf,tsoil,emis,q2,qsurf,   !) ! temporary modif by RDW
-     .        cloudfrac,totalfrac,hice)
-
-        ! copy albedo and soil thermal inertia
-        do i=1,ngridmx
-          albfi(i) = albedodat(i)
-          do j=1,nsoilmx
-           ithfi(i,j) = inertiedat(i,j)
-          enddo
-        ! build a surfithfi(:) using 1st layer of ithfi(:), which might
-        ! be neede later on if reinitializing soil thermal inertia
-          surfithfi(i)=ithfi(i,1)
-        enddo
-
+      else if (choix_1.eq.1) then 
+         !do nothing, start and startfi have already been read
       else 
         CALL exit(1)