Changeset 5618 for LMDZ6/branches/contrails/libf/phylmd/Dust

Timestamp:

Apr 15, 2025, 11:56:45 AM (3 months ago)

Author:

aborella

Message:

Merge with trunk testing r5597. We have convergence in prod and debug in NPv7.0.1c

Location:

LMDZ6/branches/contrails

Files:

• . (modified) (1 prop)
• libf/phylmd/Dust/bl_for_dms.f90 (deleted)
• libf/phylmd/Dust/checknanqfi.f90 (modified) (2 diffs)
• libf/phylmd/Dust/chem_spla_mod_h.f90 (modified) (1 diff)
• libf/phylmd/Dust/gastoparticle.f90 (deleted)
• libf/phylmd/Dust/lmdz_spla_bl_for_dms.f90 (copied) (copied from LMDZ6/trunk/libf/phylmd/Dust/lmdz_spla_bl_for_dms.f90)
• libf/phylmd/Dust/lmdz_spla_gastoparticle.f90 (copied) (copied from LMDZ6/trunk/libf/phylmd/Dust/lmdz_spla_gastoparticle.f90)
• libf/phylmd/Dust/lmdz_spla_ini.f90 (copied) (copied from LMDZ6/trunk/libf/phylmd/Dust/lmdz_spla_ini.f90)
• libf/phylmd/Dust/lmdz_spla_neutral.f90 (copied) (copied from LMDZ6/trunk/libf/phylmd/Dust/lmdz_spla_neutral.f90)
• libf/phylmd/Dust/lmdz_spla_nightingale.f90 (copied) (copied from LMDZ6/trunk/libf/phylmd/Dust/lmdz_spla_nightingale.f90)
• libf/phylmd/Dust/neutral.f90 (deleted)
• libf/phylmd/Dust/nightingale.f90 (deleted)
• libf/phylmd/Dust/phytracr_spl_mod.F90 (modified) (2 diffs)
• libf/phylmd/Dust/precuremission.f90 (modified) (3 diffs)
• libf/phylmd/Dust/read_dust.f90 (modified) (2 diffs)
• libf/phylmd/Dust/read_surface.f90 (modified) (7 diffs)
• libf/phylmd/Dust/read_vent.f90 (modified) (4 diffs)

LMDZ6/branches/contrails/libf/phylmd/Dust/checknanqfi.f90

@@ -1 +1 @@
 SUBROUTINE checknanqfi(zq,qmin,qmax,comment)
   USE dimphy
-  USE, intrinsic :: ieee_arithmetic
   IMPLICIT NONE
 
@@ -17 +16 @@
      DO i = 1, klon
 !        IF (zq(i,k).GT.qmax .OR. zq(i,k).LT.qmin) THEN
-        IF (ieee_is_nan(zq(i,k))) THEN
+        IF (isnan(zq(i,k))) THEN
            jbad = jbad + 1
            jadrs(jbad) = i

LMDZ6/branches/contrails/libf/phylmd/Dust/chem_spla_mod_h.f90

@@ -1 +1 @@
 MODULE chem_spla_mod_h
   IMPLICIT NONE; PRIVATE
-  PUBLIC ss_bins, masse_ammsulfate
+  PUBLIC ss_bins  
 
   INTEGER, PARAMETER :: ss_bins = 2
-  REAL, PARAMETER :: masse_ammsulfate = 132.0  !--g mol-1
 END MODULE chem_spla_mod_h
 

LMDZ6/branches/contrails/libf/phylmd/Dust/phytracr_spl_mod.F90

@@ -4 +4 @@
 MODULE phytracr_spl_mod
 
+  USE lmdz_spla_gastoparticle, ONLY : spla_gastoparticle
+
   ! Recuperation des morceaux de la physique de Jeronimo specifiques
   ! du modele d'aerosols d'Olivier n'co.
-  USE chem_mod_h
+  USE lmdz_spla_ini, ONLY: masse_s   !au lieu de USE chem_mod_h
   USE chem_spla_mod_h
 
@@ -2748 +2750 @@
       ENDIF
 
