Changeset 4120 for LMDZ6/trunk/libf/dyn3d

Timestamp:

Apr 5, 2022, 3:44:30 PM (3 years ago)

Author:

dcugnet

Message:

• New water names: H2Ov, H2Ol, H2Oi, H2Or -> H2O_g, H2O_l, H2O_s, H2O_r.
• Corrections for the lOldCode=.FALSE., not activated yet.

Location:

LMDZ6/trunk/libf/dyn3d

Files:

• dynetat0.F90 (moved) (moved from LMDZ6/trunk/libf/dyn3d/dynetat0.f90) (8 diffs)
• iniacademic.F90 (modified) (4 diffs)
• leapfrog.F (modified) (2 diffs)

LMDZ6/trunk/libf/dyn3d/dynetat0.F90

@@ -6 +6 @@
 ! Purpose: Initial state reading.
 !-------------------------------------------------------------------------------
-  USE infotrac,    ONLY: nqtot, tracers, iqiso, iso_indnum, tnat, alpha_ideal, &
-                         ok_isotopes
-  USE strings_mod, ONLY: maxlen
-  USE netcdf,      ONLY: NF90_OPEN,  NF90_NOWRITE, NF90_INQ_VARID, NF90_NoErr, &
-                         NF90_CLOSE, NF90_GET_VAR
+  USE infotrac,    ONLY: nqtot, tracers, niso, iqiso, iso_indnum, iso_num, tnat, alpha_ideal, ok_isotopes, iH2O
+  USE strings_mod, ONLY: maxlen, msg, strStack, real2str
+  USE netcdf,      ONLY: NF90_OPEN,  NF90_NOWRITE, NF90_INQ_VARID, &
+                         NF90_CLOSE, NF90_GET_VAR, NF90_NoErr
+  USE readTracFiles_mod, ONLY: new2oldName
   USE control_mod, ONLY: planet_type
   USE assert_eq_m, ONLY: assert_eq
@@ -38 +38 @@
 !===============================================================================
 ! Local variables:
-  CHARACTER(LEN=maxlen) :: msg, var, modname
+  CHARACTER(LEN=maxlen) :: mesg, var, modname, oldVar
   INTEGER, PARAMETER :: length=100
   INTEGER :: iq, fID, vID, idecal, iqParent, iName, iZone, iPhase
@@ -53 +53 @@
 !!!     .... while keeping everything OK for LMDZ EARTH
   IF(planet_type=="generic") THEN
-    WRITE(lunout,*)'NOTE NOTE NOTE : Planeto-like start files'
+    CALL msg('NOTE NOTE NOTE : Planeto-like start files', modname)
     idecal = 4
     annee_ref  = 2000
   ELSE
-    WRITE(lunout,*)'NOTE NOTE NOTE : Earth-like start files'
+    CALL msg('NOTE NOTE NOTE : Earth-like start files', modname)
     idecal = 5
     annee_ref  = tab_cntrl(5)
@@ -101 +101 @@
 
 !-------------------------------------------------------------------------------
