Changeset 2818 for trunk/LMDZ.MARS

Timestamp:

Nov 15, 2022, 11:25:41 AM (2 years ago)

Author:

llange

Message:

Log:
Mars GCM
Minor fix in soil_settings: oldmlayer was not allocated if dim(nlayer)
in the start != nsoil creating a seg.fault. The number of layers in the
soil can now be changed, as well as the power law.
LL

File:

• trunk/LMDZ.MARS/libf/phymars/soil_settings.F (modified) (2 diffs)

trunk/LMDZ.MARS/libf/phymars/soil_settings.F

@@ -107 +107 @@
         ! soil temperatures and thermal inertia will be requiered
           interpol=.true.
-        endif
-
-! 1.2 Find out the # of dimensions <inertiedat> was defined as using
-!     (in ye old days, thermal inertia was only given at the "surface")
-      ! Look for thermal inertia data
-!      ierr=nf90_inq_varid(nid,"inertiedat",nvarid)
-!      if (ierr.NE.nf90_noerr) then
-!         write(*,*)'soil_settings: Field <inertiedat> not found!'
-!         write(*,*)trim(nf90_strerror(ierr))
-!         call abort
-!      endif
-!
-!      ! Read the # of dimensions <inertidat> was defined as using
-!      ierr=nf90_inquire_variable(nid,nvarid,ndims=ndims)
-!      ! if (ndims.eq.1) then we have the "old 2D-surface" format
-      ndims=inquire_field_ndims("inertiedat")
-
-! 1.3 Read depths values or set olddepthdef flag and values
-      if (ndims.eq.1) then ! we know that there is none
-        write(*,*)'soil_settings: no <soildepth> field expected'
-        write(*,*)'building one mimicking old definitions'
-        olddepthdef=.true.
-        interpol=.true.
         ! allocate oldmlayer
         if (.not.allocated(oldmlayer)) then
@@ -139 +116 @@
           endif
         endif
+        endif
+
+! 1.2 Find out the # of dimensions <inertiedat> was defined as using
+!     (in ye old days, thermal inertia was only given at the "surface")
+      ! Look for thermal inertia data
+!      ierr=nf90_inq_varid(nid,"inertiedat",nvarid)
+!      if (ierr.NE.nf90_noerr) then
+!         write(*,*)'soil_settings: Field <inertiedat> not found!'
+!         write(*,*)trim(nf90_strerror(ierr))
+!         call abort
+!      endif
+!
+!      ! Read the # of dimensions <inertidat> was defined as using
+!      ierr=nf90_inquire_variable(nid,nvarid,ndims=ndims)
+!      ! if (ndims.eq.1) then we have the "old 2D-surface" format
+      ndims=inquire_field_ndims("inertiedat")
+
+! 1.3 Read depths values or set olddepthdef flag and values
+      if (ndims.eq.1) then ! we know that there is none
+        write(*,*)'soil_settings: no <soildepth> field expected'
+        write(*,*)'building one mimicking old definitions'
+        olddepthdef=.true.
+        interpol=.true.
+
         do iloop=1,dimlen
           oldmlayer(iloop)=sqrt(887.75/3.14)*((2.**(iloop-0.5))-1.)