-      CALL gastoparticle(pdtphys,zdz,zrho,rlat, &
+      CALL spla_gastoparticle(klon,klev,nbtr,pdtphys,zdz,zrho,rlat, &
                    pplay,t_seri,id_prec,id_fine, &
                    tr_seri,his_g2pgas ,his_g2paer) 

LMDZ6/branches/contrails/libf/phylmd/Dust/precuremission.f90

@@ -16 +16 @@
         source_tr,flux_tr,tr_seri)
 
-USE chem_spla_mod_h
-  USE chem_mod_h
+USE lmdz_spla_ini, ONLY: masse_s,masse_ammsulfate ! remplaces USE de chem_mod_h chem_spla_mod_h
+USE lmdz_spla_nightingale, ONLY: spla_nightingale
   USE dimphy
   USE indice_sol_mod
@@ -84 +84 @@
   REAL :: lmt_h2sbio(klon)        ! emissions de h2s bio
 
-  EXTERNAL condsurfs, liss, nightingale
+  EXTERNAL condsurfs, liss
   !=========================================================================
   ! Modifications introduced by NHL
@@ -96 +96 @@
   !=========================================================================
 
-     CALL nightingale(u_seri, v_seri, u10m_ec, v10m_ec, paprs, &
+     CALL spla_nightingale(klon,klev,nbsrf,u_seri, v_seri, u10m_ec, v10m_ec, paprs, &
            pplay, cdragh, cdragm, t_seri, q_seri, ftsol, &
            tsol, pctsrf, lmt_dmsconc, lmt_dms)

LMDZ6/branches/contrails/libf/phylmd/Dust/read_dust.f90

@@ -21 +21 @@
   save ncid1, varid1, ncid2, varid2
 !$OMP THREADPRIVATE(ncid1, varid1, ncid2, varid2)
-  integer :: start(4),count(4), status
+  integer :: start_(4),count_(4)
   integer :: i, j, ig
   !
@@ -28 +28 @@
   if (debutphy) then
   !
-     ncid1=nf90_open('dust.nc',nf90_nowrite,rcode)
-     varid1=nf90_inq_varid(ncid1,'EMISSION',rcode)
+     rcode=nf90_open('dust.nc',nf90_nowrite,ncid1)
+     if ( rcode /= 0 ) then ; call abort_physic('LMDZ','open dust.nc dans read_vent',1) ; endif
+
+     rcode=nf90_inq_varid(ncid1,'EMISSION',varid1)
+     if ( rcode /= 0 ) then ; call abort_physic('LMDZ','inq varid EMISSION dans read_vent',1) ; endif
   !
   endif
   !
-  start(1)=1
-  start(2)=1
-  start(4)=0
+  start_(1)=1
+  start_(2)=1
+  start_(3)=step
+  start_(4)=0
 
-   ! count(1)=iip1
-  count(1)=nbp_lon+1
-   ! count(2)=jjp1
-  count(2)=nbp_lat
-  count(3)=1
-  count(4)=0
+   ! count_(1)=iip1
+  count_(1)=nbp_lon+1
+   ! count_(2)=jjp1
+  count_(2)=nbp_lat
+  count_(3)=1
+  count_(4)=0
   !
-  start(3)=step
   !
-  status = nf90_get_var(ncid1, varid1, dust_nc_glo, start, count)
+  rcode = nf90_get_var(ncid1, varid1, dust_nc_glo, start_, count_)
+  if ( rcode /= 0 ) then ; call abort_physic('LMDZ','get EMISSION dans read_vent',1) ; endif
 
   !

LMDZ6/branches/contrails/libf/phylmd/Dust/read_surface.f90

@@ -31 +31 @@
        real surfa_glo(klon_glo,5)
 !
-       integer ncid, varid, rcode
-       integer start(2),count(2),status
+       integer ncid, varid, rcode, varlatid,tmpid
+       integer start_(2),count_(2)
        integer i,j,l,ig
        character*1 str1
@@ -41 +41 @@
       real, dimension(nbp_lat) :: lats
       real, dimension(nbp_lat) :: lats_glo
-      integer, dimension(1) :: startj,endj
+      integer, dimension(1) :: start_j,endj
 !JE20140526>>
 !$OMP MASTER
@@ -47 +47 @@
 
        print*,'Lecture du fichier donnees_lisa.nc' 
-       ncid=nf90_open('donnees_lisa.nc',nf90_nowrite,rcode)
+       rcode=nf90_open('donnees_lisa.nc',nf90_nowrite,ncid)
+       if ( rcode /= 0 ) then ; call abort_physic('LMDZ','open donnees_lisa.nc dans read_vent',1) ; endif
+
 
 !JE20140526<<: check if are inversed or not the latitude grid in donnes_lisa
@@ -54 +56 @@
       isinversed=.false.
       do i=1,5
-       if (i==1) aux4s='latu'
-       if (i==2) aux4s='LATU'
-       if (i==3) aux4s='LatU'
-       if (i==4) aux4s='Latu'
-       if (i==5) aux4s='latU'
-       status = nf90_inq_varid(ncid, aux4s, rcode)
-!       print *,'stat,i',status,i,outcycle,aux4s
-!       print *,'ifclause',status.NE. nf90_noerr ,outcycle == .false.
-       IF ((.not.(status.NE. nf90_noerr) ).and.( .not. outcycle )) THEN
-         outcycle=.true.
-         latstr=aux4s
-       ENDIF
+          if (i==1) aux4s='latu'
+          if (i==2) aux4s='LATU'
+          if (i==3) aux4s='LatU'
+          if (i==4) aux4s='Latu'
+          if (i==5) aux4s='latU'
+          rcode = nf90_inq_varid(ncid, aux4s, tmpid)
+          IF ((rcode==0).and.( .not. outcycle )) THEN
+            outcycle=.true.
+            varlatid=tmpid
+          ENDIF
       enddo ! check if it inversed lat
-      startj(1)=1
-!      endj(1)=jjp1
+      start_j(1)=1
       endj(1)=nbp_lat
-      varid=nf90_inq_varid(ncid,latstr,rcode)
+      rcode = nf90_get_var(ncid, varlatid, lats_glo, start_j, endj)
+      if ( .not. outcycle ) then ; call abort_physic('LMDZ','get lat dans read_surface',1) ; endif
 
-          status = nf90_get_var(ncid, varid, lats_glo, startj, endj)
-!      print *,latstr,varid,status,jjp1,rcode
-!      IF (status .NE. nf90_noerr) print*,'NOOOOOOO'
-!      print *,lats
-!stop
+
 
 ! check if netcdf is latitude inversed or not. 
@@ -86 +82 @@
           write(str1,'(i1)') i
           varname=trim(name)//str1
-       print*,'lecture variable:',varname
-          varid=nf90_inq_varid(ncid,trim(varname),rcode)
+          rcode=nf90_inq_varid(ncid,trim(varname),varid)
+          if ( rcode /= 0 ) then ; call abort_physic('LMDZ','get'//varname//'  dans read_vent',1) ; endif
 !          varid=nf90_inq_varid(ncid,varname,rcode)
 
@@ -93 +89 @@
 !  -----------------------------------------------------
 
-          start(1)=1
-          start(2)=1      
-          count(1)=nbp_lon+1
-!          count(1)=iip1
-          count(2)=nbp_lat
-!          count(2)=jjp1
+          start_(1)=1
+          start_(2)=1      
+          count_(1)=nbp_lon+1
+!          count_(1)=iip1
+          count_(2)=nbp_lat
+!          count_(2)=jjp1
 
 ! mise a zero des tableaux 
@@ -106 +102 @@
 ! Lecture
 ! -----------------------
-          status = nf90_get_var(ncid, varid, tmp_dyn_glo, start, count)
+          rcode = nf90_get_var(ncid, varid, tmp_dyn_glo, start_, count_)
+          if ( rcode /= 0 ) then ; call abort_physic('LMDZ','get'//varname//'  dans read_vent',1) ; endif
 
 !      call dump2d(iip1,jjp1,tmp_dyn,'tmp_dyn   ')

LMDZ6/branches/contrails/libf/phylmd/Dust/read_vent.f90

@@ -23 +23 @@
   save ncidu1, varidu1, ncidv1, varidv1
 !$OMP THREADPRIVATE(ncidu1, varidu1, ncidv1, varidv1)
-  integer :: start(4),count(4), status
+  integer :: start(4),count_(4)
   integer :: i, j, ig
+  integer :: lunout
+
+  lunout=6
 
 
@@ -32 +35 @@
   if (debutphy) then
   !
-     ncidu1=nf90_open('u10m.nc',nf90_nowrite,rcode)
-     varidu1=nf90_inq_varid(ncidu1,'U10M',rcode)
-     ncidv1=nf90_open('v10m.nc',nf90_nowrite,rcode)
-     varidv1=nf90_inq_varid(ncidv1,'V10M',rcode)
+     rcode=nf90_open('u10m.nc',nf90_nowrite,ncidu1)
+     if ( rcode /= 0 ) then ; call abort_physic('LMDZ','open u10m.nc dans read_vent',1) ; endif
+     rcode=nf90_inq_varid(ncidu1,'U10M',varidu1)
+     if ( rcode /= 0 ) then ; call abort_physic('LMDZ','get id u10m dans read_vent',1) ; endif
+     rcode=nf90_open('v10m.nc',nf90_nowrite,ncidv1)
+     if ( rcode /= 0 ) then ; call abort_physic('LMDZ','open v10m.nc dans read_vent',1) ; endif
+     rcode=nf90_inq_varid(ncidv1,'V10M',varidv1)
+     if ( rcode /= 0 ) then ; call abort_physic('LMDZ','get id v10m dans read_vent',1) ; endif
   !
   endif
@@ -41 +48 @@
   start(1)=1
   start(2)=1
+  start(3)=step
   start(4)=0
 
-   ! count(1)=iip1
-  count(1)=nbp_lon+1
-   ! count(2)=jjp1
-  count(2)=nbp_lat
-  count(3)=1
-  count(4)=0
+   ! count_(1)=iip1
+  count_(1)=nbp_lon+1
+   ! count_(2)=jjp1
+  count_(2)=nbp_lat
+  count_(3)=1
+  count_(4)=0
   !
-  start(3)=step
   !
-  status = nf90_get_var(ncidu1, varidu1, u10m_nc_glo, start, count)
+  rcode = nf90_get_var(ncidu1, varidu1, u10m_nc_glo, start, count_)
+  ! if ( rcode /= 0 ) then ; call abort_physic('LMDZ','lecture u10m dans read_vent',1) ; endif
+  if ( rcode /= 0 ) then ; write(lunout,*) 'WARNING : pas de temps manquant dans la lecture u10m dans read_vent' ; endif
+  rcode = nf90_get_var(ncidv1, varidv1, v10m_nc_glo, start, count_)
+  ! if ( rcode /= 0 ) then ; call abort_physic('LMDZ','lecture v10m dans read_vent',1) ; endif
+  if ( rcode /= 0 ) then ; write(lunout,*) 'WARNING : pas de temps manquant dans la lecture v10m dans read_vent' ; endif
 
-    ! print *,status
-  !
-  status = nf90_get_var(ncidv1, varidv1, v10m_nc_glo, start, count)
+
+! ------- Tests 2024/12/31-FH----------------------------------------
+! print*,'nbp_lon,npb_lat ',nbp_lon,nbp_lat
+! print*,'start ',start
+! print*,'count_ ',count_
+! print*,'satus lecture u10m ',rcode
+! call dump2d(nbp_lon+1,nbp_lat,u10m_nc_glo,'U10M global read_vent')
+! call dump2d(nbp_lon+1,nbp_lat,v10m_nc_glo,'V10M global read_vent')
+! stop
+! ------- Tests -----------------------------------------------------
 
   !
@@ -63 +82 @@
   !  print *,'beforebidcor v10m_nc', v10m_nc(1,jjp1)
 
-  !   print *,status
+  !   print *,rcode
   !  call correctbid(iim,jjp1,u10m_nc)
   !  call correctbid(iim,jjp1,v10m_nc)