-  WRITE(lunout,*)TRIM(modname)//': rad,omeg,g,cpp,kappa',rad,omeg,g,cpp,kappa
+  CALL msg('rad, omeg, g, cpp, kappa = '//TRIM(strStack(real2str([rad,omeg,g,cpp,kappa]))), modname)
   CALL check_dim(im,iim,'im','im')
   CALL check_dim(jm,jjm,'jm','jm')
@@ -114 +114 @@
   var="temps"
   IF(NF90_INQ_VARID(fID,var,vID)/=NF90_NoErr) THEN
-    WRITE(lunout,*)TRIM(modname)//": missing field <temps>"
-    WRITE(lunout,*)TRIM(modname)//": trying with <Time>"; var="Time"
+    CALL msg('missing field <temps> ; trying with <Time>', modname)
+    var="Time"
     CALL err(NF90_INQ_VARID(fID,var,vID),"inq",var)
   END IF
@@ -128 +128 @@
 !--- Tracers
   DO iq=1,nqtot
-    var=TRIM(tracers(iq)%name)
-    IF(NF90_INQ_VARID(fID,var,vID)==NF90_NoErr) THEN
-      CALL err(NF90_GET_VAR(fID,vID,q(:,:,:,iq)),"get",var); CYCLE
+    var = tracers(iq)%name
+    oldVar = new2oldName(var)
+    !--------------------------------------------------------------------------------------------------------------------------
+    IF(NF90_INQ_VARID(fID, var, vID) == NF90_NoErr) THEN                                 !=== REGULAR CASE
+      CALL err(NF90_GET_VAR(fID,vID,q(:,:,:,iq)),"get",var)
+    !--------------------------------------------------------------------------------------------------------------------------
+    ELSE IF(NF90_INQ_VARID(fID, oldVar, vID) == NF90_NoErr) THEN                         !=== OLD NAME
+      CALL msg('Tracer <'//TRIM(var)//'> is missing => initialized to <'//TRIM(oldVar)//'>', modname)
+      CALL err(NF90_GET_VAR(fID,vID,q(:,:,:,iq)),"get",oldVar)
+    !--------------------------------------------------------------------------------------------------------------------------
+#ifdef INCA
+    ELSE IF(NF90_INQ_VARID(fID, 'OX',   vID) == NF90_NoErr .AND. var == 'O3') THEN       !=== INCA: OX INSTEAD OF O3
+      CALL msg('Tracer <O3> is missing => initialized to <OX>', modname)
+      CALL err(NF90_GET_VAR(fID,vID,q(:,:,:,iq)),"get",'OX')
+    !--------------------------------------------------------------------------------------------------------------------------
+#endif
+    ELSE IF(tracers(iq)%iso_iGroup == iH2O .AND. niso > 0) THEN                          !=== WATER ISOTOPES
+!     iName    = tracers(iq)%iso_iName  ! (next commit)
+      iName    = iso_num(iq)
+      iPhase   = tracers(iq)%iso_iPhase
+      iqParent = tracers(iq)%iqParent
+      IF(tracers(iq)%iso_iZone == 0) THEN
+         CALL msg('Tracer <'//TRIM(var)//'> is missing => initialized with a simplified Rayleigh distillation law.', modname)
+         q(:,:,:,iq) = q(:,:,:,iqParent)*tnat(iName)*(q(:,:,:,iqParent)/30.e-3)**(alpha_ideal(iName)-1.)
+      ELSE
+         CALL msg('Tracer <'//TRIM(var)//'> is missing => initialized to its parent isotope concentration.', modname)
+         q(:,:,:,iq) = q(:,:,:,iqiso(iso_indnum(iq),iPhase))
+      END IF
+    !--------------------------------------------------------------------------------------------------------------------------
+    ELSE                                                                                 !=== MISSING: SET TO 0
+      CALL msg('Tracer <'//TRIM(var)//'> is missing => initialized to zero', modname)
+      q(:,:,:,iq)=0.
+    !--------------------------------------------------------------------------------------------------------------------------
     END IF
-    WRITE(lunout,*)TRIM(modname)//": Tracer <"//TRIM(var)//"> is missing"
-    WRITE(lunout,*)"         It is hence initialized to zero"
-    q(:,:,:,iq)=0.
-   !--- CRisi: for isotops, theoretical initialization using very simplified
-   !           Rayleigh distillation law.
-    iName = tracers(iq)%iso_iName
-    IF(.NOT.ok_isotopes .OR. iName<=0) CYCLE
-    iZone = tracers(iq)%iso_iZone
-    iPhase= tracers(iq)%iso_iPhase
-    iqParent = tracers(iq)%iqParent
-    IF(iZone==0) q(:,:,:,iq) = q(:,:,:,iqParent)*tnat(iName)    &
-                             *(q(:,:,:,iqParent)/30.e-3)**(alpha_ideal(iName)-1.)
-    IF(iZone==1) q(:,:,:,iq) = q(:,:,:,iqiso(iso_indnum(iq),iPhase))
   END DO
 
@@ -162 +179 @@
     s1='value of '//TRIM(str1)//' ='
     s2=' read in starting file differs from parametrized '//TRIM(str2)//' ='
-    WRITE(msg,'(10x,a,i4,2x,a,i4)')TRIM(ADJUSTL(s1)),n1,TRIM(ADJUSTL(s2)),n2
-    CALL ABORT_gcm(TRIM(modname),TRIM(msg),1)
+    WRITE(mesg,'(10x,a,i4,2x,a,i4)')TRIM(ADJUSTL(s1)),n1,TRIM(ADJUSTL(s2)),n2
+    CALL ABORT_gcm(TRIM(modname),TRIM(mesg),1)
   END IF
 END SUBROUTINE check_dim
@@ -198 +215 @@
   IF(ierr==NF90_NoERR) RETURN
   SELECT CASE(typ)
-    CASE('inq');   msg="Field <"//TRIM(nam)//"> is missing"
-    CASE('get');   msg="Reading failed for <"//TRIM(nam)//">"
-    CASE('open');  msg="File opening failed for <"//TRIM(nam)//">"
-    CASE('close'); msg="File closing failed for <"//TRIM(nam)//">"
+    CASE('inq');   mesg="Field <"//TRIM(nam)//"> is missing"
+    CASE('get');   mesg="Reading failed for <"//TRIM(nam)//">"
+    CASE('open');  mesg="File opening failed for <"//TRIM(nam)//">"
+    CASE('close'); mesg="File closing failed for <"//TRIM(nam)//">"
   END SELECT
-  CALL ABORT_gcm(TRIM(modname),TRIM(msg),1)
+  CALL ABORT_gcm(TRIM(modname),TRIM(mesg),ierr)
 END SUBROUTINE err
 

LMDZ6/trunk/libf/dyn3d/iniacademic.F90

@@ -6 +6 @@
   USE filtreg_mod, ONLY: inifilr
   USE infotrac,    ONLY: nqtot, niso_possibles, ok_isotopes, ok_iso_verif, tnat, alpha_ideal, &
-                         iqiso, tracers, iso_indnum
+                         iqiso, tracers, iso_indnum, iso_num
   USE control_mod, ONLY: day_step,planet_type
   use exner_hyb_m, only: exner_hyb
@@ -22 +22 @@
   USE temps_mod, ONLY: annee_ref, day_ini, day_ref
   USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
+  USE readTracFiles_mod, ONLY: addPhase
 
   !   Author:    Frederic Hourdin      original: 15/01/93
@@ -62 +63 @@
   real tetastrat ! potential temperature in the stratosphere, in K
   real tetajl(jjp1,llm)
-  INTEGER i,j,l,lsup,ij, iq, iName, iZone, iPhase, iqParent
+  INTEGER i,j,l,lsup,ij, iq, iName, iPhase, iqParent
 
   REAL teta0,ttp,delt_y,delt_z,eps ! Constantes pour profil de T
@@ -276 +277 @@
            do iq=1,nqtot
               q(:,:,iq)=0.
-!              IF(tracers(iq)%name == 'H2O'//phases_sep//'g') q(:,:,iq)=1.e-10
-!              IF(tracers(iq)%name == 'H2O'//phases_sep//'l') q(:,:,iq)=1.e-15
-              IF(tracers(iq)%name == 'H2Ov') q(:,:,iq)=1.e-10
-              IF(tracers(iq)%name == 'H2Ol') q(:,:,iq)=1.e-15
+              IF(tracers(iq)%name == addPhase('H2O', 'g')) q(:,:,iq)=1.e-10
+              IF(tracers(iq)%name == addPhase('H2O', 'l')) q(:,:,iq)=1.e-15
 
               ! CRisi: init des isotopes
               ! distill de Rayleigh très simplifiée
-              iName = tracers(iq)%iso_iName
+!             iName    = tracers(iq)%iso_iName  ! (next commit)
+              iName    = iso_num(iq)
               if (.NOT.ok_isotopes .OR. iName <= 0) CYCLE
-              iZone    = tracers(iq)%iso_iZone
               iPhase   = tracers(iq)%iso_iPhase
               iqParent = tracers(iq)%iqParent
-              if (iZone == 0) q(:,:,iq) = q(:,:,iqParent)*tnat(iName) &
-                                        *(q(:,:,iqParent)/30.e-3)**(alpha_ideal(iName)-1)
-              if (iZone == 1) q(:,:,iq) = q(:,:,iqiso(iso_indnum(iq),iPhase))
+              IF(tracers(iq)%iso_iZone == 0) THEN
+                 q(:,:,iq) = q(:,:,iqParent)*tnat(iName)*(q(:,:,iqParent)/30.e-3)**(alpha_ideal(iName)-1.)
+              ELSE
+                 q(:,:,iq) = q(:,:,iqiso(iso_indnum(iq),iPhase))
+              END IF
            enddo
         else

LMDZ6/trunk/libf/dyn3d/leapfrog.F

@@ -451 +451 @@
 c+jld
 
-c  Diagnostique de conservation de l'énergie : initialisation
+c  Diagnostique de conservation de l'energie : initialisation
          IF (ip_ebil_dyn.ge.1 ) THEN 
           ztit='bil dyn'
@@ -498 +498 @@
        
 c
-c  Diagnostique de conservation de l'énergie : difference
+c  Diagnostique de conservation de l'energie : difference
          IF (ip_ebil_dyn.ge.1 ) THEN 
           ztit='bil phys'