Changeset 5229 for LMDZ6/branches/Amaury_dev/libf/dyn3dmem/iniacademic_loc.F90

Timestamp:

Sep 25, 2024, 12:03:08 PM (5 weeks ago)

Author:

abarral

Message:

Merge r5214

File:

• LMDZ6/branches/Amaury_dev/libf/dyn3dmem/iniacademic_loc.F90 (modified) (3 diffs)

LMDZ6/branches/Amaury_dev/libf/dyn3dmem/iniacademic_loc.F90

@@ -1 @@
-! $Id: iniacademic.F90 1625 2012-05-09 13:14:48Z lguez $
-
 SUBROUTINE iniacademic_loc(vcov, ucov, teta, q, masse, ps, phis, time_0)
 
   USE lmdz_filtreg, ONLY: inifilr
-  USE lmdz_infotrac, ONLY: nqtot, niso, iqIsoPha, tracers, getKey, isoName, addPhase
+  USE lmdz_infotrac, ONLY: nqtot, niso, iqIsoPha, tracers, isoName, addPhase
   USE control_mod, ONLY: day_step, planet_type
   USE exner_hyb_m, ONLY: exner_hyb
@@ -21 +19 @@
   USE lmdz_academic, ONLY: tetarappel, knewt_t, kfrict, knewt_g, clat4
   USE lmdz_comgeom
+  USE iso_params_mod   ! tnat_* and alpha_ideal_*
 
   !   Author:    Frederic Hourdin      original: 15/01/93
@@ -322 +321 @@
                     WRITE(lunout, *) 'In '//TRIM(modname)//': !!!  Beware: alpha_ideal put to 1  !!!'
                  ELSE
-                    IF(getKey('tnat', tnat, isoName(iName)) .OR. getKey('alpha', alpha_ideal, isoName(iName))) &
-                    CALL abort_gcm(TRIM(modname), 'missing isotopic parameters', 1)
+                    SELECT CASE(isoName(iName))
+                      CASE('H216O'); tnat = tnat_H216O; alpha_ideal = alpha_ideal_H216O
+                      CASE('H217O'); tnat = tnat_H217O; alpha_ideal = alpha_ideal_H217O
+                      CASE('H218O'); tnat = tnat_H218O; alpha_ideal = alpha_ideal_H218O
+                      CASE('HDO');   tnat = tnat_HDO;   alpha_ideal = alpha_ideal_HDO
+                      CASE('HTO');   tnat = tnat_HTO;   alpha_ideal = alpha_ideal_HTO
+                      CASE DEFAULT
+                         CALL abort_gcm(TRIM(modname),'unknown isotope "'//TRIM(isoName(iName))//'" ; check tracer.def file',1)
+                    END SELECT
                  END IF
                  q(ijb_u:ije_u,:,iq) = q(ijb_u:ije_u,:,iqParent)*tnat*(q(ijb_u:ije_u,:,iqParent)/30.e-3)**(alpha_ideal-1.)